diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-23 14:45:22 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-23 14:45:22 +0100 |
| commit | eb4879d69bcd3011c03d055d1a4f4810a04cb58b (patch) | |
| tree | c23f6ecf34ad8359a2d0bf00b4f2cab7a7c22346 /controller-server | |
| parent | ab399a49fb0ca0b19b3d88c79fdd369563cf986c (diff) | |
Specify explicit ordering between AcessControlRequetFilter and ControllerAuthorizationFilter
Diffstat (limited to 'controller-server')
3 files changed, 4 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AccessControlRequestFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AccessControlRequestFilter.java index 8dace5d56dc..6588fe25905 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AccessControlRequestFilter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AccessControlRequestFilter.java @@ -38,7 +38,7 @@ import static com.yahoo.vespa.hosted.controller.restapi.filter.AccessControlHead * @author gv */ @After({"InputValidationFilter","RemoteIPFilter", "DoNotTrackRequestFilter", "CookieDataRequestFilter"}) -@Before("BouncerFilter") +@Before({"BouncerFilter", "ControllerAuthorizationFilter"}) public class AccessControlRequestFilter implements SecurityRequestFilter { private final Set<String> allowedUrls; 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 f718d4fa8bd..e6623fd6508 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 @@ -23,6 +23,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFact import com.yahoo.vespa.hosted.controller.api.integration.athenz.ZmsException; import com.yahoo.vespa.hosted.controller.restapi.Path; import com.yahoo.yolean.chain.After; +import com.yahoo.yolean.chain.Provides; import javax.ws.rs.ForbiddenException; import javax.ws.rs.InternalServerErrorException; @@ -47,6 +48,7 @@ import static com.yahoo.vespa.hosted.controller.restapi.filter.SecurityFilterUti * @author bjorncs */ @After("com.yahoo.vespa.hosted.controller.athenz.filter.UserAuthWithAthenzPrincipalFilter") +@Provides("ControllerAuthorizationFilter") public class ControllerAuthorizationFilter implements SecurityRequestFilter { private static final List<Method> WHITELISTED_METHODS = Arrays.asList(GET, OPTIONS, HEAD); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/AthenzFilterMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/AthenzFilterMock.java index 02a7f63fbb8..0a32406be60 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/AthenzFilterMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/AthenzFilterMock.java @@ -16,7 +16,7 @@ import static com.yahoo.vespa.hosted.controller.restapi.filter.SecurityFilterUti /** * @author bjorncs */ -@Before("com.yahoo.vespa.hosted.controller.restapi.filter.ControllerAuthorizationFilter") +@Before("ControllerAuthorizationFilter") public class AthenzFilterMock implements SecurityRequestFilter { public static final String IDENTITY_HEADER_NAME = "Athenz-Identity"; |