Use updated message in HttpEntityMethodProcessor

bclozel · bclozel · commit 757b713f2274 · 2026-02-11T14:07:21.000+01:00
Prior to this commit, the `HttpEntityMethodProcessor` would create a new `ServletServerHttpRequest` input message to parse the native Servlet request, but would not reuse it for reading the request body using the message converters. In gh-32471, we applied a change that updates HTTP headers accordingly when request parameters are read. But not reusing the input message means that we are losing this update when instantiating the resulting `HttpEntity`. This commit ensures that `HttpEntityMethodProcessor` uses the input message it just created when decoding the request body. Fixes gh-36298
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -155,7 +155,7 @@ public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewC
 					"' in method " + parameter.getMethod() + " is not parameterized");
 		}
 
-		Object body = readWithMessageConverters(webRequest, parameter, paramType);
+		Object body = readWithMessageConverters(inputMessage, parameter, paramType);
 		if (RequestEntity.class == parameter.getParameterType()) {
 			return new RequestEntity<>(body, inputMessage.getHeaders(),
 					inputMessage.getMethod(), inputMessage.getURI());
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
@@ -35,6 +35,7 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -131,6 +132,26 @@ public void resolveArgumentWithEmptyBody() throws Exception {
 		assertThat(result.getBody()).isNull();
 	}
 
+	@Test // gh-36298
+	@SuppressWarnings("unchecked")
+	void shouldResolveEntityWithMutatedHeaders() throws Exception {
+		servletRequest.setMethod("POST");
+		servletRequest.addParameter("project", "spring%20framework");
+		servletRequest.addHeader("Content-Length", "project=spring%20framework".length());
+		servletRequest.setContentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+
+		List<HttpMessageConverter<?>> converters = new ArrayList<>();
+		converters.add(new ByteArrayHttpMessageConverter());
+		HttpEntityMethodProcessor processor = new HttpEntityMethodProcessor(converters);
+
+		Method method = getClass().getDeclaredMethod("resolveAsByteArray", RequestEntity.class);
+		MethodParameter requestEntity = new MethodParameter(method, 0);
+		HttpEntity<byte[]> result = (HttpEntity<byte[]>) processor.resolveArgument(requestEntity,
+				this.mavContainer, this.webRequest, this.binderFactory);
+
+		assertThat(result.getBody().length).isEqualTo(result.getHeaders().getContentLength());
+	}
+
 	@Test
 	void resolveGenericArgument() throws Exception {
 		String content = "[{\"name\" : \"Jad\"}, {\"name\" : \"Robert\"}]";
@@ -269,6 +290,9 @@ private ResponseEntity<CharSequence> handle() {
 		return null;
 	}
 
+	private void resolveAsByteArray(RequestEntity<byte[]> request) {
+	}
+
 
 	@SuppressWarnings("unused")
 	private abstract static class MyParameterizedController<DTO extends Identifiable> {

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewC`
`155`	`155`	`"' in method " + parameter.getMethod() + " is not parameterized");`
`156`	`156`	`}`
`157`	`157`
`158`		`- Object body = readWithMessageConverters(webRequest, parameter, paramType);`
	`158`	`+ Object body = readWithMessageConverters(inputMessage, parameter, paramType);`
`159`	`159`	`if (RequestEntity.class == parameter.getParameterType()) {`
`160`	`160`	`return new RequestEntity<>(body, inputMessage.getHeaders(),`
`161`	`161`	`inputMessage.getMethod(), inputMessage.getURI());`