Ported 0.1.2 as 0.1.4 seems problematic

gbin · gbin · commit ee137b30b081 · 2013-01-04T14:41:34.000-08:00
diff --git a/twilio/jwt/__init__.py b/twilio/jwt/__init__.py
@@ -6,17 +6,16 @@
 import base64
 import hashlib
 import hmac
-from six import text_type, binary_type, b
-
+from six import text_type, b
 # default text to binary representation conversion
 def binary(txt):
     return txt.encode('utf-8')
+
 try:
     import json
 except ImportError:
     import simplejson as json
-
-
+    
 __all__ = ['encode', 'decode', 'DecodeError']
 
 class DecodeError(Exception): pass
@@ -34,24 +33,14 @@ def base64url_decode(input):
 def base64url_encode(input):
     return base64.urlsafe_b64encode(input).decode('utf-8').replace('=', '')
 
-def header(jwt):
-    header_segment = jwt.split('.', 1)[0]
-    try:
-        return json.loads(base64url_decode(header_segment))
-    except (ValueError, TypeError):
-        raise DecodeError("Invalid header encoding")
-
 def encode(payload, key, algorithm='HS256'):
     segments = []
     header = {"typ": "JWT", "alg": algorithm}
-    header_as_binary = binary(json.dumps(header))
-    segments.append(base64url_encode(header_as_binary))
-    payload_as_binary = binary(json.dumps(payload))
-    segments.append(base64url_encode(payload_as_binary))
+    segments.append(base64url_encode(binary(json.dumps(header))))
+    segments.append(base64url_encode(binary(json.dumps(payload))))
     signing_input = '.'.join(segments)
     try:
-        ascii_key = text_type(key).encode('utf8')
-        signature = signing_methods[algorithm](binary(signing_input), ascii_key)
+        signature = signing_methods[algorithm](binary(signing_input), binary(key))
     except KeyError:
         raise NotImplementedError("Algorithm not supported")
     segments.append(base64url_encode(signature))
@@ -71,8 +60,7 @@ def decode(jwt, key='', verify=True):
         raise DecodeError("Invalid segment encoding")
     if verify:
         try:
-            ascii_key = key
-            if not signature == signing_methods[header['alg']](binary(signing_input), binary(ascii_key)):
+            if not signature == signing_methods[header['alg']](binary(signing_input), binary(key)):
                 raise DecodeError("Signature verification failed")
         except KeyError:
             raise DecodeError("Algorithm not supported")
