SERVER-33935 add clusterAuthMode option to TestData

1 files changed, 23 insertions, 8 deletions

diff --git a/src/mongo/shell/utils_auth.js b/src/mongo/shell/utils_auth.js
index b105164ea50..b0437f50bf3 100644
--- a/src/mongo/shell/utils_auth.js
+++ b/src/mongo/shell/utils_auth.js
@@ -13,7 +13,8 @@ var authutil;
             conn = [conn];
         }
         for (i = 0; i < conn.length; ++i) {
-            conn[i].getDB(dbname).logout();
+            var curDB = new DB(conn[i], dbname);
+            curDB.logout();
         }
     };
 
@@ -31,7 +32,9 @@ var authutil;
         try {
             for (i = 0; i < conns.length; ++i) {
                 conn = conns[i];
-                assert(conn.getDB(dbName).auth(authParams),
+                // Bypass the implicit auth call in getDB();
+                var db = new DB(conn, dbName);
+                assert(db.auth(authParams),
                        "Failed to authenticate " + conn + " to " + dbName + " using parameters " +
                            tojson(authParams));
             }
@@ -55,7 +58,9 @@ var authutil;
 
         for (i = 0; i < conns.length; ++i) {
             conn = conns[i];
-            assert(!conn.getDB(dbName).auth(authParams),
+            // Bypass the implicit auth call in getDB();
+            var db = new DB(conn, dbName);
+            assert(!db.auth(authParams),
                    "Unexpectedly authenticated " + conn + " to " + dbName + " using parameters " +
                        tojson(authParams));
         }
@@ -67,11 +72,21 @@ var authutil;
      */
     authutil.asCluster = function(conn, keyfile, action) {
         var ex;
-        authutil.assertAuthenticate(conn, 'admin', {
-            user: '__system',
-            mechanism: 'SCRAM-SHA-1',
-            pwd: cat(keyfile).replace(/[\011-\015\040]/g, '')
-        });
+        const authMode = jsTest.options().clusterAuthMode;
+
+        if (authMode === 'keyFile') {
+            authutil.assertAuthenticate(conn, 'admin', {
+                user: '__system',
+                mechanism: 'SCRAM-SHA-1',
+                pwd: cat(keyfile).replace(/[\011-\015\040]/g, '')
+            });
+        } else if (authMode === 'x509') {
+            authutil.assertAuthenticate(conn, '$external', {
+                mechanism: 'MONGODB-X509',
+            });
+        } else {
+            throw new Error('clusterAuthMode ' + authMode + ' is currently unsupported');
+        }
 
         try {
             return action();