Merge pull request #144 from marco-c/improve_sanity_checks

Improve sanity checks

Author: marco-c

index.js

@@ -148,6 +148,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

@@ -159,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)) {
@@ -170,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) {}
     });
   });

test/testSendNotification.js

@@ -438,6 +438,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() {