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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Aug  9 17:04:54 2013
New Revision: 4679

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4679&view=rev
Log:
Extend error handling and refactor validation-related authn actions.

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java   (with props)
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationErrorContext.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectContext.java
    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/FinalizeAuthenticationFlow.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateRemoteUser.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddress.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=4679&r1=4678&r2=4679&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Fri Aug  9 17:04:54 2013
@@ -221,7 +221,7 @@
      * @param principals supported principals to add
      */
     public <T extends Principal> void setSupportedPrincipals(@Nonnull @NonnullElements final Collection<T> principals) {
-        Constraint.isNotNull(principals, "Principal list cannot be null.");
+        Constraint.isNotNull(principals, "Principal collection cannot be null.");
         
         supportedPrincipals.getPrincipals().clear();
         supportedPrincipals.getPrincipals().addAll(Collections2.filter(principals, Predicates.notNull()));

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java?rev=4679&r1=4678&r2=4679&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java Fri Aug  9 17:04:54 2013
@@ -77,9 +77,6 @@
         
     /** Authentication flow being attempted to authenticate the user. */
     @Nullable private AuthenticationFlowDescriptor attemptedFlow;
-
-    /** An exception caught by a flow during the login process. */
-    @Nullable private Exception loginException;
     
     /** A successfully processed authentication result (the output of the attempted flow, if any). */
     @Nullable private AuthenticationResult authenticationResult;
@@ -298,29 +295,6 @@
         attemptedFlow = flow;
         return this;
     }
-
-    /**
-     * Get the latest login exception encountered during the processing of the attemped flow.
-     * 
-     * @return a login exception encountered during flow processing
-     */
-    @Nullable public Exception getLoginException() {
-        return loginException;
-    }
-    
-    /**
-     * Set a login exception encountered during the processing of the attempted flow.
-     * 
-     * <p>This preserves error state generated by an action for use by the flow, typically in
-     * response to user input that can be recovered from, such as invalid credentials,
-     * a locked account, etc. Essentially anything that requires a repetition of user
-     * interaction and may require reporting on the error.</p>
-     * 
-     * @param e the exception to preserve
-     */
-    public void setLoginException(@Nullable final Exception e) {
-        loginException = e;
-    }
     
     /**
      * Get the authentication result produced by the attempted flow, or reused for SSO.
@@ -366,7 +340,8 @@
     /** {@inheritDoc} */
     public String toString() {
         return Objects.toStringHelper(this).add("initiationInstant", new DateTime(initiationInstant))
-                .add("isPassive", isPassive).add("forceAuthn", forceAuthn)
+                .add("isPassive", isPassive).add("forceAuthn", forceAuthn).add("hintedName", hintedName)
+                .add("canonicalPrincipalName", canonicalPrincipalName)

[... 404 lines stripped ...]