[java-idp-oidc] 43/44: JOIDC-5 Fine-tuning configuration and exploit 'idp.oidc.metadata.clientSecretProperties' property.

[Henri Mikkonen]

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

hjmikkon 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=855331aac08ca0f4e81cc7e2356c2380fc7e51f7

commit 855331aac08ca0f4e81cc7e2356c2380fc7e51f7
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Oct 22 15:16:08 2020 +0300

    JOIDC-5 Fine-tuning configuration and exploit 'idp.oidc.metadata.clientSecretProperties' property.
    
    https://issues.shibboleth.net/jira/browse/JOIDC-5
---
 .../src/test/resources/conf/global-oidc.xml              | 12 ++++++------
 .../src/test/resources/conf/idp-oidc.properties          |  4 +++-
 .../src/test/resources/conf/metadata-providers.xml       | 16 +++++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml b/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
index e568ce17..94cab6e5 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
@@ -14,25 +14,25 @@
          This file should be imported to global.xml
     -->
     
-    <util:list id="shibboleth.oidc.KeyInfoProviders" 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="org.geant.idpextension.keyinfo.ext.impl.provider.ClientSecretProvider" />
         <bean class="org.geant.idpextension.keyinfo.ext.impl.provider.ClientSecretReferenceProvider">
-            <constructor-arg ref="shibboleth.oidc.ClientSecretValueResolvers" />
+            <constructor-arg ref="shibboleth.oidc.DefaultClientSecretValueResolvers" />
         </bean>
         <bean class="org.geant.idpextension.keyinfo.ext.impl.provider.InlineJwksProvider" />
         <bean class="org.geant.idpextension.keyinfo.ext.impl.provider.JWKSReferenceProvider" />
     </util:list>
     
-    <util:list id="shibboleth.oidc.ClientSecretValueResolvers" value-type="org.geant.idpextension.oidc.metadata.resolver.ClientSecretValueResolver">
-        <ref bean="shibboleth.oidc.ClientSecretValueResolvers.Properties" />
+    <util:list id="shibboleth.oidc.DefaultClientSecretValueResolvers" value-type="org.geant.idpextension.oidc.metadata.resolver.ClientSecretValueResolver">
+        <ref bean="shibboleth.oidc.DefaultClientSecretValueResolvers.Properties" />
     </util:list>
 
-    <bean id="shibboleth.oidc.ClientSecretValueResolvers.Properties"
+    <bean id="shibboleth.oidc.DefaultClientSecretValueResolvers.Properties"
         class="org.geant.idpextension.oidc.metadata.impl.PropertiesClientSecretValueResolver"
-        p:resource="classpath:/org/geant/idpextension/oidc/metadata/impl/client-secret-test.properties" />
+        p:resource="%{idp.oidc.metadata.clientSecretProperties}" />
 
     <!-- Returns true unless subject is already populated in oidc response context. -->
     <bean id="SubjectRequired" class="org.geant.idpextension.oidc.profile.logic.SubjectActivationCondition" />
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/idp-oidc.properties b/idp-oidc-extension-impl/src/test/resources/conf/idp-oidc.properties
index c9672497..60fe276a 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/idp-oidc.properties
+++ b/idp-oidc-extension-impl/src/test/resources/conf/idp-oidc.properties
@@ -6,4 +6,6 @@ idp.oidc.subject.sourceAttribute = uid
 idp.oidc.subject.salt = isfd07fsddfs70sdf9d99s8
 idp.oidc.discovery.template = src/test/resources/conf/openid-configuration.json
 
-idp.service.attribute.registry.namingRegistry=OIDCExtendedNamingRegistry
\ No newline at end of file
+idp.service.attribute.registry.namingRegistry=OIDCExtendedNamingRegistry
+
+idp.oidc.metadata.clientSecretProperties = classpath:/org/geant/idpextension/oidc/metadata/impl/client-secret-test.properties
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/metadata-providers.xml b/idp-oidc-extension-impl/src/test/resources/conf/metadata-providers.xml
index 2681b6ad..d91e8a8b 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/metadata-providers.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/metadata-providers.xml
@@ -4,16 +4,14 @@
         xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource"
         xmlns:security="urn:mace:shibboleth:2.0:security"
         xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:oidcext="urn:mace:shibboleth:2.0:metadata:oidc"
+        xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
                         urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd 
                         urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
                         urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
-                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
-                        urn:mace:shibboleth:2.0:metadata:oidc classpath:/schema/idp-oidc-extension-metadata-ext.xsd">
+                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
                         
         <!-- ========================================== -->
         <!-- Metadata Configuration -->
@@ -21,7 +19,11 @@
 
     <MetadataProvider id="SP123MD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes" resourceRef="exampleMetadata-saml-oidc-clientsecret">
         <MetadataFilter xsi:type="NodeProcessing">
-            <MetadataNodeProcessor xsi:type="oidcext:ClientInformation" keyInfoProvidersRef="shibboleth.oidc.KeyInfoProviders"/>
+            <MetadataNodeProcessor
+                keyInfoProvidersRef="shibboleth.oidc.DefaultKeyInfoProviders"
+                xmlns:oidcext="urn:mace:shibboleth:2.0:metadata:oidc"
+                xsi:type="oidcext:ClientInformation" 
+                xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata:oidc classpath:/schema/idp-oidc-extension-metadata-ext.xsd" />
         </MetadataFilter>
     </MetadataProvider>
 

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