diff options
6 files changed, 17 insertions, 52 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java index e3df55a9c85..5166f53c6d2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java @@ -58,7 +58,7 @@ public class AthenzPrincipalFilter extends CorsRequestFilterBase { } @Override - public Optional<ErrorResponse> filter(DiscFilterRequest request) { + public Optional<ErrorResponse> filterRequest(DiscFilterRequest request) { try { Optional<AthenzPrincipal> certificatePrincipal = getClientCertificate(request) .map(AthenzIdentities::from) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java index 909051dcefc..910cf05b156 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java @@ -48,7 +48,7 @@ public class UserAuthWithAthenzPrincipalFilter extends AthenzPrincipalFilter { } @Override - public Optional<ErrorResponse> filter(DiscFilterRequest request) { + public Optional<ErrorResponse> filterRequest(DiscFilterRequest request) { if (request.getMethod().equals("OPTIONS")) return Optional.empty(); // Skip authentication on OPTIONS - required for Javascript CORS try { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java index 36728759e3f..8c0ee7225b5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java @@ -78,7 +78,7 @@ public class ControllerAuthorizationFilter extends CorsRequestFilterBase { // NOTE: Be aware of the ordering of the path pattern matching. Semantics may change if the patterns are evaluated // in different order. @Override - public Optional<ErrorResponse> filter(DiscFilterRequest request) { + public Optional<ErrorResponse> filterRequest(DiscFilterRequest request) { Method method = getMethod(request); if (isWhiteListedMethod(method)) return Optional.empty(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index fd4eb5c9ca1..88f0000c036 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -730,7 +730,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", POST) .userIdentity(unauthorizedUser) .nToken(N_TOKEN), - "{\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", + "{\n \"code\" : 403,\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", 403); // (Create it with the right tenant id) @@ -745,13 +745,13 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-west-1/instance/default/deploy", POST) .data(entity) .userIdentity(USER_ID), - "{\n \"message\" : \"'user.myuser' is not a Screwdriver identity. Only Screwdriver is allowed to deploy to this environment.\"\n}", + "{\n \"code\" : 403,\n \"message\" : \"'user.myuser' is not a Screwdriver identity. Only Screwdriver is allowed to deploy to this environment.\"\n}", 403); // Deleting an application for an Athens domain the user is not admin for is disallowed tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", DELETE) .userIdentity(unauthorizedUser), - "{\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", + "{\n \"code\" : 403,\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", 403); // (Deleting it with the right tenant id) @@ -765,7 +765,7 @@ public class ApplicationApiTest extends ControllerContainerTest { tester.assertResponse(request("/application/v4/tenant/tenant1", PUT) .data("{\"athensDomain\":\"domain1\", \"property\":\"property1\"}") .userIdentity(unauthorizedUser), - "{\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", + "{\n \"code\" : 403,\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", 403); // Change Athens domain @@ -780,7 +780,7 @@ public class ApplicationApiTest extends ControllerContainerTest { // Deleting a tenant for an Athens domain the user is not admin for is disallowed tester.assertResponse(request("/application/v4/tenant/tenant1", DELETE) .userIdentity(unauthorizedUser), - "{\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", + "{\n \"code\" : 403,\n \"message\" : \"Tenant admin or Vespa operator role required\"\n}", 403); } diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java index 7bdbd7eddf4..eafe17153ad 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java @@ -1,15 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.filter.security.cors; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.yahoo.jdisc.Response; -import com.yahoo.jdisc.handler.FastContentWriter; -import com.yahoo.jdisc.handler.ResponseDispatch; -import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.filter.SecurityRequestFilter; +import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase; import java.util.HashSet; import java.util.Optional; @@ -23,9 +17,7 @@ import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.createCorsResp * * @author bjorncs */ -public abstract class CorsRequestFilterBase implements SecurityRequestFilter { - - private static final ObjectMapper mapper = new ObjectMapper(); +public abstract class CorsRequestFilterBase extends JsonSecurityRequestFilterBase { private final Set<String> allowedUrls; @@ -38,44 +30,17 @@ public abstract class CorsRequestFilterBase implements SecurityRequestFilter { } @Override - public final void filter(DiscFilterRequest request, ResponseHandler handler) { - filter(request) - .ifPresent(errorResponse -> sendErrorResponse(request, errorResponse, handler)); + public final Optional<ErrorResponse> filter(DiscFilterRequest request) { + Optional<ErrorResponse> errorResponse = filterRequest(request); + errorResponse.ifPresent(response -> addCorsHeaders(request, response.getResponse())); + return errorResponse; } - protected abstract Optional<ErrorResponse> filter(DiscFilterRequest request); - - private void sendErrorResponse(DiscFilterRequest request, - ErrorResponse errorResponse, - ResponseHandler responseHandler) { - Response response = new Response(errorResponse.statusCode); - addHeaders(request, response); - writeResponse(errorResponse, responseHandler, response); - } + protected abstract Optional<ErrorResponse> filterRequest(DiscFilterRequest request); - private void addHeaders(DiscFilterRequest request, Response response) { + private void addCorsHeaders(DiscFilterRequest request, Response response) { createCorsResponseHeaders(request.getHeader("Origin"), allowedUrls) .forEach(response.headers()::add); - response.headers().add("Content-Type", "application/json"); } - private void writeResponse(ErrorResponse errorResponse, ResponseHandler responseHandler, Response response) { - ObjectNode errorMessage = mapper.createObjectNode(); - errorMessage.put("message", errorResponse.message); - try (FastContentWriter writer = ResponseDispatch.newInstance(response).connectFastWriter(responseHandler)) { - writer.write(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(errorMessage)); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - - protected static class ErrorResponse { - final int statusCode; - final String message; - - public ErrorResponse(int statusCode, String message) { - this.statusCode = statusCode; - this.message = message; - } - } } diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java index 29d28499a28..2cb25bc93cb 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java @@ -52,7 +52,7 @@ public class CorsRequestFilterBaseTest { } @Override - protected Optional<ErrorResponse> filter(DiscFilterRequest request) { + protected Optional<ErrorResponse> filterRequest(DiscFilterRequest request) { return Optional.ofNullable(this.errorResponse); } } |