mongodb 2.2.31 → 2.2.35

package/lib/mongo_client.js

@@ -30,7 +30,7 @@ var parse = require('./url_parser')
  *   db.close();
  * });
  */
-var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
+var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert', 'ciphers', 'ecdhCurve',
   'sslKey', 'sslPass', 'sslCRL', 'autoReconnect', 'noDelay', 'keepAlive', 'connectTimeoutMS', 'family',
   'socketTimeoutMS', 'reconnectTries', 'reconnectInterval', 'ha', 'haInterval',
   'replicaSet', 'secondaryAcceptableLatencyMS', 'acceptableLatencyMS',
@@ -102,7 +102,7 @@ function MongoClient() {
    * @param {boolean} [options.autoReconnect=true] Enable autoReconnect for single server instances
    * @param {boolean} [options.noDelay=true] TCP Connection no delay
    * @param {number} [options.family=4] Version of IP stack. Defaults to 4.
-   * @param {boolean} [options.keepAlive=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket.
+   * @param {number} [options.keepAlive=30000] The number of milliseconds to wait before initiating keepAlive on the TCP socket.
    * @param {number} [options.connectTimeoutMS=30000] TCP Connection timeout setting
    * @param {number} [options.socketTimeoutMS=360000] TCP Socket timeout setting
    * @param {number} [options.reconnectTries=30] Server attempt to reconnect #times
@@ -115,7 +115,7 @@ function MongoClient() {
    * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
    * @param {string} [options.authSource=undefined] Define the database to authenticate against
    * @param {string} [options.auth.user=undefined] The username for auth
-   * @param {string} [options.auth.password=undefined] The username for auth
+   * @param {string} [options.auth.password=undefined] The password for auth
    * @param {(number|string)} [options.w=null] The write concern.
    * @param {number} [options.wtimeout=null] The write concern timeout.
    * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -186,7 +186,7 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
  * @param {string} [options.authSource=undefined] Define the database to authenticate against
  * @param {string} [options.auth.user=undefined] The username for auth
- * @param {string} [options.auth.password=undefined] The username for auth
+ * @param {string} [options.auth.password=undefined] The password for auth
  * @param {(number|string)} [options.w=null] The write concern.
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -482,24 +482,36 @@ var connect = function(self, url, options, callback) {
   // Get a logger for MongoClient
   var logger = Logger('MongoClient', options);
 
-  // Parse the string
-  var object = parse(url, options);
-  var _finalOptions = createUnifiedOptions({}, object);
-  _finalOptions = mergeOptions(_finalOptions, object, false);
-  _finalOptions = createUnifiedOptions(_finalOptions, options);
+  parse(url, options, function(err, object) {
+    if (err) return callback(err);
 
-  // Check if we have connection and socket timeout set
-  if(_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 360000;
-  if(_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 30000;
+    // Parse the string
+    var _finalOptions = createUnifiedOptions({}, object);
+    _finalOptions = mergeOptions(_finalOptions, object, false);
+    _finalOptions = createUnifiedOptions(_finalOptions, options);
 
-  if (_finalOptions.db_options && _finalOptions.db_options.auth) {
-    delete _finalOptions.db_options.auth;
-  }
+    // Check if we have connection and socket timeout set
+    if(_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 360000;
+    if(_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 30000;
 
-  // Failure modes
-  if(object.servers.length == 0) {
-    throw new Error("connection string must contain at least one seed host");
-  }
+    if (_finalOptions.db_options && _finalOptions.db_options.auth) {
+      delete _finalOptions.db_options.auth;
+    }
+
+    // Failure modes
+    if(object.servers.length == 0) {
+      throw new Error("connection string must contain at least one seed host");
+    }
+
+    // Do we have a replicaset then skip discovery and go straight to connectivity
+    if(_finalOptions.replicaSet || _finalOptions.rs_name) {
+      return createReplicaset(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
+    } else if(object.servers.length > 1) {
+      return createMongos(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
+    } else {
+      return createServer(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
+    }
+  });
 
   function connectCallback(err, db) {
     if(err && err.message == 'no mongos proxies found in seed list') {
@@ -514,15 +526,6 @@ var connect = function(self, url, options, callback) {
     // Return the error and db instance
     callback(err, db);
   }
-
-  // Do we have a replicaset then skip discovery and go straight to connectivity
-  if(_finalOptions.replicaSet || _finalOptions.rs_name) {
-    return createReplicaset(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
-  } else if(object.servers.length > 1) {
-    return createMongos(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
-  } else {
-    return createServer(self, _finalOptions, connectHandler(_finalOptions, connectCallback));
-  }
 }
 
 module.exports = MongoClient

package/lib/mongos.js

@@ -48,7 +48,7 @@ var release = os.release();
 
  // Allowed parameters
  var legalOptionNames = ['ha', 'haInterval', 'acceptableLatencyMS'
-   , 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate'
+   , 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate', 'ciphers', 'ecdhCurve'
    , 'sslCA', 'sslCRL', 'sslCert', 'sslKey', 'sslPass', 'socketOptions', 'bufferMaxEntries'
    , 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
    , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS'

package/lib/read_preference.js

@@ -39,7 +39,7 @@
  * @param {string} mode The ReadPreference mode as listed above.
  * @param {array|object} tags An object representing read preference tags.
  * @param {object} [options] Additional read preference options
- * @param {number} [options.maxStalenessSeconds] Max Secondary Read Stalleness in Seconds
+ * @param {number} [options.maxStalenessSeconds] Max Secondary Read Staleness in Seconds
  * @return {ReadPreference} a ReadPreference instance.
  */
 var ReadPreference = function(mode, tags, options) {

package/lib/server.js

@@ -45,7 +45,7 @@ var release = os.release();
 
  // Allowed parameters
  var legalOptionNames = ['ha', 'haInterval', 'acceptableLatencyMS'
-   , 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate'
+   , 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate', 'ciphers', 'ecdhCurve'
    , 'sslCA', 'sslCRL', 'sslCert', 'sslKey', 'sslPass', 'socketOptions', 'bufferMaxEntries'
    , 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
    , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS', 'family'
@@ -70,8 +70,8 @@ var release = os.release();
  * @param {(Buffer|string)} [options.sslKey=null] String or buffer containing the certificate private key we wish to present (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslPass=null] String or buffer containing the certificate password (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {string} [options.servername=null] String containing the server name requested via TLS SNI.
+ * @param {boolean} [options.autoReconnect=true] Reconnect on error or timeout.
  * @param {object} [options.socketOptions=null] Socket options
- * @param {boolean} [options.socketOptions.autoReconnect=true] Reconnect on error.
  * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option.
  * @param {number} [options.socketOptions.keepAlive=0] TCP KeepAlive on the socket with a X ms delay before start.
  * @param {number} [options.socketOptions.connectTimeoutMS=0] TCP Connection timeout setting

package/lib/url_parser.js

@@ -3,9 +3,122 @@
 var ReadPreference = require('./read_preference'),
   parser = require('url'),
   f = require('util').format,
-  assign = require('./utils').assign;
+  assign = require('./utils').assign,
+  dns = require('dns');
 
-module.exports = function(url, options) {
+module.exports = function(url, options, callback) {
+  if (typeof options === 'function') (callback = options), (options = {});
+  options = options || {};
+
+  var result = parser.parse(url, true);
+  if (result.protocol !== 'mongodb:' && result.protocol !== 'mongodb+srv:') {
+    return callback(new Error('invalid schema, expected mongodb or mongodb+srv'));
+  }
+
+  if (result.protocol === 'mongodb+srv:') {
+
+    if (result.hostname.split('.').length < 3) {
+      return callback(new Error('uri does not have hostname, domainname and tld'));
+    }
+
+    result.domainLength = result.hostname.split('.').length;
+
+    if (result.pathname && result.pathname.match(',')) {
+      return callback(new Error('invalid uri, cannot contain multiple hostnames'));
+    }
+
+    if (result.port) {
+      return callback(new Error('Ports not accepted with mongodb+srv'));
+    }
+
+    var srvAddress = '_mongodb._tcp.' + result.host;
+    dns.resolveSrv(srvAddress, function(err, addresses) {
+      if (err) return callback(err);
+
+      if (addresses.length === 0) {
+        return callback(new Error('No addresses found at host'));
+      }
+
+      for (var i = 0; i < addresses.length; i++) {
+        if (!matchesParentDomain(addresses[i].name, result.hostname, result.domainLength)) {
+          return callback(new Error('srv record does not share hostname with parent uri'));
+        }
+      }
+
+      var base = result.auth ? 'mongodb://' + result.auth + '@' : 'mongodb://';
+      var connectionStrings = addresses.map(function(address, i) {
+        if (i === 0) return base + address.name + ':' + address.port;
+        else return address.name + ':' + address.port;
+      });
+
+      var connectionString = connectionStrings.join(',') + '/';
+      var connectionStringOptions = [];
+
+      // Default to SSL true
+      if (!options.ssl && !result.search) {
+        connectionStringOptions.push('ssl=true');
+      } else if (!options.ssl && result.search && !result.search.match('ssl')) {
+        connectionStringOptions.push('ssl=true');
+      }
+
+      // Keep original uri options
+      if (result.search) {
+        connectionStringOptions.push(result.search.replace('?', ''));
+      }
+
+      dns.resolveTxt(result.host, function(err, record) {
+        if (err && err.code !== 'ENODATA') return callback(err);
+        if (err && err.code === 'ENODATA') record = null;
+
+        if (record) {
+          if (record.length > 1) {
+            return callback(new Error('multiple text records not allowed'));
+          }
+
+          record = record[0];
+          if (record.length > 1) record = record.join('');
+          else record = record[0];
+
+          if (!record.includes('authSource') && !record.includes('replicaSet')) {
+            return callback(new Error('text record must only set `authSource` or `replicaSet`'));
+          }
+
+          connectionStringOptions.push(record);
+        }
+
+        // Add any options to the connection string
+        if (connectionStringOptions.length) {
+          connectionString += '?' + connectionStringOptions.join('&');
+        }
+
+        parseHandler(connectionString, options, callback);
+      });
+    });
+  } else {
+    parseHandler(url, options, callback);
+  }
+};
+
+function matchesParentDomain(srvAddress, parentDomain) {
+  var regex = /^.*?\./;
+  var srv = '.' + srvAddress.replace(regex, '');
+  var parent = '.' + parentDomain.replace(regex, '');
+  if (srv.endsWith(parent)) return true;
+  else return false;
+}
+
+function parseHandler(address, options, callback) {
+  var result, err;
+  try {
+    result = parseConnectionString(address, options);
+  } catch (e) {
+    err = e;
+  }
+
+  return err ? callback(err, null) : callback(null, result);
+}
+
+function parseConnectionString(url, options) {
   // Variables
   var connection_part = '';
   var auth_part = '';
@@ -15,10 +128,6 @@ module.exports = function(url, options) {
   // Url parser result
   var result = parser.parse(url, true);
 
-  if(result.protocol != 'mongodb:') {
-    throw new Error('invalid schema, expected mongodb');
-  }
-
   if((result.hostname == null || result.hostname == '') && url.indexOf('.sock') == -1) {
     throw new Error('no hostname or hostnames provided in connection string');
   }
@@ -87,7 +196,13 @@ module.exports = function(url, options) {
   for(i = 0; i < hosts.length; i++) {
     var r = parser.parse(f('mongodb://%s', hosts[i].trim()));
     if(r.path && r.path.indexOf(':') != -1) {
-      throw new Error('double colon in host identifier');
+      // Not connecting to a socket so check for an extra slash in the hostname.
+      // Using String#split as perf is better than match.
+      if (r.path.split('/').length > 1) {
+        throw new Error('slash in host identifier');
+      } else {
+        throw new Error('double colon in host identifier');
+      }
     }
   }
 
@@ -193,7 +308,7 @@ module.exports = function(url, options) {
         if(_host.indexOf("?") != -1) _host = _host.split(/\?/)[0];
       }
 
-      // No entry returned for duplicate servr
+      // No entry returned for duplicate server
       if(deduplicatedServers[_host + "_" + _port]) return null;
       deduplicatedServers[_host + "_" + _port] = 1;
 

package/lib/utils.js

@@ -107,7 +107,7 @@ var checkCollectionName = function checkCollectionName (collectionName) {
     throw new MongoError("collection names must not start or end with '.'");
   }
 
-  // Validate that we are not passing 0x00 in the colletion name
+  // Validate that we are not passing 0x00 in the collection name
   if(!!~collectionName.indexOf("\x00")) {
     throw new MongoError("collection names cannot contain a null character");
   }
@@ -295,7 +295,7 @@ var filterOptions = function(options, names) {
   return filterOptions;
 }
 
-// Object.assign method or polyfille
+// Object.assign method or polyfill
 var assign = Object.assign ? Object.assign : function assign(target) {
   if (target === undefined || target === null) {
     throw new TypeError('Cannot convert first argument to object');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.31",
+  "version": "2.2.35",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.1.15",
+    "mongodb-core": "2.1.19",
     "readable-stream": "2.2.7"
   },
   "devDependencies": {
@@ -25,6 +25,7 @@
     "cli-table": "^0.3.1",
     "co": "4.6.0",
     "colors": "^1.1.2",
+    "conventional-changelog-cli": "^1.3.5",
     "coveralls": "^2.11.6",
     "eslint": "^3.8.1",
     "event-stream": "^3.3.2",
@@ -52,7 +53,8 @@
   "scripts": {
     "test": "node test/runner.js -t functional",
     "coverage": "node_modules/.bin/nyc node test/runner.js -t functional && node_modules/.bin/nyc report --reporter=text-lcov | node_modules/.bin/coveralls",
-    "lint": "eslint lib"
+    "lint": "eslint lib",
+    "changelog": "conventional-changelog -p angular -i HISTORY.md -s"
   },
   "nyc": {
     "include": [