fix(buffer): replace deprecated Buffer constructor

Replace Buffer constructor with buffer.alloc and buffer.from

Fixes Node-1461

lib/auth/scram.js

@@ -70,16 +70,16 @@ var passwordDigest = function(username, password) {
 
 // XOR two buffers
 function xor(a, b) {
-  if (!Buffer.isBuffer(a)) a = new Buffer(a);
-  if (!Buffer.isBuffer(b)) b = new Buffer(b);
+  if (!Buffer.isBuffer(a)) a = Buffer.from(a);
+  if (!Buffer.isBuffer(b)) b = Buffer.from(b);
   const length = Math.max(a.length, b.length);
   const res = [];
 
   for (let i = 0; i < length; i += 1) {
     res.push(a[i] ^ b[i]);
   }
 
-  return new Buffer(res).toString('base64');
+  return Buffer.from(res).toString('base64');
 }
 
 function H(method, text) {
@@ -280,7 +280,7 @@ ScramSHA.prototype.auth = function(server, connections, db, username, password,
         var withoutProof = f('c=biws,r=%s', rnonce);
         var saltedPassword = HI(
           processedPassword,
-          new Buffer(salt, 'base64'),
+          Buffer.from(salt, 'base64'),
           iterations,
           cryptoMethod
         );
@@ -316,7 +316,7 @@ ScramSHA.prototype.auth = function(server, connections, db, username, password,
         const cmd = {
           saslContinue: 1,
           conversationId: r.result.conversationId,
-          payload: new Binary(new Buffer(clientFinal))
+          payload: new Binary(Buffer.from(clientFinal))
         };
 
         //
@@ -333,7 +333,7 @@ ScramSHA.prototype.auth = function(server, connections, db, username, password,
               var cmd = {
                 saslContinue: 1,
                 conversationId: r.result.conversationId,
-                payload: new Buffer(0)
+                payload: Buffer.alloc(0)
               };
 
               // Write the commmand on the connection

lib/connection/commands.js

@@ -129,7 +129,7 @@ Query.prototype.toBin = function() {
   if (self.batchSize !== self.numberToReturn) self.numberToReturn = self.batchSize;
 
   // Allocate write protocol header buffer
-  var header = new Buffer(
+  var header = Buffer.alloc(
     4 * 4 + // Header
     4 + // Flags
     Buffer.byteLength(self.ns) +
@@ -247,7 +247,7 @@ GetMore.prototype.toBin = function() {
   // Create command buffer
   var index = 0;
   // Allocate buffer
-  var _buffer = new Buffer(length);
+  var _buffer = Buffer.alloc(length);
 
   // Write header information
   // index = write32bit(index, _buffer, length);
@@ -332,7 +332,7 @@ KillCursor.prototype.toBin = function() {
 
   // Create command buffer
   var index = 0;
-  var _buffer = new Buffer(length);
+  var _buffer = Buffer.alloc(length);
 
   // Write header information
   // index = write32bit(index, _buffer, length);

lib/connection/connection.js

@@ -335,7 +335,7 @@ var dataHandler = function(self) {
           self.bytesRead = self.bytesRead + data.length;
 
           // Reset state of buffer
-          data = new Buffer(0);
+          data = Buffer.alloc(0);
         } else {
           // Copy the missing part of the data into our current buffer
           data.copy(self.buffer, self.bytesRead, 0, remainingBytesToRead);
@@ -374,7 +374,7 @@ var dataHandler = function(self) {
           // If we have enough bytes to determine the message size let's do it
           if (self.stubBuffer.length + data.length > 4) {
             // Prepad the data
-            var newData = new Buffer(self.stubBuffer.length + data.length);
+            var newData = Buffer.alloc(self.stubBuffer.length + data.length);
             self.stubBuffer.copy(newData, 0);
             data.copy(newData, self.stubBuffer.length);
             // Reassign for parsing
@@ -387,13 +387,13 @@ var dataHandler = function(self) {
             self.stubBuffer = null;
           } else {
             // Add the the bytes to the stub buffer
-            var newStubBuffer = new Buffer(self.stubBuffer.length + data.length);
+            var newStubBuffer = Buffer.alloc(self.stubBuffer.length + data.length);
             // Copy existing stub buffer
             self.stubBuffer.copy(newStubBuffer, 0);
             // Copy missing part of the data
             data.copy(newStubBuffer, self.stubBuffer.length);
             // Exit parsing loop
-            data = new Buffer(0);
+            data = Buffer.alloc(0);
           }
         } else {
           if (data.length > 4) {
@@ -423,7 +423,7 @@ var dataHandler = function(self) {
               sizeOfMessage < self.maxBsonMessageSize &&
               sizeOfMessage > data.length
             ) {
-              self.buffer = new Buffer(sizeOfMessage);
+              self.buffer = Buffer.alloc(sizeOfMessage);
               // Copy all the data into the buffer
               data.copy(self.buffer, 0);
               // Update bytes read
@@ -433,7 +433,7 @@ var dataHandler = function(self) {
               // Ensure stub buffer is null
               self.stubBuffer = null;
               // Exit parsing loop
-              data = new Buffer(0);
+              data = Buffer.alloc(0);
             } else if (
               sizeOfMessage > 4 &&
               sizeOfMessage < self.maxBsonMessageSize &&
@@ -447,7 +447,7 @@ var dataHandler = function(self) {
                 self.bytesRead = 0;
                 self.stubBuffer = null;
                 // Exit parsing loop
-                data = new Buffer(0);
+                data = Buffer.alloc(0);
                 // Emit the message
                 emitMessageHandler(self, emitBuffer);
               } catch (err) {
@@ -474,7 +474,7 @@ var dataHandler = function(self) {
               self.bytesRead = 0;
               self.stubBuffer = null;
               // Exit parsing loop
-              data = new Buffer(0);
+              data = Buffer.alloc(0);
             } else {
               emitBuffer = data.slice(0, sizeOfMessage);
               // Reset state of buffer
@@ -489,11 +489,11 @@ var dataHandler = function(self) {
             }
           } else {
             // Create a buffer that contains the space for the non-complete message
-            self.stubBuffer = new Buffer(data.length);
+            self.stubBuffer = Buffer.alloc(data.length);
             // Copy the data to the stub buffer
             data.copy(self.stubBuffer, 0);
             // Exit parsing loop
-            data = new Buffer(0);
+            data = Buffer.alloc(0);
           }
         }
       }

lib/connection/pool.js

@@ -1057,14 +1057,14 @@ var serializeCommands = function(self, commands, result, callback) {
       if (err) return callback(err, null);
 
       // Create the msgHeader of OP_COMPRESSED
-      var msgHeader = new Buffer(MESSAGE_HEADER_SIZE);
+      var msgHeader = Buffer.alloc(MESSAGE_HEADER_SIZE);
       msgHeader.writeInt32LE(MESSAGE_HEADER_SIZE + 9 + compressedMessage.length, 0); // messageLength
       msgHeader.writeInt32LE(thisCommand.requestId, 4); // requestID
       msgHeader.writeInt32LE(0, 8); // responseTo (zero)
       msgHeader.writeInt32LE(opcodes.OP_COMPRESSED, 12); // opCode
 
       // Create the compression details of OP_COMPRESSED
-      var compressionDetails = new Buffer(9);
+      var compressionDetails = Buffer.alloc(9);
       compressionDetails.writeInt32LE(originalCommandOpCode, 0); // originalOpcode
       compressionDetails.writeInt32LE(messageToBeCompressed.length, 4); // Size of the uncompressed compressedMessage, excluding the MsgHeader
       compressionDetails.writeUInt8(compressorIDs[self.options.agreedCompressor], 8); // compressorID

lib/topologies/replset_state.js

@@ -979,8 +979,8 @@ function addToList(self, type, ismaster, server, list) {
 }
 
 function compareObjectIds(id1, id2) {
-  var a = new Buffer(id1.toHexString(), 'hex');
-  var b = new Buffer(id2.toHexString(), 'hex');
+  var a = Buffer.from(id1.toHexString(), 'hex');
+  var b = Buffer.from(id2.toHexString(), 'hex');
 
   if (a === b) {
     return 0;

lib/topologies/shared.js

@@ -49,7 +49,7 @@ function createClientInfo(options) {
   // Do we have an application specific string
   if (options.appname) {
     // Cut at 128 bytes
-    var buffer = new Buffer(options.appname);
+    var buffer = Buffer.from(options.appname);
     // Return the truncated appname
     var appname = buffer.length > 128 ? buffer.slice(0, 128).toString('utf8') : options.appname;
     // Add to the clientInfo

test/tests/functional/server_tests.js

@@ -459,7 +459,7 @@ describe('Server tests', function() {
 
             // Write garbage, force socket closure
             try {
-              var a = new Buffer(100);
+              var a = Buffer.alloc(100);
               for (var i = 0; i < 100; i++) a[i] = i;
               result.connection.write(a);
             } catch (loopErr) {
@@ -649,7 +649,7 @@ describe('Server tests', function() {
 
             // Write garbage, force socket closure
             try {
-              var a = new Buffer(100);
+              var a = Buffer.alloc(100);
               for (var i = 0; i < 100; i++) a[i] = i;
               result.connection.write(a);
             } catch (garbageErr) {

test/tests/unit/common.js

@@ -115,7 +115,7 @@ function genClusterTime(time) {
   return {
     clusterTime: new Timestamp(time),
     signature: {
-      hash: new Binary(new Buffer('testing')),
+      hash: new Binary(Buffer.from('testing')),
       keyId: 42
     }
   };

test/tests/unit/scram_iterations_tests.js

@@ -31,7 +31,7 @@ describe('SCRAM Iterations Tests', function() {
         return request.reply({
           ok: 1,
           done: false,
-          payload: new Buffer(scramResponse)
+          payload: Buffer.from(scramResponse)
         });
       } else if (doc.saslContinue) {
         done('SHOULD NOT BE HERE');