diff options
| author | jonmv <venstad@gmail.com> | 2023-10-05 18:31:35 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-10-05 18:31:35 +0200 |
| commit | 652fff958ced79750b4f7471552691bd0ae99d91 (patch) | |
| tree | 3e56e0f3987cfc6b6416e585170fab37353b03eb | |
| parent | 8b2aba4edd1b555a46369c0979cbbf923777fe8c (diff) | |
Include CORS headers
2 files changed, 8 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java index bc69ada8e34..347f56efe58 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java @@ -54,7 +54,11 @@ public class BadgeApiHandler extends ThreadedHttpRequestHandler { Method method = request.getMethod(); try { return switch (method) { - case OPTIONS -> new SvgHttpResponse("") {{ headers().add("Allow", "GET, HEAD, OPTIONS"); }}; + case OPTIONS -> new SvgHttpResponse("") {{ + headers().add("Allow", "GET, HEAD, OPTIONS"); + headers().add("Access-Control-Allow-Origin", "*"); + headers().add("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS"); + }}; case HEAD, GET -> get(request); default -> ErrorResponse.methodNotAllowed("Method '" + method + "' is unsupported"); }; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiTest.java index e928fec8318..f932584b4c0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiTest.java @@ -89,7 +89,9 @@ public class BadgeApiTest extends ControllerContainerTest { 200); tester.assertResponse(() -> authenticatedRequest("http://localhost:8080/badge/v1/tenant/application/default", "", Method.OPTIONS), - response -> Assertions.assertEquals(List.of(Map.entry("Allow", "GET, HEAD, OPTIONS"), + response -> Assertions.assertEquals(List.of(Map.entry("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS"), + Map.entry("Access-Control-Allow-Origin", "*"), + Map.entry("Allow", "GET, HEAD, OPTIONS"), Map.entry("Content-Type", "image/svg+xml; charset=UTF-8")), response.getHeaders().entries()), 200); |