From 9e3bf6970ab27e6f251dc738458dbf94d7cec545 Mon Sep 17 00:00:00 2001 From: YuriyZ Date: Fri, 28 Jan 2022 19:33:01 +0200 Subject: [PATCH] fix(jans-auth-server): corrected jarm response mode --- .../ws/rs/AuthorizeRestWebServiceImpl.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java index a9b47fbd58c..d194b8d2bfb 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java @@ -402,6 +402,7 @@ private Response requestAuthorization( responseMode = extractResponseMode(request); if (responseMode == ResponseMode.JWT) { Jwt jwt = Jwt.parseSilently(request); + redirectUriResponse.getRedirectUri().setResponseMode(ResponseMode.JWT); fillRedirectUriResponseforJARM(redirectUriResponse, jwt, client); if (appConfiguration.isFapi()) { authorizeRestWebServiceValidator.throwInvalidJwtRequestExceptionAsJwtMode(redirectUriResponse, @@ -798,18 +799,13 @@ private void fillRedirectUriResponseforJARM(RedirectUriResponse redirectUriRespo redirectUriResponse.getRedirectUri().setBaseRedirectUri(URLDecoder.decode(tempRedirectUri, "UTF-8")); } } - redirectUriResponse.getRedirectUri().setResponseMode(ResponseMode.JWT); String clientId = client.getClientId(); redirectUriResponse.getRedirectUri().setIssuer(appConfiguration.getIssuer()); redirectUriResponse.getRedirectUri().setAudience(clientId); - redirectUriResponse.getRedirectUri() - .setAuthorizationCodeLifetime(appConfiguration.getAuthorizationCodeLifetime()); - redirectUriResponse.getRedirectUri().setSignatureAlgorithm( - SignatureAlgorithm.fromString(client.getAttributes().getAuthorizationSignedResponseAlg())); - redirectUriResponse.getRedirectUri().setKeyEncryptionAlgorithm( - KeyEncryptionAlgorithm.fromName(client.getAttributes().getAuthorizationEncryptedResponseAlg())); - redirectUriResponse.getRedirectUri().setBlockEncryptionAlgorithm( - BlockEncryptionAlgorithm.fromName(client.getAttributes().getAuthorizationEncryptedResponseEnc())); + redirectUriResponse.getRedirectUri().setAuthorizationCodeLifetime(appConfiguration.getAuthorizationCodeLifetime()); + redirectUriResponse.getRedirectUri().setSignatureAlgorithm(SignatureAlgorithm.fromString(client.getAttributes().getAuthorizationSignedResponseAlg())); + redirectUriResponse.getRedirectUri().setKeyEncryptionAlgorithm(KeyEncryptionAlgorithm.fromName(client.getAttributes().getAuthorizationEncryptedResponseAlg())); + redirectUriResponse.getRedirectUri().setBlockEncryptionAlgorithm(BlockEncryptionAlgorithm.fromName(client.getAttributes().getAuthorizationEncryptedResponseEnc())); redirectUriResponse.getRedirectUri().setCryptoProvider(cryptoProvider); String keyId = null;