Changing vapid input / output to be base64url encoded string

Author: Matt Gaunt

src/vapid-helper.js

@@ -32,8 +32,8 @@ function generateVAPIDKeys() {
   curve.generateKeys();
 
   return {
-    publicKey: curve.getPublicKey(),
-    privateKey: curve.getPrivateKey()
+    publicKey: urlBase64.encode(curve.getPublicKey()),
+    privateKey: urlBase64.encode(curve.getPrivateKey())
   };
 }
 
@@ -84,24 +84,30 @@ function getVapidHeaders(audience, subject, publicKey, privateKey, expiration) {
     throw new Error('No key set vapid.publicKey');
   }
 
-  if (!(publicKey instanceof Buffer)) {
-    throw new Error('Vapid public key is not a buffer.');
+  if (typeof publicKey !== 'string') {
+    throw new Error('Vapid public key is must be a URL safe Base 64 ' +
+      'encoded string.');
   }
 
+  publicKey = urlBase64.decode(publicKey);
+
   if (publicKey.length !== 65) {
-    throw new Error('Vapid public key should be 65 bytes long');
+    throw new Error('Vapid public key should be 65 bytes long when decoded.');
   }
 
   if (!privateKey) {
     throw new Error('No key set in vapid.privateKey');
   }
 
-  if (!(privateKey instanceof Buffer)) {
-    throw new Error('Vapid private key is not a buffer');
+  if (typeof privateKey !== 'string') {
+    throw new Error('Vapid private key must be a URL safe Base 64 ' +
+      'encoded string.');
   }
 
+  privateKey = urlBase64.decode(privateKey);
+
   if (privateKey.length !== 32) {
-    throw new Error('Vapid private key should be 32 bytes long');
+    throw new Error('Vapid private key should be 32 bytes long when decoded.');
   }
 
   if (expiration) {

test/test-vapid-helper.js

@@ -1,14 +1,15 @@
 'use strict';
 
 const assert = require('assert');
+const urlBase64 = require('urlsafe-base64');
 const webPush = require('../src/index');
 const vapidHelper = require('../src/vapid-helper');
 
 const VALID_AUDIENCE = 'https://example.com';
 const VALID_SUBJECT_MAILTO = 'mailto: [email protected]';
 const VALID_SUBJECT_URL = 'https://exampe.com/contact';
-const VALID_PUBLIC_KEY = new Buffer(65);
-const VALID_PRIVATE_KEY = new Buffer(32);
+const VALID_PUBLIC_KEY = urlBase64.encode(new Buffer(65));
+const VALID_PRIVATE_KEY = urlBase64.encode(new Buffer(32));
 const VALID_EXPIRATION = Math.floor(Date.now() / 1000) + (60 * 60 * 12);
 
 suite('Test Vapid Helpers', function() {
@@ -21,11 +22,11 @@ suite('Test Vapid Helpers', function() {
     assert(keys.privateKey);
     assert(keys.publicKey);
 
-    assert.equal(keys.privateKey instanceof Buffer, true);
-    assert.equal(keys.publicKey instanceof Buffer, true);
+    assert.equal(typeof keys.privateKey, 'string');
+    assert.equal(typeof keys.publicKey, 'string');
 
-    assert.equal(keys.privateKey.length, 32);
-    assert.equal(keys.publicKey.length, 65);
+    assert.equal(urlBase64.decode(keys.privateKey).length, 32);
+    assert.equal(urlBase64.decode(keys.publicKey).length, 65);
   });
 
   test('generate new vapid keys between calls', function() {

test/testSelenium.js

@@ -8,7 +8,6 @@
   }
 
   /* eslint-disable global-require */
-  const urlBase64 = require('urlsafe-base64');
   const seleniumAssistant = require('selenium-assistant');
   const webdriver = require('selenium-webdriver');
   const seleniumFirefox = require('selenium-webdriver/firefox');
@@ -26,11 +25,13 @@
   require('chromedriver');
   /* eslint-enable global-require */
 
+  const vapidKeys = webPush.generateVAPIDKeys();
+
   const PUSH_TEST_TIMEOUT = 120 * 1000;
   const VAPID_PARAM = {
     subject: 'mailto:[email protected]',
-    privateKey: new Buffer('H6tqEMswzHOFlPHFi2JPfDQRiKN32ZJIwvSPWZl1VTA=', 'base64'),
-    publicKey: new Buffer('BIx6khu9Z/5lBwNEXYNEOQiL70IKYDpDxsTyoiCb82puQ/V4c/NFdyrBFpWdsz3mikmV6sWARNuhRbbbLTMOmB0=', 'base64')
+    privateKey: vapidKeys.privateKey,
+    publicKey: vapidKeys.publicKey
   };
   const testDirectory = './test/output/';
 
@@ -119,7 +120,7 @@
       globalDriver = driver;
 
       if (options.vapid) {
-        testServerURL += '?vapid=' + urlBase64.encode(options.vapid.publicKey);
+        testServerURL += '?vapid=' + options.vapid.publicKey;
       }
 
       return globalDriver.get(testServerURL)