jsonld-java#144 : Check for trailing content when parsing JSON object

afs · afs · commit 5ba3e5006610 · 2015-08-22T17:39:53.000+01:00
diff --git a/core/src/main/java/com/github/jsonldjava/utils/JsonUtils.java b/core/src/main/java/com/github/jsonldjava/utils/JsonUtils.java
@@ -103,7 +103,7 @@ public static Object fromInputStream(InputStream input, String enc) throws IOExc
      */
     public static Object fromReader(Reader reader) throws IOException {
         final JsonParser jp = JSON_FACTORY.createParser(reader);
-        Object rval = null;
+        Object rval ;
         final JsonToken initialToken = jp.nextToken();
 
         if (initialToken == JsonToken.START_ARRAY) {
@@ -123,6 +123,16 @@ public static Object fromReader(Reader reader) throws IOException {
             throw new JsonParseException("document doesn't start with a valid json element : "
                     + initialToken, jp.getCurrentLocation());
         }
+        
+        JsonToken t ;
+        try { t = jp.nextToken(); }
+        catch (JsonParseException ex) {
+            throw new JsonParseException("Document contains more content after json-ld element - (possible mismatched {}?)",
+                                         jp.getCurrentLocation());
+        }
+        if ( t != null )
+            throw new JsonParseException("Document contains possible json content after the json-ld element - (possible mismatched {}?)",
+                                             jp.getCurrentLocation());
         return rval;
     }
 
diff --git a/core/src/test/java/com/github/jsonldjava/utils/JsonUtilsTest.java b/core/src/test/java/com/github/jsonldjava/utils/JsonUtilsTest.java
@@ -2,8 +2,11 @@
 
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException ;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonParseException ;
+
 import org.junit.Test;
 
 public class JsonUtilsTest {
@@ -31,4 +34,32 @@ public void fromStringTest() {
             assertTrue(true);
         }
     }
+    
+    @Test
+    public void trailingContent_1() throws JsonParseException, IOException { trailingContent("{}") ; }
+
+    @Test
+    public void trailingContent_2() throws JsonParseException, IOException { trailingContent("{}  \t  \r \n  \r\n   ") ; }
+
+    @Test(expected=JsonParseException.class)
+    public void trailingContent_3() throws JsonParseException, IOException { trailingContent("{}x") ; }
+
+    @Test(expected=JsonParseException.class)
+    public void trailingContent_4() throws JsonParseException, IOException { trailingContent("{}   x") ; }
+
+    @Test(expected=JsonParseException.class)
+    public void trailingContent_5() throws JsonParseException, IOException { trailingContent("{} \"x\"") ; }
+
+    @Test(expected=JsonParseException.class)
+    public void trailingContent_6() throws JsonParseException, IOException { trailingContent("{} {}") ; }
+
+    @Test(expected=JsonParseException.class)
+    public void trailingContent_7() throws JsonParseException, IOException { trailingContent("{},{}") ; }
+
+    @Test(expected=JsonParseException.class)
+    public void trailingContent_8() throws JsonParseException, IOException { trailingContent("{},[]") ; }
+
+    private void trailingContent(String string) throws JsonParseException, IOException {
+            JsonUtils.fromString(string) ;
+    }
 }
