[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/system/flows/cas/login/login-beans.xml main/re...

[noreply at shibboleth.net]

Author: serac
Date: Fri Jul 17 11:50:44 2015
New Revision: 7640

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7640&view=rev
Log:
IDP-761 Add support for initial-authn to CAS login flow.

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

Added:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowInitialAuthnTest.java
Modified:
    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-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=7640&r1=7639&r2=7640&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	Fri Jul 17 11:50:44 2015
@@ -59,4 +59,7 @@
           p:fieldExtractors-ref="shibboleth.CASLoginAuditExtractors"
           p:formattingMap-ref="shibboleth.AuditFormattingMap" />
 
+    <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">
+        <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.trim().length() gt 0 }" type="boolean" />
+    </bean>
 </beans>

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=7640&r1=7639&r2=7640&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	Fri Jul 17 11:50:44 2015
@@ -23,17 +23,34 @@
 
     <action-state id="CheckAuthenticationRequired">
         <evaluate expression="CheckAuthenticationRequired"/>
-        <transition on="SessionNotFound" to="BuildAuthenticationContext" />
+        <transition on="SessionNotFound" to="CheckInitialAuthenticationRequired" />
         <transition on="SessionFound" to="CheckResolveAttributes" />
-        <transition on="RenewRequested" to="BuildAuthenticationContext" />
+        <transition on="RenewRequested" to="CheckInitialAuthenticationRequired" />
         <transition on="GatewayRequested" to="RedirectToService">
             <set name="flowScope.redirectUrl" value="flowScope.serviceTicketRequest.service" />
         </transition>
     </action-state>
 
-    <action-state id="BuildAuthenticationContext">
+    <decision-state id="CheckInitialAuthenticationRequired">
+        <if test="InitialAuthenticationFlag" then="PreInitialSetup" else="PostInitialSetup" />
+    </decision-state>
+
+    <action-state id="PreInitialSetup">
         <evaluate expression="BuildAuthenticationContext"/>
         <evaluate expression="'proceed'" />
+
+        <transition on="proceed" to="DoInitialAuthenticationSubflow" />
+    </action-state>
+
+    <subflow-state id="DoInitialAuthenticationSubflow" subflow="authn-initial">
+        <input name="calledAsSubflow" value="true" />
+        <transition on="proceed" to="PostInitialSetup" />
+    </subflow-state>
+
+    <action-state id="PostInitialSetup">
+        <evaluate expression="BuildAuthenticationContext"/>
+        <evaluate expression="'proceed'" />
+
         <transition on="proceed" to="DoAuthenticationSubflow" />
     </action-state>