Use new Buffer functions to create buffers (#401)

marco-c · web-flow · commit ac1412936864 · 2019-01-14T02:45:07.000+01:00
diff --git a/src/encryption-helper.js b/src/encryption-helper.js
@@ -35,7 +35,7 @@ const encrypt = function(userPublicKey, userAuth, payload, contentEncoding) {
   }
 
   if (typeof payload === 'string' || payload instanceof String) {
-    payload = new Buffer(payload);
+    payload = Buffer.from(payload);
   }
 
   const localCurve = crypto.createECDH('prime256v1');
diff --git a/src/vapid-helper.js b/src/vapid-helper.js
@@ -48,13 +48,13 @@ function generateVAPIDKeys() {
   // in errors, hence this padding.
   // See https://github.com/web-push-libs/web-push/issues/295 for history.
   if (privateKeyBuffer.length < 32) {
-    const padding = new Buffer(32 - privateKeyBuffer.length);
+    const padding = Buffer.alloc(32 - privateKeyBuffer.length);
     padding.fill(0);
     privateKeyBuffer = Buffer.concat([privateKeyBuffer, padding]);
   }
 
   if (publicKeyBuffer.length < 65) {
-    const padding = new Buffer(65 - publicKeyBuffer.length);
+    const padding = Buffer.alloc(65 - publicKeyBuffer.length);
     padding.fill(0);
     publicKeyBuffer = Buffer.concat([publicKeyBuffer, padding]);
   }
diff --git a/test/test-encryption-helper.js b/test/test-encryption-helper.js
@@ -28,19 +28,19 @@ suite('Test Encryption Helpers', function() {
   }
 
   test('encrypt/decrypt string (aesgcm)', function() {
-    assert(encryptDecrypt('hello', webPush.supportedContentEncodings.AES_GCM).equals(new Buffer('hello')));
+    assert(encryptDecrypt('hello', webPush.supportedContentEncodings.AES_GCM).equals(Buffer.from('hello')));
   });
 
   test('encrypt/decrypt string (aes128gcm)', function() {
-    assert(encryptDecrypt('hello', webPush.supportedContentEncodings.AES_128_GCM).equals(new Buffer('hello')));
+    assert(encryptDecrypt('hello', webPush.supportedContentEncodings.AES_128_GCM).equals(Buffer.from('hello')));
   });
 
   test('encrypt/decrypt buffer (aesgcm)', function() {
-    assert(encryptDecrypt(new Buffer('hello'), webPush.supportedContentEncodings.AES_GCM).equals(new Buffer('hello')));
+    assert(encryptDecrypt(Buffer.from('hello'), webPush.supportedContentEncodings.AES_GCM).equals(Buffer.from('hello')));
   });
 
   test('encrypt/decrypt buffer (aes128gcm)', function() {
-    assert(encryptDecrypt(new Buffer('hello'), webPush.supportedContentEncodings.AES_128_GCM).equals(new Buffer('hello')));
+    assert(encryptDecrypt(Buffer.from('hello'), webPush.supportedContentEncodings.AES_128_GCM).equals(Buffer.from('hello')));
   });
 
   // userPublicKey, userAuth, payload
diff --git a/test/test-generate-request-details.js b/test/test-generate-request-details.js
@@ -128,7 +128,7 @@ suite('Test Generate Request Details', function() {
       requestOptions: {
         subscription: {
           keys: {
-            p256dh: urlBase64.encode(Buffer.concat([userPublicKey, new Buffer(1)])),
+            p256dh: urlBase64.encode(Buffer.concat([userPublicKey, Buffer.alloc(1)])),
             auth: urlBase64.encode(userAuth)
           }
         },
diff --git a/test/test-set-vapid-details.js b/test/test-set-vapid-details.js
@@ -6,8 +6,8 @@ const webPush = require('../src/index');
 
 const VALID_SUBJECT_MAILTO = 'mailto: example@example.com';
 const VALID_SUBJECT_URL = 'https://exampe.com/contact';
-const VALID_PUBLIC_KEY = urlBase64.encode(new Buffer(65));
-const VALID_PRIVATE_KEY = urlBase64.encode(new Buffer(32));
+const VALID_PUBLIC_KEY = urlBase64.encode(Buffer.alloc(65));
+const VALID_PRIVATE_KEY = urlBase64.encode(Buffer.alloc(32));
 
 suite('setVapidDetails()', function() {
   test('is defined', function() {
@@ -55,7 +55,7 @@ suite('setVapidDetails()', function() {
     },
     {
       subject: VALID_SUBJECT_URL,
-      publicKey: urlBase64.encode(new Buffer(60)),
+      publicKey: urlBase64.encode(Buffer.alloc(60)),
       privateKey: VALID_PRIVATE_KEY
     },
     {
@@ -81,7 +81,7 @@ suite('setVapidDetails()', function() {
     {
       subject: VALID_SUBJECT_URL,
       publicKey: VALID_PUBLIC_KEY,
-      privateKey: urlBase64.encode(new Buffer(60))
+      privateKey: urlBase64.encode(Buffer.alloc(60))
     },
     {
       subject: VALID_SUBJECT_URL,
diff --git a/test/test-vapid-helper.js b/test/test-vapid-helper.js
@@ -10,8 +10,8 @@ const vapidHelper = require('../src/vapid-helper');
 const VALID_AUDIENCE = 'https://example.com';
 const VALID_SUBJECT_MAILTO = 'mailto: example@example.com';
 const VALID_SUBJECT_URL = 'https://exampe.com/contact';
-const VALID_PUBLIC_KEY = urlBase64.encode(new Buffer(65));
-const VALID_PRIVATE_KEY = urlBase64.encode(new Buffer(32));
+const VALID_PUBLIC_KEY = urlBase64.encode(Buffer.alloc(65));
+const VALID_PRIVATE_KEY = urlBase64.encode(Buffer.alloc(32));
 const VALID_CONTENT_ENCODING = webPush.supportedContentEncodings.AES_GCM;
 const VALID_EXPIRATION = Math.floor(Date.now() / 1000) + (60 * 60 * 12);
 
@@ -47,8 +47,8 @@ suite('Test Vapid Helpers', function() {
     sandbox.stub(crypto, 'createECDH').callsFake(() => {
       return {
         generateKeys: () => {},
-        getPublicKey: () => new Buffer(60),
-        getPrivateKey: () => new Buffer(27)
+        getPublicKey: () => Buffer.alloc(60),
+        getPrivateKey: () => Buffer.alloc(27)
       };
     });
 
diff --git a/test/testHTTPECE.js b/test/testHTTPECE.js
@@ -12,7 +12,7 @@ suite('http_ece', function() {
   }
 
   test('aesgcm - padSize 2 - pad 0', function() {
-    const input = new Buffer(urlBase64.encode('marco'));
+    const input = Buffer.from(urlBase64.encode('marco'));
 
     const receiverCurve = crypto.createECDH('prime256v1');
     receiverCurve.setPrivateKey('a4C8H+f9IWtbAbTTkL2AgQ7xo/tqXddWWw7R2CR5OME=', 'base64');
@@ -34,7 +34,7 @@ suite('http_ece', function() {
       salt: salt,
       authSecret: authSecret
     });
-    assert(encrypted.equals(new Buffer('Np3XM0NFvnxothcJfFzrv8Vsprn_k9I', 'base64')));
+    assert(encrypted.equals(Buffer.from('Np3XM0NFvnxothcJfFzrv8Vsprn_k9I', 'base64')));
 
     const decrypted = ece.decrypt(encrypted, {
       keyid: 'receiver',
@@ -46,7 +46,7 @@ suite('http_ece', function() {
   });
 
   test('aesgcm - padSize 2 - pad 1', function() {
-    const input = new Buffer(urlBase64.encode('marco'));
+    const input = Buffer.from(urlBase64.encode('marco'));
 
     const receiverCurve = crypto.createECDH('prime256v1');
     receiverCurve.setPrivateKey('a4C8H+f9IWtbAbTTkL2AgQ7xo/tqXddWWw7R2CR5OME=', 'base64');
@@ -69,7 +69,7 @@ suite('http_ece', function() {
       authSecret: authSecret,
       pad: 1
     });
-    assert(encrypted.equals(new Buffer('Npy6P1BUsvRGMWEbwYq2JArF0l9YD38o', 'base64')));
+    assert(encrypted.equals(Buffer.from('Npy6P1BUsvRGMWEbwYq2JArF0l9YD38o', 'base64')));
 
     const decrypted = ece.decrypt(encrypted, {
       keyid: 'receiver',
diff --git a/test/testSendNotification.js b/test/testSendNotification.js
@@ -69,7 +69,7 @@ suite('sendNotification', function() {
     };
 
     server = https.createServer(options, function(req, res) {
-      requestBody = new Buffer(0);
+      requestBody = Buffer.alloc(0);
 
       req.on('data', function(chunk) {
         requestBody = Buffer.concat([requestBody, chunk]);
@@ -156,7 +156,7 @@ suite('sendNotification', function() {
         authSecret: urlBase64.encode(userAuth)
       });
 
-      assert(decrypted.equals(new Buffer(options.message)), 'Check cipher text can be correctly decoded');
+      assert(decrypted.equals(Buffer.from(options.message)), 'Check cipher text can be correctly decoded');
     }
 
     if (options.vapid) {
@@ -227,7 +227,7 @@ suite('sendNotification', function() {
         subscription: {
           keys: VALID_KEYS
         },
-        message: new Buffer('hello')
+        message: Buffer.from('hello')
       }
     }, {
       testTitle: 'send/receive unicode character',
@@ -586,7 +586,7 @@ suite('sendNotification', function() {
       requestOptions: {
         subscription: {
           keys: {
-            p256dh: urlBase64.encode(Buffer.concat([userPublicKey, new Buffer(1)])),
+            p256dh: urlBase64.encode(Buffer.concat([userPublicKey, Buffer.alloc(1)])),
             auth: urlBase64.encode(userAuth)
           }
         },

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ const encrypt = function(userPublicKey, userAuth, payload, contentEncoding) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (typeof payload === 'string' \|\| payload instanceof String) {`
`38`		`- payload = new Buffer(payload);`
	`38`	`+ payload = Buffer.from(payload);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`const localCurve = crypto.createECDH('prime256v1');`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ suite('Test Generate Request Details', function() {`
`128`	`128`	`requestOptions: {`
`129`	`129`	`subscription: {`
`130`	`130`	`keys: {`
`131`		`- p256dh: urlBase64.encode(Buffer.concat([userPublicKey, new Buffer(1)])),`
	`131`	`+ p256dh: urlBase64.encode(Buffer.concat([userPublicKey, Buffer.alloc(1)])),`
`132`	`132`	`auth: urlBase64.encode(userAuth)`
`133`	`133`	`}`
`134`	`134`	`},`