admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use updated message in HttpEntityMethodProcessor

Browse Source 
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
This commit is contained in:
Brian Clozel
2026-02-11 12:32:15 +01:00
parent a065563484
commit 757b713f22
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
+24
View File
@@ -35,6 +35,7 @@ import org.springframework.core.MethodParameter;
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 class HttpEntityMethodProcessorTests {
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 @@ public class HttpEntityMethodProcessorTests {
return null;
}
private void resolveAsByteArray(RequestEntity<byte[]> request) {
}
@SuppressWarnings("unused")
private abstract static class MyParameterizedController<DTO extends Identifiable> {