From fb0b6d738e3e6292453958d44cb14fdcf03ab416 Mon Sep 17 00:00:00 2001 From: Milton Ch <86965029+Milton-Ch@users.noreply.github.com> Date: Thu, 1 Sep 2022 14:52:48 -0400 Subject: [PATCH] fix: fixed multiple encoding issue during authz (#2152) --- .../jans/as/client/AuthorizationResponse.java | 1 + .../io/jans/as/client/EndSessionClient.java | 1 + .../as/model/util}/QueryStringDecoder.java | 20 ++-- .../as/model/util/QueryStringDecoderTest.java | 97 +++++++++++++++++++ .../ws/rs/AuthorizeRestWebServiceImpl.java | 2 +- .../server/par/ws/rs/ParRestWebService.java | 2 +- .../server/service/RedirectionUriService.java | 2 +- .../as/server/util/QueryStringDecoder.java | 42 -------- .../as/server/model/uma/TTokenRequest.java | 2 +- .../rs/AuthorizationCodeFlowEmbeddedTest.java | 9 +- .../AuthorizeRestWebServiceEmbeddedTest.java | 33 ++++--- ...AuthorizeWithResponseModeEmbeddedTest.java | 2 +- ...lientAuthenticationFilterEmbeddedTest.java | 3 +- .../ClientInfoRestWebServiceEmbeddedTest.java | 3 +- .../EndSessionBackchannelRestServerTest.java | 3 +- .../EndSessionRestWebServiceEmbeddedTest.java | 1 + .../rs/OpenIDRequestObjectEmbeddedTest.java | 24 ++--- ...nIDRequestObjectWithESAlgEmbeddedTest.java | 2 +- ...nIDRequestObjectWithHSAlgEmbeddedTest.java | 2 +- ...nIDRequestObjectWithRSAlgEmbeddedTest.java | 2 +- ...jectSigningAlgRestrictionEmbeddedTest.java | 2 +- .../ResponseTypesRestrictionEmbeddedTest.java | 2 +- ...IdentifierUrlVerificationEmbeddedTest.java | 2 +- ...ointAuthMethodRestrictionEmbeddedTest.java | 2 +- .../UserAuthenticationFilterEmbeddedTest.java | 3 +- .../UserInfoRestWebServiceEmbeddedTest.java | 11 ++- 26 files changed, 172 insertions(+), 103 deletions(-) rename jans-auth-server/{client/src/main/java/io/jans/as/client => model/src/main/java/io/jans/as/model/util}/QueryStringDecoder.java (67%) create mode 100644 jans-auth-server/model/src/test/java/io/jans/as/model/util/QueryStringDecoderTest.java delete mode 100644 jans-auth-server/server/src/main/java/io/jans/as/server/util/QueryStringDecoder.java diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java index c3a6d453357..459b1c38a24 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java @@ -14,6 +14,7 @@ import io.jans.as.model.jwe.Jwe; import io.jans.as.model.jwt.Jwt; import io.jans.as.model.util.JwtUtil; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java index df2e6a2698c..9691e4da205 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java @@ -10,6 +10,7 @@ import io.jans.as.model.session.EndSessionErrorResponseType; import io.jans.as.model.session.EndSessionRequestParam; import io.jans.as.model.session.EndSessionResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/QueryStringDecoder.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java similarity index 67% rename from jans-auth-server/client/src/main/java/io/jans/as/client/QueryStringDecoder.java rename to jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java index 2b23a4b4606..a9ad3649ed3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/QueryStringDecoder.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java @@ -4,25 +4,25 @@ * Copyright (c) 2020, Janssen Project */ -package io.jans.as.client; +package io.jans.as.model.util; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; /** * Provides functionality to parse query strings. * - * @author Javier Rojas Blum Date: 09.29.2011 + * @author Javier Rojas Blum + * @version November 24, 2017 */ public class QueryStringDecoder { - /** - * Avoid instance creation - */ - private QueryStringDecoder() { - } + private static final Logger log = Logger.getLogger(QueryStringDecoder.class); /** * Decodes a query string and returns a map with the parsed query string @@ -41,7 +41,11 @@ public static Map decode(String queryString) { String name = nameValue.length > 0 ? nameValue[0] : ""; String value = nameValue.length > 1 ? nameValue[1] : ""; if (StringUtils.isNotBlank(name)) { - map.put(name, value); + try { + map.put(name, URLDecoder.decode(value, Util.UTF8_STRING_ENCODING)); + } catch (Exception e) { + log.error(String.format("Error encoding query param, key: '%s', value: '%s'", name, value), e); + } } } } diff --git a/jans-auth-server/model/src/test/java/io/jans/as/model/util/QueryStringDecoderTest.java b/jans-auth-server/model/src/test/java/io/jans/as/model/util/QueryStringDecoderTest.java new file mode 100644 index 00000000000..d1acd659d8f --- /dev/null +++ b/jans-auth-server/model/src/test/java/io/jans/as/model/util/QueryStringDecoderTest.java @@ -0,0 +1,97 @@ +package io.jans.as.model.util; + +import io.jans.as.model.BaseTest; +import org.testng.annotations.Test; + +import java.util.Map; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +public class QueryStringDecoderTest extends BaseTest { + + @Test + public void decode_nullParam_emptyMap() { + showTitle("decode_nullParam_emptyMap"); + + Map queryParamMap = QueryStringDecoder.decode(null); + + assertTrue(queryParamMap.isEmpty()); + } + + @Test + public void decode_emptyParam_emptyMap() { + showTitle("decode_emptyParam_emptyMap"); + + Map queryParamMap = QueryStringDecoder.decode(""); + + assertTrue(queryParamMap.isEmpty()); + } + + @Test + public void decode_simpleParam_validParam() { + showTitle("decode_simpleParam_validParam"); + + String key1 = "key1"; + String key2 = "key2"; + String simpleValue = "SIMPLE"; + String urlValue = "http://localhost:9000"; + String queryParamString = String.format("%s=%s&%s=%s", key1, simpleValue, key2, urlValue); + + Map queryParamMap = QueryStringDecoder.decode(queryParamString); + + assertEquals(queryParamMap.size(), 2); + assertEquals(queryParamMap.get(key1), simpleValue); + assertEquals(queryParamMap.get(key2), urlValue); + } + + @Test + public void decode_encodedParam_validParam() { + showTitle("decode_encodedParam_validParam"); + + String key1 = "key1"; + String key3 = "key3"; + String urlValue = "http://localhost:9000"; + String encodedUrlValue = "http%3A%2F%2Flocalhost%3A9000"; + String queryParamString = String.format("%s=%s&%s=%s", key1, urlValue, key3, encodedUrlValue); + + Map queryParamMap = QueryStringDecoder.decode(queryParamString); + + assertEquals(queryParamMap.size(), 2); + assertEquals(queryParamMap.get(key1), urlValue); + assertEquals(queryParamMap.get(key3), urlValue); + } + + @Test + public void decode_emptyKeyAndValueParam_validParam() { + showTitle("decode_emptyKeyAndValueParam_validParam"); + + String emptyKey = ""; + String key2 = "key2"; + String simpleValue = "SIMPLE"; + String emptyValue = ""; + String queryParamString = String.format("%s=%s&%s=%s", emptyKey, simpleValue, key2, emptyValue); + + Map queryParamMap = QueryStringDecoder.decode(queryParamString); + + assertEquals(queryParamMap.size(), 1); + assertEquals(queryParamMap.get(key2), emptyValue); + } + + @Test + public void decode_unsupportedDecodedParam_validParam() { + showTitle("decode_unsupportedDecodedParam_validParam"); + + String key1 = "key1"; + String key2 = "key2"; + String urlValue = "http://localhost:9000"; + String encodedUrlValue = "http%3A%2F%2Flocalhost%3A9000"; + String unsupportedValue = "http%3A%2F%2Flocalhost%3A9000%GG"; + String queryParamString = String.format("%s=%s&%s=%s", key1, encodedUrlValue, key2, unsupportedValue); + + Map queryParamMap = QueryStringDecoder.decode(queryParamString); + + assertEquals(queryParamMap.size(), 1); + assertEquals(queryParamMap.get(key1), urlValue); + } +} 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 7c98f799a10..07e27c03a70 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 @@ -25,6 +25,7 @@ import io.jans.as.model.crypto.binding.TokenBindingParseException; import io.jans.as.model.error.ErrorResponseFactory; import io.jans.as.model.token.JsonWebResponse; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; import io.jans.as.server.audit.ApplicationAuditLogger; import io.jans.as.server.ciba.CIBAPingCallbackService; @@ -71,7 +72,6 @@ import io.jans.as.server.service.external.context.ExternalUpdateTokenContext; import io.jans.as.server.service.external.session.SessionEvent; import io.jans.as.server.service.external.session.SessionEventType; -import io.jans.as.server.util.QueryStringDecoder; import io.jans.as.server.util.RedirectUtil; import io.jans.as.server.util.ServerUtil; import io.jans.orm.exception.EntryPersistenceException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParRestWebService.java index ffe6d3b0b3f..73da67cbfd4 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParRestWebService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParRestWebService.java @@ -12,12 +12,12 @@ import io.jans.as.model.error.ErrorResponse; import io.jans.as.model.error.ErrorResponseFactory; import io.jans.as.model.jwt.Jwt; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; import io.jans.as.persistence.model.Par; import io.jans.as.server.authorize.ws.rs.AuthorizeRestWebServiceValidator; import io.jans.as.server.service.RedirectUriResponse; import io.jans.as.server.service.RequestParameterService; -import io.jans.as.server.util.QueryStringDecoder; import io.jans.as.server.util.ServerUtil; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.ThreadContext; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java index 84c1ed1c6a1..7fe296207a7 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java @@ -9,11 +9,11 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.common.model.registration.Client; import io.jans.as.model.configuration.AppConfiguration; import io.jans.as.model.error.ErrorResponseFactory; import io.jans.as.model.session.EndSessionErrorResponseType; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; import io.jans.as.common.model.session.SessionId; import org.apache.commons.lang.StringUtils; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/util/QueryStringDecoder.java b/jans-auth-server/server/src/main/java/io/jans/as/server/util/QueryStringDecoder.java deleted file mode 100644 index 505b9e1095d..00000000000 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/util/QueryStringDecoder.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Janssen Project software is available under the Apache License (2004). See http://www.apache.org/licenses/ for full text. - * - * Copyright (c) 2020, Janssen Project - */ - -package io.jans.as.server.util; - -import java.util.HashMap; -import java.util.Map; - -/** - * Provides functionality to parse query strings. - * - * @author Javier Rojas Blum - * @version November 24, 2017 - */ -public class QueryStringDecoder { - - /** - * Decodes a query string and returns a map with the parsed query string - * parameters as keys and its values. - * - * @param queryString The query string. - * @return A map with the parsed query string parameters and its values. - */ - public static Map decode(String queryString) { - Map map = new HashMap(); - - if (queryString != null) { - String[] params = queryString.split("&"); - for (String param : params) { - String[] nameValue = param.split("="); - String name = nameValue.length > 0 ? nameValue[0] : ""; - String value = nameValue.length > 1 ? nameValue[1] : ""; - map.put(name, value); - } - } - - return map; - } -} \ No newline at end of file diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java index 458b0d09ae3..6dc80031890 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java @@ -7,7 +7,6 @@ package io.jans.as.server.model.uma; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.TokenRequest; import io.jans.as.model.common.AuthenticationMethod; import io.jans.as.model.common.GrantType; @@ -20,6 +19,7 @@ import io.jans.as.model.uma.UmaScopeType; import io.jans.as.model.uma.UmaTestUtil; import io.jans.as.model.uma.wrapper.Token; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; import org.apache.commons.lang.StringUtils; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizationCodeFlowEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizationCodeFlowEmbeddedTest.java index 7e1f554b0b5..5418754ddeb 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizationCodeFlowEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizationCodeFlowEmbeddedTest.java @@ -7,6 +7,7 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.RegisterRequest; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.TestUtil; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.GrantType; @@ -144,7 +145,7 @@ public void completeFlowStep1(final String authorizePath, final String userId, f URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -284,7 +285,7 @@ public void completeFlowWithOptionalNonceStep1(final String authorizePath, final URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -436,7 +437,7 @@ public void revokeTokensStep1(final String authorizePath, final String userId, f URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -636,7 +637,7 @@ public void tokenExpirationStep1(final String authorizePath, final String userId URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeRestWebServiceEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeRestWebServiceEmbeddedTest.java index c50448ea0d2..cbae184bb00 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeRestWebServiceEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeRestWebServiceEmbeddedTest.java @@ -12,6 +12,7 @@ import io.jans.as.model.common.ResponseType; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ResponseAsserter; @@ -120,7 +121,7 @@ public void requestAuthorizationCode(final String authorizePath, final String us URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -168,7 +169,7 @@ public void requestAuthorizationCodeNoRedirection(final String authorizePath, fi URI uri = new URI(jsonObj.getString("redirect")); assertNotNull(uri.getQuery(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -330,7 +331,7 @@ public void requestAuthorizationToken(final String authorizePath, final String u URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("access_token"), "The access token is null"); assertNotNull(params.get("state"), "The state is null"); @@ -422,7 +423,7 @@ public void requestAuthorizationTokenFail2(final String authorizePath, final Str URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -470,7 +471,7 @@ public void requestAuthorizationTokenIdToken(final String authorizePath, final S URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); assertNotNull(params.get(AuthorizeResponseParam.TOKEN_TYPE), "The token type is null"); @@ -520,7 +521,7 @@ public void requestAuthorizationCodeIdToken(final String authorizePath, final St URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.ID_TOKEN), "The id token is null"); @@ -567,7 +568,7 @@ public void requestAuthorizationTokenCode(final String authorizePath, final Stri URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); @@ -616,7 +617,7 @@ public void requestAuthorizationTokenCodeIdToken(final String authorizePath, fin URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); @@ -666,7 +667,7 @@ public void requestAuthorizationIdToken(final String authorizePath, final String URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ID_TOKEN), "The id token is null"); assertNotNull(params.get(AuthorizeResponseParam.STATE), "The state is null"); @@ -711,7 +712,7 @@ public void requestAuthorizationPromptNone(final String authorizePath, final Str URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -757,7 +758,7 @@ public void requestAuthorizationPromptNoneFail(final String authorizePath, final URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "Query is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -935,7 +936,7 @@ public void requestAuthorizationPromptNoneLoginConsentFail(final String authoriz URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "Query is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -1012,7 +1013,7 @@ public void requestAuthorizationCodeWithoutRedirectUriStep2(final String authori URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -1098,7 +1099,7 @@ public void requestAuthorizationAccessTokenStep1(final String authorizePath, fin URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); assertNotNull(params.get(AuthorizeResponseParam.STATE), "The state is null"); @@ -1148,7 +1149,7 @@ public void requestAuthorizationAccessTokenStep2(final String authorizePath, fin URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -1196,7 +1197,7 @@ public void requestAuthorizationAccessTokenFail(final String authorizePath, fina URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeWithResponseModeEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeWithResponseModeEmbeddedTest.java index 766871225df..06d80faa9fc 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeWithResponseModeEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/AuthorizeWithResponseModeEmbeddedTest.java @@ -7,9 +7,9 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.client.RegisterResponse; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.TestUtil; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.Prompt; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientAuthenticationFilterEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientAuthenticationFilterEmbeddedTest.java index b8bf20e9393..38ecff03de3 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientAuthenticationFilterEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientAuthenticationFilterEmbeddedTest.java @@ -7,6 +7,7 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.RegisterRequest; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.ResponseAsserter; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.AuthenticationMethod; @@ -130,7 +131,7 @@ public void requestAccessTokenCustomClientAuth1Step1(final String authorizePath, URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.ID_TOKEN), "The id token is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientInfoRestWebServiceEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientInfoRestWebServiceEmbeddedTest.java index 29745fa7c51..bd227d912fd 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientInfoRestWebServiceEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ClientInfoRestWebServiceEmbeddedTest.java @@ -7,6 +7,7 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.RegisterRequest; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.TestUtil; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.AuthorizationMethod; @@ -138,7 +139,7 @@ public void requestClientInfoStep1ImplicitFlow(final String authorizePath, final URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); assertNotNull(params.get(AuthorizeResponseParam.STATE), "The state is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionBackchannelRestServerTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionBackchannelRestServerTest.java index 69695501d39..5b58d67186d 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionBackchannelRestServerTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionBackchannelRestServerTest.java @@ -14,6 +14,7 @@ import io.jans.as.model.common.ResponseType; import io.jans.as.model.jwt.Jwt; import io.jans.as.model.register.ApplicationType; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.model.TClientService; @@ -99,7 +100,7 @@ public void requestEndSessionStep2(final String authorizePath, final String user URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); assertNotNull(params.get(AuthorizeResponseParam.STATE), "The state is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionRestWebServiceEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionRestWebServiceEmbeddedTest.java index 53081bfb96a..0fd8dd2b2c3 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionRestWebServiceEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/EndSessionRestWebServiceEmbeddedTest.java @@ -11,6 +11,7 @@ import io.jans.as.model.common.Prompt; import io.jans.as.model.common.ResponseType; import io.jans.as.model.register.ApplicationType; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectEmbeddedTest.java index 310ddd4c005..36f47c82250 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectEmbeddedTest.java @@ -218,7 +218,7 @@ public void requestParameterMethod1Step2(final String authorizePath, final Strin URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.ID_TOKEN), "The idToken is null"); @@ -367,7 +367,7 @@ public void requestParameterMethod2Step2(final String authorizePath, final Strin URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -452,7 +452,7 @@ public void requestParameterMethodFail1(final String authorizePath, final String URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -527,7 +527,7 @@ public void requestParameterMethodFail2(final String authorizePath, final String URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -602,7 +602,7 @@ public void requestParameterMethodFail3(final String authorizePath, final String URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -666,7 +666,7 @@ public void requestParameterMethodFail4(final String authorizePath, final String URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -739,7 +739,7 @@ public void requestParameterMethodWithMaxAgeRestriction(final String authorizePa URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.ID_TOKEN), "The idToken is null"); @@ -830,7 +830,7 @@ public void requestFileMethod(final String authorizePath, final String userId, f URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("access_token"), "The accessToken is null"); assertNotNull(params.get("id_token"), "The idToken is null"); @@ -885,7 +885,7 @@ public void requestFileMethodFail1(final String authorizePath, final String user URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -939,7 +939,7 @@ public void requestFileMethodFail2(final String authorizePath, final String user URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -1029,7 +1029,7 @@ public void requestFileMethodFail3(final String authorizePath, final String user URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get("error"), "The error value is null"); assertNotNull(params.get("error_description"), "The errorDescription value is null"); @@ -1134,7 +1134,7 @@ public void requestParameterMethodAlgNoneStep2(final String authorizePath, final URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = io.jans.as.model.util.QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithESAlgEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithESAlgEmbeddedTest.java index 75971424a40..412853173dd 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithESAlgEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithESAlgEmbeddedTest.java @@ -7,8 +7,8 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.ResponseAsserter; import io.jans.as.client.model.authorize.Claim; import io.jans.as.client.model.authorize.ClaimValue; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithHSAlgEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithHSAlgEmbeddedTest.java index efac8db7da7..f91102abf6d 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithHSAlgEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithHSAlgEmbeddedTest.java @@ -7,7 +7,6 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.client.model.authorize.Claim; import io.jans.as.client.model.authorize.ClaimValue; @@ -19,6 +18,7 @@ import io.jans.as.model.jwt.JwtClaimName; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithRSAlgEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithRSAlgEmbeddedTest.java index 9ea9e257787..6502d82c576 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithRSAlgEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/OpenIDRequestObjectWithRSAlgEmbeddedTest.java @@ -7,7 +7,6 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.client.model.authorize.Claim; import io.jans.as.client.model.authorize.ClaimValue; @@ -19,6 +18,7 @@ import io.jans.as.model.jwt.JwtClaimName; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ResponseAsserter; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/RequestObjectSigningAlgRestrictionEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/RequestObjectSigningAlgRestrictionEmbeddedTest.java index 3990d070709..942c092802b 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/RequestObjectSigningAlgRestrictionEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/RequestObjectSigningAlgRestrictionEmbeddedTest.java @@ -7,7 +7,6 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.client.model.authorize.Claim; import io.jans.as.client.model.authorize.ClaimValue; @@ -19,6 +18,7 @@ import io.jans.as.model.jwt.JwtClaimName; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ResponseTypesRestrictionEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ResponseTypesRestrictionEmbeddedTest.java index aa921975239..e31269f36c8 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ResponseTypesRestrictionEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/ResponseTypesRestrictionEmbeddedTest.java @@ -7,7 +7,6 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.client.TokenRequest; import io.jans.as.model.authorize.AuthorizeResponseParam; @@ -17,6 +16,7 @@ import io.jans.as.model.config.Constants; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/SectorIdentifierUrlVerificationEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/SectorIdentifierUrlVerificationEmbeddedTest.java index c2dd32c7f4f..2016445396d 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/SectorIdentifierUrlVerificationEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/SectorIdentifierUrlVerificationEmbeddedTest.java @@ -7,7 +7,6 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.Prompt; @@ -19,6 +18,7 @@ import io.jans.as.model.jwt.JwtHeaderName; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/TokenEndpointAuthMethodRestrictionEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/TokenEndpointAuthMethodRestrictionEmbeddedTest.java index 775b95975c3..59cf0dea360 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/TokenEndpointAuthMethodRestrictionEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/TokenEndpointAuthMethodRestrictionEmbeddedTest.java @@ -7,7 +7,6 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.AuthorizationRequest; -import io.jans.as.client.QueryStringDecoder; import io.jans.as.client.RegisterRequest; import io.jans.as.client.TokenRequest; import io.jans.as.model.authorize.AuthorizeResponseParam; @@ -20,6 +19,7 @@ import io.jans.as.model.crypto.signature.SignatureAlgorithm; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.register.RegisterResponseParam; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.StringUtils; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserAuthenticationFilterEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserAuthenticationFilterEmbeddedTest.java index cd64d60b07d..549773a36fb 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserAuthenticationFilterEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserAuthenticationFilterEmbeddedTest.java @@ -7,6 +7,7 @@ package io.jans.as.server.ws.rs; import io.jans.as.client.RegisterRequest; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.TestUtil; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.AuthenticationMethod; @@ -492,7 +493,7 @@ public void requestAccessTokenCustomAuthStep1(final String authorizePath, final URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getQuery(), "The query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getQuery()); + Map params = QueryStringDecoder.decode(uri.getQuery()); assertNotNull(params.get(AuthorizeResponseParam.CODE), "The code is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserInfoRestWebServiceEmbeddedTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserInfoRestWebServiceEmbeddedTest.java index dd5abf94c3b..741901e2c6a 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserInfoRestWebServiceEmbeddedTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/UserInfoRestWebServiceEmbeddedTest.java @@ -12,6 +12,7 @@ import io.jans.as.client.model.authorize.Claim; import io.jans.as.client.model.authorize.ClaimValue; import io.jans.as.client.model.authorize.JwtAuthorizationRequest; +import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.util.TestUtil; import io.jans.as.model.authorize.AuthorizeResponseParam; import io.jans.as.model.common.AuthorizationMethod; @@ -153,7 +154,7 @@ public void requestUserInfoStep1ImplicitFlow(final String authorizePath, final S URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); assertNotNull(params.get(AuthorizeResponseParam.TOKEN_TYPE), "The token type is null"); @@ -461,7 +462,7 @@ public void requestUserInfoAdditionalClaims(final String authorizePath, final St URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Fragment is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The access token is null"); assertNotNull(params.get(AuthorizeResponseParam.TOKEN_TYPE), "The token type is null"); @@ -615,7 +616,7 @@ public void requestUserInfoHS256Step2(final String authorizePath, final String u URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -761,7 +762,7 @@ public void requestUserInfoHS384Step2(final String authorizePath, final String u URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null"); @@ -905,7 +906,7 @@ public void requestUserInfoHS512Step2(final String authorizePath, final String u URI uri = new URI(response.getLocation().toString()); assertNotNull(uri.getFragment(), "Query string is null"); - Map params = io.jans.as.client.QueryStringDecoder.decode(uri.getFragment()); + Map params = QueryStringDecoder.decode(uri.getFragment()); assertNotNull(params.get(AuthorizeResponseParam.ACCESS_TOKEN), "The accessToken is null"); assertNotNull(params.get(AuthorizeResponseParam.SCOPE), "The scope is null");