Use form charset in ServletServerHttpRequest

Closes gh-34675

Author: rstoyanchev

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

@@ -270,18 +270,19 @@ private static boolean isFormPost(HttpServletRequest request) {
 	 */
 	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();) {
 			Map.Entry<String, String[]> entry = entryItr.next();
 			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 @@ private InputStream getBodyFromServletRequestParameters(HttpServletRequest reque
 		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> {
 

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

@@ -18,6 +18,7 @@
 
 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 @@ void getFormBodyWhenNotEncodedCharactersPresent() throws IOException {
 		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);