[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/system/flows/cas/abstractValidate/abstractVali...

[noreply at shibboleth.net]

Author: serac
Date: Wed Jun 24 16:07:52 2015
New Revision: 7604

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7604&view=rev
Log:
IDP-742 Fix attribute resolution on existing SSO session.

https://issues.shibboleth.net/jira/browse/IDP-742
This fix adds some switching logic to the login flow to select the
appropriate principalNameLookupStrategy used with the ResolveAttributes
action based on whether or not the authentication subflow is called.
Related refactoring in validate flows to reduce duplication.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/common-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
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml?rev=7604&r1=7603&r2=7604&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml	Wed Jun 24 16:07:52 2015
@@ -35,31 +35,12 @@
           c:proxyAuthenticator-ref="cas.ProxyAuthenticator"
           c:ticketService-ref="cas.TicketService" />
 
-    <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>
-    </bean>
-
-    <bean id="resolveAttributes"
-          class="net.shibboleth.idp.profile.impl.ResolveAttributes"
-          scope="prototype"
-          c:resolverService-ref="shibboleth.AttributeResolverService"
-          p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}"
-          p:principalNameLookupStrategy-ref="principalLookupFunction" />
-
     <bean id="filterAttributes"
           class="net.shibboleth.idp.profile.impl.FilterAttributes"
           scope="prototype"
           c:filterService-ref="shibboleth.AttributeFilterService"
           p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}"
-          p:principalNameLookupStrategy-ref="principalLookupFunction" />
+          p:principalNameLookupStrategy-ref="sessionPrincipalLookupFunction" />
 
     <bean id="extractAttributesAction"
           class="net.shibboleth.idp.cas.flow.ExtractAttributesAction" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml?rev=7604&r1=7603&r2=7604&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml	Wed Jun 24 16:07:52 2015
@@ -54,7 +54,7 @@
     </action-state>
 
     <action-state id="resolveAttributes">
-        <evaluate expression="resolveAttributes" />
+        <evaluate expression="resolveAttributesFromSessionPrincipal" />
         <evaluate expression="filterAttributes" />
         <evaluate expression="extractAttributesAction" />
         <evaluate expression="'finished'" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml?rev=7604&r1=7603&r2=7604&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml	Wed Jun 24 16:07:52 2015
@@ -42,4 +42,23 @@
     <bean id="validateIdPSessionAction"
           class="net.shibboleth.idp.cas.flow.ValidateIdpSessionAction"
           c:resolver-ref="shibboleth.SessionManager" />
+

[... 365 lines stripped ...]