[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java id...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Jul 30 09:20:55 2012
New Revision: 4216

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4216&view=rev
Log:
work on various authn stages
add example configs for authn stages

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequest.java
      - copied, changed from r4203, trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormResponse.java
    trunk/idp-authn-impl/src/main/resources/authnbeans-example.xml   (with props)
    trunk/idp-authn-impl/src/main/resources/authnflow-example.xml   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormResponse.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromWssToken.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/InitializeAuthenticationContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationWorkflow.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationData.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddress.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java?rev=4216&r1=4215&r2=4216&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java Mon Jul 30 09:20:55 2012
@@ -20,8 +20,17 @@
 /** Constants to use for {@link org.springframework.webflow.execution.Event} IDs. */
 public final class AuthnEventIds {
 
+    /** ID of event that indicates the authentication context is missing or corrupt in some way. */
+    public static final String INVALID_AUTHN_CTX = "InvalidAuthenticationContext";
+
     /** ID of event returned if there are no authentication workflow that could be used to authenticate the user. */
     public static final String NO_POTENTIAL_WORKFLOW = "NoPotentialWorkflow";
+
+    /** ID of event returned if there are no credentials available in the request. */
+    public static final String NO_CREDENTIALS = "NoCredentials";
+
+    /** ID of event returned if there given credentials are invalid. */
+    public static final String INVALID_CREDENTIALS = "InvalidCredentials";
 
     /** Constructor. */
     private AuthnEventIds() {

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java?rev=4216&r1=4215&r2=4216&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java Mon Jul 30 09:20:55 2012
@@ -216,6 +216,8 @@
             if (!authenticationEvents.containsKey(authnEvent.getAuthenticationWorkflow())) {
                 authenticationEvents.put(authnEvent.getAuthenticationWorkflow(), authnEvent);
             }
+            
+            //TODO(lajoie) don't we need to update the authn event if it already exists?
 
             serviceSessions.put(serviceId, session);
         } finally {

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java?rev=4216&r1=4215&r2=4216&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java Mon Jul 30 09:20:55 2012
@@ -21,14 +21,19 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.shibboleth.ext.spring.webflow.Event;
+import net.shibboleth.ext.spring.webflow.Events;
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.AuthenticationException;
 import net.shibboleth.idp.authn.AuthenticationRequestContext;
+import net.shibboleth.idp.authn.AuthnEventIds;

[... 662 lines stripped ...]