Merge pull request #55 from web-push-libs/rust

feat: rust implementaion

Author: jrconlin

python/py_vapid/__init__.py

@@ -127,7 +127,14 @@ def from_file(cls, private_key_file=None):
 
     @classmethod
     def verify(cls, key, auth):
-        # TODO: add v2 validation
+        """Verify a VAPID authorization token.
+
+        :param key: base64 serialized public key
+        :type key: str
+        :param auth: authorization token
+        type key: str
+
+        """
         tokens = auth.rsplit(' ', 1)[1].rsplit('.', 1)
         kp = cls().from_raw_public(key.encode())
         return kp.verify_token(
@@ -295,5 +302,25 @@ def sign(self, claims, crypto_key=None):
             )
         }
 
+    @classmethod
+    def verify(cls, auth):
+        pref_tok = auth.rsplit(' ', 1)
+        assert pref_tok[0].lower() == cls._schema, (
+                "Incorrect schema specified")
+        parts = {}
+        for tok in pref_tok[1].split(','):
+            kv = tok.split('=', 1)
+            parts[kv[0]] = kv[1]
+        assert 'k' in parts.keys(), (
+                "Auth missing public key 'k' value")
+        assert 't' in parts.keys(), (
+                "Auth missing token set 't' value")
+        kp = cls().from_raw_public(parts['k'].encode())
+        tokens = parts['t'].rsplit('.', 1)
+        return kp.verify_token(
+            validation_token=tokens[0].encode(),
+            verification_token=tokens[1]
+        )
+
 
 Vapid = Vapid01

python/py_vapid/tests/test_vapid.py

@@ -169,12 +169,13 @@ def test_integration(self):
         # These values were taken from a test page. DO NOT ALTER!
         key = ("BDd3_hVL9fZi9Ybo2UUzA284WG5FZR30_95YeZJsiApwXKpNcF1rRPF3foI"
                "iBHXRdJI2Qhumhf6_LFTeZaNndIo")
-        auth = ("WebPush eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJhdWQiOiJod"
+        auth = ("eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJhdWQiOiJod"
                 "HRwczovL3VwZGF0ZXMucHVzaC5zZXJ2aWNlcy5tb3ppbGxhLmNvbSIsImV"
                 "4cCI6MTQ5NDY3MTQ3MCwic3ViIjoibWFpbHRvOnNpbXBsZS1wdXNoLWRlb"
                 "W9AZ2F1bnRmYWNlLmNvLnVrIn0.LqPi86T-HJ71TXHAYFptZEHD7Wlfjcc"
                 "4u5jYZ17WpqOlqDcW-5Wtx3x1OgYX19alhJ9oLumlS2VzEvNioZolQA")
-        ok_(Vapid01.verify(key=key, auth=auth))
+        ok_(Vapid01.verify(key=key, auth="webpush {}".format(auth)))
+        ok_(Vapid02.verify(auth="vapid t={},k={}".format(auth, key)))
 
     def test_bad_integration(self):
         # These values were taken from a test page. DO NOT ALTER!

rust/vapid/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "vapid"
+version = "0.1.0"
+authors = ["jrconlin <[email protected]>"]
+
+[dependencies]
+openssl = "0.9.16"
+serde_json = "1.0.2"
+base64 = "0.6.0"
+time = "0.1"