Merge pull request #42 from IABTechLab/gdm-jsonnull-hotfix

Added JsonNull handling in KeyParser

Author: gmsdelmundo

src/main/java/com/uid2/client/KeyParser.java

@@ -40,7 +40,7 @@ static KeyContainer parse(InputStream stream) {
                 tokenExpirySeconds = defaultTokenExpiryDays * 24 * 60 * 60;
             }
 
-            JsonArray keysJson = body.get("keys").getAsJsonArray();
+            JsonArray keysJson = isNull(body.get("keys")) ? new JsonArray() : body.get("keys").getAsJsonArray();
 
             List<Key> keys = new ArrayList<>();
             for (JsonElement element : keysJson) {
@@ -62,10 +62,15 @@ static KeyContainer parse(InputStream stream) {
 
     static private int getAsInt(JsonObject body, String memberName) {
         JsonElement element = body.get(memberName);
-        return element == null ? 0 : element.getAsInt();
+        return isNull(element) ? 0 : element.getAsInt();
     }
+
     static private long getAsLong(JsonObject body, String memberName) {
         JsonElement element = body.get(memberName);
-        return element == null ? 0 : element.getAsLong();
+        return isNull(element) ? 0 : element.getAsLong();
+    }
+
+    static private boolean isNull(JsonElement jo) {
+        return jo == null || jo.isJsonNull();
     }
 }

src/test/java/com/uid2/client/KeyParserTests.java

@@ -10,9 +10,10 @@
 
 
 public class KeyParserTests {
+    private static final int DEFAULT_TOKEN_EXPIRY_SECONDS = 2592000;
+
     @Test
-    public void parseKeyListSharingEndpoint() throws Exception
-    {
+    public void parseKeyListSharingEndpoint() {
         String s = "{ \"body\": { " +
                 "\"caller_site_id\": 11, " +
                 "\"master_keyset_id\": 1, " +
@@ -42,32 +43,32 @@ public void parseKeyListSharingEndpoint() throws Exception
         KeyContainer keyContainer = parse(s);
 
         assertEquals(11, keyContainer.getCallerSiteId());
+        assertEquals(1728000, keyContainer.getTokenExpirySeconds());
+
         Key masterKey = keyContainer.getMasterKey(Instant.now());
         assertNotNull(masterKey);
         assertEquals(2, masterKey.getId());
 
         Key defaultKey = keyContainer.getDefaultKey(Instant.now());
         assertNotNull(defaultKey);
         assertEquals(3, defaultKey.getId());
-        assertEquals(1728000, keyContainer.getTokenExpirySeconds());
 
-        Key key = keyContainer.getKey(3);
-        assertNotNull(key);
-        assertEquals(99999, key.getKeysetId());
-        assertEquals(Instant.ofEpochSecond(1609459200), key.getCreated());
-        assertEquals(Instant.ofEpochSecond(1609459210), key.getActivates());
-        assertEquals(Instant.ofEpochSecond(1893456000), key.getExpires());
-        assertEquals("o8HsvkwJ5Ulnrd0uui3GpukpwDapj+JLqb7qfN/GJKo=", InputUtil.byteArrayToBase64(key.getSecret()));
-
-        key = keyContainer.getKey(2);
-        assertNotNull(key);
-        assertEquals(1, key.getKeysetId());
-        assertEquals(Instant.ofEpochSecond(1609458200), key.getCreated());
-        assertEquals(Instant.ofEpochSecond(1609459220), key.getActivates());
-        assertEquals(Instant.ofEpochSecond(1893457000), key.getExpires());
-        assertEquals("DD67xF8OFmbJ1/lMPQ6fGRDbJOT4kXErrYWcKdFfCUE=", InputUtil.byteArrayToBase64(key.getSecret()));
-    }
+        Key key3 = keyContainer.getKey(3);
+        assertNotNull(key3);
+        assertEquals(99999, key3.getKeysetId());
+        assertEquals(Instant.ofEpochSecond(1609459200), key3.getCreated());
+        assertEquals(Instant.ofEpochSecond(1609459210), key3.getActivates());
+        assertEquals(Instant.ofEpochSecond(1893456000), key3.getExpires());
+        assertEquals("o8HsvkwJ5Ulnrd0uui3GpukpwDapj+JLqb7qfN/GJKo=", InputUtil.byteArrayToBase64(key3.getSecret()));
 
+        Key key2 = keyContainer.getKey(2);
+        assertNotNull(key2);
+        assertEquals(1, key2.getKeysetId());
+        assertEquals(Instant.ofEpochSecond(1609458200), key2.getCreated());
+        assertEquals(Instant.ofEpochSecond(1609459220), key2.getActivates());
+        assertEquals(Instant.ofEpochSecond(1893457000), key2.getExpires());
+        assertEquals("DD67xF8OFmbJ1/lMPQ6fGRDbJOT4kXErrYWcKdFfCUE=", InputUtil.byteArrayToBase64(key2.getSecret()));
+    }
 
     @Test
     public void parseErrorKeyList() {
@@ -79,6 +80,33 @@ public void parseErrorKeyList() {
         assertThrows(Exception.class, () -> parse("{\"body\": [{\"id\": 5}]}"));
     }
 
+    @Test
+    public void parseWithNullTokenExpirySecondField() {
+        String s = "{ \"body\": { " +
+                "\"caller_site_id\": 11, " +
+                "\"token_expiry_seconds\": null " +
+                "}, " +
+                "\"status\": \"success\" }";
+
+        KeyContainer keyContainer = parse(s);
+
+        assertEquals(11, keyContainer.getCallerSiteId());
+        assertEquals(DEFAULT_TOKEN_EXPIRY_SECONDS, keyContainer.getTokenExpirySeconds());
+    }
+
+    @Test
+    public void parseWithMissingTokenExpirySecondField() {
+        String s = "{ \"body\": { " +
+                "\"caller_site_id\": 11 " +
+                "}, " +
+                "\"status\": \"success\" }";
+
+        KeyContainer keyContainer = parse(s);
+
+        assertEquals(11, keyContainer.getCallerSiteId());
+        assertEquals(DEFAULT_TOKEN_EXPIRY_SECONDS, keyContainer.getTokenExpirySeconds());
+    }
+
     private KeyContainer parse(String str) {
         InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
         return KeyParser.parse(inputStream);