Merge pull request #11 from web-push-libs/bug/15

bug: fix "aud" to not be remote host url

Author: jrconlin

js/vapid.js

@@ -20,8 +20,8 @@ class VapidToken {
          *
          * VAPID allows for self identification of a subscription update.
          *
-         * :param aud: Audience - email of the admin contact for this update.
-         * :param sub: Subscription - Optional site URL for this update.
+         * :param sub: Subscription - email of the admin contact for this
+         *      update.
          * :param exp: Expiration - UTC expiration of this update. Defaults
          *      to now + 24 hours
          */
@@ -157,8 +157,8 @@ class VapidToken {
         if (! claims.hasOwnProperty("exp")) {
             claims.exp = parseInt(Date.now()*.001) + 86400;
         }
-        if (! claims.hasOwnProperty("aud")) {
-            throw new Error(this.lang.errs.ERR_CLAIM_MIS, "aud");
+        if (! claims.hasOwnProperty("sub")) {
+            throw new Error(this.lang.errs.ERR_CLAIM_MIS, "sub");
         }
         let alg = {name:"ECDSA", namedCurve: "P-256", hash:{name:"SHA-256"}};
         let headStr = this.mzcc.toUrlBase64(

python/py_vapid/__init__.py

@@ -106,10 +106,6 @@ def sign(self, claims, crypto_key=None):
         """
         if not claims.get('exp'):
             claims['exp'] = int(time.time()) + 86400
-        if not claims.get('aud'):
-            raise VapidException(
-                "Missing 'aud' from claims. "
-                "'aud' is your site's URL.")
         if not claims.get('sub'):
             raise VapidException(
                 "Missing 'sub' from claims. "

python/py_vapid/tests/test_vapid.py

@@ -115,8 +115,5 @@ def test_bad_sign(self):
         v = Vapid("/tmp/private")
         self.assertRaises(VapidException,
                           v.sign,
-                          {'sub': "[email protected]"})
-        self.assertRaises(VapidException,
-                          v.sign,
-                          {'aud': "https://e.c"})
+                          {'aud': "p.example.com"})
 

python/setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = "0.4.1"
+__version__ = "0.5.0"
 
 
 def read_from(file):