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

Author: marco-c

.eslintrc

@@ -14,6 +14,7 @@
     "max-len": [1, 80, 4, {"ignoreComments": true, "ignoreUrls": true}],
     "no-param-reassign": 0,
     "quote-props": 0,
-    "wrap-iife": [2, "inside"]
+    "wrap-iife": [2, "inside"],
+    "import/no-unresolved": 0
   }
 }

bin/web-push.js

@@ -0,0 +1,68 @@
+#! /usr/bin/env node
+const fs = require('fs');
+const webPush = require('web-push');
+webPush.setGCMAPIKey(process.env.GCM_API_KEY);
+
+const argv = require('minimist')(process.argv.slice(2));
+
+const usage = 'Use: web-push --endpoint=<url> --key=<browser key> ' +
+  '[--auth=<auth secret>] [--ttl=<seconds>] [--payload=<message>] ' +
+  '[--vapid-audience] [--vapid-subject] [--vapid-pvtkey] [--vapid-pubkey]';
+
+if (!argv.endpoint || !argv.key) {
+  console.log(usage);
+  process.exit(1);
+}
+
+const endpoint = argv.endpoint;
+const key = argv.key;
+const ttl = argv.ttl || 0;
+const payload = argv.payload || '';
+const auth = argv.auth || null;
+
+const vapidAudience = argv['vapid-audience'] || null;
+const vapidSubject = argv['vapid-subject'] || null;
+const vapidPubKey = argv['vapid-pubkey'] || null;
+const vapidPvtKey = argv['vapid-pvtkey'] || null;
+
+function getKeys() {
+  if (vapidPubKey && vapidPvtKey) {
+    const publicKey = fs.readFileSync(vapidPubKey);
+    const privateKey = fs.readFileSync(vapidPvtKey);
+
+    if (publicKey && privateKey) {
+      return {
+        privateKey,
+        publicKey
+      };
+    }
+  }
+
+  return webPush.generateVAPIDKeys();
+}
+
+let params = {
+  TTL: ttl,
+  payload,
+  userPublicKey: key
+};
+if (vapidAudience && vapidSubject) {
+  const vapidKeys = getKeys();
+  const vapid = {
+    audience: vapidAudience,
+    subject: `mailto:${vapidSubject}`,
+    privateKey: vapidKeys.privateKey,
+    publicKey: vapidKeys.publicKey
+  };
+  params.vapid = vapid;
+}
+if (auth) {
+  params.userAuth = auth;
+}
+webPush.sendNotification(endpoint, params).then(() => {
+  console.log('Push message sent.');
+}, (err) => {
+  console.log('Error sending push message: ', err);
+}).then(() => {
+  process.exit(0);
+});

package.json

@@ -42,22 +42,24 @@
   },
   "devDependencies": {
     "chalk": "^1.1.3",
-    "chromedriver": "^2.23.1",
+    "chromedriver": "^2.24.1",
     "del": "^2.2.1",
     "dmg": "^0.1.0",
     "eslint": "^2.10.2",
     "eslint-config-airbnb": "^9.0.1",
     "eslint-plugin-import": "^1.11.1",
     "fs-extra": "^0.30.0",
+    "geckodriver": "^1.1.2",
     "istanbul": "^0.4.2",
     "mkdirp": "^0.5.1",
     "mocha": "^2.4.5",
     "portfinder": "^1.0.2",
     "request": "^2.69.0",
-    "selenium-assistant": "0.4.0",
-    "selenium-webdriver": "~2.53.2",
+    "selenium-assistant": "0.5.3",
+    "selenium-webdriver": "^3.0.0-beta-2",
     "semver": "^5.1.0",
-    "temp": "^0.8.3"
+    "temp": "^0.8.3",
+    "which": "^1.2.11"
   },
   "engines": {
     "node": ">= v0.10.0"

src/encryption-helper.js

@@ -0,0 +1,65 @@
+'use strict';
+
+const crypto = require('crypto');
+const ece = require('http_ece');
+const urlBase64 = require('urlsafe-base64');
+
+const encrypt = function(userPublicKey, userAuth, payload) {
+  if (!userPublicKey) {
+    throw new Error('No user public key provided for encryption.');
+  }
+
+  if (typeof userPublicKey !== 'string') {
+    throw new Error('The subscription p256dh value must be a string.');
+  }
+
+  if (urlBase64.decode(userPublicKey).length !== 65) {
+    throw new Error('The subscription p256dh value should be 65 bytes long.');
+  }
+
+  if (!userAuth) {
+    throw new Error('No user auth provided for encryption.');
+  }
+
+  if (typeof userAuth !== 'string') {
+    throw new Error('The subscription auth key must be a string.');
+  }
+
+  if (urlBase64.decode(userAuth).length < 16) {
+    throw new Error('The subscription auth key should be at least 16 ' +
+      'bytes long');
+  }
+
+  if (typeof payload !== 'string' && !Buffer.isBuffer(payload)) {
+    throw new Error('Payload must be either a string or a Node Buffer.');
+  }
+
+  if (typeof payload === 'string' || payload instanceof String) {
+    payload = new Buffer(payload);
+  }
+
+  const localCurve = crypto.createECDH('prime256v1');
+  const localPublicKey = localCurve.generateKeys();
+
+  const salt = urlBase64.encode(crypto.randomBytes(16));
+
+  ece.saveKey('webpushKey', localCurve, 'P-256');
+
+  const cipherText = ece.encrypt(payload, {
+    keyid: 'webpushKey',
+    dh: userPublicKey,
+    salt: salt,
+    authSecret: userAuth,
+    padSize: 2
+  });
+
+  return {
+    localPublicKey: localPublicKey,
+    salt: salt,
+    cipherText: cipherText
+  };
+};
+
+module.exports = {
+  encrypt: encrypt
+};