[java-identity-provider] branch master updated: OSJ-308 - Honor ordered BindingCriterion precedence

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d6f408a6c5e9eb56e80e5017bb7dfbc7efcdc3ea

The following commit(s) were added to refs/heads/master by this push:
       new  d6f408a6c OSJ-308 - Honor ordered BindingCriterion precedence
d6f408a6c is described below

commit d6f408a6c5e9eb56e80e5017bb7dfbc7efcdc3ea
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 8 19:44:56 2020 -0400

    OSJ-308 - Honor ordered BindingCriterion precedence
    
    https://issues.shibboleth.net/jira/browse/OSJ-308
    
    Move bean to better location.
    Add property to override ordering.
---
 idp-conf/src/main/resources/system/conf/global-system.xml       | 2 --
 idp-conf/src/main/resources/system/conf/saml-binding-config.xml | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 999995cca..a1c9cd3df 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -176,8 +176,6 @@
     <bean id="shibboleth.MarshallerFactory" factory-method="getMarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpenSAMLConfig" />
     <bean id="shibboleth.UnmarshallerFactory" factory-method="getUnmarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpenSAMLConfig" />
 
-    <bean id="shibboleth.EndpointResolver" class="org.opensaml.saml.common.binding.impl.DefaultEndpointResolver" />
-
     <bean id="shibboleth.CookieManager" class="net.shibboleth.utilities.java.support.net.CookieManager"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse"
diff --git a/idp-conf/src/main/resources/system/conf/saml-binding-config.xml b/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
index 4ebcfcda2..a9447dccd 100644
--- a/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
+++ b/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
@@ -138,6 +138,10 @@
             p:encoderBeanId="shibboleth.Encoders.IDWSFSOAPEncoder" />
     </util:list>
 
+    <!-- Global bean used in all the SAML flows for endpoint resolution. -->
+    <bean id="shibboleth.EndpointResolver" class="org.opensaml.saml.common.binding.impl.DefaultEndpointResolver"
+        p:inMetadataOrder="%{idp.bindings.inMetadataOrder:true}" />
+
     <!--
     These are the actual MessageEncoder beans that implement the outgoing binding requirements.
     There is generally never any reason to change these. The init-method is being nulled below to

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.