mongodb 2.2.33 → 2.2.34

package/HISTORY.md

@@ -1,3 +1,22 @@
+<a name="2.2.34"></a>
+## [2.2.34](https://github.com/mongodb/node-mongodb-native/compare/v2.2.33...v2.2.34) (2018-01-03)
+
+
+### Bug Fixes
+
+* **collection:** allow { upsert: 1 } for findOneAndUpdate() and update() ([#1580](https://github.com/mongodb/node-mongodb-native/issues/1580)) ([0f338c8](https://github.com/mongodb/node-mongodb-native/commit/0f338c8)), closes [Automattic/mongoose#5839](https://github.com/Automattic/mongoose/issues/5839)
+* **GridFS:** fix TypeError: doc.data.length is not a function ([811de0c](https://github.com/mongodb/node-mongodb-native/commit/811de0c))
+* **import:** adds missing import to lib/authenticate.js ([10db9a2](https://github.com/mongodb/node-mongodb-native/commit/10db9a2))
+* **list-collections:** ensure default of primary ReadPreference ([0935306](https://github.com/mongodb/node-mongodb-native/commit/0935306))
+
+
+### Features
+
+* **ssl:** adds missing ssl options ssl options for `ciphers` and `ecdhCurve` ([bd4fb53](https://github.com/mongodb/node-mongodb-native/commit/bd4fb53))
+* **url parser:** add dns seedlist support ([2d357bc](https://github.com/mongodb/node-mongodb-native/commit/2d357bc))
+* **core**: update mongodb-core to 2.1.18
+
+
 2.2.33 2017-10-12
 -----------------
 * update to mongodb-core 2.1.17

package/README.md

@@ -325,7 +325,7 @@ Next lets delete the document where the field **a** equals to **3**.
 var deleteDocument = function(db, callback) {
   // Get the documents collection
   var collection = db.collection('documents');
-  // Insert some documents
+  // Delete document where a is 3
   collection.deleteOne({ a : 3 }, function(err, result) {
     assert.equal(err, null);
     assert.equal(1, result.result.n);

package/lib/authenticate.js

@@ -1,6 +1,7 @@
 var shallowClone = require('./utils').shallowClone
   , handleCallback = require('./utils').handleCallback
-  , MongoError = require('mongodb-core').MongoError;
+  , MongoError = require('mongodb-core').MongoError
+  , f = require('util').format;
 
 var authenticate = function(self, username, password, options, callback) {
   // Did the user destroy the topology

package/lib/collection.js

@@ -1044,8 +1044,8 @@ var updateDocuments = function(self, selector, document, options, callback) {
 
   // Execute the operation
   var op = {q: selector, u: document};
-  op.upsert = typeof options.upsert == 'boolean' ? options.upsert : false;
-  op.multi = typeof options.multi == 'boolean' ? options.multi : false;
+  op.upsert = options.upsert !== void 0 ? !!options.upsert : false;
+  op.multi = options.multi !== void 0 ? !!options.multi : false;
 
   // Have we specified collation
   decorateWithCollation(finalOptions, self, options);
@@ -2371,8 +2371,8 @@ var findOneAndUpdate = function(self, filter, update, options, callback) {
   var finalOptions = shallowClone(options);
   finalOptions['fields'] = options.projection;
   finalOptions['update'] = true;
-  finalOptions['new'] = typeof options.returnOriginal == 'boolean' ? !options.returnOriginal : false;
-  finalOptions['upsert'] = typeof options.upsert == 'boolean' ? options.upsert : false;
+  finalOptions['new'] = options.returnOriginal !== void 0 ? !options.returnOriginal : false;
+  finalOptions['upsert'] = options.upsert !== void 0 ? !!options.upsert : false;
 
   // Execute findAndModify
   self.findAndModify(

package/lib/db.js

@@ -653,7 +653,7 @@ var listCollectionsTranforms = function(databaseName) {
  * Get the list of all collection information for the specified db.
  *
  * @method
- * @param {object} filter Query to filter collections by
+ * @param {object} [filter={}] Query to filter collections by
  * @param {object} [options=null] Optional settings.
  * @param {number} [options.batchSize=null] The batchSize for the returned command cursor or if pre 2.8 the systems batch collection
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
@@ -671,6 +671,8 @@ Db.prototype.listCollections = function(filter, options) {
   // Ensure valid readPreference
   if(options.readPreference) {
     options.readPreference = convertReadPreference(options.readPreference);
+  } else {
+    options.readPreference = this.s.readPreference || CoreReadPreference.primary;
   }
 
   // We have a list collections command

package/lib/gridfs-stream/download.js

@@ -209,26 +209,27 @@ function doRead(_this) {
       return __handleError(_this, new Error(errmsg));
     }
 
-    if (doc.data.length() !== expectedLength) {
+    var buf = Buffer.isBuffer(doc.data) ? doc.data : doc.data.buffer;
+
+    if (buf.length !== expectedLength) {
       if (bytesRemaining <= 0) {
         errmsg = 'ExtraChunk: Got unexpected n: ' + doc.n;
         return __handleError(_this, new Error(errmsg));
       }
 
       errmsg = 'ChunkIsWrongSize: Got unexpected length: ' +
-        doc.data.length() + ', expected: ' + expectedLength;
+        buf.length + ', expected: ' + expectedLength;
       return __handleError(_this, new Error(errmsg));
     }
 
-    _this.s.bytesRead += doc.data.length();
+    _this.s.bytesRead += buf.length;
 
-    if (doc.data.buffer.length === 0) {
+    if (buf.length === 0) {
       return _this.push(null);
     }
 
     var sliceStart = null;
     var sliceEnd = null;
-    var buf = doc.data.buffer;
 
     if (_this.s.bytesToSkip != null) {
       sliceStart = _this.s.bytesToSkip;
@@ -241,7 +242,7 @@ function doRead(_this) {
 
     // If the remaining amount of data left is < chunkSize read the right amount of data
     if (_this.s.options.end && (
-      (_this.s.options.end - _this.s.bytesToSkip) < doc.data.length()
+      (_this.s.options.end - _this.s.bytesToSkip) < buf.length
     )) {
       sliceEnd = (_this.s.options.end - _this.s.bytesToSkip);
     }

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
@@ -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/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'

package/lib/url_parser.js

@@ -3,9 +3,121 @@
 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 connectionStrings = addresses.map(function(address, i) {
+        if (i === 0) return 'mongodb://' + 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 +127,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 +195,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');
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.33",
+  "version": "2.2.34",
   "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.17",
+    "mongodb-core": "2.1.18",
     "readable-stream": "2.2.7"
   },
   "devDependencies": {