Filter Discovered peers for ipv6 support (#6498)

* use existing NetworkUtility for PeerDiscoveryAgent pingpacket data filtering, add ipv6 check/fallback
* log at debug when we override pingpacket from
* use java native address parsing rather than lookup by host

Signed-off-by: garyschulte <garyschulte@gmail.com>

util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java

@@ -16,6 +16,7 @@ package org.hyperledger.besu.util;
 
 import java.io.IOException;
 import java.net.DatagramSocket;
+import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -26,6 +27,7 @@ import java.net.UnknownHostException;
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
+import com.google.common.net.InetAddresses;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,8 +35,16 @@ import org.slf4j.LoggerFactory;
 public class NetworkUtility {
   /** The constant INADDR_ANY. */
   public static final String INADDR_ANY = "0.0.0.0";
+  /** The constant INADDR_NONE. */
+  public static final String INADDR_NONE = "255.255.255.255";
   /** The constant INADDR6_ANY. */
   public static final String INADDR6_ANY = "0:0:0:0:0:0:0:0";
+  /** The constant INADDR6_NONE. */
+  public static final String INADDR6_NONE = "::";
+  /** The constant INADDR_LOCALHOST. */
+  public static final String INADDR_LOCALHOST = "127.0.0.1";
+  /** The constant INADDR6_LOCALHOST. */
+  public static final String INADDR6_LOCALHOST = "::1";
 
   private static final Logger LOG = LoggerFactory.getLogger(NetworkUtility.class);
 
@@ -119,7 +129,20 @@ public class NetworkUtility {
    * @return the boolean
    */
   public static boolean isUnspecifiedAddress(final String ipAddress) {
-    return INADDR_ANY.equals(ipAddress) || INADDR6_ANY.equals(ipAddress);
+    return INADDR_ANY.equals(ipAddress)
+        || INADDR6_ANY.equals(ipAddress)
+        || INADDR_NONE.equals(ipAddress)
+        || INADDR6_NONE.equals(ipAddress);
+  }
+
+  /**
+   * Returns whether host address string is local host address.
+   *
+   * @param ipAddress the host address as a string
+   * @return true if the host address is a local host address
+   */
+  public static boolean isLocalhostAddress(final String ipAddress) {
+    return INADDR_LOCALHOST.equals(ipAddress) || INADDR6_LOCALHOST.equals(ipAddress);
   }
 
   /**
@@ -173,4 +196,32 @@ public class NetworkUtility {
   public static boolean isPortAvailable(final int port) {
     return isPortAvailableForTcp(port) && isPortAvailableForUdp(port);
   }
+
+  /**
+   * Is hostAddress string an ip v4 address
+   *
+   * @param hostAddress the host address as a string
+   * @return true if the host address is an ip v4 address
+   */
+  public static boolean isIpV4Address(final String hostAddress) {
+    try {
+      return InetAddresses.forString(hostAddress) instanceof Inet4Address;
+    } catch (final IllegalArgumentException e) {
+      return false;
+    }
+  }
+
+  /**
+   * Is hostAddress string an ip v6 address
+   *
+   * @param hostAddress the host address as a string
+   * @return true if the host address is an ip v6 address
+   */
+  public static boolean isIpV6Address(final String hostAddress) {
+    try {
+      return InetAddresses.forString(hostAddress) instanceof Inet6Address;
+    } catch (final IllegalArgumentException e) {
+      return false;
+    }
+  }
 }

util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java

@@ -40,4 +40,33 @@ public class NetworkUtilityTest {
     assertThat(!NetworkUtility.isPortAvailable(8541)).isEqualTo(true);
     serverSocket.close();
   }
+
+  @Test
+  public void assertLocalhostIdentification() {
+    assertThat(NetworkUtility.isLocalhostAddress("127.0.0.1")).isTrue();
+    assertThat(NetworkUtility.isLocalhostAddress("::1")).isTrue();
+    assertThat(NetworkUtility.isLocalhostAddress("192.168.1.1")).isFalse();
+    assertThat(NetworkUtility.isLocalhostAddress("::ffff:c0a8:101")).isFalse();
+  }
+
+  @Test
+  public void assertIpV4Address() {
+    assertThat(NetworkUtility.isIpV4Address("127.0.0.1")).isTrue();
+    assertThat(NetworkUtility.isIpV4Address("10.0.0.0")).isTrue();
+    assertThat(NetworkUtility.isIpV4Address("172.16.1.1")).isTrue();
+    assertThat(NetworkUtility.isIpV4Address("127.0.0.")).isFalse();
+    assertThat(NetworkUtility.isIpV4Address("256.256.256.256")).isFalse();
+    // ipv6 compatible ipv4 address
+    assertThat(NetworkUtility.isIpV4Address("::ffff:c0a8:5801")).isTrue();
+    assertThat(NetworkUtility.isIpV4Address("0:0:0:0:0:ffff:c0a8:5801")).isTrue();
+    assertThat(NetworkUtility.isIpV4Address("0000:0000:0000:0000:0000:ffff:c0a8:5801")).isTrue();
+  }
+
+  @Test
+  public void assertIpV6Address() {
+    assertThat(NetworkUtility.isIpV6Address("::1")).isTrue();
+    assertThat(NetworkUtility.isIpV6Address("::")).isTrue();
+    assertThat(NetworkUtility.isIpV6Address("2001:db8:3333:4444:5555:6666:7777:8888")).isTrue();
+    assertThat(NetworkUtility.isIpV6Address("00:00::00:00::00:00")).isFalse();
+  }
 }