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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 15 16:25:14 2013
New Revision: 4863

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4863&view=rev
Log:
Streamline handling of principal name during authn flow, fix up config files.

Added:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitch.java
      - copied, changed from r4861, trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/InvalidateSession.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.java
      - copied, changed from r4861, trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionTest.java
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.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/SubjectCanonicalizationContext.java
    trunk/idp-authn-impl/pom.xml
    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/FinalizeAuthenticationFlow.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationFlowTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SimpleSubjectCanonicalizationTest.java
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
    trunk/idp-conf/src/main/resources/conf/global-beans.xml
    trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/simple-subject-c14n-flow.xml
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/InvalidateSession.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResultTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java?rev=4863&r1=4862&r2=4863&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java Tue Oct 15 16:25:14 2013
@@ -179,7 +179,8 @@
     }
 
     /**
-     * Performs this c14n action's pre-execute step. Default implementation just returns true.
+     * Performs this c14n action's pre-execute step. Default implementation just returns true iff a subject
+     * is set.
      * 
      * @param profileRequestContext the current IdP profile request context
      * @param c14nContext the current subject canonicalization context
@@ -190,7 +191,7 @@
      */
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final SubjectCanonicalizationContext c14nContext) throws SubjectCanonicalizationException {
-        return true;
+        return c14nContext.getSubject() != null;
     }
     
     /**

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java?rev=4863&r1=4862&r2=4863&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java (original)

[... 973 lines stripped ...]