Updated ConfigValidatorUtil to handle null values, Updated ConfigVali…

…datorUtilTest to test handling null values
IABTechLab · Dec 19, 2024 · cd23998 · cd23998
1 parent 8018196
commit cd23998
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java
@@ -7,9 +7,17 @@
 
 public class ConfigValidatorUtil {
     private static final Logger logger = LoggerFactory.getLogger(ConfigValidatorUtil.class);
+    public static final String VALUES_ARE_NULL = "Required config values are null";
 
     public static Boolean validateIdentityRefreshTokens(Integer identityExpiresAfter, Integer refreshExpiresAfter, Integer refreshIdentityAfter) {
         boolean isValid = true;
+
+        if (identityExpiresAfter == null || refreshExpiresAfter == null || refreshIdentityAfter == null) {
+            logger.error(VALUES_ARE_NULL);
+            return false;
+        }
+
+
         if (identityExpiresAfter > refreshExpiresAfter) {
             logger.error(REFRESH_TOKEN_EXPIRES_AFTER_SECONDS + " must be >= " + IDENTITY_TOKEN_EXPIRES_AFTER_SECONDS);
             isValid = false;
@@ -25,6 +33,11 @@ public static Boolean validateIdentityRefreshTokens(Integer identityExpiresAfter
     }
 
     public static Boolean validateBidstreamLifetime(Integer maxBidstreamLifetimeSeconds, Integer identityTokenExpiresAfterSeconds) {
+        if (maxBidstreamLifetimeSeconds == null || identityTokenExpiresAfterSeconds == null) {
+            logger.error(VALUES_ARE_NULL);
+            return false;
+        }
+
         if (maxBidstreamLifetimeSeconds < identityTokenExpiresAfterSeconds) {
             logger.error("Max bidstream lifetime seconds ({} seconds) is less than identity token lifetime ({} seconds)", maxBidstreamLifetimeSeconds, identityTokenExpiresAfterSeconds);
             return false;

diff --git a/src/test/java/com/uid2/operator/service/ConfigValidatorUtilTest.java b/src/test/java/com/uid2/operator/service/ConfigValidatorUtilTest.java
@@ -29,4 +29,31 @@ void testValidateBidstreamLifetime() {
         assertTrue(ConfigValidatorUtil.validateBidstreamLifetime(10, 5));
         assertTrue(ConfigValidatorUtil.validateBidstreamLifetime(10, 10));
     }
+
+    @Test
+    void testValidateIdentityRefreshTokensWithNullValues() {
+        // identityExpiresAfter is null
+        assertFalse(ConfigValidatorUtil.validateIdentityRefreshTokens(null, 10, 5));
+
+        // refreshExpiresAfter is null
+        assertFalse(ConfigValidatorUtil.validateIdentityRefreshTokens(10, null, 5));
+
+        // refreshIdentityAfter is null
+        assertFalse(ConfigValidatorUtil.validateIdentityRefreshTokens(10, 5, null));
+
+        // all values are null
+        assertFalse(ConfigValidatorUtil.validateIdentityRefreshTokens(null, null, null));
+    }
+
+    @Test
+    void testValidateBidstreamLifetimeWithNullValues() {
+        // maxBidstreamLifetimeSeconds is null
+        assertFalse(ConfigValidatorUtil.validateBidstreamLifetime(null, 10));
+
+        // identityTokenExpiresAfterSeconds is null
+        assertFalse(ConfigValidatorUtil.validateBidstreamLifetime(10, null));
+
+        // both values are null
+        assertFalse(ConfigValidatorUtil.validateBidstreamLifetime(null, null));
+    }
 }