Skip to content

MockMvcRequestConverter uses US_ASCII for URL decoding while encoding uses UTF-8 #1034

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

Merged
wilkinsona merged 1 commit into from
Apr 8, 2026
+12 −1
Merged

MockMvcRequestConverter uses US_ASCII for URL decoding while encoding uses UTF-8 #1034

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
2 changes: 1 addition & 1 deletion ...s-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ private static void processParameter(String parameter, MultiValueMap<String, Str
}

private static String decode(String encoded) {
return URLDecoder.decode(encoded, StandardCharsets.US_ASCII);
return URLDecoder.decode(encoded, StandardCharsets.UTF_8);
}

}
11 changes: 11 additions & 0 deletions ...kmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,17 @@ public void postRequestWithParametersAndQueryStringCreatesFormUrlEncodedContentW
assertThat(request.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
}

@Test
public void postRequestWithNonAsciiParametersAndQueryStringCreatesFormUrlEncodedContentWithoutDuplication() {
OperationRequest request = createOperationRequest(MockMvcRequestBuilders.post("/foo?name=\uD64D\uAE38\uB3D9")
.param("name", "\uD64D\uAE38\uB3D9")
.param("other", "\uD64D\uAE38\uB3D9"));
assertThat(request.getUri()).isEqualTo(URI.create("http://localhost/foo?name=%ED%99%8D%EA%B8%B8%EB%8F%99"));
assertThat(request.getMethod()).isEqualTo(HttpMethod.POST);
assertThat(request.getContentAsString()).isEqualTo("other=%ED%99%8D%EA%B8%B8%EB%8F%99");
assertThat(request.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
}

@Test
public void mockMultipartFileUpload() {
OperationRequest request = createOperationRequest(MockMvcRequestBuilders.multipart("/foo")
Expand Down