Make dependency on AuthenticationFilter more explicit

2 files changed, 5 insertions, 1 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthenticationFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthenticationFilter.java
index 53666f9f25f..eed22535842 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthenticationFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthenticationFilter.java
@@ -8,6 +8,7 @@ import com.yahoo.jdisc.http.filter.DiscFilterRequest;
 import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
+import com.yahoo.yolean.chain.Provides;
 
 import java.security.cert.X509Certificate;
 import java.util.List;
@@ -20,6 +21,7 @@ import java.util.logging.Logger;
  *
  * @author bjorncs
  */
+@Provides("AuthenticationFilter")
 public class AuthenticationFilter extends JsonSecurityRequestFilterBase {
 
     private static final Logger log = Logger.getLogger(AuthenticationFilter.class.getName());
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthorizationFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthorizationFilter.java
index 5fd85bac096..ab6bb229dd8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthorizationFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/AuthorizationFilter.java
@@ -11,6 +11,7 @@ import com.yahoo.net.HostName;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.restapi.v2.Authorizer;
 import com.yahoo.vespa.hosted.provision.restapi.v2.ErrorResponse;
+import com.yahoo.yolean.chain.After;
 
 import java.net.URI;
 import java.security.Principal;
@@ -24,11 +25,12 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- * Authorization filter for all paths in config server.
+ * Authorization filter for all paths in config server. It assumes that {@link AuthenticationFilter} is part of filter chain.
  *
  * @author mpolden
  * @author bjorncs
  */
+@After("AuthenticationFilter")
 public class AuthorizationFilter implements SecurityRequestFilter {
 
     private static final Logger log = Logger.getLogger(AuthorizationFilter.class.getName());