Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use form charset in ServletServerHttpRequest

Browse Source 
Closes gh-34675
This commit is contained in:
rstoyanchev
2025-04-02 09:05:40 +01:00
parent e01ad5a08d
commit 290c9c4a19
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
View File

@@ -270,7 +270,8 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
*/
private InputStream getBodyFromServletRequestParameters(HttpServletRequest request) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
Writer writer = new OutputStreamWriter(bos, FORM_CHARSET);
Charset charset = getFormCharset();
Writer writer = new OutputStreamWriter(bos, charset);
Map<String, String[]> form = request.getParameterMap();
for (Iterator<Map.Entry<String, String[]>> entryItr = form.entrySet().iterator(); entryItr.hasNext();) {
@@ -278,10 +279,10 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
List<String> values = Arrays.asList(entry.getValue());
for (Iterator<String> valueItr = values.iterator(); valueItr.hasNext();) {
String value = valueItr.next();
writer.write(URLEncoder.encode(entry.getKey(), FORM_CHARSET));
writer.write(URLEncoder.encode(entry.getKey(), charset));
if (value != null) {
writer.write('=');
writer.write(URLEncoder.encode(value, FORM_CHARSET));
writer.write(URLEncoder.encode(value, charset));
if (valueItr.hasNext()) {
writer.write('&');
}
@@ -301,6 +302,19 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
return new ByteArrayInputStream(bytes);
}
private Charset getFormCharset() {
try {
MediaType contentType = getHeaders().getContentType();
if (contentType != null && contentType.getCharset() != null) {
return contentType.getCharset();
}
}
catch (Exception ex) {
// ignore
}
return FORM_CHARSET;
}
private final class AttributesMap extends AbstractMap<String, Object> {

11
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.http.server;
import java.io.IOException;
import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -217,6 +218,16 @@ class ServletServerHttpRequestTests {
assertThat(request.getHeaders().getContentLength()).isEqualTo(contentLength);
}
@Test // gh-34675
void getFormBodyWithNotUtf8Charset() throws IOException {
String charset = "windows-1251";
mockRequest.setContentType("application/x-www-form-urlencoded; charset=" + charset);
mockRequest.setMethod("POST");
mockRequest.addParameter("x", URLDecoder.decode("%e0%e0%e0", charset));
assertFormContent("x=%E0%E0%E0");
}
private int assertFormContent(String expected) throws IOException {
byte[] result = FileCopyUtils.copyToByteArray(request.getBody());
byte[] content = expected.getBytes(StandardCharsets.UTF_8);