[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 20:02:36 2015
New Revision: 7605

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7605&view=rev
Log:
IDP-742 Populate SubjectContext.

https://issues.shibboleth.net/jira/browse/IDP-742
Populate SubjectContext prior to attribute resolution at scantor's
suggestion.

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

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=7605&r1=7604&r2=7605&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 20:02:36 2015
@@ -35,13 +35,6 @@
           c:proxyAuthenticator-ref="cas.ProxyAuthenticator"
           c:ticketService-ref="cas.TicketService" />
 
-    <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="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=7605&r1=7604&r2=7605&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 20:02:36 2015
@@ -54,7 +54,8 @@
     </action-state>
 
     <action-state id="resolveAttributes">
-        <evaluate expression="resolveAttributesFromSessionPrincipal" />
+        <evaluate expression="populateSubjectContext" />
+        <evaluate expression="resolveAttributes" />
         <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=7605&r1=7604&r2=7605&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 20:02:36 2015
@@ -55,10 +55,19 @@
         </constructor-arg>
     </bean>
 
-    <bean id="resolveAttributesFromSessionPrincipal"
+    <bean id="populateSubjectContext"
+          class="net.shibboleth.idp.profile.impl.PopulateSubjectContext"
+          scope="prototype"
+          p:principalNameLookupStrategy-ref="sessionPrincipalLookupFunction" />
+
+    <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="sessionPrincipalLookupFunction" />
+          c:resolverService-ref="shibboleth.AttributeResolverService" />
+
+    <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}" />
 </beans>

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=7605&r1=7604&r2=7605&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml	(original)

[... 113 lines stripped ...]