SERVER-8502 Make sure authMechanism is actually used when running auth passthrough tests

Author: stbrody

buildscripts/smoke.py

@@ -464,7 +464,8 @@ def runTest(test):
                      'TestData.noJournalPrealloc = ' + ternary( no_preallocj )  + ";" + \
                      'TestData.auth = ' + ternary( auth ) + ";" + \
                      'TestData.keyFile = ' + ternary( keyFile , '"' + str(keyFile) + '"' , 'null' ) + ";" + \
-                     'TestData.keyFileData = ' + ternary( keyFile , '"' + str(keyFileData) + '"' , 'null' ) + ";"
+                     'TestData.keyFileData = ' + ternary( keyFile , '"' + str(keyFileData) + '"' , 'null' ) + ";" + \
+                     'TestData.authMechanism = ' + ternary( authMechanism, '"' + str(authMechanism) + '"', 'null') + ";"
         if os.sys.platform == "win32":
             # double quotes in the evalString on windows; this
             # prevents the backslashes from being removed when

src/mongo/shell/dbshell.cpp

@@ -855,42 +855,42 @@ int _main( int argc, char* argv[], char **envp ) {
 
         if ( params.count( "password" ) && password.empty() )
             password = mongo::askPassword();
+    }
 
-        // Construct the authentication-related code to execute on shell startup.
-        //
-        // This constructs and immediately executes an anonymous function, to avoid
-        // the shell's default behavior of printing statement results to the console.
-        //
-        // It constructs a statement of the following form:
-        //
-        // (function() {
-        //    // Set default authentication mechanism and, maybe, authenticate.
-        //  }())
-        stringstream authStringStream;
-        authStringStream << "(function() { " << endl;
-        if ( !authenticationMechanism.empty() ) {
-            authStringStream << "DB.prototype._defaultAuthenticationMechanism = \"" <<
-                authenticationMechanism << "\";" << endl;
-        }
+    // Construct the authentication-related code to execute on shell startup.
+    //
+    // This constructs and immediately executes an anonymous function, to avoid
+    // the shell's default behavior of printing statement results to the console.
+    //
+    // It constructs a statement of the following form:
+    //
+    // (function() {
+    //    // Set default authentication mechanism and, maybe, authenticate.
+    //  }())
+    stringstream authStringStream;
+    authStringStream << "(function() { " << endl;
+    if ( !authenticationMechanism.empty() ) {
+        authStringStream << "DB.prototype._defaultAuthenticationMechanism = \"" <<
+            authenticationMechanism << "\";" << endl;
+    }
 
-        if ( username.size() ) {
-            authStringStream << "var username = \"" << username << "\";" << endl;
-            authStringStream << "var password = \"" << password << "\";" << endl;
-            if (authenticationDatabase.empty()) {
-                authStringStream << "var authDb = db;" << endl;
-            }
-            else {
-                authStringStream << "var authDb = db.getSiblingDB(\"" << authenticationDatabase <<
-                    "\");" << endl;
-            }
-            authStringStream << "authDb._authOrThrow({ " <<
-                saslCommandPrincipalFieldName << ": username, " <<
-                saslCommandPasswordFieldName << ": password });" << endl;
+    if (!nodb && username.size()) {
+        authStringStream << "var username = \"" << username << "\";" << endl;
+        authStringStream << "var password = \"" << password << "\";" << endl;
+        if (authenticationDatabase.empty()) {
+            authStringStream << "var authDb = db;" << endl;
         }
-        authStringStream << "}())";
-
-        mongo::shell_utils::_dbAuth = authStringStream.str();
+        else {
+            authStringStream << "var authDb = db.getSiblingDB(\"" << authenticationDatabase <<
+                "\");" << endl;
+        }
+        authStringStream << "authDb._authOrThrow({ " <<
+            saslCommandPrincipalFieldName << ": username, " <<
+            saslCommandPasswordFieldName << ": password });" << endl;
     }
+    authStringStream << "}())";
+    mongo::shell_utils::_dbAuth = authStringStream.str();
+
 
     mongo::ScriptEngine::setConnectCallback( mongo::shell_utils::onConnect );
     mongo::ScriptEngine::setup();

src/mongo/shell/servers.js

@@ -728,21 +728,33 @@ startMongos = function(args){
     return MongoRunner.runMongos(args);
 }
 
+/**
+ * Returns a new argArray with any test-specific arguments added.
+ */
+getTestArgs = function(argArray) {
+    var programName = argArray[0];
+    if (programName.endsWith('mongod') || programName.endsWith('mongos')) {
+        if (jsTest.options().enableTestCommands) {
+            argArray.push.apply(argArray, ['--setParameter', "enableTestCommands=1"]);
+        }
+        if (jsTest.options().authMechanism) {
+            argArray.push.apply(argArray,
+                                ['--setParameter',
+                                 "authenticationMechanisms=" + jsTest.options().authMechanism]);
+        }
+    }
+    return argArray;
+};
+
 /**
  * Start a mongo process with a particular argument array.  If we aren't waiting for connect, 
  * return null.
  */
 MongoRunner.startWithArgs = function(argArray, waitForConnect) {
+    // TODO: Make there only be one codepath for starting mongo processes
 
+    argArray = getTestArgs(argArray);
     var port = _parsePort.apply(null, argArray);
-    
-    // Enable test commands.
-    // TODO: Make there only be one codepath for starting mongo processes
-    var programName = argArray[0];
-    if (jsTest.options().enableTestCommands && (programName.endsWith('mongod') || programName.endsWith('mongos'))) {
-        argArray.push.apply(argArray, ['--setParameter', 'enableTestCommands=1']);
-    }
-    
     var pid = _startMongoProgram.apply(null, argArray);
 
     var conn = null;
@@ -782,11 +794,7 @@ startMongoProgram = function(){
     // TODO: Make this work better with multi-version testing so that we can support
     // enabling this on 2.4 when testing 2.6
     var args = argumentsToArray( arguments );
-    var programName = args[0];
-    if (jsTest.options().enableTestCommands && (programName.endsWith('mongod') || programName.endsWith('mongos'))) {
-        args.push.apply(args, ['--setParameter', 'enableTestCommands=1']);
-    }
-
+    args = getTestArgs(args);
     var pid = _startMongoProgram.apply( null, args );
 
     var m;

src/mongo/shell/shell_utils.cpp

@@ -156,10 +156,9 @@ namespace mongo {
 
             if ( !_dbConnect.empty() ) {
                 uassert( 12513, "connect failed", scope.exec( _dbConnect , "(connect)" , false , true , false ) );
-                if ( !_dbAuth.empty() ) {
-                    installGlobalUtils( scope );
-                    uassert( 12514, "login failed", scope.exec( _dbAuth , "(auth)" , true , true , false ) );
-                }
+            }
+            if ( !_dbAuth.empty() ) {
+                uassert( 12514, "login failed", scope.exec( _dbAuth , "(auth)" , true , true , false ) );
             }
         }
 

src/mongo/shell/utils.js

@@ -371,6 +371,7 @@ jsTestOptions = function(){
                               keyFile : TestData.keyFile,
                               authUser : "__system",
                               authPassword : TestData.keyFileData,
+                              authMechanism : TestData.authMechanism,
                               adminUser : TestData.adminUser || "admin",
                               adminPassword : TestData.adminPassword || "password" });
     }