commit fb4968f1738172615d9c21f1673e49599dc13766
author Mridul Muralidharan <1591700+mridulm@users.noreply.github.com> Thu Jul 25 01:33:00 2024 -0700
committer GitHub <noreply@github.com> Thu Jul 25 16:33:00 2024 +0800
tree d1bcfac5fe919f8cac9a507d2831a4c8672c7e04
parent 7825b4f032653efc0cf75ff7e650f8055707f9d1

RATIS-2131. Surround with [] only if hostName is a IPv6 string (#1125)

ratis-common/src/main/java/org/apache/ratis/util/NetUtils.java

diff --git a/ratis-common/src/main/java/org/apache/ratis/util/NetUtils.java b/ratis-common/src/main/java/org/apache/ratis/util/NetUtils.java
index a6ce5af..baf6762 100644
--- a/ratis-common/src/main/java/org/apache/ratis/util/NetUtils.java
+++ b/ratis-common/src/main/java/org/apache/ratis/util/NetUtils.java
@@ -17,6 +17,8 @@
  */
 package org.apache.ratis.util;
 
+import org.apache.ratis.thirdparty.com.google.common.net.InetAddresses;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -145,8 +147,12 @@
     if (address == null) {
       return null;
     }
-    final StringBuilder b = new StringBuilder(address.getHostName());
-    if (address.getAddress() instanceof Inet6Address) {
+    String hostName = address.getHostName();
+    final StringBuilder b = new StringBuilder(hostName);
+    // Surround with '[', ']' only if it is a IPv6 ip - not for a IPv6 host
+    if (address.getAddress() instanceof Inet6Address &&
+        InetAddresses.isInetAddress(hostName) &&
+        InetAddresses.forString(hostName).getAddress().length == 16) {
       b.insert(0, '[').append(']');
     }
     return b.append(':').append(address.getPort()).toString();