[java-idp-oidc] branch main updated: JOIDC-60 - Remove assumption that config skeleton is a file resource

Scott Cantor cantor.2 at osu.edu
Tue Nov 30 18:06:35 UTC 2021


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=71850cb192c35c54e3425749fda38f662a9c6154

The following commit(s) were added to refs/heads/main by this push:
     new 71850cb1 JOIDC-60 - Remove assumption that config skeleton is a file resource
71850cb1 is described below

commit 71850cb192c35c54e3425749fda38f662a9c6154
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Nov 30 13:06:32 2021 -0500

    JOIDC-60 - Remove assumption that config skeleton is a file resource
    
    https://shibboleth.atlassian.net/browse/JOIDC-60
---
 .../op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java   | 2 +-
 .../shibboleth/idp/flows/oidc/configuration/configuration-beans.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java
index def7e04a..5511e806 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java
@@ -96,7 +96,7 @@ public class DynamicFilesystemProviderMetadataResolver extends FilesystemProvide
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
-        final List<OIDCProviderMetadata> result = new ArrayList<OIDCProviderMetadata>();
+        final List<OIDCProviderMetadata> result = new ArrayList<>();
         final Iterator<OIDCProviderMetadata> entities = super.resolve(profileRequestContext).iterator();
         while (entities.hasNext()) {
             final OIDCProviderMetadata entity = entities.next();
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
index 85e0e3c7..193774d4 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
@@ -30,7 +30,7 @@
         class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.DynamicFilesystemProviderMetadataResolver"
         p:minRefreshDelay="%{idp.oidc.config.minRefreshDelay:PT5M}"
         p:maxRefreshDelay="%{idp.oidc.config.maxRefreshDelay:PT4H}"
-        c:metadata-ref="MetadataSkeleton">
+        c:metadata="#{getObject('shibboleth.oidc.OpenIDConfiguration') ?: getObject('DefaultMetadataSkeleton')}">
         <property name="dynamicValueResolvers">
             <map value-type="net.shibboleth.idp.plugin.oidc.op.metadata.resolver.MetadataValueResolver">
                 <entry key="id_token_signing_alg_values_supported" value-ref="SignatureAlgorithmInfoResolver" />
@@ -43,7 +43,7 @@
         </property>
     </bean>
 
-    <bean id="MetadataSkeleton" class="org.springframework.core.io.FileSystemResource"
+    <bean id="DefaultMetadataSkeleton" class="org.springframework.core.io.FileSystemResource" lazy-init="true"
         c:path="%{idp.oidc.discovery.template:%{idp.home}/static/openid-configuration.json}" />
 
     <bean id="CredentialResolver" class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.CredentialMetadataValueResolver" />

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


More information about the commits mailing list