[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/error-mappings.xml system/conf/utilities....

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 15 18:42:19 2014
New Revision: 6298

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6298&view=rev
Log:
IDP-414: Add channel binding verification action, error handling.

Modified:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/error-mappings.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/error-mappings.xml?rev=6298&r1=6297&r2=6298&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/error-mappings.xml Tue Jul 15 18:42:19 2014
@@ -78,6 +78,8 @@
         <entry key="SubjectCanonicalizationError" value-ref="shibboleth.SAML2Status.UnknownPrincipal" />
         
         <entry key="InvalidNameIDPolicy" value-ref="shibboleth.SAML2Status.InvalidNameIDPolicy" />
+        
+        <entry key="ChannelBindingsError" value-ref="shibboleth.SAML2Status.ChannelBindingsError" />
     </util:map>
 
     <util:map id="shibboleth.SOAPFaultCodeMappings">
@@ -103,6 +105,8 @@
         <entry key="SubjectCanonicalizationError" value-ref="shibboleth.SOAP.Client" />
         
         <entry key="InvalidNameIDPolicy" value-ref="shibboleth.SOAP.Client" />
+        
+        <entry key="ChannelBindingsError" value-ref="shibboleth.SOAP.Client" />
     </util:map>
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6298&r1=6297&r2=6298&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Tue Jul 15 18:42:19 2014
@@ -141,6 +141,11 @@
         <util:constant static-field="org.opensaml.saml.saml2.core.StatusCode.REQUESTER_URI" />
         <util:constant static-field="org.opensaml.saml.saml2.core.StatusCode.INVALID_NAMEID_POLICY_URI" />
     </util:list>
+
+    <util:list id="shibboleth.SAML2Status.ChannelBindingsError">
+        <util:constant static-field="org.opensaml.saml.saml2.core.StatusCode.REQUESTER_URI" />
+        <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20CB_NS" />
+    </util:list>
     
     <util:constant id="shibboleth.SOAP.Client" static-field="org.opensaml.soap.soap11.FaultCode.CLIENT"/>
     <util:constant id="shibboleth.SOAP.Server" static-field="org.opensaml.soap.soap11.FaultCode.SERVER"/>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=6298&r1=6297&r2=6298&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Tue Jul 15 18:42:19 2014
@@ -24,6 +24,9 @@
     <bean id="InitializeMessageChannelSecurityContext"
         class="org.opensaml.profile.action.impl.StaticMessageChannelSecurity" scope="prototype"
         p:confidentialityActive="false" p:integrityActive="false" />
+        
+    <bean id="VerifyChannelBindings"
+        class="org.opensaml.saml.common.profile.impl.VerifyChannelBindings" scope="prototype" />
     
     <bean id="ProcessRequestedAuthnContext"
         class="net.shibboleth.idp.saml.saml2.profile.impl.ProcessRequestedAuthnContext" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml?rev=6298&r1=6297&r2=6298&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml Tue Jul 15 18:42:19 2014
@@ -13,6 +13,7 @@
     </action-state>
 
     <action-state id="DoProfileWork">
+        <evaluate expression="VerifyChannelBindings" />
         <evaluate expression="InitializeAuthenticationContext" />
         <evaluate expression="InitializeRequestedPrincipalContext" />
         <evaluate expression="ProcessRequestedAuthnContext" />