Update operations should check for empty documents

JAVA-1795

Author: rozza

driver-core/src/main/com/mongodb/connection/UpdateCommandMessage.java

@@ -80,7 +80,14 @@ protected UpdateCommandMessage writeTheWrites(final BsonOutput bsonOutput, final
             writer.writeName("q");
             getCodec(update.getFilter()).encode(writer, update.getFilter(), EncoderContext.builder().build());
             writer.writeName("u");
+
+            int bufferPosition = bsonOutput.getPosition();
             getCodec(update.getUpdate()).encode(writer, update.getUpdate(), EncoderContext.builder().build());
+
+            if (update.getType() == WriteRequest.Type.UPDATE && bsonOutput.getPosition() == bufferPosition + 8) {
+                throw new IllegalArgumentException("Invalid BSON document for an update");
+            }
+
             if (update.isMulti()) {
                 writer.writeBoolean("multi", update.isMulti());
             }

driver-core/src/main/com/mongodb/connection/UpdateMessage.java

@@ -65,7 +65,11 @@ protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final in
         if (updateRequest.getType() == REPLACE) {
             addCollectibleDocument(updateRequest.getUpdate(), bsonOutput, new CollectibleDocumentFieldNameValidator());
         } else {
+            int bufferPosition = bsonOutput.getPosition();
             addDocument(updateRequest.getUpdate(), bsonOutput, new UpdateFieldNameValidator());
+            if (bsonOutput.getPosition() == bufferPosition + 5) {
+                throw new IllegalArgumentException("Invalid BSON document for an update");
+            }
         }
 
         if (updates.size() == 1) {

driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationAsyncSpecification.groovy

@@ -253,6 +253,44 @@ class MixedBulkWriteOperationAsyncSpecification extends OperationFunctionalSpeci
         ordered << [true, false]
     }
 
+
+    def 'when updating with an empty document, update should throw IllegalArgumentException'() {
+        given:
+        def id = new ObjectId()
+        def op = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), UPDATE)],
+                true, ACKNOWLEDGED)
+
+        when:
+        executeAsync(op)
+
+        then:
+        def ex = thrown(MongoException)
+        ex.getCause() instanceof IllegalArgumentException
+
+        where:
+        ordered << [true, false]
+    }
+
+    def 'when updating with an invalid document, update should throw IllegalArgumentException'() {
+        given:
+        def id = new ObjectId()
+        def op = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('a', new BsonInt32(1)), UPDATE)],
+                true, ACKNOWLEDGED)
+
+        when:
+        executeAsync(op)
+
+        then:
+        def ex = thrown(MongoException)
+        ex.getCause() instanceof IllegalArgumentException
+
+        where:
+        ordered << [true, false]
+    }
+
+
     def 'when a document contains a key with an illegal character, replacing a document with it should throw IllegalArgumentException'() {
         given:
         def id = new ObjectId()

driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationSpecification.groovy

@@ -18,11 +18,11 @@ package com.mongodb.operation
 
 import category.Slow
 import com.mongodb.ClusterFixture
+import com.mongodb.MongoBulkWriteException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadPreference
 import com.mongodb.WriteConcern
 import com.mongodb.binding.SingleConnectionBinding
-import com.mongodb.MongoBulkWriteException
 import com.mongodb.bulk.BulkWriteResult
 import com.mongodb.bulk.BulkWriteUpsert
 import com.mongodb.bulk.DeleteRequest
@@ -252,6 +252,40 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         ordered << [true, false]
     }
 
+    def 'when updating with an empty document, update should throw IllegalArgumentException'() {
+        given:
+        def id = new ObjectId()
+        def op = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), UPDATE)],
+                true, ACKNOWLEDGED)
+
+        when:
+        op.execute(getBinding())
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        ordered << [true, false]
+    }
+
+    def 'when updating with an invalid document, update should throw IllegalArgumentException'() {
+        given:
+        def id = new ObjectId()
+        def op = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('a', new BsonInt32(1)), UPDATE)],
+                true, ACKNOWLEDGED)
+
+        when:
+        op.execute(getBinding())
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        ordered << [true, false]
+    }
+
     def 'when a document contains a key with an illegal character, replacing a document with it should throw IllegalArgumentException'() {
         given:
         def id = new ObjectId()

driver-core/src/test/functional/com/mongodb/operation/UpdateOperationSpecification.groovy

@@ -223,4 +223,19 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         ordered << [true, false]
     }
 
+
+    def 'when an update document is empty, update should throw IllegalArgumentException'() {
+        when:
+        new UpdateOperation(getNamespace(), ordered, ACKNOWLEDGED,
+                [new UpdateRequest(new BsonDocument(),
+                        new BsonDocument(), WriteRequest.Type.UPDATE)])
+                .execute(getBinding())
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        ordered << [true, false]
+    }
+
 }