diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-23 14:46:47 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-23 14:46:47 +0100 |
| commit | 52445a9acaecf189612d0f65b1e29f72afa62199 (patch) | |
| tree | 04f80455be669f728393abc1b58d92234c2c2e72 /controller-server/src/main/java/com | |
| parent | eb4879d69bcd3011c03d055d1a4f4810a04cb58b (diff) | |
Give AccessControlRequestFilter a simpler name in the yolean world
Diffstat (limited to 'controller-server/src/main/java/com')
2 files changed, 3 insertions, 1 deletions
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 cae8c485cb3..1208eac74df 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 @@ -30,7 +30,7 @@ import static com.yahoo.vespa.hosted.controller.restapi.filter.SecurityFilterUti * @author bjorncs */ // TODO Remove this filter once migrated to Okta -@After({"com.yahoo.vespa.hosted.controller.restapi.filter.AccessControlRequestFilter", "BouncerFilter"}) +@After({"AccessControlRequestFilter", "BouncerFilter"}) public class UserAuthWithAthenzPrincipalFilter extends AthenzPrincipalFilter { private static final Logger log = Logger.getLogger(UserAuthWithAthenzPrincipalFilter.class.getName()); 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 6588fe25905..8df4124028e 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 @@ -11,6 +11,7 @@ import com.yahoo.jdisc.http.filter.SecurityRequestFilter; import com.yahoo.vespa.hosted.controller.restapi.filter.config.HttpAccessControlConfig; import com.yahoo.yolean.chain.After; import com.yahoo.yolean.chain.Before; +import com.yahoo.yolean.chain.Provides; import java.util.Collections; import java.util.Set; @@ -39,6 +40,7 @@ import static com.yahoo.vespa.hosted.controller.restapi.filter.AccessControlHead */ @After({"InputValidationFilter","RemoteIPFilter", "DoNotTrackRequestFilter", "CookieDataRequestFilter"}) @Before({"BouncerFilter", "ControllerAuthorizationFilter"}) +@Provides("AccessControlRequestFilter") public class AccessControlRequestFilter implements SecurityRequestFilter { private final Set<String> allowedUrls; |