[java-identity-provider COMMIT] in /trunk: idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/CheckAuthentic...

[noreply at shibboleth.net]

Author: serac
Date: Thu Oct 29 14:51:24 2015
New Revision: 7906

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7906&view=rev
Log:
IDP-846 Delegate to authn flow for sec policy.

https://issues.shibboleth.net/jira/browse/IDP-846
Replace CheckAuthenticationRequiredAction with a simple decision state that
checks for CAS gateway mode, and calls the authn subflow in all other cases.
The authn subflow is the authority on the need for authentication based on
session policy, existing authentication results, and SP requirements.

Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/CheckAuthenticationRequiredAction.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/CheckAuthenticationRequiredActionTest.java
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml

Modified: trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml?rev=7906&r1=7905&r2=7906&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml	(original)
+++ trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml	Thu Oct 29 14:51:24 2015
@@ -94,9 +94,6 @@
     <bean id="buildSAMLMetadataContextAction"
           class="net.shibboleth.idp.cas.flow.impl.BuildSAMLMetadataContextAction" />
 
-    <bean id="checkAuthenticationRequiredAction"
-          class="net.shibboleth.idp.cas.flow.impl.CheckAuthenticationRequiredAction" />
-
     <bean id="checkProxyAuthorizationAction"
           class="net.shibboleth.idp.cas.flow.impl.CheckProxyAuthorizationAction" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml?rev=7906&r1=7905&r2=7906&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml	Thu Oct 29 14:51:24 2015
@@ -29,9 +29,6 @@
 
     <bean id="InitializeLogin"
           class="net.shibboleth.idp.cas.flow.impl.InitializeLoginAction" />
-
-    <bean id="CheckAuthenticationRequired"
-          class="net.shibboleth.idp.cas.flow.impl.CheckAuthenticationRequiredAction" />
 
     <bean id="BuildAuthenticationContext"
           class="net.shibboleth.idp.cas.flow.impl.BuildAuthenticationContextAction" />

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=7906&r1=7905&r2=7906&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	Thu Oct 29 14:51:24 2015
@@ -28,14 +28,15 @@
         <transition on="proceed" to="CheckAuthenticationRequired"/>
     </subflow-state>
 
-    <action-state id="CheckAuthenticationRequired">
-        <evaluate expression="CheckAuthenticationRequired"/>
-        <transition on="SessionInvalid" to="CheckInitialAuthenticationRequired" />
-        <transition on="SessionValid" to="CheckResolveAttributes" />
-        <transition on="RenewRequested" to="CheckInitialAuthenticationRequired" />
-        <transition on="GatewayRequested" to="RedirectToService">
-            <set name="flowScope.redirectUrl" value="flowScope.serviceTicketRequest.service" />
-        </transition>
+    <decision-state id="CheckAuthenticationRequired">
+        <if test="flowScope.serviceTicketRequest.gateway"
+            then="PrepareForRedirectToService"
+            else="CheckInitialAuthenticationRequired" />
+    </decision-state>
+
+    <action-state id="PrepareForRedirectToService">
+        <set name="flowScope.redirectUrl" value="flowScope.serviceTicketRequest.service" />
+        <transition to="RedirectToService" />
     </action-state>
 
     <decision-state id="CheckInitialAuthenticationRequired">