[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: Mon Mar 28 15:51:38 2016
New Revision: 8184

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8184&view=rev
Log:
IDP-921 - restart authentication in postAuthenticationFlows

https://issues.shibboleth.net/jira/browse/IDP-921

Added restart detection after authn flow and post-authn intercepts.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

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=8184&r1=8183&r2=8184&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 Mar 28 15:51:38 2016
@@ -56,7 +56,10 @@
     
     /** ID of event returned if a flow wishes to indicate that another flow should be selected instead. */
     @Nonnull @NotEmpty public static final String RESELECT_FLOW = "ReselectFlow";
-    
+
+    /** ID of event returned if the authentication process should be restarted from scratch. */
+    @Nonnull @NotEmpty public static final String RESTART_AUTHN = "RestartAuthentication";
+
     /**
      * ID of event returned if the {@link net.shibboleth.idp.authn.context.SubjectCanonicalizationContext}
      * is missing or invalid.

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml?rev=8184&r1=8183&r2=8184&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml	Mon Mar 28 15:51:38 2016
@@ -27,6 +27,7 @@
     <end-state id="NoPotentialFlow" />
     <end-state id="RequestUnsupported" />
     <end-state id="ReselectFlow" />
+    <end-state id="RestartAuthentication" />
     <end-state id="RuntimeException" />
     <end-state id="SubjectCanonicalizationError" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml?rev=8184&r1=8183&r2=8184&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml	Mon Mar 28 15:51:38 2016
@@ -91,6 +91,7 @@
         <transition on="proceed" to="CheckResolveAttributes">
             <evaluate result="flowScope.hasAuthenticationContext" expression="true" />
         </transition>
+        <transition on="RestartAuthentication" to="PostInitialSetup" />
     </subflow-state>
 
     <decision-state id="CheckResolveAttributes">
@@ -128,6 +129,7 @@
     <subflow-state id="DoPostAuthnInterceptSubflow" subflow="intercept">
         <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="GrantServiceTicket" />
+        <transition on="RestartAuthentication" to="PostInitialSetup" />
     </subflow-state>
 
     <action-state id="GrantServiceTicket">

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml?rev=8184&r1=8183&r2=8184&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml	Mon Mar 28 15:51:38 2016
@@ -19,6 +19,7 @@
     <end-state id="AttributeReleaseRejected" />
     <end-state id="TermsRejected" />
     <end-state id="ContextCheckDenied" />
+    <end-state id="RestartAuthentication" />
     <end-state id="RuntimeException" />
 
     <action-state id="LogRuntimeException">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml?rev=8184&r1=8183&r2=8184&view=diff

[... 42 lines stripped ...]