Merge pull request #1605 from ivassile/JBEAP-27014

[UNDERTOW-2383] do not canonicalize query string in sendRedirect location
undertow-io · Jun 21, 2024 · 282d7ff · 282d7ff
2 parents fbe9b3b + 85ee324
commit 282d7ff
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/HttpServletResponseImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/HttpServletResponseImpl.java
@@ -219,7 +219,14 @@ public void sendRedirect(final String location) throws IOException {
                 } else {
                     current = "";
                 }
-                realPath = CanonicalPathUtils.canonicalize(servletContext.getContextPath() + current + location);
+                String precanonLocation = location;
+                String query = "";
+                int firstQuestionMark = location.indexOf("?");
+                if (firstQuestionMark >= 0) {
+                    precanonLocation = location.substring(0, firstQuestionMark);
+                    query = location.substring(firstQuestionMark);
+                }
+                realPath = CanonicalPathUtils.canonicalize(servletContext.getContextPath() + current + precanonLocation) + query;
             }
             String loc = exchange.getRequestScheme() + "://" + exchange.getHostAndPort() + realPath;
             exchange.getResponseHeaders().put(Headers.LOCATION, loc);