Skip to content

Validate authorization-code token parameters #19242

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
goutamadwant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Validate authorization-code token parameters #19242

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
11 changes: 11 additions & 0 deletions ...ramework/security/oauth2/server/authorization/web/authentication/OAuth2EndpointUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

Expand Down Expand Up @@ -85,6 +86,9 @@ static Map<String, Object> getParametersIfMatchesAuthorizationCodeGrantRequest(H
}
MultiValueMap<String, String> multiValueParameters = "GET".equals(request.getMethod())
? getQueryParameters(request) : getFormParameters(request);
validateSingleParameter(multiValueParameters, OAuth2ParameterNames.GRANT_TYPE);
validateSingleParameter(multiValueParameters, OAuth2ParameterNames.CODE);
validateSingleParameter(multiValueParameters, PkceParameterNames.CODE_VERIFIER);
for (String exclusion : exclusions) {
multiValueParameters.remove(exclusion);
}
Expand All @@ -96,6 +100,13 @@ static Map<String, Object> getParametersIfMatchesAuthorizationCodeGrantRequest(H
return parameters;
}

private static void validateSingleParameter(MultiValueMap<String, String> parameters, String parameterName) {
List<String> values = parameters.get(parameterName);
if (values != null && values.size() != 1) {
throwError(OAuth2ErrorCodes.INVALID_REQUEST, parameterName, ACCESS_TOKEN_REQUEST_ERROR_URI);
}
}

static boolean matchesAuthorizationCodeGrantRequest(HttpServletRequest request) {
return AuthorizationGrantType.AUTHORIZATION_CODE.getValue()
.equals(request.getParameter(OAuth2ParameterNames.GRANT_TYPE))
Expand Down
22 changes: 22 additions & 0 deletions ...erver/authorization/web/authentication/ClientSecretBasicAuthenticationConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,28 @@ public void convertWhenConfidentialClientWithPkceParametersThenAdditionalParamet
entry("custom-param", new String[] { "custom-value-1", "custom-value-2" }));
}

@Test
public void convertWhenConfidentialClientWithMultipleCodeThenInvalidRequestError() throws Exception {
MockHttpServletRequest request = createPkceTokenRequest();
request.addParameter(OAuth2ParameterNames.CODE, "code-2");
request.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + encodeBasicAuth("clientId", "secret"));
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> this.converter.convert(request))
.extracting(OAuth2AuthenticationException::getError)
.extracting("errorCode")
.isEqualTo(OAuth2ErrorCodes.INVALID_REQUEST);
}

@Test
public void convertWhenConfidentialClientWithMultipleCodeVerifierThenInvalidRequestError() throws Exception {
MockHttpServletRequest request = createPkceTokenRequest();
request.addParameter(PkceParameterNames.CODE_VERIFIER, "code-verifier-2");
request.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + encodeBasicAuth("clientId", "secret"));
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> this.converter.convert(request))
.extracting(OAuth2AuthenticationException::getError)
.extracting("errorCode")
.isEqualTo(OAuth2ErrorCodes.INVALID_REQUEST);
}

private static String encodeBasicAuth(String clientId, String secret) throws Exception {
clientId = URLEncoder.encode(clientId, StandardCharsets.UTF_8.name());
secret = URLEncoder.encode(secret, StandardCharsets.UTF_8.name());
Expand Down
24 changes: 24 additions & 0 deletions ...server/authorization/web/authentication/ClientSecretPostAuthenticationConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,30 @@ public void convertWhenConfidentialClientWithPkceParametersThenAdditionalParamet
entry("custom-param", new String[] { "custom-value-1", "custom-value-2" }));
}

@Test
public void convertWhenConfidentialClientWithMultipleCodeThenInvalidRequestError() {
MockHttpServletRequest request = createPkceTokenRequest();
request.addParameter(OAuth2ParameterNames.CLIENT_ID, "client-1");
request.addParameter(OAuth2ParameterNames.CLIENT_SECRET, "client-secret");
request.addParameter(OAuth2ParameterNames.CODE, "code-2");
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> this.converter.convert(request))
.extracting(OAuth2AuthenticationException::getError)
.extracting("errorCode")
.isEqualTo(OAuth2ErrorCodes.INVALID_REQUEST);
}

@Test
public void convertWhenConfidentialClientWithMultipleCodeVerifierThenInvalidRequestError() {
MockHttpServletRequest request = createPkceTokenRequest();
request.addParameter(OAuth2ParameterNames.CLIENT_ID, "client-1");
request.addParameter(OAuth2ParameterNames.CLIENT_SECRET, "client-secret");
request.addParameter(PkceParameterNames.CODE_VERIFIER, "code-verifier-2");
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> this.converter.convert(request))
.extracting(OAuth2AuthenticationException::getError)
.extracting("errorCode")
.isEqualTo(OAuth2ErrorCodes.INVALID_REQUEST);
}

private static MockHttpServletRequest createPkceTokenRequest() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addParameter(OAuth2ParameterNames.GRANT_TYPE, AuthorizationGrantType.AUTHORIZATION_CODE.getValue());
Expand Down