You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/07/25 04:20:58 UTC
[pulsar] 10/12: [fix][proxy] Do not preserve host when forwarding admin requests. (#16342)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 37c4873ce182d932ed3936046cfca54c5fd62830
Author: Yang Yang <yy...@streamnative.io>
AuthorDate: Thu Jul 21 15:05:49 2022 +0800
[fix][proxy] Do not preserve host when forwarding admin requests. (#16342)
(cherry picked from commit e8ee8aff448e6d0c329e99c8bda47c3b45228880)
---
.../main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java | 1 -
.../java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java | 1 -
.../apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java | 1 -
.../org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java | 1 -
4 files changed, 4 deletions(-)
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
index 4df36229b01..33cfa45b106 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
@@ -254,7 +254,6 @@ public class ProxyServiceStarter {
AdminProxyHandler adminProxyHandler = new AdminProxyHandler(config, discoveryProvider);
ServletHolder servletHolder = new ServletHolder(adminProxyHandler);
- servletHolder.setInitParameter("preserveHost", "true");
server.addServlet("/admin", servletHolder);
server.addServlet("/lookup", servletHolder);
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java
index 735184628cd..a4a3f01284e 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java
@@ -109,7 +109,6 @@ public class AuthedAdminProxyHandlerTest extends MockedPulsarServiceBaseTest {
doReturn(report).when(discoveryProvider).nextBroker();
ServletHolder servletHolder = new ServletHolder(new AdminProxyHandler(proxyConfig, discoveryProvider));
- servletHolder.setInitParameter("preserveHost", "true");
webServer.addServlet("/admin", servletHolder);
webServer.addServlet("/lookup", servletHolder);
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java
index fdc7f5c739d..9f0eb0998cc 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java
@@ -106,7 +106,6 @@ public class SuperUserAuthedAdminProxyHandlerTest extends MockedPulsarServiceBas
doReturn(report).when(discoveryProvider).nextBroker();
ServletHolder servletHolder = new ServletHolder(new AdminProxyHandler(proxyConfig, discoveryProvider));
- servletHolder.setInitParameter("preserveHost", "true");
webServer.addServlet("/admin", servletHolder);
webServer.addServlet("/lookup", servletHolder);
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java
index 972655fe9d4..8bf19c61bc4 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java
@@ -83,7 +83,6 @@ public class UnauthedAdminProxyHandlerTest extends MockedPulsarServiceBaseTest {
discoveryProvider = spy(new BrokerDiscoveryProvider(proxyConfig, resource));
adminProxyHandler = new AdminProxyWrapper(proxyConfig, discoveryProvider);
ServletHolder servletHolder = new ServletHolder(adminProxyHandler);
- servletHolder.setInitParameter("preserveHost", "true");
webServer.addServlet("/admin", servletHolder);
webServer.addServlet("/lookup", servletHolder);