[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/profile-defaults.xml conf/relying-...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 15 11:59:05 2014
New Revision: 6297

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6297&view=rev
Log:
IDP-414: Wire ChannelBindings extract handlers into SOAP and ECP inbound handler chains

Added:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/ecp-security-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/soap-security-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml?rev=6297&r1=6296&r2=6297&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml Tue Jul 15 11:59:05 2014
@@ -37,7 +37,7 @@
         c:_0="security-policy/saml2-sso" />
         
     <bean id="shibboleth.SAML2.ECP.InboundFlowId" class="java.lang.String"
-        c:_0="security-policy/saml2-sso" />
+        c:_0="security-policy/saml2-ecp" />
 
     <!--  SAML2 - Liberty -->
     <bean id="shibboleth.SAML2.SSOS.InboundFlowId" class="java.lang.String"

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6297&r1=6296&r2=6297&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Tue Jul 15 11:59:05 2014
@@ -64,7 +64,7 @@
 
     <bean id="SAML2.ECP"
         class="net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration"
-        p:inboundSubflowId="security-policy/saml2-sso"
+        p:inboundSubflowId="security-policy/saml2-ecp"
         p:encryptionOptional="%{idp.encryption.optional:false}" />
 
     <bean id="SAML2.AttributeQuery"

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6297&r1=6296&r2=6297&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Tue Jul 15 11:59:05 2014
@@ -49,6 +49,7 @@
         <webflow:flow-location id="security-policy.abstract" path="/saml/security-abstract-flow.xml" />
         <webflow:flow-location id="security-policy/shibboleth-sso" path="/saml/saml1/sso-security-flow.xml" />
         <webflow:flow-location id="security-policy/saml2-sso" path="/saml/saml2/sso-security-flow.xml" />
+        <webflow:flow-location id="security-policy/saml2-ecp" path="/saml/saml2/ecp-security-flow.xml" />
         <webflow:flow-location id="security-policy/soap" path="/saml/soap-security-flow.xml" />
 
         <!-- Master flow for authentication. -->

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml?rev=6297&r1=6296&r2=6297&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml Tue Jul 15 11:59:05 2014
@@ -180,4 +180,20 @@
         </property>
     </bean>
 
+    <bean id="ExtractChannelBindingsHeadersHandler"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.saml.saml2.binding.security.impl.ExtractChannelBindingsHeadersHandler" scope="prototype" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="ExtractChannelBindingsExtensionsHandler"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.saml.saml2.binding.security.impl.ExtractChannelBindingsExtensionsHandler" scope="prototype" />
+        </constructor-arg>
+    </bean>
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/soap-security-flow.xml

[... 13 lines stripped ...]