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

[noreply at shibboleth.net]

Author: serac
Date: Mon Sep 19 11:17:14 2016
New Revision: 8404

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8404&view=rev
Log:
IDP-1048 Check for authentication results in gateway mode.

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=8404&r1=8403&r2=8404&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	Mon Sep 19 11:17:14 2016
@@ -71,15 +71,16 @@
     </bean>
 
     <!-- Supplementary beans -->
+    <bean id="SessionContextLookup"
+          class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+          c:type="net.shibboleth.idp.session.context.SessionContext" />
+
     <bean id="PrincipalLookupFunction"
           class="com.google.common.base.Functions"
           factory-method="compose">
         <constructor-arg index="0">
             <bean class="net.shibboleth.idp.session.context.navigate.SessionContextPrincipalLookupFunction" />
         </constructor-arg>
-        <constructor-arg index="1">
-            <bean class="org.opensaml.messaging.context.navigate.ChildContextLookup"
-                  c:type="net.shibboleth.idp.session.context.SessionContext" />
-        </constructor-arg>
+        <constructor-arg index="1" ref="SessionContextLookup" />
     </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=8404&r1=8403&r2=8404&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 Sep 19 11:17:14 2016
@@ -53,9 +53,12 @@
     </decision-state>
 
     <decision-state id="CheckForExistingSession">
-        <if test="PrincipalLookupFunction.apply(opensamlProfileRequestContext) == null"
-            then="PrepareForReturnToService"
-            else="CheckResolveAttributes" />
+        <on-entry>
+            <set name="flowScope.sessionContext" value="SessionContextLookup.apply(opensamlProfileRequestContext)" />
+        </on-entry>
+        <if test="sessionContext != null and sessionContext.idPSession.authenticationResults.size() > 0"
+            then="CheckResolveAttributes"
+            else="PrepareForReturnToService" />
     </decision-state>
 
     <action-state id="PrepareForReturnToService">