You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/12/23 14:32:41 UTC
[pulsar] branch master updated: [fix][client] Prevent DNS reverse lookup when physical address is an IP address (#19028)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new d8569cd4ec6 [fix][client] Prevent DNS reverse lookup when physical address is an IP address (#19028)
d8569cd4ec6 is described below
commit d8569cd4ec6da14f8b2b9338db1ed2f6a3eacf0a
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Dec 23 16:32:34 2022 +0200
[fix][client] Prevent DNS reverse lookup when physical address is an IP address (#19028)
---
.../apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java | 2 +-
.../src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java | 2 +-
.../java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
index 6ae18724166..e79bacb4156 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
@@ -210,7 +210,7 @@ public class AsyncHttpConnector implements Connector {
private URI replaceWithNew(InetSocketAddress address, URI uri) {
String originalUri = uri.toString();
String newUri = (originalUri.split(":")[0] + "://")
- + address.getHostName() + ":"
+ + address.getHostString() + ":"
+ address.getPort()
+ uri.getRawPath();
if (uri.getRawQuery() != null) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
index da522020f51..5e0a592cdc6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
@@ -274,7 +274,7 @@ public class ConnectionPool implements AutoCloseable {
cnx.setTargetBroker(logicalAddress);
}
- cnx.setRemoteHostName(physicalAddress.getHostName());
+ cnx.setRemoteHostName(physicalAddress.getHostString());
cnx.connectionFuture().thenRun(() -> {
if (log.isDebugEnabled()) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java
index 35c04ce27b1..32f5aa4975c 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java
@@ -61,7 +61,7 @@ public class PulsarServiceNameResolver implements ServiceNameResolver {
@Override
public URI resolveHostUri() {
InetSocketAddress host = resolveHost();
- String hostUrl = serviceUri.getServiceScheme() + "://" + host.getHostName() + ":" + host.getPort();
+ String hostUrl = serviceUri.getServiceScheme() + "://" + host.getHostString() + ":" + host.getPort();
return URI.create(hostUrl);
}