Move BlockingRequestFilter to jdisc-security-filters

2 files changed, 18 insertions, 24 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/BlockingRequestFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/BlockingRequestFilter.java
deleted file mode 100644
index 3bd504b37d8..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/BlockingRequestFilter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2018 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.Response;
-import com.yahoo.jdisc.handler.FastContentWriter;
-import com.yahoo.jdisc.handler.ResponseDispatch;
-import com.yahoo.jdisc.handler.ResponseHandler;
-import com.yahoo.jdisc.http.filter.DiscFilterRequest;
-import com.yahoo.jdisc.http.filter.SecurityRequestFilter;
-
-/**
- * @author bjorncs
- */
-@SuppressWarnings("unused") // Injected
-public class BlockingRequestFilter implements SecurityRequestFilter {
-
-    @Override
-    public void filter(DiscFilterRequest request, ResponseHandler handler) {
-        Response response = new Response(Response.Status.FORBIDDEN);
-        try (FastContentWriter writer = ResponseDispatch.newInstance(response).connectFastWriter(handler)) {
-            writer.write("Forbidden to access this API");
-        }
-    }
-}
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/misc/BlockingRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/misc/BlockingRequestFilter.java
new file mode 100644
index 00000000000..00b81e32952
--- /dev/null
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/misc/BlockingRequestFilter.java
@@ -0,0 +1,18 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.jdisc.http.filter.security.misc;
+
+import com.yahoo.jdisc.Response;
+import com.yahoo.jdisc.http.filter.DiscFilterRequest;
+import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase;
+
+import java.util.Optional;
+
+/**
+ * @author bjorncs
+ */
+public class BlockingRequestFilter extends JsonSecurityRequestFilterBase {
+    @Override
+    protected Optional<ErrorResponse> filter(DiscFilterRequest request) {
+        return Optional.of(new ErrorResponse(Response.Status.FORBIDDEN, "Forbidden to access this path"));
+    }
+}