[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml/saml2: idwsf-ssos-beans.xml i...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug 28 18:46:27 2015
New Revision: 7714

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7714&view=rev
Log:
More work on how Liberty delegation flow is wired.

Move non-security handler beans/actions out of security intercept flow and up to main flow.
Use flow inheritance to override a couple of transitions and splice in child flow actions.
Add action to populate some flow-specific data into outbound message context.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml?rev=7714&r1=7713&r2=7714&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	Fri Aug 28 18:46:27 2015
@@ -58,5 +58,105 @@
             </util:list>
         </property>
     </bean>
+    
+    <util:constant id="shibboleth.Delegation.MetadataLookup.Protocol"
+        static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
+
+    <util:constant id="shibboleth.Delegation.MetadataLookup.Role"
+        static-field="org.opensaml.saml.saml2.metadata.SPSSODescriptor.DEFAULT_ELEMENT_NAME" />
+    
+    <bean id="PopulateInboundMessageContextWithSAMLSelf" 
+        class="net.shibboleth.idp.saml.profile.impl.PopulateInboundMessageContextWithSAMLSelf" scope="prototype" />
+    
+    <bean id="ProcessFrameworkHandler"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="net.shibboleth.idp.saml.saml2.profile.delegation.messaging.impl.ProcessFrameworkHandler" />
+        </constructor-arg>
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="not"
+                c:predicate-ref="shibboleth.Conditions.BrowserProfile" />
+        </property>
+        <property name="errorEvent">
+            <util:constant static-field="org.opensaml.profile.action.EventIds.INVALID_MESSAGE" />
+        </property>
+    </bean>
+    
+    <bean id="ProcessSenderHandler"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="net.shibboleth.idp.saml.saml2.profile.delegation.messaging.impl.ProcessSenderHandler" />
+        </constructor-arg>
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="not"
+                c:predicate-ref="shibboleth.Conditions.BrowserProfile" />
+        </property>
+        <property name="errorEvent">
+            <util:constant static-field="org.opensaml.profile.action.EventIds.INVALID_MESSAGE" />
+        </property>
+    </bean>
+    
+    <bean id="ExtractMessageIDHandler"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.soap.wsaddressing.messaging.impl.ExtractMessageIDHandler" />
+        </constructor-arg>
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="not"
+                c:predicate-ref="shibboleth.Conditions.BrowserProfile" />
+        </property>
+        <property name="errorEvent">
+            <util:constant static-field="org.opensaml.profile.action.EventIds.INVALID_MESSAGE" />
+        </property>
+    </bean>
+    
+    <bean id="ValidateActionHandler"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.soap.wsaddressing.messaging.impl.ValidateActionHandler">
+                <property name="expectedActionURI">
+                    <util:constant static-field="net.shibboleth.idp.saml.saml2.profile.delegation.impl.LibertyConstants.SSOS_AUTHN_REQUEST_WSA_ACTION_URI" />
+                </property>
+            </bean>
+        </constructor-arg>
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="not"
+                c:predicate-ref="shibboleth.Conditions.BrowserProfile" />

[... 236 lines stripped ...]