IPv6 support (alibaba#3773)

* IPv6 support * AddressServerParamCheckUtil 合并到 IpUtil 及一些修改 * 解决魔法值 * 修改隐患 * 调整使用了类似 ip.indexOf(":") 查找是否有端口的地方的逻辑, 一些 ":" 替换为常量 * 删除无用测试 * IpUtil 改名为 IPUtil, 涉及IP的相关方法名修改,涉及到的调用修改,检测IP的地方调用的isIPv4改为isIP. 修改涉及IP的字段长度及相关升级更新的sql * no message * no message * no message * no message * 获取本机IP时,如果本机IP是IPv6并且包含网卡信息(V6地址中最后面的百分号和百分号后面的内容)则去除网卡信息 * 解决 AvoidComplexConditionRule(请不要在条件中使用复杂的表达式) * 移除无用代码 * 添加注释 * 调整code style, 调整获取本机IP的逻辑
MedXchange-io · Nov 5, 2020 · 5385095 · 5385095
1 parent 6ddfa3e
commit 5385095
Show file tree

Hide file tree

Showing 33 changed files with 506 additions and 265 deletions.
diff --git a/address/src/main/java/com/alibaba/nacos/address/component/AddressServerGeneratorManager.java b/address/src/main/java/com/alibaba/nacos/address/component/AddressServerGeneratorManager.java
@@ -18,6 +18,7 @@
 
 import com.alibaba.nacos.address.constant.AddressServerConstants;
 import com.alibaba.nacos.api.common.Constants;
+import com.alibaba.nacos.common.utils.IPUtil;
 import com.alibaba.nacos.naming.core.Instance;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -85,14 +86,11 @@ public List<Instance> generateInstancesByIps(String serviceName, String rawProdu
     }
 
     private String[] generateIpAndPort(String ip) {
-
-        int index = ip.indexOf(AddressServerConstants.IP_PORT_SEPARATOR);
-        if (index != -1) {
-
-            return new String[] {ip.substring(0, index), ip.substring(index + 1)};
+        String[] result = IPUtil.splitIPPortStr(ip);
+        if (result.length != IPUtil.SPLIT_IP_PORT_RESULT_LENGTH) {
+            return new String[] {result[0], String.valueOf(AddressServerConstants.DEFAULT_SERVER_PORT)};
         }
-
-        return new String[] {ip, String.valueOf(AddressServerConstants.DEFAULT_SERVER_PORT)};
+        return result;
     }
 
     /**

diff --git a/address/src/main/java/com/alibaba/nacos/address/constant/AddressServerConstants.java b/address/src/main/java/com/alibaba/nacos/address/constant/AddressServerConstants.java
@@ -38,11 +38,6 @@ public interface AddressServerConstants {
      */
     String DEFAULT_PRODUCT = "nacos";
 
-    /**
-     * the separator between ip and port.
-     */
-    String IP_PORT_SEPARATOR = ":";
-
     /**
      * the separator for service name between raw service name and group.
      */

diff --git a/...ss/src/main/java/com/alibaba/nacos/address/controller/AddressServerClusterController.java b/...ss/src/main/java/com/alibaba/nacos/address/controller/AddressServerClusterController.java
@@ -20,9 +20,9 @@
 import com.alibaba.nacos.address.component.AddressServerManager;
 import com.alibaba.nacos.address.constant.AddressServerConstants;
 import com.alibaba.nacos.address.misc.Loggers;
-import com.alibaba.nacos.address.util.AddressServerParamCheckUtil;
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.api.naming.pojo.healthcheck.AbstractHealthChecker;
+import com.alibaba.nacos.common.utils.IPUtil;
 import com.alibaba.nacos.naming.core.Cluster;
 import com.alibaba.nacos.naming.core.Instance;
 import com.alibaba.nacos.naming.core.Service;
@@ -87,8 +87,8 @@ public ResponseEntity postCluster(@RequestParam(required = false) String product
             clusterObj.setHealthChecker(new AbstractHealthChecker.None());
             serviceManager.createServiceIfAbsent(Constants.DEFAULT_NAMESPACE_ID, serviceName, false, clusterObj);
             String[] ipArray = addressServerManager.splitIps(ips);
-            String checkResult = AddressServerParamCheckUtil.checkIps(ipArray);
-            if (AddressServerParamCheckUtil.CHECK_OK.equals(checkResult)) {
+            String checkResult = IPUtil.checkIPs(ipArray);
+            if (IPUtil.checkOK(checkResult)) {
                 List<Instance> instanceList = addressServerGeneratorManager
                         .generateInstancesByIps(serviceName, rawProductName, clusterName, ipArray);
                 for (Instance instance : instanceList) {
@@ -143,8 +143,8 @@ public ResponseEntity deleteCluster(@RequestParam(required = false) String produ
                 } else {
                     // delete specified ip list
                     String[] ipArray = addressServerManager.splitIps(ips);
-                    String checkResult = AddressServerParamCheckUtil.checkIps(ipArray);
-                    if (AddressServerParamCheckUtil.CHECK_OK.equals(checkResult)) {
+                    String checkResult = IPUtil.checkIPs(ipArray);
+                    if (IPUtil.checkOK(checkResult)) {
                         List<Instance> instanceList = addressServerGeneratorManager
                                 .generateInstancesByIps(serviceName, rawProductName, clusterName, ipArray);
                         serviceManager.removeInstance(Constants.DEFAULT_NAMESPACE_ID, serviceName, false,

diff --git a/address/src/main/java/com/alibaba/nacos/address/util/AddressServerParamCheckUtil.java b/address/src/main/java/com/alibaba/nacos/address/util/AddressServerParamCheckUtil.java
diff --git a/address/src/test/java/com/alibaba/nacos/address/ParamCheckUtilTests.java b/address/src/test/java/com/alibaba/nacos/address/ParamCheckUtilTests.java
@@ -16,17 +16,17 @@
 
 package com.alibaba.nacos.address;
 
-import com.alibaba.nacos.address.util.AddressServerParamCheckUtil;
+import com.alibaba.nacos.common.utils.IPUtil;
 import org.junit.Test;
 
 public class ParamCheckUtilTests {
 
     @Test
-    public void checkIps() {
+    public void checkIPs() {
         String[] ips = {"127.0.0.1"};
-        System.out.println(AddressServerParamCheckUtil.checkIps(ips));
+        System.out.println(IPUtil.checkIPs(ips));
 
         String[] illlegalIps = {"127.100.19", "127.0.0.1"};
-        System.err.println(AddressServerParamCheckUtil.checkIps(illlegalIps));
+        System.err.println(IPUtil.checkIPs(illlegalIps));
     }
 }
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
@@ -30,6 +30,7 @@
 import com.alibaba.nacos.common.lifecycle.Closeable;
 import com.alibaba.nacos.common.notify.NotifyCenter;
 import com.alibaba.nacos.common.utils.IoUtils;
+import com.alibaba.nacos.common.utils.IPUtil;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.common.utils.ThreadUtils;
 import org.slf4j.Logger;
@@ -87,9 +88,9 @@ public ServerListManager(List<String> fixed, String namespace) {
         this.isStarted = true;
         List<String> serverAddrs = new ArrayList<String>();
         for (String serverAddr : fixed) {
-            String[] serverAddrArr = serverAddr.split(":");
+            String[] serverAddrArr = IPUtil.splitIPPortStr(serverAddr);
             if (serverAddrArr.length == 1) {
-                serverAddrs.add(serverAddrArr[0] + ":" + ParamUtil.getDefaultServerPort());
+                serverAddrs.add(serverAddrArr[0] + IPUtil.IP_PORT_SPLITER + ParamUtil.getDefaultServerPort());
             } else {
                 serverAddrs.add(serverAddr);
             }
@@ -156,9 +157,10 @@ public ServerListManager(Properties properties) throws NacosException {
                 if (serverAddr.startsWith(HTTPS) || serverAddr.startsWith(HTTP)) {
                     serverAddrs.add(serverAddr);
                 } else {
-                    String[] serverAddrArr = serverAddr.split(":");
+                    String[] serverAddrArr = IPUtil.splitIPPortStr(serverAddr);
                     if (serverAddrArr.length == 1) {
-                        serverAddrs.add(HTTP + serverAddrArr[0] + ":" + ParamUtil.getDefaultServerPort());
+                        serverAddrs.add(HTTP + serverAddrArr[0] + IPUtil.IP_PORT_SPLITER + ParamUtil
+                                .getDefaultServerPort());
                     } else {
                         serverAddrs.add(HTTP + serverAddr);
                     }
@@ -355,10 +357,10 @@ private List<String> getApacheServerList(String url, String name) {
                 List<String> result = new ArrayList<String>(lines.size());
                 for (String serverAddr : lines) {
                     if (StringUtils.isNotBlank(serverAddr)) {
-                        String[] ipPort = serverAddr.trim().split(":");
+                        String[] ipPort = IPUtil.splitIPPortStr(serverAddr.trim());
                         String ip = ipPort[0].trim();
                         if (ipPort.length == 1) {
-                            result.add(ip + ":" + ParamUtil.getDefaultServerPort());
+                            result.add(ip + IPUtil.IP_PORT_SPLITER + ParamUtil.getDefaultServerPort());
                         } else {
                             result.add(serverAddr);
                         }

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/utils/ParamUtils.java b/client/src/main/java/com/alibaba/nacos/client/config/utils/ParamUtils.java
@@ -17,7 +17,7 @@
 package com.alibaba.nacos.client.config.utils;
 
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.common.utils.IpUtils;
+import com.alibaba.nacos.common.utils.IPUtil;
 import com.alibaba.nacos.common.utils.StringUtils;
 
 import java.util.List;
@@ -190,7 +190,7 @@ public static void checkBetaIps(String betaIps) throws NacosException {
         }
         String[] ipsArr = betaIps.split(",");
         for (String ip : ipsArr) {
-            if (!IpUtils.isIpv4(ip)) {
+            if (!IPUtil.isIP(ip)) {
                 throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "betaIps invalid");
             }
         }

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
@@ -45,6 +45,7 @@
 import com.alibaba.nacos.common.lifecycle.Closeable;
 import com.alibaba.nacos.common.utils.HttpMethod;
 import com.alibaba.nacos.common.utils.IoUtils;
+import com.alibaba.nacos.common.utils.IPUtil;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.common.utils.ThreadUtils;
@@ -588,8 +589,8 @@ public String callServer(String api, Map<String, String> params, Map<String, Str
         if (curServer.startsWith(UtilAndComs.HTTPS) || curServer.startsWith(UtilAndComs.HTTP)) {
             url = curServer + api;
         } else {
-            if (!curServer.contains(UtilAndComs.SERVER_ADDR_IP_SPLITER)) {
-                curServer = curServer + UtilAndComs.SERVER_ADDR_IP_SPLITER + serverPort;
+            if (!IPUtil.containsPort(curServer)) {
+                curServer = curServer + IPUtil.IP_PORT_SPLITER + serverPort;
             }
             url = NamingHttpClientManager.getInstance().getPrefix() + curServer + api;
         }

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java
@@ -51,8 +51,6 @@ public class UtilAndComs {
 
     public static final String NACOS_NAMING_LOG_LEVEL = "com.alibaba.nacos.naming.log.level";
 
-    public static final String SERVER_ADDR_IP_SPLITER = ":";
-
     public static final int DEFAULT_CLIENT_BEAT_THREAD_COUNT =
             Runtime.getRuntime().availableProcessors() > 1 ? Runtime.getRuntime().availableProcessors() / 2 : 1;
 

diff --git a/common/src/main/java/com/alibaba/nacos/common/tls/SelfHostnameVerifier.java b/common/src/main/java/com/alibaba/nacos/common/tls/SelfHostnameVerifier.java
@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.common.tls;
 
-import com.alibaba.nacos.common.utils.IpUtils;
+import com.alibaba.nacos.common.utils.IPUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +38,7 @@ public final class SelfHostnameVerifier implements HostnameVerifier {
 
     private static ConcurrentHashMap<String, Boolean> hosts = new ConcurrentHashMap<String, Boolean>();
 
-    private static final String[] LOCALHOST_HOSTNAME = new String[] {"localhost", "127.0.0.1"};
+    private static final String[] LOCALHOST_HOSTNAME = new String[] {"localhost", IPUtil.localHostIP()};
 
     public SelfHostnameVerifier(HostnameVerifier hv) {
         this.hv = hv;
@@ -49,22 +49,22 @@ public boolean verify(String hostname, SSLSession session) {
         if (LOCALHOST_HOSTNAME[0].equalsIgnoreCase(hostname) || LOCALHOST_HOSTNAME[1].equals(hostname)) {
             return true;
         }
-        if (isIpv4(hostname)) {
+        if (isIP(hostname)) {
             return true;
         }
         return hv.verify(hostname, session);
     }
 
-    private static boolean isIpv4(String host) {
+    private static boolean isIP(String host) {
         if (host == null || host.isEmpty()) {
-            LOGGER.warn("host is empty, isIPv4 = false");
+            LOGGER.warn("host is empty, isIP = false");
             return false;
         }
         Boolean cacheHostVerify = hosts.get(host);
         if (cacheHostVerify != null) {
             return cacheHostVerify;
         }
-        boolean isIp = IpUtils.isIpv4(host);
+        boolean isIp = IPUtil.isIP(host);
         hosts.putIfAbsent(host, isIp);
         return isIp;
     }