Save query parameters in WebSessionServerRequestCache

Previously, URL query parameters were lost when saving a request in WebSessionServerRequestCache. Now it is properly saved and restored. Fixes: gh-6421
spring-projects · Jan 15, 2019 · 548dc44 · 548dc44
1 parent 7f2f12c
commit 548dc44
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...va/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java b/...va/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java
@@ -90,7 +90,9 @@ public Mono<ServerHttpRequest> removeMatchingRequest(
 	}
 
 	private static String pathInApplication(ServerHttpRequest request) {
-		return request.getPath().pathWithinApplication().value();
+		String path = request.getPath().pathWithinApplication().value();
+		String query = request.getURI().getRawQuery();
+		return path + (query != null ? "?" + query : "");
 	}
 
 	private static ServerWebExchangeMatcher createDefaultRequestMacher() {

diff --git a/...g/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java b/...g/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java
@@ -44,6 +44,16 @@ public void saveRequestGetRequestWhenGetThenFound() {
 		assertThat(saved).isEqualTo(exchange.getRequest().getURI());
 	}
 
+	@Test
+	public void saveRequestGetRequestWithQueryParamsWhenGetThenFound() {
+		MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/secured/").queryParam("key", "value").accept(MediaType.TEXT_HTML));
+		this.cache.saveRequest(exchange).block();
+
+		URI saved = this.cache.getRedirectUri(exchange).block();
+
+		assertThat(saved).isEqualTo(exchange.getRequest().getURI());
+	}
+
 	@Test
 	public void saveRequestGetRequestWhenFaviconThenNotFound() {
 		MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/favicon.png").accept(MediaType.TEXT_HTML));