spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Append query on redirect in UrlHandlerFilter

Browse Source 
Closes gh-35873
This commit is contained in:
rstoyanchev
2025-12-05 12:35:32 +00:00
parent e45727d4fa
commit cee185ce3b
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/web/filter/UrlHandlerFilter.java
+6 -1
View File
@@ -299,9 +299,14 @@ public final class UrlHandlerFilter extends OncePerRequestFilter {
public void handleInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
throws IOException {
String location = trimTrailingSlash(request.getRequestURI());
if (StringUtils.hasText(request.getQueryString())) {
location += "?" + request.getQueryString();
}
response.resetBuffer();
response.setStatus(this.httpStatus.value());
response.setHeader(HttpHeaders.LOCATION, trimTrailingSlash(request.getRequestURI()));
response.setHeader(HttpHeaders.LOCATION, location);
response.flushBuffer();
}
}
spring-web/src/main/java/org/springframework/web/filter/reactive/UrlHandlerFilter.java
+8 -1
View File
@@ -290,9 +290,16 @@ public final class UrlHandlerFilter implements WebFilter {
@Override
public Mono<Void> handleInternal(ServerWebExchange exchange, WebFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
String query = request.getURI().getRawQuery();
String location = trimTrailingSlash(request);
if (StringUtils.hasText(query)) {
location += "?" + query;
}
ServerHttpResponse response = exchange.getResponse();
response.setStatusCode(this.statusCode);
response.getHeaders().set(HttpHeaders.LOCATION, trimTrailingSlash(exchange.getRequest()));
response.getHeaders().set(HttpHeaders.LOCATION, location);
return Mono.empty();
}
}
spring-web/src/test/java/org/springframework/web/filter/UrlHandlerFilterTests.java
+7 -3
View File
@@ -78,14 +78,18 @@ public class UrlHandlerFilterTests {
UrlHandlerFilter filter = UrlHandlerFilter.trailingSlashHandler("/path/*").redirect(status).build();
String path = "/path/123";
MockHttpServletRequest request = new MockHttpServletRequest("GET", path + "/");
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
filter.doFilterInternal(new MockHttpServletRequest("GET", path + "/"), response, chain);
String queryString = "foo=bar";
request.setQueryString(queryString);
filter.doFilterInternal(request, response, chain);
assertThat(chain.getRequest()).isNull();
assertThat(response.getStatus()).isEqualTo(status.value());
assertThat(response.getHeader(HttpHeaders.LOCATION)).isEqualTo(path);
assertThat(response.getHeader(HttpHeaders.LOCATION)).isEqualTo(path + "?" + queryString);
assertThat(response.isCommitted()).isTrue();
}
spring-web/src/test/java/org/springframework/web/filter/reactive/UrlHandlerFilterTests.java
+3 -2
View File
@@ -64,14 +64,15 @@ public class UrlHandlerFilterTests {
UrlHandlerFilter filter = UrlHandlerFilter.trailingSlashHandler("/path/*").redirect(status).build();
String path = "/path/123";
MockServerHttpRequest original = MockServerHttpRequest.get(path + "/").build();
String queryString = "foo=bar";
MockServerHttpRequest original = MockServerHttpRequest.get(path + "/?" + queryString).build();
ServerWebExchange exchange = MockServerWebExchange.from(original);
assertThatThrownBy(() -> invokeFilter(filter, exchange))
.hasMessageContaining("No argument value was captured");
assertThat(exchange.getResponse().getStatusCode()).isEqualTo(status);
assertThat(exchange.getResponse().getHeaders().getLocation()).isEqualTo(URI.create(path));
assertThat(exchange.getResponse().getHeaders().getLocation()).isEqualTo(URI.create(path + "?" + queryString));
}
@Test