#23971 IPUtils Test failure from incorrect state of IPUtils.disabledI…

…pPrivateSubnet
dotCMS · Feb 2, 2023 · df179fd · df179fd
1 parent eb4e08a
commit df179fd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/util/network/IPUtils.java b/dotCMS/src/main/java/com/dotcms/util/network/IPUtils.java
@@ -1,6 +1,7 @@
 package com.dotcms.util.network;
 
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.xbill.DNS.Address;
 import com.dotcms.repackage.org.apache.commons.net.util.SubnetUtils;
 import com.dotmarketing.util.Config;
@@ -10,7 +11,7 @@
 import io.vavr.control.Try;
 
 public class IPUtils {
-    private static boolean disabledIpPrivateSubnet = false;
+    private static final AtomicBoolean disabledIpPrivateSubnet = new AtomicBoolean(false);
 
     private IPUtils() {
         throw new IllegalStateException("static Utility class");
@@ -71,7 +72,7 @@ public static boolean isIpInCIDR(final String ip, final String CIDR) {
     public static boolean isIpPrivateSubnet(final String ipOrHostName) {
 
 
-        if (disabledIpPrivateSubnet) {
+        if (disabledIpPrivateSubnet.get()) {
             return false;
         }
 
@@ -102,6 +103,6 @@ public static boolean isIpPrivateSubnet(final String ipOrHostName) {
 
 
     public static void disabledIpPrivateSubnet(final boolean disabledIpPrivateSubnet) {
-        IPUtils.disabledIpPrivateSubnet = disabledIpPrivateSubnet;
+        IPUtils.disabledIpPrivateSubnet.set(disabledIpPrivateSubnet);
     }
 }
diff --git a/dotCMS/src/test/java/com/dotcms/cube/CubeJSClientTest.java b/dotCMS/src/test/java/com/dotcms/cube/CubeJSClientTest.java
@@ -113,16 +113,21 @@ public void http404() {
         final String cubeServerIp = "127.0.0.1";
         final int cubeJsServerPort = 8000;
 
-        IPUtils.disabledIpPrivateSubnet(true);
+        try {
+            IPUtils.disabledIpPrivateSubnet(true);
 
-        final CubeJSQuery cubeJSQuery = new Builder()
-                .dimensions("Events.experiment", "Events.variant")
-                .build();
+            final CubeJSQuery cubeJSQuery = new Builder()
+                    .dimensions("Events.experiment", "Events.variant")
+                    .build();
 
-        final CubeJSClient cubeClient =  new CubeJSClient(String.format("http://%s:%s", cubeServerIp, cubeJsServerPort));
-        final CubeJSResultSet cubeJSResultSet = cubeClient.send(cubeJSQuery);
+            final CubeJSClient cubeClient = new CubeJSClient(
+                    String.format("http://%s:%s", cubeServerIp, cubeJsServerPort));
+            final CubeJSResultSet cubeJSResultSet = cubeClient.send(cubeJSQuery);
 
-        assertEquals(0, cubeJSResultSet.size());
+            assertEquals(0, cubeJSResultSet.size());
+        } finally {
+            IPUtils.disabledIpPrivateSubnet(false);
+        }
     }
 
     /**

diff --git a/dotCMS/src/test/java/com/dotcms/util/network/IPUtilsTest.java b/dotCMS/src/test/java/com/dotcms/util/network/IPUtilsTest.java
@@ -80,7 +80,7 @@ public void test_false_cases() {
     @Test
     public void test_ip_private_subnets() {
         for(String testCase : ipsOnPrivateSubnets) {
-            assertTrue( IPUtils.isIpPrivateSubnet(testCase));
+            assertTrue(String.format("Testcase %s failed",testCase), IPUtils.isIpPrivateSubnet(testCase));
         }
     }
     @Test