Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #17567 #17588

Merged
merged 5 commits into from
Nov 16, 2020
Merged

fixes #17567 #17588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b67958
Modify keyvault template to soft delete
jacko9et Oct 29, 2020
f1e976c
Merge branch 'master' of github.com:Azure/azure-sdk-for-java into master
jacko9et Nov 11, 2020
c2dc713
Merge branch 'master' of github.com:Azure/azure-sdk-for-java into master
jacko9et Nov 12, 2020
ad13ee5
Merge branch 'master' of github.com:Azure/azure-sdk-for-java into master
jacko9et Nov 16, 2020
a569350
fixes #17567
jacko9et Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ain/java/com/azure/spring/autoconfigure/aad/AADAuthenticationFilterAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions ...ng-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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;
}
Expand Down