diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-09 12:56:40 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-09 13:42:05 +0200 |
commit | 8d10816667ceb5798389b95209f1ffd50205ecf5 (patch) | |
tree | e099c1d0114854ebdb57328d94dfd3307bc6445a | |
parent | e056e4faf903ba1d01d2a22f482fd0ab7cfb484b (diff) |
Change package name and class name of Cors filters
* Change package name to 'com.yahoo.jdisc.filter.security.cors'
* Remove 'Security' from names of Cors class names
14 files changed, 52 insertions, 55 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 767a1da3eb0..e3df55a9c85 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 @@ -4,8 +4,8 @@ package com.yahoo.vespa.hosted.controller.athenz.filter; import com.google.inject.Inject; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig; -import com.yahoo.jdisc.http.filters.cors.CorsSecurityRequestFilterBase; +import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig; +import com.yahoo.jdisc.http.filter.security.cors.CorsRequestFilterBase; import com.yahoo.vespa.athenz.api.AthenzPrincipal; import com.yahoo.vespa.athenz.api.NToken; import com.yahoo.vespa.athenz.utils.AthenzIdentities; @@ -31,7 +31,7 @@ import java.util.concurrent.Executor; * @author bjorncs */ // TODO bjorncs: Move this class to vespa-athenz bundle -public class AthenzPrincipalFilter extends CorsSecurityRequestFilterBase { +public class AthenzPrincipalFilter extends CorsRequestFilterBase { private final NTokenValidator validator; private final String principalTokenHeader; @@ -43,7 +43,7 @@ public class AthenzPrincipalFilter extends CorsSecurityRequestFilterBase { public AthenzPrincipalFilter(ZmsKeystore zmsKeystore, Executor executor, AthenzConfig athenzConfig, - CorsSecurityFilterConfig corsConfig) { + CorsFilterConfig corsConfig) { this(new NTokenValidator(zmsKeystore), executor, athenzConfig.principalHeaderName(), new HashSet<>(corsConfig.allowedUrls())); } 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 27e3b339b38..909051dcefc 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 @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.athenz.filter; import com.google.inject.Inject; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig; +import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig; import com.yahoo.log.LogLevel; import com.yahoo.vespa.athenz.api.AthenzPrincipal; import com.yahoo.vespa.athenz.api.AthenzUser; @@ -29,7 +29,7 @@ import java.util.stream.Stream; * @author bjorncs */ // TODO Remove this filter once migrated to Okta -@After({"CorsPreflightSecurityRequestFilter", "BouncerFilter"}) +@After({"CorsPreflightRequestFilter", "BouncerFilter"}) public class UserAuthWithAthenzPrincipalFilter extends AthenzPrincipalFilter { private static final Logger log = Logger.getLogger(UserAuthWithAthenzPrincipalFilter.class.getName()); @@ -41,7 +41,7 @@ public class UserAuthWithAthenzPrincipalFilter extends AthenzPrincipalFilter { public UserAuthWithAthenzPrincipalFilter(ZmsKeystore zmsKeystore, Executor executor, AthenzConfig athenzConfig, - CorsSecurityFilterConfig corsConfig) { + CorsFilterConfig corsConfig) { super(zmsKeystore, executor, athenzConfig, corsConfig); this.userAuthenticationPassThruAttribute = athenzConfig.userAuthenticationPassThruAttribute(); this.principalHeaderName = athenzConfig.principalHeaderName(); 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 b7f4d8e490a..36728759e3f 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 @@ -6,8 +6,8 @@ import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.TenantName; import com.yahoo.jdisc.http.HttpRequest.Method; import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig; -import com.yahoo.jdisc.http.filters.cors.CorsSecurityRequestFilterBase; +import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig; +import com.yahoo.jdisc.http.filter.security.cors.CorsRequestFilterBase; import com.yahoo.log.LogLevel; import com.yahoo.vespa.athenz.api.AthenzDomain; import com.yahoo.vespa.athenz.api.AthenzIdentity; @@ -49,7 +49,7 @@ import static com.yahoo.vespa.hosted.controller.api.integration.athenz.HostedAth */ @After("com.yahoo.vespa.hosted.controller.athenz.filter.UserAuthWithAthenzPrincipalFilter") @Provides("ControllerAuthorizationFilter") -public class ControllerAuthorizationFilter extends CorsSecurityRequestFilterBase { +public class ControllerAuthorizationFilter extends CorsRequestFilterBase { private static final List<Method> WHITELISTED_METHODS = Arrays.asList(GET, OPTIONS, HEAD); @@ -61,7 +61,7 @@ public class ControllerAuthorizationFilter extends CorsSecurityRequestFilterBase @Inject public ControllerAuthorizationFilter(AthenzClientFactory clientFactory, Controller controller, - CorsSecurityFilterConfig corsConfig) { + CorsFilterConfig corsConfig) { super(corsConfig); this.clientFactory = clientFactory; this.tenantController = controller.tenants(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java index d4754d03997..5ccdcdbf4e8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java @@ -54,7 +54,7 @@ public class ControllerContainerTest { " <item key=\"rotation-id-5\">rotation-fqdn-5</item>\n" + " </rotations>\n" + " </config>\n" + - " <config name=\"jdisc.http.filters.cors.cors-security-filter\">\n" + + " <config name=\"jdisc.http.filter.security.cors.cors-filter\">\n" + " <allowedUrls>\n" + " <item>http://localhost</item>\n" + " </allowedUrls>\n" + diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt index b20883d3154..1c6e067f974 100644 --- a/jdisc-security-filters/CMakeLists.txt +++ b/jdisc-security-filters/CMakeLists.txt @@ -2,4 +2,4 @@ install_fat_java_artifact(jdisc-security-filters) install_java_artifact_dependencies(jdisc-security-filters) -install_config_definition(src/main/resources/configdefinitions/cors-security-filter.def) +install_config_definition(src/main/resources/configdefinitions/cors-filter.def) diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsLogic.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsLogic.java index 3f1aeff9e95..54f1ee3042f 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsLogic.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsLogic.java @@ -1,5 +1,5 @@ // 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.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.google.common.collect.ImmutableMap; import com.yahoo.jdisc.HeaderFields; diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilter.java index d162fff53b1..6e14cbe8ac2 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilter.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilter.java @@ -1,5 +1,5 @@ // 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.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.google.inject.Inject; import com.yahoo.jdisc.Response; @@ -14,7 +14,6 @@ import java.util.HashSet; import java.util.Set; import static com.yahoo.jdisc.http.HttpRequest.Method.OPTIONS; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsPreflightResponseHeaders; /** * <p> @@ -34,12 +33,12 @@ import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsPreflightRes * @author gv * @author bjorncs */ -@Provides("CorsPreflightSecurityRequestFilter") -public class CorsPreflightSecurityRequestFilter implements SecurityRequestFilter { +@Provides("CorsPreflightRequestFilter") +public class CorsPreflightRequestFilter implements SecurityRequestFilter { private final Set<String> allowedUrls; @Inject - public CorsPreflightSecurityRequestFilter(CorsSecurityFilterConfig config) { + public CorsPreflightRequestFilter(CorsFilterConfig config) { this.allowedUrls = new HashSet<>(config.allowedUrls()); } @@ -52,7 +51,7 @@ public class CorsPreflightSecurityRequestFilter implements SecurityRequestFilter HttpResponse response = HttpResponse.newInstance(Response.Status.OK); - createCorsPreflightResponseHeaders(origin, allowedUrls) + CorsLogic.createCorsPreflightResponseHeaders(origin, allowedUrls) .forEach(response.headers()::put); ContentChannel cc = responseHandler.handleResponse(response); diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBase.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java index fd64aa37875..7bdbd7eddf4 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBase.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java @@ -1,5 +1,5 @@ // 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.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -15,7 +15,7 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsResponseHeaders; +import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.createCorsResponseHeaders; /** * Security request filters should extend this base class to ensure that CORS header are included in the response of a rejected request. @@ -23,17 +23,17 @@ import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsResponseHead * * @author bjorncs */ -public abstract class CorsSecurityRequestFilterBase implements SecurityRequestFilter { +public abstract class CorsRequestFilterBase implements SecurityRequestFilter { private static final ObjectMapper mapper = new ObjectMapper(); private final Set<String> allowedUrls; - protected CorsSecurityRequestFilterBase(CorsSecurityFilterConfig config) { + protected CorsRequestFilterBase(CorsFilterConfig config) { this(new HashSet<>(config.allowedUrls())); } - protected CorsSecurityRequestFilterBase(Set<String> allowedUrls) { + protected CorsRequestFilterBase(Set<String> allowedUrls) { this.allowedUrls = allowedUrls; } diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilter.java index bf288661bc4..d0b9e4ce7c9 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilter.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilter.java @@ -1,5 +1,5 @@ // 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.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.google.inject.Inject; import com.yahoo.jdisc.AbstractResource; @@ -11,27 +11,25 @@ import com.yahoo.yolean.chain.Provides; import java.util.HashSet; import java.util.Set; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsResponseHeaders; - /** * @author gv * @author Tony Vaagenes * @author bjorncs */ -@Provides("CorsSecurityResponseFilter") -public class CorsSecurityResponseFilter extends AbstractResource implements SecurityResponseFilter { +@Provides("CorsResponseFilter") +public class CorsResponseFilter extends AbstractResource implements SecurityResponseFilter { private final Set<String> allowedUrls; @Inject - public CorsSecurityResponseFilter(CorsSecurityFilterConfig config) { + public CorsResponseFilter(CorsFilterConfig config) { this.allowedUrls = new HashSet<>(config.allowedUrls()); } @Override public void filter(DiscFilterResponse response, RequestView request) { - createCorsResponseHeaders(request.getFirstHeader("Origin").orElse(null), allowedUrls) + CorsLogic.createCorsResponseHeaders(request.getFirstHeader("Origin").orElse(null), allowedUrls) .forEach(response::setHeader); } diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/package-info.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/package-info.java index 6357acc4e99..cada3d3fcd8 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/package-info.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/package-info.java @@ -3,6 +3,6 @@ * @author bjorncs */ @ExportPackage -package com.yahoo.jdisc.http.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/cors-security-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def index 71d4b998b99..a5c69b2db62 100644 --- a/jdisc-security-filters/src/main/resources/configdefinitions/cors-security-filter.def +++ b/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def @@ -1,4 +1,4 @@ # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=jdisc.http.filters.cors +namespace=jdisc.http.filter.security.cors allowedUrls[] string diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java index cb934c32bee..2486bc444c8 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java @@ -1,5 +1,5 @@ // 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.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.yahoo.jdisc.HeaderFields; import com.yahoo.jdisc.Response; @@ -7,14 +7,14 @@ import com.yahoo.jdisc.handler.ContentChannel; 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.filters.cors.CorsSecurityFilterConfig.Builder; +import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder; import org.junit.Test; import java.util.Arrays; import static com.yahoo.jdisc.http.HttpRequest.Method.OPTIONS; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ACCESS_CONTROL_HEADERS; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ALLOW_ORIGIN_HEADER; +import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS; +import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,7 +24,7 @@ import static org.mockito.Mockito.when; * @author gjoranv * @author bjorncs */ -public class CorsPreflightSecurityRequestFilterTest { +public class CorsPreflightRequestFilterTest { @Test public void any_options_request_yields_access_control_headers_in_response() { @@ -59,10 +59,10 @@ public class CorsPreflightSecurityRequestFilterTest { return request; } - private static CorsPreflightSecurityRequestFilter newRequestFilter(String... allowedOriginUrls) { + private static CorsPreflightRequestFilter newRequestFilter(String... allowedOriginUrls) { Builder builder = new Builder(); Arrays.asList(allowedOriginUrls).forEach(builder::allowedUrls); - return new CorsPreflightSecurityRequestFilter(new CorsSecurityFilterConfig(builder)); + return new CorsPreflightRequestFilter(new CorsFilterConfig(builder)); } private static class AccessControlResponseHandler implements ResponseHandler { diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBaseTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java index 65fb78cdbd6..29d28499a28 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBaseTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java @@ -1,5 +1,5 @@ // 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.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.yahoo.container.jdisc.RequestHandlerTestDriver.MockResponseHandler; import com.yahoo.jdisc.Response; @@ -11,7 +11,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ALLOW_ORIGIN_HEADER; +import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; @@ -21,15 +21,15 @@ import static org.mockito.Mockito.when; /** * @author bjorncs */ -public class CorsSecurityRequestFilterBaseTest { +public class CorsRequestFilterBaseTest { @Test public void adds_cors_headers_when_filter_reject_request() { String origin = "http://allowed.origin"; Set<String> allowedOrigins = Collections.singleton(origin); int statusCode = 403; - SimpleCorsSecurityRequestFilter filter = - new SimpleCorsSecurityRequestFilter(allowedOrigins, statusCode, "Forbidden"); + SimpleCorsRequestFilter filter = + new SimpleCorsRequestFilter(allowedOrigins, statusCode, "Forbidden"); DiscFilterRequest request = mock(DiscFilterRequest.class); when(request.getHeader("Origin")).thenReturn(origin); MockResponseHandler responseHandler = new MockResponseHandler(); @@ -43,10 +43,10 @@ public class CorsSecurityRequestFilterBaseTest { assertThat(allowOriginHeader.get(0), equalTo(origin)); } - private static class SimpleCorsSecurityRequestFilter extends CorsSecurityRequestFilterBase { + private static class SimpleCorsRequestFilter extends CorsRequestFilterBase { private final ErrorResponse errorResponse; - SimpleCorsSecurityRequestFilter(Set<String> allowedUrls, int statusCode, String message) { + SimpleCorsRequestFilter(Set<String> allowedUrls, int statusCode, String message) { super(allowedUrls); this.errorResponse = new ErrorResponse(statusCode, message); } diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java index cadc4b217b3..2967a7659f5 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java @@ -1,11 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.http.filters.cors; +package com.yahoo.jdisc.http.filter.security.cors; import com.yahoo.jdisc.http.Cookie; import com.yahoo.jdisc.http.filter.DiscFilterResponse; import com.yahoo.jdisc.http.filter.RequestView; import com.yahoo.jdisc.http.filter.SecurityResponseFilter; -import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig.Builder; +import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder; import com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpResponse; import org.junit.Test; @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ACCESS_CONTROL_HEADERS; -import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ALLOW_ORIGIN_HEADER; +import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS; +import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; * @author gjoranv * @author bjorncs */ -public class CorsSecurityResponseFilterTest { +public class CorsResponseFilterTest { @Test public void any_request_yields_access_control_headers_in_response() { @@ -62,10 +62,10 @@ public class CorsSecurityResponseFilterTest { return Collections.unmodifiableMap(response.headers); } - private static CorsSecurityResponseFilter newResponseFilter(String... allowedOriginUrls) { + private static CorsResponseFilter newResponseFilter(String... allowedOriginUrls) { Builder builder = new Builder(); Arrays.asList(allowedOriginUrls).forEach(builder::allowedUrls); - return new CorsSecurityResponseFilter(new CorsSecurityFilterConfig(builder)); + return new CorsResponseFilter(new CorsFilterConfig(builder)); } private static RequestView newRequestView(String originUrl) { |