Merge pull request #50 from rebeckag/b2s_conv_fix

Raise exception if item can't be converted to avoid silently signing …

Author: Roland Hedberg

src/jwkest/jwt.py

@@ -17,13 +17,15 @@ def split_token(token):
 def b2s_conv(item):
     if isinstance(item, bytes):
         return item.decode("utf-8")
-    elif isinstance(item, (six.string_types, int, bool)):
+    elif item is None or isinstance(item, (six.string_types, int, bool)):
         return item
     elif isinstance(item, list):
         return [b2s_conv(i) for i in item]
     elif isinstance(item, dict):
         return dict([(k, b2s_conv(v)) for k, v in item.items()])
 
+    raise ValueError("Can't convert {}.".format(repr(item)))
+
 
 def b64encode_item(item):
     if isinstance(item, bytes):

tests/test_1_jwt.py

@@ -1,5 +1,8 @@
 import json
-from jwkest.jwt import JWT
+
+import pytest
+
+from jwkest.jwt import JWT, b2s_conv
 
 __author__ = 'roland'
 
@@ -44,6 +47,10 @@ def test_unpack_str():
     assert _jwt2
     out_payload = _jwt2.payload()
 
+def test_b2s_conv_raise_exception_on_bad_value():
+    with pytest.raises(ValueError):
+        b2s_conv(object())
+
 
 if __name__ == "__main__":
     test_unpack_str()