summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/shell/mongo.js2
-rw-r--r--src/mongo/shell/mongodtest.js11
-rw-r--r--src/mongo/shell/replsettest.js5
-rwxr-xr-xsrc/mongo/shell/servers.js32
-rw-r--r--src/mongo/shell/servers_misc.js30
-rw-r--r--src/mongo/shell/shardingtest.js2
-rw-r--r--src/mongo/shell/utils.js6
7 files changed, 7 insertions, 81 deletions
diff --git a/src/mongo/shell/mongo.js b/src/mongo/shell/mongo.js
index c5384166677..043c254c29d 100644
--- a/src/mongo/shell/mongo.js
+++ b/src/mongo/shell/mongo.js
@@ -34,7 +34,7 @@ Mongo.prototype.getSlaveOk = function() {
}
Mongo.prototype.getDB = function( name ){
- if ((jsTest.options().keyFile || jsTest.options().useX509) &&
+ if ((jsTest.options().keyFile) &&
((typeof this.authenticated == 'undefined') || !this.authenticated)) {
jsTest.authenticate(this)
}
diff --git a/src/mongo/shell/mongodtest.js b/src/mongo/shell/mongodtest.js
index a8a5e04b5a2..0a05f377d9c 100644
--- a/src/mongo/shell/mongodtest.js
+++ b/src/mongo/shell/mongodtest.js
@@ -34,17 +34,6 @@ startMongodTest = function (port, dirname, restart, extraOptions) {
options["auth"] = "";
if(jsTestOptions().keyFile && (!extraOptions || !extraOptions['keyFile']))
options['keyFile'] = jsTestOptions().keyFile
- if(jsTestOptions().useSSL) {
- if (!options["sslMode"])
- options["sslMode"] = "requireSSL";
- if (!options["sslPEMKeyFile"])
- options["sslPEMKeyFile"] = "jstests/libs/server.pem";
- if (!options["sslCAFile"])
- options["sslCAFile"] = "jstests/libs/ca.pem";
- options["sslWeakCertificateValidation"] = "";
- }
- if (jsTestOptions().useX509 && !options["clusterAuthMode"])
- options["clusterAuthMode"] = "x509";
if (extraOptions)
Object.extend(options , extraOptions);
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index f3a923b95b0..3604f099e18 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -460,8 +460,7 @@ ReplSetTest.prototype.initiate = function( cfg , initCmd , timeout ) {
this.awaitSecondaryNodes(timeout);
// Setup authentication if running test with authentication
- if ((jsTestOptions().keyFile || jsTestOptions().useX509) &&
- cmdKey == 'replSetInitiate') {
+ if ((jsTestOptions().keyFile) && cmdKey == 'replSetInitiate') {
master = this.getMaster();
jsTest.authenticateNodes(this.nodes);
}
@@ -731,7 +730,7 @@ ReplSetTest.prototype.restart = function( n , options, signal, wait ){
this.stop(n, signal, options);
started = this.start( n , options , true, wait );
- if (jsTestOptions().keyFile || jsTestOptions().useX509) {
+ if (jsTestOptions().keyFile) {
if (started.length) {
// if n was an array of conns, start will return an array of connections
for (var i = 0; i < started.length; i++) {
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 52defda408c..6c487edb20e 100755
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -423,23 +423,7 @@ MongoRunner.mongoOptions = function( opts ){
// Default for waitForConnect is true
opts.waitForConnect = (waitForConnect == undefined || waitForConnect == null) ?
true : waitForConnect;
-
- if( jsTestOptions().useSSL ) {
- if (!opts.sslMode) opts.sslMode = "requireSSL";
- if (!opts.sslPEMKeyFile) opts.sslPEMKeyFile = "jstests/libs/server.pem";
- if (!opts.sslCAFile) opts.sslCAFile = "jstests/libs/ca.pem";
-
- // Needed for jstest/ssl/upgrade_to_ssl.js
- opts.sslWeakCertificateValidation = "";
-
- // Needed for jstest/ssl/ssl_hostname_validation.js
- opts.sslAllowInvalidHostnames = "";
- }
- if ( jsTestOptions().useX509 && !opts.clusterAuthMode ) {
- opts.clusterAuthMode = "x509";
- }
-
opts.port = opts.port || MongoRunner.nextOpenPort()
MongoRunner.usedPortMap[ "" + parseInt( opts.port ) ] = true
@@ -493,22 +477,6 @@ MongoRunner.mongodOptions = function( opts ){
opts.keyFile = jsTestOptions().keyFile
}
- if( jsTestOptions().useSSL ) {
- if (!opts.sslMode) opts.sslMode = "requireSSL";
- if (!opts.sslPEMKeyFile) opts.sslPEMKeyFile = "jstests/libs/server.pem";
- if (!opts.sslCAFile) opts.sslCAFile = "jstests/libs/ca.pem";
-
- // Needed for jstest/ssl/upgrade_to_ssl.js
- opts.sslWeakCertificateValidation = "";
-
- // Needed for jstest/ssl/ssl_hostname_validation.js
- opts.sslAllowInvalidHostnames = "";
- }
-
- if ( jsTestOptions().useX509 && !opts.clusterAuthMode ) {
- opts.clusterAuthMode = "x509";
- }
-
if( opts.noReplSet ) opts.replSet = null
if( opts.arbiter ) opts.oplogSize = 1
diff --git a/src/mongo/shell/servers_misc.js b/src/mongo/shell/servers_misc.js
index 2a652ce8662..8c338e8285b 100644
--- a/src/mongo/shell/servers_misc.js
+++ b/src/mongo/shell/servers_misc.js
@@ -163,26 +163,6 @@ ReplTest.prototype.getOptions = function( master , extra , putBinaryFirst, norep
a.push( jsTestOptions().keyFile )
}
- if( jsTestOptions().useSSL ) {
- if (!a.contains("--sslMode")) {
- a.push( "--sslMode" )
- a.push( "requireSSL" )
- }
- if (!a.contains("--sslPEMKeyFile")) {
- a.push( "--sslPEMKeyFile" )
- a.push( "jstests/libs/server.pem" )
- }
- if (!a.contains("--sslCAFile")) {
- a.push( "--sslCAFile" )
- a.push( "jstests/libs/ca.pem" )
- }
- a.push( "--sslWeakCertificateValidation" )
- }
- if( jsTestOptions().useX509 && !a.contains("--clusterAuthMode")) {
- a.push( "--clusterAuthMode" )
- a.push( "x509" )
- }
-
if ( !norepl ) {
if ( master ){
a.push( "--master" );
@@ -218,7 +198,7 @@ ReplTest.prototype.start = function( master , options , restart, norepl ){
return conn;
} else {
var conn = startMongod.apply(null, o);
- if (jsTestOptions().keyFile || jsTestOptions().auth || jsTestOptions().useX509) {
+ if (jsTestOptions().keyFile || jsTestOptions().auth) {
jsTest.authenticate(conn);
}
if (!master) {
@@ -331,14 +311,6 @@ function startParallelShell( jsCode, port, noConnect ){
args.push("--port", port);
}
- if( jsTestOptions().useSSL ) {
- args.push( "--ssl" )
- args.push( "--sslPEMKeyFile" )
- args.push( "jstests/libs/client.pem" )
- args.push( "--sslCAFile" )
- args.push( "jstests/libs/ca.pem" )
- }
-
x = startMongoProgramNoConnect.apply(null, args);
return function(){
return waitProgram( x );
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 2396e6df790..04b1cf3096b 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -424,7 +424,7 @@ ShardingTest = function( testName , numShards , verboseLevel , numMongos , other
);
}
- if (jsTestOptions().keyFile || jsTestOptions().useX509) {
+ if (jsTestOptions().keyFile) {
jsTest.authenticate( this._configConnection );
jsTest.authenticateNodes( this._configServers );
jsTest.authenticateNodes( this._mongos );
diff --git a/src/mongo/shell/utils.js b/src/mongo/shell/utils.js
index e61e3c7f4ff..694a5a10709 100644
--- a/src/mongo/shell/utils.js
+++ b/src/mongo/shell/utils.js
@@ -157,9 +157,7 @@ jsTestOptions = function(){
authPassword : TestData.keyFileData,
authMechanism : TestData.authMechanism,
adminUser : TestData.adminUser || "admin",
- adminPassword : TestData.adminPassword || "password",
- useSSL : TestData.useSSL,
- useX509 : TestData.useX509});
+ adminPassword : TestData.adminPassword || "password"});
}
return _jsTestOptions;
}
@@ -195,7 +193,7 @@ jsTest.randomize = function( seed ) {
}
jsTest.authenticate = function(conn) {
- if (!jsTest.options().auth && !jsTest.options().keyFile && !jsTest.options().useX509) {
+ if (!jsTest.options().auth && !jsTest.options().keyFile) {
conn.authenticated = true;
return true;
}
View Lorry Controller Status