SERVER-12209: check _id for $fields at insert time

mongodb · Feb 6, 2014 · 34d8993 · 34d8993
1 parent efeb3da
commit 34d8993
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/mongo/db/ops/insert.cpp b/src/mongo/db/ops/insert.cpp
@@ -80,6 +80,12 @@ namespace mongo {
                         return StatusWith<BSONObj>( ErrorCodes::BadValue,
                                                     "can't use an array for _id" );
                     }
+                    if ( e.type() == Object ) {
+                        BSONObj o = e.Obj();
+                        Status s = o.storageValidEmbedded();
+                        if ( !s.isOK() )
+                            return StatusWith<BSONObj>( s );
+                    }
                 }
 
             }

diff --git a/src/mongo/dbtests/pdfiletests.cpp b/src/mongo/dbtests/pdfiletests.cpp
@@ -100,6 +100,16 @@ namespace PdfileTests {
                 ASSERT( a.timestampValue() > 0 );
             }
         };
+
+        class ValidId : public Base {
+        public:
+            void run() {
+                ASSERT( fixDocumentForInsert( BSON( "_id" << 5 ) ).isOK() );
+                ASSERT( fixDocumentForInsert( BSON( "_id" << BSON( "x" << 5 ) ) ).isOK() );
+                ASSERT( !fixDocumentForInsert( BSON( "_id" << BSON( "$x" << 5 ) ) ).isOK() );
+                ASSERT( !fixDocumentForInsert( BSON( "_id" << BSON( "$oid" << 5 ) ) ).isOK() );
+            }
+        };
     } // namespace Insert
 
     class ExtentSizing {
@@ -164,6 +174,7 @@ namespace PdfileTests {
         void setupTests() {
             add< Insert::InsertNoId >();
             add< Insert::UpdateDate >();
+            add< Insert::ValidId >();
             add< ExtentSizing >();
         }
     } myall;