Fixing the issue quarkusio#33922 about Access-Control-Expose-Headers

Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Updating unit-test Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Formatting codes Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Removing duplicated code block Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Formatting codes Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Formatting codes Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Formatting codes Signed-off-by: Rhuan Rocha <rhuan080@gmail.com> Formatting codes Signed-off-by: Rhuan Rocha <rhuan080@gmail.com>
rhuan080 · Jun 14, 2023 · 0fcfc8b · 0fcfc8b
1 parent 1c8d564
commit 0fcfc8b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...tes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java b/...tes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java
@@ -32,6 +32,15 @@ public void corsFullConfigTestServlet() {
                 .header("Access-Control-Allow-Headers", "X-Custom")
                 .header("Access-Control-Max-Age", "86400");
 
+        given().header("Origin", "http://custom.origin.quarkus")
+                .when()
+                .get("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", "http://custom.origin.quarkus")
+                .header("Access-Control-Allow-Methods", "GET,PUT,POST")
+                .header("Access-Control-Expose-Headers", "Content-Disposition")
+                .header("Access-Control-Allow-Headers", "X-Custom");
+
         given().header("Origin", "http://www.quarkus.io")
                 .header("Access-Control-Request-Method", "PUT")
                 .when()
@@ -40,6 +49,7 @@ public void corsFullConfigTestServlet() {
                 .header("Access-Control-Allow-Origin", "http://www.quarkus.io")
                 .header("Access-Control-Allow-Methods", "GET,PUT,POST")
                 .header("Access-Control-Expose-Headers", "Content-Disposition");
+
     }
 
     @Test

diff --git a/...sions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java b/...sions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java
@@ -176,6 +176,12 @@ public void handle(RoutingContext event) {
             if (allowedMethods != null) {
                 response.headers().add(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, allowedMethods);
             }
+
+            //always set expose headers if present
+            if (exposedHeaders != null) {
+                response.headers().add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, exposedHeaders);
+            }
+
             //we check that the actual request matches the allowed methods and headers
             if (!isMethodAllowed(request.method())) {
                 LOG.debug("Method is not allowed");
@@ -216,10 +222,6 @@ private void handlePreflightRequest(RoutingContext event, String requestedHeader
             response.headers().add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, exposedHeaders);
         }
 
-        if (!isConfiguredWithWildcard(corsConfig.exposedHeaders)) {
-            response.headers().set(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, this.exposedHeaders);
-        }
-
     }
 
     static boolean isSameOrigin(HttpServerRequest request, String origin) {