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

fix: backport AM-3520 on 4.4 #5437

Open
wants to merge 1 commit into
base: 4.4.x
Choose a base branch
from
+48 −4
Open

fix: backport AM-3520 on 4.4 #5437

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
9 changes: 7 additions & 2 deletions .../main/java/io/gravitee/am/gateway/handler/oauth2/service/token/impl/TokenServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Single;
import lombok.Setter;
import net.minidev.json.JSONArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

import java.time.Instant;
import java.util.Date;
Expand Down Expand Up @@ -108,6 +110,10 @@ public class TokenServiceImpl implements TokenService {
@Autowired
private AuditService auditService;

@Setter
@Value("${handlers.oauth2.response.strict:false}")
private boolean strictResponse = false;

@Override
public Maybe<Token> getAccessToken(String token, Client client) {
return jwtService.decodeAndVerify(token, client, ACCESS_TOKEN)
Expand Down Expand Up @@ -290,8 +296,7 @@ private Token convert(JWT accessToken, String encodedAccessToken, String encoded
token.setExpiresIn(Instant.ofEpochSecond(accessToken.getExp()).minusMillis(System.currentTimeMillis()).getEpochSecond());
token.setScope(accessToken.getScope());
// set additional information

if (oAuth2Request.getAdditionalParameters() != null && !oAuth2Request.getAdditionalParameters().isEmpty()) {
if (!strictResponse && oAuth2Request.getAdditionalParameters() != null && !oAuth2Request.getAdditionalParameters().isEmpty()) {
oAuth2Request.getAdditionalParameters().toSingleValueMap().entrySet().stream()
.filter(e -> !Token.getStandardParameters().contains(e.getKey()) && !e.getKey().equals(ID_TOKEN))
.forEach(e -> token.getAdditionalInformation().put(e.getKey(), e.getValue()));
Expand Down
43 changes: 41 additions & 2 deletions ...c/src/test/java/io/gravitee/am/gateway/handler/oauth2/service/token/TokenServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
public class TokenServiceTest {

@InjectMocks
private TokenService tokenService = new TokenServiceImpl();
private TokenServiceImpl tokenService = new TokenServiceImpl();

@Mock
private AccessTokenRepository accessTokenRepository;
Expand Down Expand Up @@ -122,20 +122,52 @@ public void after() {
@Test
public void shouldCreate() {
OAuth2Request oAuth2Request = new OAuth2Request();
MultiValueMap<String, String> additionalParameters = new LinkedMultiValueMap<>();
additionalParameters.add("key", "value");
oAuth2Request.setAdditionalParameters(additionalParameters);

Client client = new Client();
client.setClientId("my-client-id");

ExecutionContext executionContext = mock(ExecutionContext.class);

when(jwtService.encode(any(), any(Client.class))).thenReturn(Single.just(""));
when(tokenEnhancer.enhance(any(), any(), any(), any(), any())).thenReturn(Single.just(new AccessToken("token-id")));
when(tokenEnhancer.enhance(any(), any(), any(), any(), any())).thenAnswer(ans -> Single.just(ans.getArgument(0)));
when(executionContextFactory.create(any())).thenReturn(executionContext);
doReturn(Completable.complete()).when(tokenManager).storeAccessToken(any());
TestObserver<Token> testObserver = tokenService.create(oAuth2Request, client, null).test();
testObserver.assertComplete();
testObserver.assertNoErrors();
testObserver.assertValue(token -> token.getAdditionalInformation().containsKey("key"));

verify(tokenManager, times(1)).storeAccessToken(any());
verify(accessTokenRepository, never()).delete(anyString());
verify(refreshTokenRepository, never()).delete(anyString());
}

@Test
public void shouldCreateWithoutAdditionalParameters() {
tokenService.setStrictResponse(true);
OAuth2Request oAuth2Request = new OAuth2Request();
MultiValueMap<String, String> additionalParameters = new LinkedMultiValueMap<>();
additionalParameters.add("key", "value");
oAuth2Request.setAdditionalParameters(additionalParameters);

Client client = new Client();
client.setClientId("my-client-id");

ExecutionContext executionContext = mock(ExecutionContext.class);

when(jwtService.encode(any(), any(Client.class))).thenReturn(Single.just(""));
when(tokenEnhancer.enhance(any(), any(), any(), any(), any())).thenAnswer(ans -> Single.just(ans.getArgument(0)));
when(executionContextFactory.create(any())).thenReturn(executionContext);
doReturn(Completable.complete()).when(tokenManager).storeAccessToken(any());
TestObserver<Token> testObserver = tokenService.create(oAuth2Request, client, null).test();
testObserver.assertComplete();
testObserver.assertNoErrors();

testObserver.assertValue(token -> token.getAdditionalInformation().isEmpty());

verify(tokenManager, times(1)).storeAccessToken(any());
verify(accessTokenRepository, never()).delete(anyString());
verify(refreshTokenRepository, never()).delete(anyString());
Expand Down Expand Up @@ -228,6 +260,7 @@ public void shouldCreateAccessTokenWithRefreshToken() {
verify(refreshTokenRepository, never()).delete(anyString());
}

@Test
public void shouldCreate_withAudArray() {
OAuth2Request oAuth2Request = new OAuth2Request();
oAuth2Request.setClientId("my-client-id");
Expand All @@ -248,6 +281,12 @@ public void shouldCreate_withAudArray() {

when(jwtService.encode(any(), any(Client.class))).thenReturn(Single.just(""));
when(tokenEnhancer.enhance(any(), any(), any(), any(), any())).thenReturn(Single.just(new AccessToken("token-id")));
when(executionContextFactory.create(any())).thenReturn(executionContext);
doReturn(Completable.complete()).when(tokenManager).storeAccessToken(any());

TestObserver<Token> testObserver = tokenService.create(oAuth2Request, client, null).test();
testObserver.assertComplete();
testObserver.assertNoErrors();

verify(jwtService).encode(argThat(jwt -> jwt.get(Claims.aud) instanceof List
&& jwt.getAud().equals(((List)jwt.get(Claims.aud)).get(0))
Expand Down