Prevent duplicated encoding in mvc #3658
Open
Conversation
This file contains 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
The setPath method was causing URLs to be encoded twice under certain conditions. This fix ensures proper handling of parameters to avoid redundant encoding.
The stripPrefix method was causing URLs to be encoded twice under certain conditions. This fix ensures proper handling of parameters to avoid redundant encoding.
The removeRequestParameter method was causing URLs to be encoded twice under certain conditions. This fix ensures proper handling of parameters to avoid redundant encoding.
raccoonback
commented
Jan 5, 2025
Comment on lines
+218
to
+223
| MultiValueMap<String, String> encodedQueryParams = UriUtils.encodeQueryParams(queryParams); | ||
|
|
||
| // remove from uri | ||
| URI newUri = UriComponentsBuilder.fromUri(request.uri()) | ||
| .replaceQueryParams(unmodifiableMultiValueMap(queryParams)) | ||
| .build() | ||
| .replaceQueryParams(unmodifiableMultiValueMap(encodedQueryParams)) | ||
| .build(true) |
There was a problem hiding this comment.
This change only re-encodes request parameters, and does not affect other segments such as the request path.
| @@ -407,7 +412,7 @@ public static Function<ServerRequest, ServerRequest> stripPrefix(int parts) { | |||
|
|
|||
| URI prefixedUri = UriComponentsBuilder.fromUri(request.uri()) | |||
| .replacePath(newPath.toString()) | |||
| .build() | |||
| .build(true) | |||
There was a problem hiding this comment.
The stripped path is already encoded, so no additional encoding will be applied.
Furthermore, other parts such as request parameters are not affected.
Comment on lines
+357
to
+360
| URI prefixedUri = UriComponentsBuilder.fromUri(request.uri()) | ||
| .replacePath(uri.getRawPath()) | ||
| .build(true) | ||
| .toUri(); |
There was a problem hiding this comment.
The modified path is already encoded, so no additional encoding will be applied.
Furthermore, other parts, such as request parameters, are not affected.
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.
Motivation
There were issues with the
setPath()andstripPrefix()methods where already encoded URIs were being double-encoded.Also, the
removeRequestParameter()method was also double-encoding not only request parameters but also paths and other components.Key Changes
setPath()andstripPrefix()methods have been fixed to prevent double encoding.removeRequestParameter()has been updated to ensure that only request parameters are encoded.Reference
related with #3131