[java-idp-oidc] branch main updated: JOIDC-61 - Support metadata policies in the dyn. reg. profile configuration

[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=caf798c2c080e9cfeb5b13e7b9232fd45c135e68

The following commit(s) were added to refs/heads/main by this push:
     new caf798c2 JOIDC-61 - Support metadata policies in the dyn. reg. profile configuration
caf798c2 is described below

commit caf798c2c080e9cfeb5b13e7b9232fd45c135e68
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Mar 4 12:51:23 2022 +0200

    JOIDC-61 - Support metadata policies in the dyn. reg. profile configuration
    
    https://shibboleth.atlassian.net/browse/JOIDC-61
    
    Use the default policy filename as the identifier for the cache.
---
 .../net/shibboleth/idp/service/relying-party/postconfig.xml    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 9919c870..6711e91e 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -802,6 +802,10 @@
     <bean id="shibboleth.oidc.dynreg.BaseMetadataPolicyResolver" abstract="true"
         class="net.shibboleth.oidc.metadata.policy.impl.OIDCMetadataPolicyResolver" />
 
+    <bean id="shibboleth.oidc.dyngreg.DefaultMetadataPolicyFilename" class="java.lang.String" factory-method="valueOf">
+        <constructor-arg value="%{idp.oidc.dynreg.defaultMetadataPolicyFile:}" />
+    </bean>
+
     <bean id="shibboleth.oidc.dynreg.DefaultMetadataPolicyResolver"
         parent="shibboleth.oidc.dynreg.BaseMetadataPolicyResolver">
         <constructor-arg>
@@ -810,7 +814,7 @@
                     <bean p:cacheId="DefaultPolicyFileCache" parent="shibboleth.oidc.dynreg.BatchMetadataCacheBuilderSpec">
                         <property name="loadingStrategy">
                             <bean class="net.shibboleth.oidc.metadata.cache.impl.DefaultFileLoadingStrategy"
-                                c:metadata="%{idp.oidc.dynreg.defaultMetadataPolicyFile:}" />
+                                c:metadata-ref="shibboleth.oidc.dyngreg.DefaultMetadataPolicyFilename" />
                         </property>
                     </bean>
                 </constructor-arg>
@@ -840,13 +844,13 @@
         c:valueClass="net.shibboleth.oidc.metadata.policy.MetadataPolicy"/>
 
     <bean id="shibboleth.oidc.dynreg.DefaultMetadataCriteriaToIdentifierStrategy"
-       parent="shibboleth.Functions.Constant" c:target="DefaultMetadataPolicy" />
+       parent="shibboleth.Functions.Constant" c:target="#{getObject('shibboleth.oidc.dyngreg.DefaultMetadataPolicyFilename') ?: 'undefined'}" />
 
     <bean id="shibboleth.oidc.dynreg.DefaultExpirationTimeStrategy"
         class="net.shibboleth.oidc.metadata.cache.impl.DefaultSourceMetadataExpirationTimeStrategy" c:duration="PT10M"/>
 
     <bean id="shibboleth.oidc.dynreg.DefaultMetadataPolicyIdentifierExtractionStrategy"
-       parent="shibboleth.Functions.Constant" c:target="DefaultMetadataPolicy" />
+       parent="shibboleth.Functions.Constant" c:target="#{getObject('shibboleth.oidc.dyngreg.DefaultMetadataPolicyFilename') ?: 'undefined'}" />
 
     <bean id="shibboleth.oidc.dynreg.DefaultMetadataPolicy"
             factory-bean="shibboleth.oidc.dynreg.DefaultMetadataPolicyResolver"

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