Merge pull request #38 from web-push-libs/feat/pub

feat: Add --applicationServerKey dumper

Author: jrconlin

python/py_vapid/__init__.py

@@ -21,6 +21,12 @@ def b64urldecode(data):
     return base64.urlsafe_b64decode(data + "===="[:len(data) % 4])
 
 
+def b64urlencode(bstring):
+    return binascii.b2a_base64(
+        bstring).decode('utf8').replace('\n', '').replace(
+        '+', '-').replace('/', '_').replace('=', '')
+
+
 class VapidException(Exception):
     """An exception wrapper for Vapid."""
     pass
@@ -205,11 +211,6 @@ def _base_sign(self, claims):
                 "'sub' is your admin email as a mailto: link.")
         return claims
 
-    def encode(self, bstring):
-        return binascii.b2a_base64(
-            bstring).decode('utf8').replace('\n', '').replace(
-            '+', '-').replace('/', '_').replace('=', '')
-
     def sign(self, claims, crypto_key=None):
         """Sign a set of claims.
         :param claims: JSON object containing the JWT claims to use.
@@ -228,7 +229,7 @@ def sign(self, claims, crypto_key=None):
         pubkey = self.public_key.to_string()
         if len(pubkey) == 64:
             pubkey = b'\04' + pubkey
-        pkey += self.encode(pubkey)
+        pkey += b64urlencode(pubkey)
         if crypto_key:
             crypto_key = crypto_key + ';' + pkey
         else:
@@ -257,7 +258,7 @@ def sign(self, claims, crypto_key=None):
             "Authorization": "{schema} t={t},k={k}".format(
                 schema=self._schema,
                 t=sig,
-                k=self.encode(pkey)
+                k=b64urlencode(pkey)
             )
         }
 

python/py_vapid/main.py

@@ -6,7 +6,7 @@
 import os
 import json
 
-from py_vapid import Vapid01, Vapid02
+from py_vapid import Vapid01, Vapid02, b64urlencode
 
 
 def main():
@@ -21,6 +21,9 @@ def main():
                         default=True, action="store_true")
     parser.add_argument('--json',  help="dump as json",
                         default=False, action="store_true")
+    parser.add_argument('--applicationServerKey',
+                        help="show applicationServerKey value",
+                        default=False, action="store_true")
     args = parser.parse_args()
     Vapid = Vapid01
     if args.version2:
@@ -56,6 +59,10 @@ def main():
         print("Generating public_key.pem")
         vapid.save_public_key('public_key.pem')
     claim_file = args.sign
+    result = dict()
+    if args.applicationServerKey:
+        print("Application Server Key = {}\n\n".format(
+            b64urlencode(vapid.public_key.to_string())))
     if claim_file:
         if not os.path.exists(claim_file):
             print("No {} file found.".format(claim_file))
@@ -82,7 +89,7 @@ def main():
             exit
         try:
             claims = json.loads(open(claim_file).read())
-            result = vapid.sign(claims)
+            result.update(vapid.sign(claims))
         except Exception as exc:
             print("Crap, something went wrong: {}".format(repr(exc)))
             raise exc

python/setup.py

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