SERVER-12852: validate update+upsert->insert doc

Author: scotthernandez

jstests/upsert3.js

@@ -2,6 +2,15 @@
 t = db.upsert3;
 t.drop();
 
+//make sure we validate query
+t.update( {a: {"a.a": 1}} , {$inc: {y: 1}} , true );
+assert.gleError(db, function(gle) {
+    return "a.a.a-1 - " + tojson(gle) + " doc:" + tojson(t.findOne()) });
+
+t.update( {a: {$a: 1}} , {$inc: {y: 1}} , true );
+assert.gleError(db, function(gle) {
+    return "a.$a-1 - " + tojson(gle) + " doc:" + tojson(t.findOne()) });
+
 // make sure the new _id is not duplicated
 t.update( {"a.b": 1, a: {a: 1, b: 1}} , {$inc: {y: 1}} , true );
 assert.gleError(db, function(gle) {

src/mongo/db/ops/update.cpp

@@ -795,6 +795,9 @@ namespace mongo {
         // creates the base of the update for the inserterd doc (because upsert was true)
         if (cq) {
             uassertStatusOK(driver->populateDocumentWithQueryFields(cq, doc));
+            // Validate the base doc, as taken from the query -- no fields means validate all.
+            FieldRefSet noFields;
+            uassertStatusOK(validate(BSONObj(), noFields, doc, NULL, driver->modOptions()));
             if (!driver->isDocReplacement()) {
                 opDebug->fastmodinsert = true;
                 // We need all the fields from the query to compare against for validation below.
@@ -828,6 +831,7 @@ namespace mongo {
             if (lifecycle)
                 immutableFields = lifecycle->getImmutableFields();
 
+            // This will only validate the modified fields if not a replacement.
             uassertStatusOK(validate(original,
                                      updatedFields,
                                      doc,