Merge branch 'master' of https://github.com/marco-c/web-push into remove_intermediate_standard

Author: marco-c

README.md

@@ -3,7 +3,7 @@
 
 Supports Firefox 44+ and Chromium/Chrome 42+.
 Notifications with payloads are supported in Firefox 44+ and Chromium/Chrome 50+.
-[VAPID](https://tools.ietf.org/html/draft-thomson-webpush-vapid-02) is supported in Firefox 45+ (for notifications without payloads).
+[VAPID](https://tools.ietf.org/html/draft-thomson-webpush-vapid-02) is supported in Firefox 45+ (for notifications without payloads) and in Firefox 46+ for all notifications.
 
 [![NPM](https://nodei.co/npm/web-push.svg?downloads=true)](https://www.npmjs.com/package/web-push)
 

index.js

@@ -124,6 +124,22 @@ function sendNotification(endpoint, params) {
         console.warn('You are using the old, deprecated, interface of the `sendNotification` function.'.bold.red);
       }
 
+      if (userPublicKey) {
+        if (typeof userPublicKey !== 'string') {
+          throw new Error('userPublicKey should be a base64-encoded string.');
+        } else if (urlBase64.decode(userPublicKey).length !== 65) {
+          throw new Error('userPublicKey should be 65 bytes long.');
+        }
+      }
+
+      if (userAuth) {
+        if (typeof userAuth !== 'string') {
+          throw new Error('userAuth should be a base64-encoded string.');
+        } else if (urlBase64.decode(userAuth).length < 12) {
+          throw new Error('userAuth should be at least 12 bytes long');
+        }
+      }
+
       const isGCM = endpoint.indexOf('https://android.googleapis.com/gcm/send') === 0;
 
       var urlParts = url.parse(endpoint);

test/testSelenium.js

@@ -58,9 +58,7 @@ suite('selenium', function() {
     .then(function(newServer) {
       server = newServer;
 
-      var profilePath = temp.mkdirSync('marco');
-
-      var profile = new firefox.Profile(profilePath);
+      var profile = new firefox.Profile();
       profile.setPreference('security.turn_off_all_security_so_that_viruses_can_take_over_this_computer', true);
       profile.setPreference('extensions.checkCompatibility.nightly', false);
       // Only allow installation of third-party addons from the user's profile dir (needed to block the third-party
@@ -76,7 +74,7 @@ suite('selenium', function() {
       var chromeOptions = new chrome.Options()
         .setChromeBinaryPath(chromeBinaryPath)
         .addArguments('--no-sandbox')
-        .addArguments('user-data-dir=' + profilePath);
+        .addArguments('user-data-dir=' + temp.mkdirSync('marco'));
 
       var builder = new webdriver.Builder()
         .forBrowser('firefox')
@@ -161,9 +159,10 @@ suite('selenium', function() {
 
       try {
         console.log('Using Firefox: ' + firefoxStableBinaryPath);
-        console.log('Version: ' + childProcess.execSync(firefoxStableBinaryPath + ' --version').replace('\n', ''));
-        console.log('Beta Version: ' + childProcess.execSync(firefoxBetaBinaryPath + ' --version').replace('\n', ''));
-        console.log('Aurora Version: ' + childProcess.execSync(firefoxAuroraBinaryPath + ' --version').replace('\n', ''));
+        console.log('Version: ' + childProcess.execSync(firefoxStableBinaryPath + ' --version').toString().replace('\n', ''));
+        console.log('Beta Version: ' + childProcess.execSync(firefoxBetaBinaryPath + ' --version').toString().replace('\n', ''));
+        //console.log('Aurora Version: ' + childProcess.execSync(firefoxAuroraBinaryPath + ' --version').toString().replace('\n', ''));
+        console.log('Nightly Version: ' + childProcess.execSync(firefoxNightlyBinaryPath + ' --version').toString().replace('\n', ''));
       } catch (e) {}
 
       if (process.env.GCM_API_KEY && !fs.existsSync(chromeBinaryPath)) {
@@ -172,7 +171,7 @@ suite('selenium', function() {
 
       try {
         console.log('Using Chromium: ' + chromeBinaryPath);
-        console.log('Version: ' + childProcess.execSync(chromeBinaryPath + ' --version').replace('\n', ''));
+        console.log('Version: ' + childProcess.execSync(chromeBinaryPath + ' --version').toString().replace('\n', ''));
       } catch (e) {}
     });
   });
@@ -260,15 +259,13 @@ suite('selenium', function() {
     });
   }
 
-  /*
-  XXX: Currently broken, see https://github.com/mozilla-services/autopush/issues/426.
   test('send/receive notification with payload & vapid with Firefox Beta', function() {
     return runTest({
       browser: 'firefox-beta',
       payload: 'marco',
       vapid: vapidParam,
     });
-  });*/
+  });
 
   if (process.env.GCM_API_KEY && process.env.TRAVIS_OS_NAME !== 'osx') {
     test('send/receive notification with payload & vapid with Chrome', function() {

test/testSendNotification.js

@@ -211,6 +211,23 @@ suite('sendNotification', function() {
     });
   });
 
+  test('send/receive string (non-urlsafe base64)', function() {
+    return startServer('hello')
+    .then(function() {
+      return webPush.sendNotification('https://127.0.0.1:' + serverPort, {
+        userPublicKey: userPublicKey.toString('base64'),
+        userAuth: userAuth.toString('base64'),
+        payload: 'hello',
+      });
+    })
+    .then(function(body) {
+      assert(true, 'sendNotification promise resolved');
+      assert.equal(body, 'ok');
+    }, function(e) {
+      assert(false, 'sendNotification promise rejected with: ' + e);
+    });
+  });
+
   test('send/receive buffer', function() {
     return startServer('hello')
     .then(function() {
@@ -396,6 +413,71 @@ suite('sendNotification', function() {
     });
   });
 
+  test('userPublicKey argument isn\'t a string', function() {
+    return webPush.sendNotification('https://127.0.0.1:' + serverPort, {
+      userPublicKey: userPublicKey,
+      userAuth: urlBase64.encode(userAuth),
+      payload: 'hello',
+    })
+    .then(function(body) {
+      assert(false, 'sendNotification promise resolved');
+    }, function() {
+      assert(true, 'sendNotification promise rejected');
+    });
+  });
+
+  test('userAuth argument isn\'t a string', function() {
+    return webPush.sendNotification('https://127.0.0.1:' + serverPort, {
+      userPublicKey: urlBase64.encode(userPublicKey),
+      userAuth: userAuth,
+      payload: 'hello',
+    })
+    .then(function(body) {
+      assert(false, 'sendNotification promise resolved');
+    }, function() {
+      assert(true, 'sendNotification promise rejected');
+    });
+  });
+
+  test('userPublicKey argument is too long', function() {
+    return webPush.sendNotification('https://127.0.0.1:' + serverPort, {
+      userPublicKey: urlBase64.encode(Buffer.concat([ userPublicKey, new Buffer(1) ])),
+      userAuth: urlBase64.encode(userAuth),
+      payload: 'hello',
+    })
+    .then(function(body) {
+      assert(false, 'sendNotification promise resolved');
+    }, function() {
+      assert(true, 'sendNotification promise rejected');
+    });
+  });
+
+  test('userPublicKey argument is too short', function() {
+    return webPush.sendNotification('https://127.0.0.1:' + serverPort, {
+      userPublicKey: urlBase64.encode(userPublicKey.slice(1)),
+      userAuth: urlBase64.encode(userAuth),
+      payload: 'hello',
+    })
+    .then(function(body) {
+      assert(false, 'sendNotification promise resolved');
+    }, function() {
+      assert(true, 'sendNotification promise rejected');
+    });
+  });
+
+  test('userAuth argument is too short', function() {
+    return webPush.sendNotification('https://127.0.0.1:' + serverPort, {
+      userPublicKey: urlBase64.encode(userPublicKey),
+      userAuth: urlBase64.encode(userAuth.slice(1)),
+      payload: 'hello',
+    })
+    .then(function(body) {
+      assert(false, 'sendNotification promise resolved');
+    }, function() {
+      assert(true, 'sendNotification promise rejected');
+    });
+  });
+
   test('TTL with old interface', function() {
     return startServer(undefined, 5)
     .then(function() {