[java-identity-provider COMMIT] in /trunk: idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProt...

[noreply at shibboleth.net]

Author: serac
Date: Fri Mar  4 10:02:47 2016
New Revision: 8123

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

https://issues.shibboleth.net/jira/browse/IDP-911
Wire up inbound and outbound intercept flows for parity with SAML profiles.

Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
    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-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java?rev=8123&r1=8122&r2=8123&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java	Fri Mar  4 10:02:47 2016
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.cas.config.impl;
 
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nonnull;
@@ -60,6 +61,7 @@
      */
     public AbstractProtocolConfiguration(@Nonnull @NotEmpty final String profileId) {
         super(profileId);
+        setInboundInterceptorFlows(Collections.<String>emptyList());
         setSecurityConfiguration(
                 new SecurityConfiguration(
                     TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES),

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=8123&r1=8122&r2=8123&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 Mar  4 10:02:47 2016
@@ -14,6 +14,15 @@
           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"
@@ -57,10 +66,20 @@
           c:type="net.shibboleth.idp.authn.context.SubjectContext" />
 
     <bean id="PopulatePostAuthnInterceptContext"
-          class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
+          class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext"
+          scope="prototype"
           p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
         <property name="activeFlowsLookupStrategy">
             <bean class="net.shibboleth.idp.authn.config.navigate.PostAuthenticationFlowsLookupFunction" />
+        </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>
 

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=8123&r1=8122&r2=8123&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 Mar  4 10:02:47 2016
@@ -10,7 +10,6 @@
             <evaluate result="flowScope.hasAuthenticationContext" expression="false" />
         </on-entry>
         <evaluate expression="InitializeProfileRequestContext"/>
-        <evaluate expression="PopulateUserAgentContext"/>
         <evaluate expression="PopulateClientStorageLoadContext" />
         <evaluate expression="'proceed'" />
         <transition on="proceed" to="ClientStorageLoad" />
@@ -30,9 +29,22 @@

[... 78 lines stripped ...]