Merge pull request #41062 from thomasdarimont/issue/gh-41060-fix-inva…

…lid-query-param-encoding Fix encoding of '?' in query parameter values by Encode.encodeQueryParam(..)
quarkusio · Jun 8, 2024 · ec7291d · ec7291d
2 parents b27a39b + f244de0
commit ec7291d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/...reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java b/...reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java
@@ -95,7 +95,9 @@ public class Encode {
                 case '.':
                 case '_':
                 case '~':
+                    continue;
                 case '?':
+                    queryNameValueEncoding[i] = "%3F";
                     continue;
                 case ' ':
                     queryNameValueEncoding[i] = "+";

diff --git a/...tive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/util/EncodeTest.java b/...tive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/util/EncodeTest.java
@@ -15,4 +15,11 @@ void encodeEmoji() {
         assertEquals(encodedEmoji, Encode.encodePath(emoji));
         assertEquals(encodedEmoji, Encode.encodeQueryParam(emoji));
     }
+
+    @Test
+    void encodeQuestionMarkQueryParameterValue() {
+        String uriQueryValue = "bar?a=b";
+        String encoded = URLEncoder.encode(uriQueryValue, StandardCharsets.UTF_8);
+        assertEquals(encoded, Encode.encodeQueryParam(uriQueryValue));
+    }
 }