Merge pull request #6 from jkarneges/master

allow non-ascii keys

jwt/__init__.py

@@ -43,8 +43,9 @@ def encode(payload, key, algorithm='HS256'):
     segments.append(base64url_encode(json.dumps(payload)))
     signing_input = '.'.join(segments)
     try:
-        ascii_key = unicode(key).encode('utf8')
-        signature = signing_methods[algorithm](signing_input, ascii_key)
+        if isinstance(key, unicode):
+            key = key.encode('utf-8')
+        signature = signing_methods[algorithm](signing_input, key)
     except KeyError:
         raise NotImplementedError("Algorithm not supported")
     segments.append(base64url_encode(signature))
@@ -64,8 +65,9 @@ def decode(jwt, key='', verify=True):
         raise DecodeError("Invalid segment encoding")
     if verify:
         try:
-            ascii_key = unicode(key).encode('utf8')
-            if not signature == signing_methods[header['alg']](signing_input, ascii_key):
+            if isinstance(key, unicode):
+                key = key.encode('utf-8')
+            if not signature == signing_methods[header['alg']](signing_input, key):
                 raise DecodeError("Signature verification failed")
         except KeyError:
             raise DecodeError("Algorithm not supported")

tests/test_jwt.py

@@ -48,7 +48,12 @@ def test_unicode_secret(self):
         jwt_message = jwt.encode(self.payload, secret)
         decoded_payload = jwt.decode(jwt_message, secret)
         self.assertEqual(decoded_payload, self.payload)
-
+
+    def test_nonascii_secret(self):
+        secret = '\xc2' # char value that ascii codec cannot decode
+        jwt_message = jwt.encode(self.payload, secret)
+        decoded_payload = jwt.decode(jwt_message, secret)
+        self.assertEqual(decoded_payload, self.payload)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()