RequestMapper allows trailing characters

Fixes quarkusio#23110
gsmet · Jan 24, 2022 · bf677b0 · bf677b0
1 parent 685d832
commit bf677b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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
@@ -104,11 +104,13 @@ public RequestMatch<T> map(String path) {
                 params[paramCount] = null;
             }
             boolean fullMatch = matchPos == pathLength;
-            if (!prefixAllowed && !fullMatch) {
+            boolean doPrefixMatch = false;
+            if (!fullMatch) {
                 //according to the spec every template ends with (/.*)?
-                prefixAllowed = path.charAt(matchPos) == '/' && matchPos == pathLength - 1;
+                doPrefixMatch = (matchPos == 1 || path.charAt(matchPos) == '/') //matchPos == 1 corresponds to '/' as a root level match
+                        && (prefixAllowed || matchPos == pathLength - 1); //if prefix is allowed, or the remainder is only a trailing /
             }
-            if (matched && (fullMatch || prefixAllowed)) {
+            if (matched && (fullMatch || doPrefixMatch)) {
                 String remaining;
                 if (fullMatch) {
                     remaining = "";

diff --git a/...tx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java b/...tx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java
@@ -24,8 +24,9 @@ public void accept(ResteasyReactiveDeploymentManager.ScanStep scanStep) {
     @Test
     public void testRestPath() {
         RestAssured.basePath = "/";
-        RestAssured.when().get("/foo/hello").then().statusCode(200).body(Matchers.is("hello"));
         RestAssured.when().get("/foo/hello/nested").then().statusCode(200).body(Matchers.is("world hello"));
+        RestAssured.when().get("/foo/helloX").then().statusCode(404);
+        RestAssured.when().get("/foo/hello").then().statusCode(200).body(Matchers.is("hello"));
     }
 
     @Test