Skip to content

Rotated refresh token uses the expiry of initial refresh token #2320

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

Open
kpur-sbab wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −4
Open

Rotated refresh token uses the expiry of initial refresh token #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions ...ringframework/security/oauth2/server/authorization/token/OAuth2RefreshTokenGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@

import java.time.Instant;
import java.util.Base64;
import java.util.Optional;

import org.springframework.lang.Nullable;
import org.jspecify.annotations.Nullable;
import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
import org.springframework.security.crypto.keygen.StringKeyGenerator;
import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
import org.springframework.security.oauth2.core.OAuth2RefreshToken;
import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
import org.springframework.security.oauth2.server.authorization.OAuth2TokenType;
import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken;

Expand All @@ -50,16 +52,23 @@ public OAuth2RefreshToken generate(OAuth2TokenContext context) {
// Do not issue refresh token to public client
return null;
}

var refreshToken = Optional.ofNullable(context.getAuthorization())
.map(OAuth2Authorization::getRefreshToken)
.orElse(null);
Instant issuedAt = Instant.now();
Instant expiresAt = issuedAt.plus(context.getRegisteredClient().getTokenSettings().getRefreshTokenTimeToLive());
Instant expiresAt;
if (refreshToken == null) {
expiresAt = issuedAt.plus(context.getRegisteredClient().getTokenSettings().getRefreshTokenTimeToLive());
} else {
expiresAt = refreshToken.getToken().getExpiresAt();
}
return new OAuth2RefreshToken(this.refreshTokenGenerator.generateKey(), issuedAt, expiresAt);
}

private static boolean isPublicClientForAuthorizationCodeGrant(OAuth2TokenContext context) {
// @formatter:off
if (AuthorizationGrantType.AUTHORIZATION_CODE.equals(context.getAuthorizationGrantType()) &&
(context.getAuthorizationGrant().getPrincipal() instanceof OAuth2ClientAuthenticationToken clientPrincipal)) {
(context.getAuthorizationGrant().getPrincipal() instanceof OAuth2ClientAuthenticationToken clientPrincipal)) {
return clientPrincipal.getClientAuthenticationMethod().equals(ClientAuthenticationMethod.NONE);
}
// @formatter:on
Expand Down
30 changes: 30 additions & 0 deletions ...ramework/security/oauth2/server/authorization/token/OAuth2RefreshTokenGeneratorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

import org.junit.jupiter.api.Test;

import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.OAuth2RefreshToken;
import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
import org.springframework.security.oauth2.server.authorization.OAuth2TokenType;
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
Expand Down Expand Up @@ -67,4 +69,32 @@ public void generateWhenRefreshTokenTypeThenReturnRefreshToken() {
assertThat(refreshToken.getExpiresAt()).isBetween(expiresAt.minusSeconds(1), expiresAt.plusSeconds(1));
}

@Test
public void generateWhenAuthorizationContainsRefreshTokenThenReuseExistingExpiresAt() {
RegisteredClient registeredClient = TestRegisteredClients.registeredClient().build();

Instant existingIssuedAt = Instant.now().minusSeconds(60);
Instant existingExpiresAt = Instant.now().plusSeconds(3600);
OAuth2RefreshToken existingRefreshToken = new OAuth2RefreshToken("existing-token", existingIssuedAt, existingExpiresAt);

OAuth2Authorization authorization = OAuth2Authorization.withRegisteredClient(registeredClient)
.principalName("principal")
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.token(existingRefreshToken)
.build();

OAuth2TokenContext tokenContext = DefaultOAuth2TokenContext.builder()
.registeredClient(registeredClient)
.authorization(authorization)
.tokenType(OAuth2TokenType.REFRESH_TOKEN)
.build();

OAuth2RefreshToken generatedRefreshToken = this.tokenGenerator.generate(tokenContext);
assertThat(generatedRefreshToken).isNotNull();
assertThat(generatedRefreshToken.getExpiresAt()).isEqualTo(existingExpiresAt);

Instant issuedAt = Instant.now();
assertThat(generatedRefreshToken.getIssuedAt()).isBetween(issuedAt.minusSeconds(1), issuedAt.plusSeconds(1));
}

}