From 0acbda385e475b8045502a34204db47822416458 Mon Sep 17 00:00:00 2001
From: Jono <jono@apache.org>
Date: Thu, 5 Sep 2024 01:24:51 +1200
Subject: [PATCH] #42687 handle trailing slash

---
 .../server/mapping/RequestMapper.java         | 27 ++++--
 .../vertx/test/matching/RegexPathTest.java    | 89 +++++++++++++++++++
 2 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexPathTest.java

diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java
index 7fd7cb535f518..a6130273a0990 100644
--- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java
@@ -76,14 +76,24 @@ private RequestMatch<T> mapFromPathMatcher(String path, PathMatcher.PathMatch<Ar
             for (int i = 1; i < potentialMatch.template.components.length; ++i) {
                 URITemplate.TemplateComponent segment = potentialMatch.template.components[i];
                 if (segment.type == URITemplate.Type.CUSTOM_REGEX) {
-                    Matcher matcher = segment.pattern.matcher(path);
-                    matched = matcher.find(matchPos);
-                    if (!matched || matcher.start() != matchPos) {
-                        break;
-                    }
-                    matchPos = matcher.end();
-                    for (String group : segment.groups) {
-                        params[paramCount++] = matcher.group(group);
+                    if (initialMatch.getRemaining().isEmpty() || initialMatch.getRemaining().equals("/")) {
+                        matched = true;
+                    } else {
+                        boolean endSlash = path.charAt(path.length() - 1) == '/';
+                        // exclude any path end slash when matching, but include it in the matched length
+                        Matcher matcher = segment.pattern.matcher(
+                                endSlash ? path.substring(0, path.length() - 1) : path);
+                        matched = matcher.find(matchPos);
+                        if (!matched || matcher.start() != matchPos) {
+                            break;
+                        }
+                        matchPos = matcher.end();
+                        if (endSlash) {
+                            matchPos++;
+                        }
+                        for (String group : segment.groups) {
+                            params[paramCount++] = matcher.group(group);
+                        }
                     }
                 } else if (segment.type == URITemplate.Type.LITERAL) {
                     //make sure the literal text is the same
@@ -125,6 +135,7 @@ private RequestMatch<T> mapFromPathMatcher(String path, PathMatcher.PathMatch<Ar
                 if (matchPos == 1) { //matchPos == 1 corresponds to '/' as a root level match
                     doPrefixMatch = prefixAllowed || pathLength == 1; //if prefix is allowed, or we've matched the whole thing
                 } else if (path.charAt(matchPos) == '/') {
+                    // match /world/ with matchPos = 6 and mathPos == pathLengh - 1
                     doPrefixMatch = prefixAllowed || matchPos == pathLength - 1; //if prefix is allowed, or the remainder is only a trailing /
                 }
             }
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexPathTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexPathTest.java
new file mode 100644
index 0000000000000..409f36768ce89
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexPathTest.java
@@ -0,0 +1,89 @@
+package org.jboss.resteasy.reactive.server.vertx.test.matching;
+
+import static io.restassured.RestAssured.get;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.function.Supplier;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class RegexPathTest {
+
+    @RegisterExtension
+    static ResteasyReactiveUnitTest test = new ResteasyReactiveUnitTest()
+            .setArchiveProducer(new Supplier<>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(EndingSlashTest.TestResource.class);
+                }
+            });
+
+    @Test
+    public void test() {
+
+        get("/hello/world/1")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Hello World! 1"));
+
+        get("/hello/world/1/")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Hello World! 1"));
+
+        get("/hello/again/1")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Hello Again! 1"));
+
+        get("/hello/again/1/")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Hello Again! 1"));
+
+        get("/hello/again/2/surprise")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Hello Surprise! 2"));
+
+        get("/hello/again/2/surprise/")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Hello Surprise! 2"));
+    }
+
+    @Path("/hello")
+    public static class TestResource {
+
+        @GET
+        @Path("/world/{sample}")
+        @Produces(MediaType.TEXT_PLAIN)
+        public String hello(int sample) {
+            return "Hello World! " + sample;
+        }
+
+        @GET
+        @Path("/again/{sample:\\d+}")
+        @Produces(MediaType.TEXT_PLAIN)
+        public String helloWithRegex(int sample) {
+            return "Hello Again! " + sample;
+        }
+
+        @GET
+        @Path("/again/{sample:\\d+}/surprise")
+        @Produces(MediaType.TEXT_PLAIN)
+        public String helloWithRegexSecond(int sample) {
+            return "Hello Surprise! " + sample;
+        }
+    }
+}