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

[noreply at shibboleth.net]

Author: serac
Date: Mon Mar  7 11:32:39 2016
New Revision: 8135

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8135&view=rev
Log:
IDP-911 Wire in inbound/outbound intercept subflows.

https://issues.shibboleth.net/jira/browse/IDP-911
All CAS protocol flows now invoke inbound and outbound intercept flows
based on profile configuration data for parity with SAML profile flows.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml?rev=8135&r1=8134&r2=8135&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml	Mon Mar  7 11:32:39 2016
@@ -27,6 +27,24 @@
 
     <bean id="BuildSAMLMetadataContext"
           class="net.shibboleth.idp.cas.flow.impl.BuildSAMLMetadataContextAction" />
+
+    <bean id="PopulateInboundInterceptContext"
+          class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext"
+          scope="prototype"
+          p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+        <property name="activeFlowsLookupStrategy">
+            <bean class="net.shibboleth.idp.profile.config.navigate.InboundFlowsLookupFunction" />
+        </property>
+    </bean>
+
+    <bean id="PopulateOutboundInterceptContext"
+          class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext"
+          scope="prototype"
+          p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+        <property name="activeFlowsLookupStrategy">
+            <bean class="net.shibboleth.idp.profile.config.navigate.OutboundFlowsLookupFunction" />
+        </property>
+    </bean>
 
     <bean id="PublishProtocolRequest"
           class="net.shibboleth.idp.cas.flow.impl.PublishProtocolMessageAction"

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=8135&r1=8134&r2=8135&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 Mar  7 11:32:39 2016
@@ -14,15 +14,6 @@
           p:profileId="#{T(net.shibboleth.idp.cas.config.impl.LoginConfiguration).PROFILE_ID}"
           p:loggingId="%{idp.service.logging.cas:SSO}"
           p:browserProfile="true" />
-
-    <bean id="PopulateInboundInterceptContext"
-          class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext"
-          scope="prototype"
-          p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
-        <property name="activeFlowsLookupStrategy">
-            <bean class="net.shibboleth.idp.profile.config.navigate.InboundFlowsLookupFunction" />
-        </property>
-    </bean>
 
     <bean id="PopulateUserAgentContext"
           class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"
@@ -74,15 +65,6 @@
         </property>
     </bean>
 
-    <bean id="PopulateOutboundInterceptContext"
-          class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext"
-          scope="prototype"
-          p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
-        <property name="activeFlowsLookupStrategy">
-            <bean class="net.shibboleth.idp.profile.config.navigate.OutboundFlowsLookupFunction" />
-        </property>
-    </bean>
-
     <bean id="PopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
           p:fieldExtractors-ref="#{
             getObject('shibboleth.CASLoginAuditExtractors') != null

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml?rev=8135&r1=8134&r2=8135&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml	Mon Mar  7 11:32:39 2016
@@ -17,9 +17,21 @@
         <evaluate expression="SelectRelyingPartyConfiguration" />
         <evaluate expression="SelectProfileConfiguration" />
         <evaluate expression="PublishProtocolRequest" />

[... 97 lines stripped ...]