Merge pull request #9 from web-push-libs/bug/8

bug: append vapid and encryption headers with a ';'

Author: jrconlin

pywebpush/__init__.py

@@ -172,7 +172,10 @@ def send(self, data, headers={}, ttl=0, gcm_key=None, reg_id=None):
         headers = CaseInsensitiveDict(headers)
         crypto_key = headers.get("crypto-key", "")
         if crypto_key:
-            crypto_key += ','
+            # due to some confusion by a push service provider, we should
+            # use ';' instead of ',' to append the headers.
+            # see https://github.com/webpush-wg/webpush-encryption/issues/6
+            crypto_key += ';'
         crypto_key += "keyid=p256dh;dh=" + encoded["crypto_key"].decode('utf8')
         headers.update({
             'crypto-key': crypto_key,

pywebpush/tests/test_webpush.py

@@ -106,7 +106,7 @@ def test_send(self, mock_post):
         ok_('encryption' in pheaders)
         eq_(pheaders.get('AUTHENTICATION'), headers.get('Authentication'))
         ckey = pheaders.get('crypto-key')
-        ok_('pre-existing,' in ckey)
+        ok_('pre-existing' in ckey)
         eq_(pheaders.get('content-encoding'), 'aesgcm')
 
     def test_ci_dict(self):