[java-identity-provider] branch main updated: IDP-1752 - Support injection of extension schemas into SchemaBuilder

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  acadc088c IDP-1752 - Support injection of extension schemas into SchemaBuilder
acadc088c is described below

commit acadc088cf9180c0669fced416d306d65ad4f423
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 17 11:43:33 2021 -0500

    IDP-1752 - Support injection of extension schemas into SchemaBuilder
    
    https://issues.shibboleth.net/jira/browse/IDP-1752
---
 .../resources/net/shibboleth/idp/conf/global-system.xml    | 14 +++++++-------
 idp-conf/src/test/resources/conf/global.xml                | 10 ++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 45675c99b..600d60d75 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -153,20 +153,20 @@
     <bean id="shibboleth.SchemaBuilder" lazy-init="true"
         class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11" c:strict="%{idp.schemaValidation.strict:false}">
         <property name="schemaBuilder">
-            <bean class="net.shibboleth.utilities.java.support.xml.SchemaBuilder">
+            <bean class="net.shibboleth.utilities.java.support.xml.SchemaBuilder"
+                    p:schemaResources="#{getObject('shibboleth.ExtensionSchemas') ?: getObject('shibboleth.DefaultExtensionSchemas')}">
                 <property name="resourceResolver">
                     <bean class="net.shibboleth.utilities.java.support.xml.ClasspathResolver" />
                 </property>
-                <property name="schemaResources">
-                    <list>
-                        <value>#{'classpath:' + T(org.opensaml.saml.common.xml.SAMLConstants).XMLSIG_SCHEMA_LOCATION }</value>
-                        <value>#{'classpath:' + T(net.shibboleth.idp.saml.xmlobject.ExtensionsConstants).SHIB_MDEXT10_SCHEMA_LOCATION }</value>
-                    </list>
-                </property>
             </bean>
         </property>
     </bean>
 
+    <util:list id="shibboleth.DefaultExtensionSchemas">
+        <value>#{'classpath:' + T(org.opensaml.saml.common.xml.SAMLConstants).XMLSIG_SCHEMA_LOCATION }</value>
+        <value>#{'classpath:' + T(net.shibboleth.idp.saml.xmlobject.ExtensionsConstants).SHIB_MDEXT10_SCHEMA_LOCATION }</value>
+    </util:list>
+
     <bean id="shibboleth.HttpServletRequest" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" />
     <bean id="shibboleth.HttpServletResponse" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" />
 
diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/conf/global.xml
index c80e55d31..ef53c5ccc 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/conf/global.xml
@@ -97,4 +97,14 @@
     </bean>
     -->
     
+    <!--
+    <bean id="shibboleth.ExtensionSchemas" parent="shibboleth.DefaultExtensionSchemas">
+        <property name="sourceList">
+            <list merge="true">
+                <value>classpath:/schema/saml-metadata-ext-oidcmd.xsd</value>
+            </list>
+        </property>
+    </bean>
+    -->
+    
 </beans>

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