SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1.x' into 4.2.x

Browse Source
This commit is contained in:
Ryan Baxter
2025-05-14 11:29:19 -04:00
parent e57bdc64d3 d1af09910c
commit f33387ffbb
4 changed files with 159 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java
View File

@@ -195,8 +195,7 @@ public abstract class BeforeFilterFunctions {
String newPath = uri.getRawPath() + request.uri().getRawPath();
URI prefixedUri = UriComponentsBuilder.fromUri(request.uri())
.replacePath(newPath).build(true).toUri();
URI prefixedUri = UriComponentsBuilder.fromUri(request.uri()).replacePath(newPath).build(true).toUri();
return ServerRequest.from(request).uri(prefixedUri).build();
};
}

18
spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java
View File

@@ -245,28 +245,22 @@ class BeforeFilterFunctionsTests {
@Test
void prefixPath() {
MockHttpServletRequest servletRequest = MockMvcRequestBuilders
.get("http://localhost/get").buildRequest(null);
MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get").buildRequest(null);
ServerRequest request = ServerRequest.create(servletRequest,
Collections.emptyList());
ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList());
ServerRequest modified = BeforeFilterFunctions.prefixPath("/prefix")
.apply(request);
ServerRequest modified = BeforeFilterFunctions.prefixPath("/prefix").apply(request);
assertThat(modified.uri().getRawPath()).isEqualTo("/prefix/get");
}
@Test
void prefixEncodedPath() {
MockHttpServletRequest servletRequest = MockMvcRequestBuilders
.get("http://localhost/get/é").buildRequest(null);
MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get/é").buildRequest(null);
ServerRequest request = ServerRequest.create(servletRequest,
Collections.emptyList());
ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList());
ServerRequest modified = BeforeFilterFunctions.prefixPath("/pre fix")
.apply(request);
ServerRequest modified = BeforeFilterFunctions.prefixPath("/pre fix").apply(request);
assertThat(modified.uri().getRawPath()).isEqualTo("/pre%20fix/get/%C3%A9");
}