fixes #17567 (#17588)

Add new configuration item: azure.activedirectory.jwk-set-cache-refresh-time
Azure · Nov 16, 2020 · bf43d37 · bf43d37
1 parent 9215dcc
commit bf43d37
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...ain/java/com/azure/spring/autoconfigure/aad/AADAuthenticationFilterAutoConfiguration.java b/...ain/java/com/azure/spring/autoconfigure/aad/AADAuthenticationFilterAutoConfiguration.java
@@ -109,7 +109,8 @@ public ResourceRetriever getJWTResourceRetriever() {
     @ConditionalOnMissingBean(JWKSetCache.class)
     public JWKSetCache getJWKSetCache() {
         long lifespan = aadAuthenticationProperties.getJwkSetCacheLifespan();
-        return new DefaultJWKSetCache(lifespan, lifespan, TimeUnit.MILLISECONDS);
+        long refreshTime = aadAuthenticationProperties.getJwkSetCacheRefreshTime();
+        return new DefaultJWKSetCache(lifespan, refreshTime, TimeUnit.MILLISECONDS);
     }
 
     @PostConstruct

diff --git a/...ng-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java b/...ng-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java
@@ -33,6 +33,7 @@ public class AADAuthenticationProperties {
     private static final Logger LOGGER = LoggerFactory.getLogger(AADAuthenticationProperties.class);
     private static final String DEFAULT_SERVICE_ENVIRONMENT = "global";
     private static final long DEFAULT_JWK_SET_CACHE_LIFESPAN = TimeUnit.MINUTES.toMillis(5);
+    private static final long DEFAULT_JWK_SET_CACHE_REFRESH_TIME = DEFAULT_JWK_SET_CACHE_LIFESPAN;
     private static final String GROUP_RELATIONSHIP_DIRECT = "direct";
     private static final String GROUP_RELATIONSHIP_TRANSITIVE = "transitive";
 
@@ -101,6 +102,11 @@ public class AADAuthenticationProperties {
      */
     private long jwkSetCacheLifespan = DEFAULT_JWK_SET_CACHE_LIFESPAN;
 
+    /**
+     * The refresh time of the cached JWK set before it expires, default is 5 minutes.
+     */
+    private long jwkSetCacheRefreshTime = DEFAULT_JWK_SET_CACHE_REFRESH_TIME;
+
     /**
      * Azure Tenant ID.
      */
@@ -388,6 +394,14 @@ public void setJwkSetCacheLifespan(long jwkSetCacheLifespan) {
         this.jwkSetCacheLifespan = jwkSetCacheLifespan;
     }
 
+    public long getJwkSetCacheRefreshTime() {
+        return jwkSetCacheRefreshTime;
+    }
+
+    public void setJwkSetCacheRefreshTime(long jwkSetCacheRefreshTime) {
+        this.jwkSetCacheRefreshTime = jwkSetCacheRefreshTime;
+    }
+
     public String getTenantId() {
         return tenantId;
     }