[java-idp-oidc] branch main updated: Make use of property-based client secret references pluggable.

[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=20ad9ffa8bf9724530bc8c65de8d655f0c56643c

The following commit(s) were added to refs/heads/main by this push:
       new  20ad9ffa  Make use of property-based client secret references pluggable.
20ad9ffa is described below

commit 20ad9ffa8bf9724530bc8c65de8d655f0c56643c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 16 19:26:52 2021 -0500

    Make use of property-based client secret references pluggable.
---
 .../META-INF/net.shibboleth.idp/postconfig.xml       |  4 ++++
 .../idp/service/saml/metadata/postconfig.xml         | 20 ++++++--------------
 .../src/test/resources/conf/global.xml               |  5 ++++-
 .../src/test/resources/conf/oidc.properties          |  2 --
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index d5c6d736..c7e8477b 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -117,6 +117,10 @@
     
     <!-- Utilities. -->
 
+    <!-- Supports property-based loading of client secrets referenced in SAML metadata. -->
+    <bean id="shibboleth.oidc.PropertiesClientSecretValueResolver" abstract="true"
+        class="net.shibboleth.oidc.metadata.impl.PropertiesClientSecretValueResolver" />
+
     <!-- Returns true if resolver is executed in authz endpoint. -->
     <bean id="shibboleth.oidc.Conditions.SubjectRequired"
         class="net.shibboleth.idp.plugin.oidc.op.profile.logic.SubjectActivationCondition" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml
index 147278dc..1f10c23d 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml
@@ -6,8 +6,8 @@
     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"
+                        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">
 
@@ -16,24 +16,16 @@
     <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">
+    <util:list id="shibboleth.oidc.DefaultKeyInfoProviders"
+            value-type="org.opensaml.xmlsec.keyinfo.impl.KeyInfoProvider">
         <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.DSAKeyValueProvider" />
         <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.InlineX509DataProvider" />
         <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.RSAKeyValueProvider" />
         <bean class="net.shibboleth.oidc.metadata.keyinfo.ext.impl.provider.ClientSecretProvider" />
-        <bean class="net.shibboleth.oidc.metadata.keyinfo.ext.impl.provider.ClientSecretReferenceProvider">
-            <constructor-arg ref="shibboleth.oidc.DefaultClientSecretValueResolvers" />
-        </bean>
+        <bean class="net.shibboleth.oidc.metadata.keyinfo.ext.impl.provider.ClientSecretReferenceProvider"
+            c:_0="#{getObject('shibboleth.oidc.ClientSecretValueResolvers')}" />
         <bean class="net.shibboleth.oidc.metadata.keyinfo.ext.impl.provider.InlineJwksProvider" />
         <bean class="net.shibboleth.oidc.metadata.keyinfo.ext.impl.provider.JWKSReferenceProvider" />
     </util:list>
-    
-    <util:list id="shibboleth.oidc.DefaultClientSecretValueResolvers" value-type="net.shibboleth.oidc.metadata.ClientSecretValueResolver">
-        <ref bean="shibboleth.oidc.DefaultClientSecretValueResolvers.Properties" />
-    </util:list>
 
-    <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 e6eb31e0..94970221 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/global.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/global.xml
@@ -12,7 +12,10 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- Use this file to define any custom beans needed globally. -->
+    <util:list id="shibboleth.oidc.ClientSecretValueResolvers">
+        <bean parent="shibboleth.oidc.PropertiesClientSecretValueResolver"
+            p:resource="classpath:/net/shibboleth/idp/oidc/metadata/impl/client-secret-test.properties" />
+    </util:list>
     
     <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"/>
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties b/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties
index 6cad6a9d..8dd2e620 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties
+++ b/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties
@@ -5,5 +5,3 @@ idp.oidc.issuer = https://op.example.org
 idp.oidc.subject.sourceAttribute = uid
 idp.oidc.subject.salt = isfd07fsddfs70sdf9d99s8
 idp.oidc.discovery.template = src/test/resources/conf/openid-configuration.json
-
-idp.oidc.metadata.clientSecretProperties = classpath:/net/shibboleth/idp/oidc/metadata/impl/client-secret-test.properties
\ No newline at end of file

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