fix: adding prefix handling to base uri

closes: quarkusio#50293

Signed-off-by: Steve Hawkins <[email protected]>

Author: shawkins

extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/ForwardedPrefixHeaderTest.java

@@ -30,7 +30,7 @@ public void basicTest() {
                 .get("/test")
                 .then()
                 .statusCode(200)
-                .body(Matchers.equalTo("http|http://localhost:8081/test"));
+                .body(Matchers.equalTo("absolute http|http://localhost:8081/test base http|http://localhost:8081/"));
 
         given()
                 .header("X-Forwarded-Proto", "https")
@@ -40,7 +40,8 @@ public void basicTest() {
                 .get("/test")
                 .then()
                 .statusCode(200)
-                .body(Matchers.equalTo("https|https://backend:1234/prefix/test"));
+                .body(Matchers
+                        .equalTo("absolute https|https://backend:1234/prefix/test base https|https://backend:1234/prefix/"));
     }
 
     @Test
@@ -73,7 +74,8 @@ public static class Resource {
 
         @GET
         public String get(UriInfo uriInfo) {
-            return uriInfo.getAbsolutePath().getScheme() + "|" + uriInfo.getAbsolutePath();
+            return "absolute " + uriInfo.getAbsolutePath().getScheme() + "|" + uriInfo.getAbsolutePath() + " base "
+                    + uriInfo.getBaseUri().getScheme() + "|" + uriInfo.getBaseUri();
         }
 
         @GET

independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/LocationUtil.java

@@ -16,31 +16,25 @@ static URI determineLocation(URI location) {
             // FIXME: this leaks server stuff onto the client
             ResteasyReactiveRequestContext request = CurrentRequestManager.get();
             if (request != null) {
-                ServerHttpRequest req = request.serverRequest();
-                try {
-                    String host = req.getRequestHost();
-                    int port = -1;
-                    int index = host.lastIndexOf(":");
-                    if (index > -1 && (host.charAt(0) != '[' || index > host.lastIndexOf("]"))) {
-                        port = Integer.parseInt(host.substring(index + 1));
-                        host = host.substring(0, index);
-                    }
-                    String prefix = determinePrefix(req, request.getDeployment());
-                    // Spec says relative to request, but TCK tests relative to Base URI, so we do that
-                    String path = location.toString();
-                    if (!path.startsWith("/")) {
-                        path = "/" + path;
-                    }
-                    URI baseUri = new URI(req.getRequestScheme(), null, host, port, null, null, null);
-                    location = baseUri.resolve(prefix + path);
-                } catch (URISyntaxException e) {
-                    throw new RuntimeException(e);
-                }
+                location = getUri(location.toString(), request, true);
             }
         }
         return location;
     }
 
+    static URI getUri(String path, ResteasyReactiveRequestContext request, boolean usePrefix) {
+        try {
+            String prefix = usePrefix ? determinePrefix(request.serverRequest(), request.getDeployment()) : "";
+            // Spec says relative to request, but TCK tests relative to Base URI, so we do that
+            if (!path.startsWith("/")) {
+                path = "/" + path;
+            }
+            return new URI(request.getScheme(), request.getAuthority(), null, null, null).resolve(prefix + path);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static String determinePrefix(ServerHttpRequest serverHttpRequest, Deployment deployment) {
         String prefix = "";
         if (deployment != null) {
@@ -68,24 +62,7 @@ static URI determineContentLocation(URI location) {
             ResteasyReactiveRequestContext request = CurrentRequestManager.get();
             if (request != null) {
                 // FIXME: this leaks server stuff onto the client
-                ServerHttpRequest req = request.serverRequest();
-                try {
-                    String host = req.getRequestHost();
-                    int port = -1;
-                    int index = host.lastIndexOf(":");
-                    if (index > -1 && (host.charAt(0) != '[' || index > host.lastIndexOf("]"))) {
-                        port = Integer.parseInt(host.substring(index + 1));
-                        host = host.substring(0, index);
-                    }
-                    String path = location.toString();
-                    if (!path.startsWith("/")) {
-                        path = "/" + path;
-                    }
-                    location = new URI(req.getRequestScheme(), null, host, port, null, null, null)
-                            .resolve(path);
-                } catch (URISyntaxException e) {
-                    throw new RuntimeException(e);
-                }
+                location = getUri(location.toString(), request, false);
             }
         }
         return location;

independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java

@@ -17,7 +17,6 @@
 import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
 import org.jboss.resteasy.reactive.common.util.URIDecoder;
 import org.jboss.resteasy.reactive.common.util.UnmodifiableMultivaluedMap;
-import org.jboss.resteasy.reactive.server.core.Deployment;
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
 import org.jboss.resteasy.reactive.server.core.UriMatch;
 import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
@@ -49,14 +48,16 @@ public String getPath() {
 
     @Override
     public String getPath(boolean decode) {
-        if (!decode)
+        if (!decode) {
             throw encodedNotSupported();
+        }
         // TCK says normalized
         String path = URIDecoder.decodeURIComponent(currentRequest.getPath(), false);
         // the path must not contain the prefix
         String prefix = currentRequest.getDeployment().getPrefix();
-        if (prefix.isEmpty())
+        if (prefix.isEmpty()) {
             return path;
+        }
         // else skip the prefix
         if (path.length() == prefix.length()) {
             return "/";
@@ -71,8 +72,9 @@ public List<PathSegment> getPathSegments() {
 
     @Override
     public List<PathSegment> getPathSegments(boolean decode) {
-        if (!decode)
+        if (!decode) {
             throw encodedNotSupported();
+        }
         return PathSegmentImpl.parseSegments(getPath(), decode);
     }
 
@@ -119,24 +121,7 @@ public UriBuilder getAbsolutePathBuilder() {
 
     @Override
     public URI getBaseUri() {
-        try {
-            Deployment deployment = currentRequest.getDeployment();
-            // the TCK doesn't tell us, but Stuart and Georgios prefer dressing their base URIs with useless slashes ;)
-            String prefix = "/";
-            if (deployment != null) {
-                // prefix can be empty, but if it's not it will not end with a slash
-                prefix = deployment.getPrefix();
-                if (prefix.isEmpty())
-                    prefix = "/";
-                else
-                    prefix = prefix + "/";
-            }
-            return new URI(currentRequest.getScheme(), currentRequest.getAuthority(),
-                    prefix,
-                    null, null);
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
+        return LocationUtil.getUri("", currentRequest, true);
     }
 
     @Override
@@ -151,8 +136,9 @@ public MultivaluedMap<String, String> getPathParameters() {
 
     @Override
     public MultivaluedMap<String, String> getPathParameters(boolean decode) {
-        if (!decode)
+        if (!decode) {
             throw encodedNotSupported();
+        }
         // pathParams have to be recreated when the target changes.
         // this happens e.g. when the ResteasyReactiveRequestContext#restart is called for sub resources
         // The sub resource, can have additional path params that are not present on the locator
@@ -174,8 +160,9 @@ public MultivaluedMap<String, String> getQueryParameters() {
 
     @Override
     public MultivaluedMap<String, String> getQueryParameters(boolean decode) {
-        if (!decode)
+        if (!decode) {
             throw encodedNotSupported();
+        }
         if (queryParams == null) {
             queryParams = new QuarkusMultivaluedHashMap<>();
             Collection<String> entries = currentRequest.serverRequest().queryParamNames();
@@ -193,8 +180,9 @@ public List<String> getMatchedURIs() {
 
     @Override
     public List<String> getMatchedURIs(boolean decode) {
-        if (!decode)
+        if (!decode) {
             throw encodedNotSupported();
+        }
         if (currentRequest.getTarget() == null) {
             return Collections.emptyList();
         }

independent-projects/resteasy-reactive/server/runtime/src/test/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImplTest.java

@@ -16,14 +16,15 @@ public class ResponseBuilderImplTest {
     @Test
     public void shouldBuildWithNonAbsoulteLocationAndIPv6Address() {
         var context = Mockito.mock(ResteasyReactiveRequestContext.class, Mockito.RETURNS_DEEP_STUBS);
-        Mockito.when(context.serverRequest().getRequestHost()).thenReturn("[0:0:0:0:0:0:0:1]");
+        Mockito.when(context.getScheme()).thenReturn("https");
+        Mockito.when(context.getAuthority()).thenReturn("[0:0:0:0:0:0:0:1]");
         Mockito.when(context.getDeployment().getPrefix()).thenReturn("/prefix");
         CurrentRequestManager.set(context);
         var response = ResponseBuilderImpl.ok().location(URI.create("/host")).build();
-        assertEquals("//[0:0:0:0:0:0:0:1]/prefix/host", response.getLocation().toString());
+        assertEquals("https://[0:0:0:0:0:0:0:1]/prefix/host", response.getLocation().toString());
 
         response = ResponseBuilderImpl.ok().contentLocation(URI.create("/host")).build();
-        assertEquals("//[0:0:0:0:0:0:0:1]/host", response.getHeaders().getFirst(HttpHeaders.CONTENT_LOCATION).toString());
+        assertEquals("https://[0:0:0:0:0:0:0:1]/host", response.getHeaders().getFirst(HttpHeaders.CONTENT_LOCATION).toString());
     }
 
 }

independent-projects/resteasy-reactive/server/runtime/src/test/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImplTest.java

@@ -16,14 +16,15 @@ public class RestResponseBuilderImplTest {
     @Test
     public void shouldBuildWithNonAbsoulteLocationAndIPv6Address() {
         var context = Mockito.mock(ResteasyReactiveRequestContext.class, Mockito.RETURNS_DEEP_STUBS);
-        Mockito.when(context.serverRequest().getRequestHost()).thenReturn("[0:0:0:0:0:0:0:1]");
+        Mockito.when(context.getScheme()).thenReturn("https");
+        Mockito.when(context.getAuthority()).thenReturn("[0:0:0:0:0:0:0:1]");
         Mockito.when(context.getDeployment().getPrefix()).thenReturn("/prefix");
         CurrentRequestManager.set(context);
         var response = RestResponseBuilderImpl.ok().location(URI.create("/host")).build();
-        assertEquals("//[0:0:0:0:0:0:0:1]/prefix/host", response.getLocation().toString());
+        assertEquals("https://[0:0:0:0:0:0:0:1]/prefix/host", response.getLocation().toString());
 
         response = RestResponseBuilderImpl.ok().contentLocation(URI.create("/host")).build();
-        assertEquals("//[0:0:0:0:0:0:0:1]/host", response.getHeaders().getFirst(HttpHeaders.CONTENT_LOCATION).toString());
+        assertEquals("https://[0:0:0:0:0:0:0:1]/host", response.getHeaders().getFirst(HttpHeaders.CONTENT_LOCATION).toString());
     }
 
 }