bug: force key string encoding to utf8

closes #8

Author: jrconlin

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.3 (2016-05-17)
+bug: force key string encoding to utf8
+
 ## 0.3.2 (2016-04-28)
 bug: fix setup.py issues
 

pywebpush/__init__.py

@@ -68,11 +68,13 @@ def __init__(self, subscription_info):
         for k in ['p256dh', 'auth']:
             if keys.get(k) is None:
                 raise WebPushException("Missing keys value: %s", k)
-        receiver_raw = base64.urlsafe_b64decode(self._repad(keys['p256dh']))
+        receiver_raw = base64.urlsafe_b64decode(
+            self._repad(keys['p256dh'].encode('utf8')))
         if len(receiver_raw) != 65 and receiver_raw[0] != "\x04":
             raise WebPushException("Invalid p256dh key specified")
         self.receiver_key = receiver_raw
-        self.auth_key = base64.urlsafe_b64decode(self._repad(keys['auth']))
+        self.auth_key = base64.urlsafe_b64decode(
+            self._repad(keys['auth'].encode('utf8')))
 
     def _repad(self, str):
         """Add base64 padding to the end of a string, if required"""
@@ -96,7 +98,7 @@ def encode(self, data):
         server_key_id = base64.urlsafe_b64encode(server_key.get_pubkey()[1:])
 
         # http_ece requires that these both be set BEFORE encrypt or
-        # decrypt is called.
+        # decrypt is called if you specify the key as "dh".
         http_ece.keys[server_key_id] = server_key
         http_ece.labels[server_key_id] = "P-256"
 

pywebpush/tests/test_webpush.py

@@ -24,11 +24,11 @@ def _gen_subscription_info(self, recv_key):
     def test_init(self):
         # use static values so we know what to look for in the reply
         subscription_info = {
-            "endpoint": "https://example.com/",
-            "keys": {
-                "p256dh": ("BOrnIslXrUow2VAzKCUAE4sIbK00daEZCswOcf8m3T"
-                           "F8V82B-OpOg5JbmYLg44kRcvQC1E2gMJshsUYA-_zMPR8"),
-                "auth": "k8JV6sjdbhAi1n3_LDBLvA"
+            u"endpoint": u"https://example.com/",
+            u"keys": {
+                u"p256dh": (u"BOrnIslXrUow2VAzKCUAE4sIbK00daEZCswOcf8m3T"
+                            "F8V82B-OpOg5JbmYLg44kRcvQC1E2gMJshsUYA-_zMPR8"),
+                u"auth": u"k8JV6sjdbhAi1n3_LDBLvA"
             }
         }
         self.assertRaises(

setup.py

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