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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Apr  5 14:47:31 2014
New Revision: 5698

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5698&view=rev
Log:
Fix up message handlers to handle SOAP cases, and cert authn

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5698&r1=5697&r2=5698&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Sat Apr  5 14:47:31 2014
@@ -184,18 +184,6 @@
         c:messageHandler-ref="outboundMessageHandlerChain"
         c:executionDirection="OUTBOUND" />
 
-    <bean id="outboundMessageHandlerChain"
-            class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">
-        <property name="handlers">
-            <util:list>
-                <!-- TODO outbound handlers -->
-                <bean class="org.opensaml.saml.common.binding.SAMLOutboundDestinationHandler" />
-                <bean class="org.opensaml.saml.common.binding.security.EndpointUrlSchemeSecurityHandler" />
-                <bean class="org.opensaml.saml.common.binding.security.SAMLOutboundProtocolMessageSigningHandler" />
-            </util:list>
-        </property>
-    </bean>
-
     <bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype"
         p:messageEncoderFactory-ref="messageEncoderFactory" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml?rev=5698&r1=5697&r2=5698&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml Sat Apr  5 14:47:31 2014
@@ -63,8 +63,15 @@
                 
                 <bean class="org.opensaml.saml.common.binding.security.MessageLifetimeSecurityHandler" />
                 
-                <bean class="org.opensaml.saml.saml2.binding.security.SAML2AuthnRequestsSignedSecurityHandler" />
-                
+                <bean class="org.opensaml.saml.common.binding.security.SAMLMDClientCertAuthSecurityHandler">
+                    <property name="httpServletRequest" ref="shibboleth.HttpServletRequest" />
+                    <property name="trustEngine" ref="idp.X509TrustEngine" />
+                    <property name="certificateNameOptions">
+                        <bean class="org.opensaml.security.messaging.impl.CertificateNameOptions"
+                            p:evaluateSubjectCommonName="true" />
+                    </property>
+                </bean>
+
                 <bean class="org.opensaml.saml.common.binding.security.SAMLProtocolMessageXMLSignatureSecurityHandler">
                     <property name="trustEngine" ref="idp.SignatureTrustEngine" />
                 </bean>
@@ -106,6 +113,16 @@
         class="org.opensaml.saml.saml1.profile.impl.AddSubjectConfirmationToSubjects" scope="prototype"
         p:methods="#{ {'urn:oasis:names:tc:SAML:1.0:cm:sender-vouches'} }" />
 
+    <bean id="outboundMessageHandlerChain"
+            class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">
+        <property name="handlers">
+            <util:list>
+                <!-- TODO outbound handlers -->
+                <bean class="org.opensaml.saml.common.binding.security.SAMLOutboundProtocolMessageSigningHandler" />
+            </util:list>
+        </property>
+    </bean>
+
     <bean id="messageEncoderFactory" class="net.shibboleth.idp.saml.impl.profile.SpringAwareMessageEncoderFactory"
         p:bindings-ref="shibboleth.OutgoingSOAPBindings" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=5698&r1=5697&r2=5698&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Sat Apr  5 14:47:31 2014
@@ -99,6 +99,18 @@

[... 44 lines stripped ...]