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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug 20 16:57:05 2014
New Revision: 6450

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6450&view=rev
Log:
Allow controllable behavior on identity switches.

Added:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DetectIdentitySwitch.java
      - copied, changed from r6449, trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitch.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/DetectIdentitySwitchTest.java
      - copied, changed from r6449, trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.java
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/test/resources/test/test-ldap.ldif
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitch.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.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=6450&r1=6449&r2=6450&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 Wed Aug 20 16:57:05 2014
@@ -47,7 +47,7 @@
     
     /** ID of event returned if the given credentials are invalid. */
     @Nonnull @NotEmpty public static final String INVALID_CREDENTIALS = "InvalidCredentials";
-
+    
     /** ID of event returned if the subject's account is in an invalid state. */
     @Nonnull @NotEmpty public static final String ACCOUNT_ERROR = "AccountError";
 
@@ -68,6 +68,9 @@
 
     /** ID of event returned if an error occurs canonicalizing a Subject. */
     @Nonnull @NotEmpty public static final String SUBJECT_C14N_ERROR = "SubjectCanonicalizationError";
+
+    /** ID of event returned if an authenticated subject doesn't match the identity in an existing session. */
+    @Nonnull @NotEmpty public static final String IDENTITY_SWITCH = "IdentitySwitch";
     
     /** ID of event returned if authentication throws an exception unrelated to credential validation. */
     @Nonnull @NotEmpty public static final String AUTHN_EXCEPTION = "AuthenticationException";

Modified: trunk/idp-conf/src/main/resources/conf/error-mappings.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/error-mappings.xml?rev=6450&r1=6449&r2=6450&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/error-mappings.xml Wed Aug 20 16:57:05 2014
@@ -23,6 +23,7 @@
     <!-- List of events to trap and handle with local views, without returning to SPs. -->
     <!--
     <util:list id="shibboleth.LocalEvents">
+        <value>IdentitySwitch</value>
         <value>NoPotentialFlow</value>
     </util:list>
     -->
@@ -47,6 +48,7 @@
         <entry key="NoCredentials" value-ref="shibboleth.SAML1Status.Requester" />
         <entry key="InvalidCredentials" value-ref="shibboleth.SAML1Status.Requester" />
         <entry key="AccountError" value-ref="shibboleth.SAML1Status.Requester" />
+        <entry key="IdentitySwitch" value-ref="shibboleth.SAML1Status.Requester" />
         <entry key="AuthenticationException" value-ref="shibboleth.SAML1Status.Requester" />
         
         <entry key="InvalidSubject" value-ref="shibboleth.SAML1Status.Requester" />
@@ -72,6 +74,7 @@
         <entry key="NoCredentials" value-ref="shibboleth.SAML2Status.AuthnFailed" />
         <entry key="InvalidCredentials" value-ref="shibboleth.SAML2Status.AuthnFailed" />
         <entry key="AccountError" value-ref="shibboleth.SAML2Status.AuthnFailed" />
+        <entry key="IdentitySwitch" value-ref="shibboleth.SAML2Status.AuthnFailed" />
         <entry key="AuthenticationException" value-ref="shibboleth.SAML2Status.AuthnFailed" />
         
         <entry key="InvalidSubject" value-ref="shibboleth.SAML2Status.UnknownPrincipal" />

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6450&r1=6449&r2=6450&view=diff
==============================================================================

[... 235 lines stripped ...]