[java-identity-provider COMMIT] in /trunk/idp-authn-impl: pom.xml src/main/java/net/shibboleth/idp/authn/impl/Display...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul 31 00:50:53 2013
New Revision: 4641

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4641&view=rev
Log:
IDP-107: form login page action

Added:
    trunk/idp-authn-impl/src/main/resources/templates/
    trunk/idp-authn-impl/src/main/resources/templates/login.vt
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPageTest.java   (with props)
Modified:
    trunk/idp-authn-impl/pom.xml
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SendHTTPBasicAuthChallenge.java

Modified: trunk/idp-authn-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/pom.xml?rev=4641&r1=4640&r2=4641&view=diff
==============================================================================
--- trunk/idp-authn-impl/pom.xml (original)
+++ trunk/idp-authn-impl/pom.xml Wed Jul 31 00:50:53 2013
@@ -33,6 +33,11 @@
             <artifactId>velocity</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+        </dependency>
+
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
@@ -41,9 +46,16 @@
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-profile-api</artifactId>
-            <version>${project.version}</version>
+            <version>${opensaml.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-impl</artifactId>
+            <version>${opensaml.version}</version>
+            <scope>test</scope>
         </dependency>
         
     </dependencies>

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java?rev=4641&r1=4640&r2=4641&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java Wed Jul 31 00:50:53 2013
@@ -20,41 +20,54 @@
 import java.io.IOException;
 
 import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.shibboleth.idp.authn.AbstractAuthenticationAction;
-import net.shibboleth.idp.authn.AuthenticationException;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.profile.ActionSupport;
-
+import org.opensaml.profile.ProfileException;
+import org.opensaml.profile.action.AbstractProfileAction;
+import org.opensaml.profile.action.ActionSupport;
+import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
-
+import org.owasp.esapi.ESAPI;
+import org.owasp.esapi.Encoder;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.net.HttpServletSupport;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.velocity.Template;
 
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.exception.VelocityException;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-//TODO(lajoie) internationalized pages based on Accept-Language
-
-/** A stage which renders a username/password collection page. */
- at ThreadSafe
-public class DisplayUsernamePasswordPage extends AbstractAuthenticationAction {
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// TODO: internationalized pages based on Accept-Language
+
+/**
+ * An action that renders a web page for collection of a username and password.
+ * 
+ * @event {@link EventIds#PROCEED_EVENT_ID}
+ * @event {@link EventIds#INVALID_PROFILE_CTX}
+ * @event {@link EventIds#IO_ERROR}
+ * @pre <pre>ProfileRequestContext.getSubcontext(AuthenticationContext.class, false) != null</pre>
+ * @pre <pre>ProfileRequestContext.getHttpResponse() != null</pre>
+ * @post A Velocity template is rendered to the client.
+ */
+public class DisplayUsernamePasswordPage extends AbstractProfileAction {
+    

[... 250 lines stripped ...]