Decode path param in path param extractor

Fixes quarkusio#35960 Signed-off-by: rmartinc <[email protected]>
rmartinc · Dec 4, 2023 · 09c8d4d · 09c8d4d
1 parent 574e4f5
commit 09c8d4d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.../src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java b/.../src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java
@@ -1,6 +1,8 @@
 package org.jboss.resteasy.reactive.server.core.parameters;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.jboss.resteasy.reactive.common.util.Encode;
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
@@ -20,13 +22,13 @@ public PathParamExtractor(int index, boolean encoded, boolean single) {
     @Override
     public Object extractParameter(ResteasyReactiveRequestContext context) {
         String pathParam = context.getPathParam(index);
-        if (encoded) {
-            pathParam = Encode.encodeQueryParam(pathParam);
-        }
         if (single) {
-            return pathParam;
+            return encoded ? pathParam : Encode.decodePath(pathParam);
         } else {
-            return List.of(pathParam.split("/"));
+            return encoded
+                    ? List.of(pathParam.split("/"))
+                    : Arrays.stream(pathParam.split("/")).map(Encode::decodePath)
+                            .collect(Collectors.toList());
         }
     }
 }
diff --git a/...erver/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java b/...erver/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java
@@ -8,8 +8,6 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 
-import org.jboss.resteasy.reactive.common.util.URIDecoder;
-
 public class RequestMapper<T> {
 
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
@@ -111,7 +109,7 @@ private RequestMatch<T> mapFromPathMatcher(String path, PathMatcher.PathMatch<Ar
                     while (matchPos < pathLength && path.charAt(matchPos) != '/') {
                         matchPos++;
                     }
-                    params[paramCount++] = URIDecoder.decodeURIComponent(path.substring(start, matchPos), false);
+                    params[paramCount++] = path.substring(start, matchPos);
                 }
             }
             if (!matched) {

diff --git a/.../src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexMatchTest.java b/.../src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexMatchTest.java
@@ -41,6 +41,10 @@ public void testLiteralInRegex() {
                 .then()
                 .statusCode(200)
                 .body(equalTo("plain:abb/foo/alongpathtotriggerbug"));
+        RestAssured.get("/regex/abb/foo/path space")
+                .then()
+                .statusCode(200)
+                .body(equalTo("plain:abb/foo/path space"));
         RestAssured.get("/regex/abb/literal/ddc")
                 .then()
                 .statusCode(200)