Improve IpAddressHelper for public address determining (#857)

prebid · Aug 12, 2020 · b341d78 · b341d78
1 parent c83316e
commit b341d78
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/main/java/org/prebid/server/auction/IpAddressHelper.java b/src/main/java/org/prebid/server/auction/IpAddressHelper.java
@@ -112,6 +112,8 @@ private boolean isIpPublic(IPAddress ipAddress) {
         return ipAddress != null
                 && !ipAddress.isLocal()
                 && !ipAddress.isLoopback()
+                && !ipAddress.isMulticast()
+                && !ipAddress.isMax()
                 && ipv6LocalNetworkMaskAddresses.stream().noneMatch(network -> network.contains(ipAddress));
     }
 }
diff --git a/src/test/java/org/prebid/server/auction/IpAddressHelperTest.java b/src/test/java/org/prebid/server/auction/IpAddressHelperTest.java
@@ -81,11 +81,41 @@ public void toIpAddressShouldReturnNullIfIpIsV4AndSiteLocal() {
         assertThat(ipAddressHelper.toIpAddress("192.168.0.1")).isNull();
     }
 
+    @Test
+    public void toIpAddressShouldReturnNullIfIpIsV4AndMulticast() {
+        assertThat(ipAddressHelper.toIpAddress("224.0.0.0/4")).isNull();
+    }
+
+    @Test
+    public void toIpAddressShouldReturnNullIfIpIsV4AndZero() {
+        assertThat(ipAddressHelper.toIpAddress("0.0.0.0")).isNull();
+    }
+
+    @Test
+    public void toIpAddressShouldReturnNullIfIpIsV4AndMax() {
+        assertThat(ipAddressHelper.toIpAddress("255.255.255.255")).isNull();
+    }
+
     @Test
     public void toIpAddressShouldReturnNullIfIpIsV6AndLocal() {
         assertThat(ipAddressHelper.toIpAddress("fc00:0000:0000:0000:0000:0000:0000:0001")).isNull();
     }
 
+    @Test
+    public void toIpAddressShouldReturnNullIfIpIsV6AndMulticast() {
+        assertThat(ipAddressHelper.toIpAddress("ff00::/64")).isNull();
+    }
+
+    @Test
+    public void toIpAddressShouldReturnNullIfIpIsV6AndZero() {
+        assertThat(ipAddressHelper.toIpAddress("0000:0000:0000:0000:0000:0000:0000:0000")).isNull();
+    }
+
+    @Test
+    public void toIpAddressShouldReturnNullIfIpIsV6AndMax() {
+        assertThat(ipAddressHelper.toIpAddress("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")).isNull();
+    }
+
     @Test
     public void toIpAddressShouldReturnIpV4Address() {
         assertThat(ipAddressHelper.toIpAddress("12.34.56.78")).isEqualTo(IpAddress.of("12.34.56.78", IpAddress.IP.v4));