GridFS handle alternative numbers for the files metadata

JAVA-2023

Author: rozza

driver/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java

@@ -19,6 +19,7 @@
 import com.mongodb.Block;
 import com.mongodb.Function;
 import com.mongodb.MongoClient;
+import com.mongodb.MongoGridFSException;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoIterable;
@@ -39,6 +40,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Arrays.asList;
+import static java.lang.String.format;
 
 class GridFSFindIterableImpl implements GridFSFindIterable {
     private static final CodecRegistry DEFAULT_CODEC_REGISTRY = MongoClient.getDefaultCodecRegistry();
@@ -122,11 +124,11 @@ private MongoIterable<GridFSFile> toGridFSFileIterable() {
             public GridFSFile apply(final Document document) {
                 BsonValue id = getId(document);
                 String filename = document.getString("filename");
-                long length = document.getLong("length");
-                int chunkSize = document.getInteger("chunkSize");
+                long length = getAndValidateNumber("length", document).longValue();
+                int chunkSize = getAndValidateNumber("chunkSize", document).intValue();
                 Date uploadDate = document.getDate("uploadDate");
-                String md5 = document.getString("md5");
 
+                String md5 = document.getString("md5");
                 Document metadata = document.get("metadata", Document.class);
                 Set<String> extraElementKeys = new HashSet<String>(document.keySet());
                 extraElementKeys.removeAll(VALID_FIELDS);
@@ -144,6 +146,14 @@ public GridFSFile apply(final Document document) {
         });
     }
 
+    private Number getAndValidateNumber(final String fieldName, final Document document) {
+        Number value = document.get(fieldName, Number.class);
+        if ((value.floatValue() % 1) != 0){
+            throw new MongoGridFSException(format("Invalid number format for %s", fieldName));
+        }
+        return value;
+    }
+
     private BsonValue getId(final Document document) {
         Object rawId = document.get("_id");
         if (rawId instanceof ObjectId) {

driver/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy

@@ -21,6 +21,7 @@ import com.mongodb.CursorType
 import com.mongodb.FindIterableImpl
 import com.mongodb.Function
 import com.mongodb.MongoClient
+import com.mongodb.MongoGridFSException
 import com.mongodb.MongoNamespace
 import com.mongodb.ReadConcern
 import com.mongodb.TestOperationExecutor
@@ -152,8 +153,8 @@ class GridFSFindIterableSpecification extends Specification {
             firstResult.getId() == new BsonInt32(expectedResult.getInteger('_id'));
         }
         firstResult.getFilename() == expectedResult.getString('filename')
-        firstResult.getLength() == expectedResult.getLong('length')
-        firstResult.getChunkSize() == expectedResult.getInteger('chunkSize')
+        firstResult.getLength() == expectedResult.get('length')
+        firstResult.getChunkSize() == expectedResult.get('chunkSize')
         firstResult.getMD5() == expectedResult.getString('md5')
         firstResult.getUploadDate() == expectedResult.getDate('uploadDate')
 
@@ -210,6 +211,66 @@ class GridFSFindIterableSpecification extends Specification {
         cannedResults << [toSpecCannedResults, legacyCannedResults]
     }
 
+    def 'should handle alternative data for the GridFS file'() {
+        given:
+        def expectedLength = 123
+        def expectedChunkSize = 255
+
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def getResult = {
+                    count++
+                    count == 1 ? [cannedResults] : null
+                }
+                next() >> { getResult() }
+                hasNext() >> { count == 0 }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor()]);
+        def underlying = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
+                new Document(), new FindOptions())
+        def mongoIterable = new GridFSFindIterableImpl(underlying)
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results.getLength() == expectedLength
+        results.getChunkSize() == expectedChunkSize
+
+        where:
+        cannedResults << alternativeImplCannedResults
+    }
+
+    def 'should throw if has a value with a decimal'() {
+        given:
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def getResult = {
+                    count++
+                    count == 1 ? [cannedResults] : null
+                }
+                next() >> { getResult() }
+                hasNext() >> { count == 0 }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor()]);
+        def underlying = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
+                new Document(), new FindOptions())
+        def mongoIterable = new GridFSFindIterableImpl(underlying)
+
+        when:
+        mongoIterable.first()
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        cannedResults << invalidFloatCannedResults
+    }
+
     @Shared
     def toSpecCannedResults = [
             Document.parse('''{ '_id' : { '$oid' : '000000000000000000000001' }, 'filename' : 'File 1',
@@ -236,6 +297,24 @@ class GridFSFindIterableSpecification extends Specification {
                                     'md5' : 'd41d8cd98f00b204e9800998ecf8427e', 'aliases' : ['File Three', 'Third File'] }''')
     ]
 
+    @Shared
+    def alternativeImplCannedResults = [
+            Document.parse('''{ '_id' : 1, 'filename' : 'File 1', 'length' : 123,  'chunkSize' : { '$numberLong' : '255' },
+                                'uploadDate' : { '$date' : 1438679434041 }, 'md5' : 'd41d8cd98f00b204e9800998ecf8427e' }'''),
+            Document.parse('''{ '_id' : { '$oid' : '000000000000000000000001' }, 'filename' : 'File 2', 'length' : 123.0,
+                                'chunkSize' : 255.0, 'uploadDate' : { '$date' : 1438679434050 },
+                                'md5' : 'd41d8cd98f00b204e9800998ecf8427e'}''')
+    ]
+
+    @Shared
+    def invalidFloatCannedResults = [
+            Document.parse('''{ '_id' : 1, 'filename' : 'File 1', 'length' : 123.4,  'chunkSize' : 255,
+                                'uploadDate' : { '$date' : 1438679434041 }, 'md5' : 'd41d8cd98f00b204e9800998ecf8427e' }'''),
+            Document.parse('''{ '_id' : { '$oid' : '000000000000000000000001' }, 'filename' : 'File 2', 'length' : 123,
+                                'chunkSize' : 255.5, 'uploadDate' : { '$date' : 1438679434050 },
+                                'md5' : 'd41d8cd98f00b204e9800998ecf8427e'}''')
+    ]
+
     @Shared
     mixedResults = [toSpecCannedResults[0], legacyCannedResults[1], legacyCannedResults[2]]
 }