diff --git a/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java b/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java index dd74c7112d0..bcf73b90d4a 100644 --- a/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java +++ b/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java @@ -90,7 +90,9 @@ public Mono 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/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java index 4142f940fe7..93c3d84fc00 100644 --- a/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java +++ b/web/src/test/java/org/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));