[java-idp-oidc] branch main updated: Changed DynamicMetadataCache into FetchThroughMetadataCache.

Henri Mikkonen henri.mikkonen at iki.fi
Tue Mar 8 13:11:54 UTC 2022


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=5d615f61a2d496bb6c05e89985ef0fc4ca70eab7

The following commit(s) were added to refs/heads/main by this push:
     new 5d615f61 Changed DynamicMetadataCache into FetchThroughMetadataCache.
5d615f61 is described below

commit 5d615f61a2d496bb6c05e89985ef0fc4ca70eab7
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Mar 8 15:10:51 2022 +0200

    Changed DynamicMetadataCache into FetchThroughMetadataCache.
    
    No caching is really needed, as we want to fetch a fresh metadata policy
    once this admin flow is being called.
---
 .../issue-registration-access-token-beans.xml      | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
index ad156e21..0342c792 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
@@ -57,9 +57,9 @@
     <bean id="shibboleth.oidc.admin.DefaultMetadataPolicyResolver"
         parent="shibboleth.oidc.admin.BaseMetadataPolicyResolver">
         <constructor-arg>
-            <bean parent="shibboleth.oidc.admin.DynamicCacheBuilder">
+            <bean parent="shibboleth.oidc.admin.CacheBuilder">
                 <constructor-arg>
-                    <bean p:cacheId="AdminMetadataPolicyCache" parent="shibboleth.oidc.admin.BaseDynamicCacheBuilderSpec" />
+                    <bean p:cacheId="AdminMetadataPolicyCache" parent="shibboleth.oidc.admin.BaseCacheBuilderSpec" />
                 </constructor-arg>
             </bean>
         </constructor-arg>
@@ -76,27 +76,22 @@
        parent="shibboleth.Functions.Expression" p:customObject-ref="shibboleth.HttpServletRequest"
        c:expression="#custom.getParameter(T(net.shibboleth.idp.plugin.oidc.op.cli.IssueRegistrationAccessTokenArguments).URL_PARAM_METADATA_POLICY_LOCATION)" />
 
-    <bean id="shibboleth.oidc.admin.ExpirationTimeStrategy" parent="shibboleth.Functions.Constant"
-        c:target="#{T(java.time.Instant).ofEpochSecond(1)}" />
-
     <bean id="shibboleth.oidc.admin.MetadataPolicyIdentifierExtractionStrategy"
        parent="shibboleth.Functions.Expression" p:customObject-ref="shibboleth.HttpServletRequest"
        c:expression="#custom.getParameter(T(net.shibboleth.idp.plugin.oidc.op.cli.IssueRegistrationAccessTokenArguments).URL_PARAM_METADATA_POLICY_LOCATION)" />
         
-    <bean id="dynamicCacheFactory" class="net.shibboleth.oidc.metadata.cache.impl.DynamicMetadataCacheBuilder$Builder"/>
+    <bean id="fetchThroughCacheFactory" class="net.shibboleth.oidc.metadata.cache.impl.FetchThroughMetadataCacheBuilder$Builder"/>
     
-    <bean id="shibboleth.oidc.admin.DynamicCacheBuilder" factory-bean="dynamicCacheFactory" factory-method="build"
+    <bean id="shibboleth.oidc.admin.CacheBuilder" factory-bean="fetchThroughCacheFactory" factory-method="build"
         abstract="true"/>
     
-    <bean class="net.shibboleth.oidc.metadata.cache.impl.DynamicMetadataCacheBuilderSpec" 
-        id="shibboleth.oidc.admin.BaseDynamicCacheBuilderSpec" abstract="true"        
-        p:fetchStrategy-ref="shibboleth.oidc.admin.MetadataPolicyFetchingStrategy" 
-        p:criteriaToIdentifierStrategy-ref="shibboleth.oidc.admin.CriteriaToIdentifierStrategy" 
-        p:metadataExpirationTimeStrategy-ref="shibboleth.oidc.admin.ExpirationTimeStrategy" 
+    <bean class="net.shibboleth.oidc.metadata.cache.impl.FetchThroughMetadataCacheBuilderSpec"
+        id="shibboleth.oidc.admin.BaseCacheBuilderSpec" abstract="true"
+        p:fetchStrategy-ref="shibboleth.oidc.admin.MetadataPolicyFetchingStrategy"
+        p:criteriaToIdentifierStrategy-ref="shibboleth.oidc.admin.CriteriaToIdentifierStrategy"
         p:identifierExtractionStrategy-ref="shibboleth.oidc.admin.MetadataPolicyIdentifierExtractionStrategy"
-        p:minCacheDuration="0"
        />
-       
+
     <bean id="shibboleth.oidc.admin.MetadataPolicyFetchingStrategy"
         class="net.shibboleth.oidc.metadata.policy.impl.MetadataPolicyViaLocationFetchingStrategy"
         c:client-ref="shibboleth.InternalHttpClient"

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


More information about the commits mailing list