Fix JsonReader parsing of "Date()"

JAVA-2024

Author: rozza

bson/src/main/org/bson/json/JsonReader.java

@@ -181,8 +181,8 @@ public BsonType readBsonType() {
                     setCurrentBsonType(BsonType.BINARY);
                     currentValue = visitBinDataConstructor();
                 } else if ("Date".equals(value)) {
-                    setCurrentBsonType(BsonType.DATE_TIME);
-                    currentValue = visitDateTimeConstructor(); // withNew = false
+                    currentValue = visitDateTimeConstructorWithOutNew();
+                    setCurrentBsonType(BsonType.STRING);
                 } else if ("HexData".equals(value)) {
                     setCurrentBsonType(BsonType.BINARY);
                     currentValue = visitHexDataConstructor();
@@ -845,6 +845,25 @@ private long visitDateTimeConstructor() {
         }
     }
 
+    private String visitDateTimeConstructorWithOutNew() {
+        verifyToken("(");
+        JsonToken token = popToken();
+        if (token.getType() != JsonTokenType.RIGHT_PAREN) {
+            while (token.getType() != JsonTokenType.END_OF_FILE) {
+                token = popToken();
+                if (token.getType() == JsonTokenType.RIGHT_PAREN) {
+                    break;
+                }
+            }
+            if (token.getType() != JsonTokenType.RIGHT_PAREN) {
+                throw new JsonParseException("JSON reader expected a ')' but found '%s'.", token.getValue());
+            }
+        }
+
+        DateFormat df = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss z", Locale.ENGLISH);
+        return df.format(new Date());
+    }
+
     private BsonBinary visitBinDataExtendedJson() {
         verifyToken(":");
         JsonToken bytesToken = popToken();
@@ -883,7 +902,7 @@ private long visitDateTimeExtendedJson() {
             try {
                 return DatatypeConverter.parseDateTime(dateTimeString).getTimeInMillis();
             } catch (IllegalArgumentException e) {
-                throw new JsonParseException("JSON reader expected an ISO-8601 date time string but found.", dateTimeString);
+                throw new JsonParseException("JSON reader expected an ISO-8601 date time string but found '%s'.", dateTimeString);
             }
         } else {
             throw new JsonParseException("JSON reader expected an integer or string but found '%s'.", valueToken.getValue());

bson/src/test/unit/org/bson/json/JsonReaderTest.java

@@ -26,7 +26,10 @@
 import org.bson.types.ObjectId;
 import org.junit.Test;
 
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -716,12 +719,22 @@ public void testEmptyDateTimeConstructorWithNew() {
     }
 
     @Test
-    public void testEmptyDateTimeConstructor() {
-        long currentTime = new Date().getTime();
+    public void testDateTimeWithOutNew() {
+        long currentTime = currentTimeWithoutMillis();
         String json = "Date()";
         bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertTrue(bsonReader.readDateTime() >= currentTime);
+        assertEquals(BsonType.STRING, bsonReader.readBsonType());
+        assertTrue(dateStringToTime(bsonReader.readString()) >= currentTime);
+        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+    }
+
+    @Test
+    public void testDateTimeWithOutNewContainingJunk() {
+        long currentTime = currentTimeWithoutMillis();
+        String json = "Date({ok: 1}, 1234)";
+        bsonReader = new JsonReader(json);
+        assertEquals(BsonType.STRING, bsonReader.readBsonType());
+        assertTrue(dateStringToTime(bsonReader.readString()) >= currentTime);
         assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
     }
 
@@ -798,4 +811,14 @@ public void testDBPointerWithNew() {
         assertEquals(new ObjectId("5209296cd6c4e38cf96fffdc"), dbPointer.getId());
     }
 
+    private long dateStringToTime(final String date) {
+        SimpleDateFormat df = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss z", Locale.ENGLISH);
+        return df.parse(date, new ParsePosition(0)).getTime();
+    }
+
+    private long currentTimeWithoutMillis() {
+        long currentTime = new Date().getTime();
+        return currentTime - (currentTime % 1000);
+    }
+
 }