You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2018/06/28 16:24:00 UTC
[incubator-pulsar] 01/01: Move AuthenticationFilter to
pulsar-broker-common (#2039)
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit de7332bfb98280cadba152db3cf648ac5530905d
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Wed Jun 27 19:16:14 2018 +0200
Move AuthenticationFilter to pulsar-broker-common (#2039)
So that it can be used by the proxy also.
Master issue: #1991
---
.../main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java | 5 ++---
.../src/main/java/org/apache/pulsar/broker/web/WebService.java | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java
similarity index 94%
rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java
rename to pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java
index a384e35..c5be5ec 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java
@@ -30,7 +30,6 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.authentication.AuthenticationDataHttps;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.broker.authentication.AuthenticationService;
@@ -48,8 +47,8 @@ public class AuthenticationFilter implements Filter {
public static final String AuthenticatedRoleAttributeName = AuthenticationFilter.class.getName() + "-role";
public static final String AuthenticatedDataAttributeName = AuthenticationFilter.class.getName() + "-data";
- public AuthenticationFilter(PulsarService pulsar) {
- this.authenticationService = pulsar.getBrokerService().getAuthenticationService();
+ public AuthenticationFilter(AuthenticationService authenticationService) {
+ this.authenticationService = authenticationService;
}
@Override
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
index 099f1a0..34809b0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
@@ -134,7 +134,8 @@ public class WebService implements AutoCloseable {
}
if (requiresAuthentication && pulsar.getConfiguration().isAuthenticationEnabled()) {
- FilterHolder filter = new FilterHolder(new AuthenticationFilter(pulsar));
+ FilterHolder filter = new FilterHolder(new AuthenticationFilter(
+ pulsar.getBrokerService().getAuthenticationService()));
context.addFilter(filter, MATCH_ALL, EnumSet.allOf(DispatcherType.class));
}