SERVER-16069 Input validation on the arguments to createCollection

1 files changed, 16 insertions, 2 deletions

diff --git a/jstests/core/apitest_db.js b/jstests/core/apitest_db.js
index 932a206a802..066f80115a9 100644
--- a/jstests/core/apitest_db.js
+++ b/jstests/core/apitest_db.js
@@ -38,9 +38,23 @@ var found = false;
 db.getCollectionNames().forEach( function(x) { if (x == "test") found = true; });
 assert(found, "found test.test in system.namespaces");
 
+// storageEngine in collection options must:
+// - be a document
+// - contains a single field of document type with the name of the current storage engine.
+db.getCollection('test').drop();
+var storageEngineName = db.serverStatus().storageEngine.name;
+assert.commandFailed(db.createCollection('test', {storageEngine: {}}));
+assert.commandFailed(db.createCollection('test', {storageEngine: {unknownStorageEngine: {}}}));
+var invalidStorageEngineOptions = {}
+invalidStorageEngineOptions[storageEngineName] = 12345;
+assert.commandFailed(db.createCollection('test', {storageEngine: invalidStorageEngineOptions}));
+
 // Test round trip of storageEngine in collection options.
+// Assume that empty document for storageEngine-specific options is acceptable.
+var validStorageEngineOptions = {}
+validStorageEngineOptions[storageEngineName] = {};
 db.getCollection('test').drop();
-assert.commandWorked(db.createCollection('test', {storageEngine: {storageEngine1: {x: 1}}}));
+assert.commandWorked(db.createCollection('test', {storageEngine: validStorageEngineOptions}));
 var result = assert.commandWorked(db.runCommand('listCollections'));
 found  = false;
 for (var i = 0; i < result.collections.length; ++i) {
@@ -49,7 +63,7 @@ for (var i = 0; i < result.collections.length; ++i) {
         continue;
     }
     found = true;
-    assert.docEq({storageEngine1: {x: 1}}, collection.options.storageEngine,
+    assert.docEq(validStorageEngineOptions, collection.options.storageEngine,
                  'storage engine options not found in listCommands result');
 }
 assert(found, "'test' collection not created");