libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-2731: Improve thread safety of TokenManager

Browse source 
This commit guards access to the non-final fields of TokenManager by its intrinsic lock.
This commit is contained in:
Guus der Kinderen 2016-04-05 15:01:37 +02:00
parent 0d6c72a378
commit 804dd13abd
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java
View file

@ -52,7 +52,7 @@ public class TokenManager {
return getAccessToken().getToken();
}
public AccessTokenResponse getAccessToken(){
public synchronized AccessTokenResponse getAccessToken(){
if(currentToken == null){
grantToken();
}else if(tokenExpired()){
@ -78,9 +78,10 @@ public class TokenManager {
TokenService tokenService = target.proxy(TokenService.class);
int requestTime = Time.currentTime();
currentToken = tokenService.grantToken(config.getRealm(), form.asMap());
expirationTime = requestTime + currentToken.getExpiresIn();
synchronized (this) {
currentToken = tokenService.grantToken( config.getRealm(), form.asMap() );
expirationTime = requestTime + currentToken.getExpiresIn();
}
return currentToken;
}
@ -101,20 +102,22 @@ public class TokenManager {
try {
int requestTime = Time.currentTime();
currentToken = tokenService.refreshToken(config.getRealm(), form.asMap());
expirationTime = requestTime + currentToken.getExpiresIn();
synchronized (this) {
currentToken = tokenService.refreshToken( config.getRealm(), form.asMap() );
expirationTime = requestTime + currentToken.getExpiresIn();
}
return currentToken;
} catch (BadRequestException e) {
return grantToken();
}
}
public void setMinTokenValidity(long minTokenValidity) {
public synchronized void setMinTokenValidity(long minTokenValidity) {
this.minTokenValidity = minTokenValidity;
}
private boolean tokenExpired() {
private synchronized boolean tokenExpired() {
return (Time.currentTime() + minTokenValidity) >= expirationTime;
}