URL encode client credentials #9791
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spring-projects-issues
added
the
status: waiting-for-triage
sjohnr
added
in: oauth2
jgrandja
requested changes
May 25, 2021
.../security/oauth2/client/endpoint/AbstractOAuth2AuthorizationGrantRequestEntityConverter.java
Outdated
Show resolved
Hide resolved
...ecurity/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
Outdated
Show resolved
Hide resolved
...ecurity/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
Outdated
Show resolved
Hide resolved
...ecurity/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
Outdated
Show resolved
Hide resolved
jgrandja
requested changes
May 31, 2021
...ecurity/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java
Outdated
Show resolved
Hide resolved
...ingframework/security/oauth2/client/endpoint/OAuth2AuthorizationGrantRequestEntityUtils.java
Outdated
Show resolved
Hide resolved
...security/oauth2/client/endpoint/OAuth2ClientCredentialsGrantRequestEntityConverterTests.java
Outdated
Show resolved
Hide resolved
...urity/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java
Outdated
Show resolved
Hide resolved
sjohnr
changed the title
OrangeDog
reviewed
Jun 1, 2021
| assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8); | ||
| assertThat(headers.getContentType()) | ||
| .isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8")); | ||
| String urlEncodedClientCredential = URLEncoder.encode(clientCredentialWithAnsiKeyboardSpecialCharacters, |
There was a problem hiding this comment.
@sjohnr Rather than compare it to exactly the same code, actually specify the expected encoded version. e.g. with the case from the RFC:
assertEquals("+%25%26%2B%C2%A3%E2%82%AC", encodeClientCredential(" %&+£€"));
There was a problem hiding this comment.
@OrangeDog that's a good idea too. However, instead of testing the private method, we could probably test the end result with hard-coded characters. Would you be interested in submitting a PR with an additional test using characters like those (not from the ansi keyboard, as mine was), and asserting like:
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic <hard-coded encoded credentials here>");
Note: I was mostly concerned with using the test case to ensure that the code complied with the spec, not ensuring specific characters are encoded correctly with Java's encoding mechanism, hence re-using the URLEncoder class.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes gh-9610