From 01a537332194175af87835dfb7c27df6a18b8282 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 9 Jan 2018 13:36:37 +0100 Subject: Remove unused classes --- .../controller/restapi/filter/DummyFilter.java | 16 ----------- .../restapi/filter/NTokenRequestFilter.java | 33 ---------------------- 2 files changed, 49 deletions(-) delete mode 100644 controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/DummyFilter.java delete mode 100644 controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/NTokenRequestFilter.java (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/DummyFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/DummyFilter.java deleted file mode 100644 index 7beb3f755ad..00000000000 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/DummyFilter.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.restapi.filter; - -import com.yahoo.jdisc.handler.ResponseHandler; -import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.filter.SecurityRequestFilter; - -/** - * @author Stian Kristoffersen - */ -public class DummyFilter implements SecurityRequestFilter { - @Override - public void filter(DiscFilterRequest request, ResponseHandler handler) { - /* Do nothing - a bug in JDisc prevents empty request chains */ - } -} diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/NTokenRequestFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/NTokenRequestFilter.java deleted file mode 100644 index 443a53b476d..00000000000 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/NTokenRequestFilter.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.restapi.filter; - -import com.google.inject.Inject; -import com.yahoo.jdisc.handler.ResponseHandler; -import com.yahoo.jdisc.http.filter.DiscFilterRequest; -import com.yahoo.jdisc.http.filter.SecurityRequestFilter; -import com.yahoo.vespa.hosted.controller.athenz.config.AthenzConfig; -import com.yahoo.yolean.chain.After; - -/** - * @author bjorncs - */ -@After("BouncerFilter") -public class NTokenRequestFilter implements SecurityRequestFilter { - - public static final String NTOKEN_HEADER = "com.yahoo.vespa.hosted.controller.restapi.filter.NTokenRequestFilter.ntoken"; - - private final String principalHeaderName; - - @Inject - public NTokenRequestFilter(AthenzConfig config) { - this.principalHeaderName = config.principalHeaderName(); - } - - @Override - public void filter(DiscFilterRequest request, ResponseHandler responseHandler) { - String nToken = request.getHeader(principalHeaderName); - if (nToken != null) { - request.setAttribute(NTOKEN_HEADER, nToken); - } - } -} -- cgit v1.2.3