Merge pull request #33448 from Sgitario/33419

Fix location and content location headers in Resteasy Reactive
quarkusio · May 18, 2023 · 93770e6 · 93770e6
2 parents 5a2347f + ced8b0a
commit 93770e6
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 14 deletions.
diff --git a/...r/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/...r/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java
@@ -40,10 +40,12 @@ public Response.ResponseBuilder location(URI location) {
                         prefix = deployment.getPrefix();
                     }
                     // Spec says relative to request, but TCK tests relative to Base URI, so we do that
-                    location = new URI(req.getRequestScheme(), null, host, port,
-                            prefix +
-                                    (location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath()),
-                            location.getQuery(), null);
+                    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);
                 }
@@ -72,9 +74,12 @@ public Response.ResponseBuilder contentLocation(URI location) {
                         port = Integer.parseInt(host.substring(index + 1));
                         host = host.substring(0, index);
                     }
-                    location = new URI(req.getRequestScheme(), null, host, port,
-                            location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath(),
-                            location.getQuery(), null);
+                    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);
                 }

diff --git a/...ntime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java b/...ntime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java
@@ -40,10 +40,12 @@ public RestResponse.ResponseBuilder<T> location(URI location) {
                         prefix = deployment.getPrefix();
                     }
                     // Spec says relative to request, but TCK tests relative to Base URI, so we do that
-                    location = new URI(req.getRequestScheme(), null, host, port,
-                            prefix +
-                                    (location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath()),
-                            location.getQuery(), null);
+                    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);
                 }
@@ -72,9 +74,12 @@ public RestResponse.ResponseBuilder<T> contentLocation(URI location) {
                         port = Integer.parseInt(host.substring(index + 1));
                         host = host.substring(0, index);
                     }
-                    location = new URI(req.getRequestScheme(), null, host, port,
-                            location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath(),
-                            location.getQuery(), null);
+                    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);
                 }

diff --git a/...tx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java b/...tx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java
@@ -2,6 +2,7 @@
 
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -16,4 +17,20 @@ public void testCaseInsensitivity() {
         Assertions.assertEquals("HEAD", response.getHeaders().getFirst("allow"));
         Assertions.assertEquals("HEAD", response.getHeaders().getFirst(HttpHeaders.ALLOW));
     }
+
+    @Test
+    public void testLocation() {
+        final var location = UriBuilder.fromUri("http://localhost:8080").path("{language}")
+                .build("en/us");
+        Response response = Response.ok("Hello").location(location).build();
+        Assertions.assertEquals("http://localhost:8080/en%2Fus", response.getLocation().toString());
+    }
+
+    @Test
+    public void testContentLocation() {
+        final var location = UriBuilder.fromUri("http://localhost:8080").path("{language}")
+                .build("en/us");
+        Response response = Response.ok("Hello").contentLocation(location).build();
+        Assertions.assertEquals("http://localhost:8080/en%2Fus", response.getHeaderString("Content-Location"));
+    }
 }
diff --git a/...est/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java b/...est/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java
@@ -13,6 +13,7 @@
 import jakarta.ws.rs.core.CacheControl;
 import jakarta.ws.rs.core.NewCookie;
 import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
 import jakarta.ws.rs.core.Variant;
 
 import org.jboss.resteasy.reactive.RestResponse;
@@ -47,6 +48,24 @@ public RestResponse<?> wildcard() {
         return RestResponse.ResponseBuilder.ok("Hello").header("content-type", "text/plain").build();
     }
 
+    @GET
+    @Path("rest-response-location")
+    public RestResponse<?> location() {
+        final var location = UriBuilder.fromResource(RestResponseResource.class).path("{language}")
+                .queryParam("user", "John")
+                .build("en/us");
+        return RestResponse.ResponseBuilder.ok("Hello").location(location).build();
+    }
+
+    @GET
+    @Path("rest-response-content-location")
+    public RestResponse<?> contentLocation() {
+        final var location = UriBuilder.fromResource(RestResponseResource.class).path("{language}")
+                .queryParam("user", "John")
+                .build("en/us");
+        return RestResponse.ResponseBuilder.ok("Hello").contentLocation(location).build();
+    }
+
     @GET
     @Path("rest-response-full")
     @SuppressWarnings("deprecation")

diff --git a/...rc/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java b/...rc/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java
@@ -1,5 +1,7 @@
 package org.jboss.resteasy.reactive.server.vertx.test.response;
 
+import static org.hamcrest.CoreMatchers.endsWith;
+
 import java.util.function.Supplier;
 
 import org.hamcrest.Matchers;
@@ -107,5 +109,11 @@ public void test() {
                 .then().statusCode(200)
                 .and().body(Matchers.equalTo("Uni<RestResponse> request filter"))
                 .and().contentType("text/plain");
+        RestAssured.get("/rest-response-location")
+                .then().statusCode(200)
+                .header("Location", endsWith("/en%2Fus?user=John"));
+        RestAssured.get("/rest-response-content-location")
+                .then().statusCode(200)
+                .header("Content-Location", endsWith("/en%2Fus?user=John"));
     }
 }