fix #5390 (#5391)

alibaba · Apr 19, 2021 · 3ce1cba · 3ce1cba
1 parent 36a4a84
commit 3ce1cba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/common/src/main/java/com/alibaba/nacos/common/utils/IPUtil.java b/common/src/main/java/com/alibaba/nacos/common/utils/IPUtil.java
@@ -73,11 +73,7 @@ public static String localHostIP() {
      * @return boolean
      */
     public static boolean isIPv4(String addr) {
-        try {
-            return InetAddress.getByName(addr).getAddress().length == IPV4_ADDRESS_LENGTH;
-        } catch (UnknownHostException e) {
-            return false;
-        }
+        return ipv4Pattern.matcher(addr).matches();
     }
 
     /**
@@ -101,12 +97,7 @@ public static boolean isIPv6(String addr) {
      * @return boolean
      */
     public static boolean isIP(String addr) {
-        try {
-            InetAddress.getByName(addr);
-            return true;
-        } catch (UnknownHostException e) {
-            return false;
-        }
+        return isIPv4(addr) || isIPv6(addr);
     }
 
     /**

diff --git a/common/src/test/java/com/alibaba/nacos/common/utils/IPUtilTest.java b/common/src/test/java/com/alibaba/nacos/common/utils/IPUtilTest.java
@@ -33,6 +33,7 @@ public void testIsIPv4() {
         Assert.assertFalse(IPUtil.isIPv4("[::1]"));
         Assert.assertFalse(IPUtil.isIPv4("asdfasf"));
         Assert.assertFalse(IPUtil.isIPv4("ffgertert"));
+        Assert.assertFalse(IPUtil.isIPv4("127.100.19"));
     }
 
     @Test
@@ -47,6 +48,7 @@ public void testIsIP() {
         Assert.assertTrue(IPUtil.isIP("[::1]"));
         Assert.assertTrue(IPUtil.isIP("127.0.0.1"));
         Assert.assertFalse(IPUtil.isIP("er34234"));
+        Assert.assertFalse(IPUtil.isIP("127.100.19"));
     }
 
     @Test