[java-idp-oidc] branch main updated: Auto-wire SAML metadata node processor and related objects.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=32744aa80d66f6fbb0b77e6d93192edc97763232

The following commit(s) were added to refs/heads/main by this push:
       new  32744aa8  Auto-wire SAML metadata node processor and related objects.
32744aa8 is described below

commit 32744aa80d66f6fbb0b77e6d93192edc97763232
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 16 17:15:17 2021 -0500

    Auto-wire SAML metadata node processor and related objects.
---
 .../shibboleth/idp/service/saml/metadata/postconfig.xml} | 16 +++++++++-------
 .../src/test/resources/conf/global.xml                   |  2 --
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml
similarity index 82%
rename from idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml
index 79efaa0f..147278dc 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
 
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <!-- 
-         This file contains global oidc bean definitions.
-         This file should be imported to global.xml
-    -->
+    <!-- This wiring supports SAML metadata applied to OIDC. -->
+
+    <bean class="net.shibboleth.oidc.metadata.impl.ClientInformationNodeProcessor"
+        c:_0-ref="shibboleth.oidc.DefaultKeyInfoProviders" />
     
     <util:list id="shibboleth.oidc.DefaultKeyInfoProviders" value-type="org.opensaml.xmlsec.keyinfo.impl.KeyInfoProvider">
         <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.DSAKeyValueProvider" />
@@ -33,5 +35,5 @@
     <bean id="shibboleth.oidc.DefaultClientSecretValueResolvers.Properties"
         class="net.shibboleth.oidc.metadata.impl.PropertiesClientSecretValueResolver"
         p:resource="%{idp.oidc.metadata.clientSecretProperties}" />
-
+    
 </beans>
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/global.xml b/idp-oidc-extension-impl/src/test/resources/conf/global.xml
index bd724ebd..e6eb31e0 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/global.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/global.xml
@@ -14,8 +14,6 @@
 
     <!-- Use this file to define any custom beans needed globally. -->
     
-    <import resource="global-oidc.xml" />
-
     <bean id="exampleMetadata-saml-oidc-clientsecret" class="org.springframework.core.io.ClassPathResource">
         <constructor-arg value="/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml"/>
     </bean>

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