merlimat closed pull request #2039: Move AuthenticationFilter to
pulsar-broker-common
URL: https://github.com/apache/incubator-pulsar/pull/2039
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 a384e35c0e..c5be5ec61c 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.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 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 099f1a08eb..34809b0f09 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 void addServlet(String path, ServletHolder
servletHolder, boolean require
}
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));
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
