root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix missing contextPath when mutating ServerHttpRequest 

This commit ensures that when mutating `ServerHttpRequest` instances,
the original contextPath information is copied to the request being
built.

Note that mutation on the `contextPath(String)` or `path(String)` should
be reflected to the other. (See their Javadoc for more information).

Fixes gh-25279
This commit is contained in:
Brian Clozel 2020-06-22 19:13:10 +02:00
parent 80d1aaec0c
commit c4326cb0f5
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
View File

@ -71,6 +71,7 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
this.uri = original.getURI();
this.httpMethodValue = original.getMethodValue();
this.contextPath = original.getPath().contextPath().value();
this.body = original.getBody();
this.httpHeaders = HttpHeaders.writableHttpHeaders(original.getHeaders());

31
spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
View File

@ -37,6 +37,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
/**
@ -163,14 +164,42 @@ public class ServerHttpRequestTests {
assertThat(request.getHeaders().get(headerName)).containsExactly(headerValue3);
}
@Test
void mutateWithExistingContextPath() throws Exception {
ServerHttpRequest request = createHttpRequest("/context/path", "/context");
ServerHttpRequest mutated = request.mutate().build();
assertThat(mutated.getPath().contextPath().value()).isEqualTo("/context");
assertThat(mutated.getPath().pathWithinApplication().value()).isEqualTo("/path");
assertThat(mutated.getURI().getRawPath()).isEqualTo("/context/path");
mutated = request.mutate().contextPath("/other").path("/other/path").build();
assertThat(mutated.getPath().contextPath().value()).isEqualTo("/other");
assertThat(mutated.getPath().pathWithinApplication().value()).isEqualTo("/path");
assertThat(mutated.getURI().getRawPath()).isEqualTo("/other/path");
}
@Test
void mutateContextPathWithoutUpdatingPathShouldFail() throws Exception {
ServerHttpRequest request = createHttpRequest("/context/path", "/context");
assertThatThrownBy(() -> request.mutate().path("/fail").build())
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Invalid contextPath '/context': must match the start of requestPath: '/fail'");
}
private ServerHttpRequest createHttpRequest(String uriString) throws Exception {
return createHttpRequest(uriString, "");
}
private ServerHttpRequest createHttpRequest(String uriString, String contextPath) throws Exception {
URI uri = URI.create(uriString);
MockHttpServletRequest request = new TestHttpServletRequest(uri);
request.setContextPath(contextPath);
AsyncContext asyncContext = new MockAsyncContext(request, new MockHttpServletResponse());
return new ServletServerHttpRequest(request, asyncContext, "", new DefaultDataBufferFactory(), 1024);
}
private static class TestHttpServletRequest extends MockHttpServletRequest {
TestHttpServletRequest(URI uri) {