Fixes propert detection of SSL based replicaset using MongoClient.connect and Db.connect #849

Author: christkv

lib/mongodb/db.js

@@ -2018,10 +2018,16 @@ Db.connect = function(url, options, callback) {
   // need to verify that it's one or the other and fail if it's a mix
   // Connect to all servers and run ismaster
   for(var i = 0; i < object.servers.length; i++) {
+    // Set up socket options
+    var _server_options = {socketOptions:{connectTimeoutMS:1000}, auto_reconnect:false};
+    // Add ssl if missing
+    if(object.server_options.socketOptions &&
+      object.server_options.socketOptions.ssl) _server_options.ssl = object.server_options.socketOptions.ssl;
+
     // Set up the Server object
     var _server = object.servers[i].domain_socket 
-        ? new Server(object.servers[i].domain_socket, {socketOptions:{connectTimeoutMS:1000}, auto_reconnect:false})
-        : new Server(object.servers[i].host, object.servers[i].port, {socketOptions:{connectTimeoutMS:1000}, auto_reconnect:false});
+        ? new Server(object.servers[i].domain_socket, _server_options)
+        : new Server(object.servers[i].host, object.servers[i].port, _server_options);
 
     // Attempt connect
     new Db(object.dbName, _server, {safe:false, native_parser:false}).open(function(err, db) {

test/auxilliary/ssl/mongo_client_ssl_test.js

@@ -0,0 +1,72 @@
+var mongodb = process.env['TEST_NATIVE'] != null ? require('../../../lib/mongodb').native() : require('../../../lib/mongodb').pure();
+
+var testCase = require('nodeunit').testCase,
+  debug = require('util').debug,
+  inspect = require('util').inspect,
+  nodeunit = require('nodeunit'),
+  gleak = require('../../../dev/tools/gleak'),
+  Db = mongodb.Db,
+  Cursor = mongodb.Cursor,
+  Collection = mongodb.Collection,
+  Server = mongodb.Server,
+  MongoClient = mongodb.MongoClient,
+  ServerManager = require('../../../test/tools/server_manager').ServerManager,
+  Step = require("step");  
+
+var MONGODB = 'integration_tests';
+var serverManager = null;
+var ssl = true;
+
+/**
+ * Retrieve the server information for the current
+ * instance of the db client
+ * 
+ * @ignore
+ */
+exports.setUp = function(callback) {
+  callback();      
+}
+
+/**
+ * Retrieve the server information for the current
+ * instance of the db client
+ * 
+ * @ignore
+ */
+exports.tearDown = function(callback) {
+  callback();
+}
+
+exports.shouldCorrectlyCommunicateUsingSSLSocket = function(test) {
+  if(process.env['JENKINS']) return test.done();
+  var db1 = new Db(MONGODB, new Server("127.0.0.1", 27017, {auto_reconnect: false, poolSize:4, ssl:ssl}), {w:0, native_parser: (process.env['TEST_NATIVE'] != null)});
+  // All inserted docs
+  var docs = [];
+  var errs = [];
+  var insertDocs = [];
+  
+  // Start server
+  serverManager = new ServerManager({auth:false, purgedirectories:true, journal:true, ssl:ssl})
+  serverManager.start(true, function() {
+    MongoClient.connect("mongodb://localhost:27017/test?ssl=true", function(err, db) {
+      test.equal(null, err);
+      test.ok(db != null);
+
+      db.close();
+      serverManager.killAll();
+      test.done();
+    });
+  });
+}
+
+/**
+ * Retrieve the server information for the current
+ * instance of the db client
+ * 
+ * @ignore
+ */
+exports.noGlobalsLeaked = function(test) {
+  var leaks = gleak.detectNew();
+  test.equal(0, leaks.length, "global var leak detected: " + leaks.join(', '));
+  test.done();
+}

test/auxilliary/ssl/repl_set_ssl_test.js

@@ -9,6 +9,7 @@ var testCase = require('nodeunit').testCase,
   Cursor = mongodb.Cursor,
   Collection = mongodb.Collection,
   Server = mongodb.Server,
+  MongoClient = mongodb.MongoClient,
   ReplSetServers = mongodb.ReplSetServers,
   ReplicaSetManager = require('../../../test/tools/replica_set_manager').ReplicaSetManager,
   Step = require("step");  
@@ -28,7 +29,7 @@ exports.setUp = function(callback) {
   RS = new ReplicaSetManager({retries:120, 
     ssl:ssl,
     arbiter_count:1,
-    secondary_count:1,
+    secondary_count:2,
     passive_count:1});
   RS.startSet(true, function(err, result) {      
     if(err != null) throw err;
@@ -66,6 +67,16 @@ exports.shouldCorrectlyConncetToSSLBasedReplicaset = function(test) {
     p_db.close();
   });
 }
+
+exports.shouldCorrectlyConncetMongoClient = function(test) {
+  // Connect to the replicaset
+  MongoClient.connect("mongodb://localhost:" + RS.ports[1] + ",localhost:" + RS.ports[0] + "/foo?ssl=true", function(err, db) {
+    test.equal(null, err);
+    test.ok(db != null);
+    db.close();
+    test.done();
+  });
+}
 
 /**
  * Retrieve the server information for the current

test/tools/server_manager.js

@@ -114,7 +114,7 @@ ServerManager.prototype.stop = function(signal, callback) {
 
 ServerManager.prototype.killAll = function(callback) {
   exec('killall -9 mongod', function(err, stdout, stderr) {
-    callback(null, null);
+    if(typeof callback == 'function') callback(null, null);
   });
 }