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

fix(jans-auth-server): fixed server and tests after jetty 11 migration #1354

Merged
merged 16 commits into from
May 17, 2022
Merged

fix(jans-auth-server): fixed server and tests after jetty 11 migration #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5f39d13
fix(jans-auth-server): restored previous state of authz impl
yuriyz May 16, 2022
35c9750
fix(jans-auth-server): cherry-pick 4d5ad263 and adapt code
yuriyz May 16, 2022
5e6e939
fix(jans-auth-server): cherry-pick ae0b60b4 and adapt code
yuriyz May 16, 2022
f3c6bd7
fix(jans-auth-server): cherry-pick e30e65ed and adapt code
yuriyz May 16, 2022
106c5d7
Revert "fix(jans-auth-server): cherry-pick e30e65ed and adapt code"
yuriyz May 16, 2022
7e0c2c5
Revert "fix(jans-auth-server): cherry-pick ae0b60b4 and adapt code"
yuriyz May 17, 2022
fb50a06
fix(jans-auth-server): put back inlined request jwt
yuriyz May 17, 2022
0622dd7
fix(jans-auth-server): extracted authorize method
yuriyz May 17, 2022
e7e3da0
fix(jans-auth-server): more extracted methods out of authorize
yuriyz May 17, 2022
d356873
fix(jans-auth-server): extracted methods out of authorize
yuriyz May 17, 2022
406ecd3
fix(jans-auth-server): methods out of authorize
yuriyz May 17, 2022
cfb9929
fix(jans-auth-server): request jwt refactoring
yuriyz May 17, 2022
4a9feec
fix(jans-auth-server): corrected redirect uri creation
yuriyz May 17, 2022
9593d7d
fix(jans-auth-server): corrected redirect uri creation
yuriyz May 17, 2022
8ecea1b
fix(jans-auth-server): corrected register response assert builder
yuriyz May 17, 2022
8bdfd2a
fix(jans-auth-server): code clean up
yuriyz May 17, 2022
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 .../src/test/java/io/jans/as/client/client/assertbuilders/RegisterResponseAssertBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.jans.as.client.RegisterResponse;
import io.jans.as.model.common.BackchannelTokenDeliveryMode;
import io.jans.as.model.crypto.signature.AsymmetricSignatureAlgorithm;
import org.apache.commons.lang3.BooleanUtils;

import static io.jans.as.model.register.RegisterRequestParam.*;
import static org.testng.Assert.*;
Expand Down Expand Up @@ -84,7 +85,7 @@ public void check() {
assertTrue(response.getClaims().containsKey(BACKCHANNEL_AUTHENTICATION_REQUEST_SIGNING_ALG.toString()));
assertEquals(response.getClaims().get(BACKCHANNEL_AUTHENTICATION_REQUEST_SIGNING_ALG.toString()), backchannelRequestSigningAlgorithm.getValue());
}
if (backchannelUserCodeParameter != null) {
if (BooleanUtils.isTrue(backchannelUserCodeParameter)) {
assertTrue(response.getClaims().containsKey(BACKCHANNEL_USER_CODE_PARAMETER.toString()));
assertEquals(response.getClaims().get(BACKCHANNEL_USER_CODE_PARAMETER.toString()), String.valueOf(backchannelUserCodeParameter));
}
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down
26 changes: 15 additions & 11 deletions ...r/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,23 +332,20 @@ private static boolean canLogWebApplicationException(WebApplicationException e)

private ResponseBuilder authorize(AuthzRequest authzRequest) throws AcrChangedException, SearchException, TokenBindingParseException {
String tokenBindingHeader = authzRequest.getHttpRequest().getHeader("Sec-Token-Binding");
boolean isPar = authzRequestService.processPar(authzRequest);

List<Prompt> prompts = Prompt.fromString(authzRequest.getPrompt(), " ");
final List<ResponseType> responseTypes = authzRequest.getResponseTypeList();

SessionId sessionUser = identity.getSessionId();
User user = sessionIdService.getUser(sessionUser);

boolean isPar = authzRequestService.processPar(authzRequest);

Map<String, String> customResponseHeaders = Util.jsonObjectArrayStringAsMap(authzRequest.getCustomResponseHeaders());

updateSessionForROPC(authzRequest.getHttpRequest(), sessionUser);

Client client = authorizeRestWebServiceValidator.validateClient(authzRequest, isPar);

String deviceAuthzUserCode = deviceAuthorizationService.getUserCodeFromSession(authzRequest.getHttpRequest());
authzRequest.setRedirectUri(authorizeRestWebServiceValidator.validateRedirectUri(client, authzRequest.getRedirectUri(), authzRequest.getState(), deviceAuthzUserCode, authzRequest.getHttpRequest()));

authzRequestService.createRedirectUriResponse(authzRequest);

authorizeRestWebServiceValidator.validateAcrs(authzRequest, client);
Expand All @@ -357,7 +354,8 @@ private ResponseBuilder authorize(AuthzRequest authzRequest) throws AcrChangedEx

authorizeRestWebServiceValidator.checkSignedRequestRequired(authzRequest);

authzRequestService.processRequestObject(authzRequest, client, scopes, user);
authzRequestService.processRequestObject(authzRequest, client, scopes, user, prompts);

validateRequestJwt(authzRequest, isPar, client);

authorizeRestWebServiceValidator.validate(authzRequest, responseTypes, client);
Expand Down Expand Up @@ -503,18 +501,24 @@ private ResponseBuilder authorize(AuthzRequest authzRequest) throws AcrChangedEx

ResponseBuilder builder = RedirectUtil.getRedirectResponseBuilder(authzRequest.getRedirectUriResponse().getRedirectUri(), authzRequest.getHttpRequest());

if (isTrue(appConfiguration.getCustomHeadersWithAuthorizationResponse())) {
for (Entry<String, String> entry : customResponseHeaders.entrySet()) {
builder.header(entry.getKey(), entry.getValue());
}
}
addCustomHeaders(builder, authzRequest);

runCiba(authzRequest.getAuthReqId(), client, authzRequest.getHttpRequest(), authzRequest.getHttpResponse());
processDeviceAuthorization(deviceAuthzUserCode, user);

return builder;
}

private void addCustomHeaders(ResponseBuilder builder, AuthzRequest authzRequest) {
if (isTrue(appConfiguration.getCustomHeadersWithAuthorizationResponse())) {

Map<String, String> customResponseHeaders = Util.jsonObjectArrayStringAsMap(authzRequest.getCustomResponseHeaders());
for (Entry<String, String> entry : customResponseHeaders.entrySet()) {
builder.header(entry.getKey(), entry.getValue());
}
}
}

private void addResponseParameterScope(AuthzRequest authzRequest, AuthorizationGrant authorizationGrant) {
if (authorizationGrant != null && !appConfiguration.isFapi()) {
authzRequest.setScope(authorizationGrant.checkScopesPolicy(authzRequest.getScope()));
Expand Down
Loading