Fixed the factories.

Author: Roland Hedberg

setup.py

@@ -46,10 +46,12 @@ def run_tests(self):
     license="Apache 2.0",
     packages=["jwkest"],
     package_dir={"": "src"},
-    classifiers=["Development Status :: 4 - Beta",
-                 "License :: OSI Approved :: Apache Software License",
-                 "Topic :: Software Development :: Libraries :: Python "
-                 "Modules"],
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "License :: OSI Approved :: Apache Software License",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.4"],
     install_requires=["pycrypto >= 2.6.1", "requests", "six", "future"],
     tests_require=['pytest'],
     zip_safe=False,

src/jwkest/__init__.py

@@ -4,9 +4,12 @@
 import re
 import struct
 
-from builtins import zip
-from builtins import hex
-from builtins import str
+try:
+    from builtins import zip
+    from builtins import hex
+    from builtins import str
+except ImportError:
+    pass
 
 from binascii import unhexlify
 

src/jwkest/jwe.py

@@ -1,7 +1,9 @@
 # from future import standard_library
 # standard_library.install_aliases()
-from builtins import object
-# JSON Web Encryption
+try:
+    from builtins import object
+except ImportError:
+    pass
 
 import struct
 import io
@@ -691,11 +693,9 @@ def decrypt(self, token, keys=None, alg=None):
             "No available key that could decrypt the message")
 
 
-
-def factory(jwx):
-    p = jwx.split(".")
-    _jw = JWE()
-    if _jw.is_jwe(p[0]):
-        return _jw
+def factory(token):
+    _jwt = JWEnc().unpack(token)
+    if _jwt.is_jwe():
+        return JWE()
     else:
         return None

src/jwkest/jws.py

@@ -1,6 +1,9 @@
 """JSON Web Token"""
-from builtins import str
-from builtins import object
+try:
+    from builtins import str
+    from builtins import object
+except ImportError:
+    pass
 
 # Most of the code, ideas herein I have borrowed/stolen from other people
 # Most notably Jeff Lindsay, Ryan Kelly and Richard Barnes
@@ -586,32 +589,35 @@ def verify_json(self, jws, keys=None, allow_none=False, sigalg=None):
 
         return _claim
 
-    def is_jws(self, part):
+    def is_jws(self, token):
         """
 
-        :param part:
+        :param token:
         :return:
         """
-        self.parse_header(part)
+        try:
+            jwt = JWSig().unpack(token)
+        except Exception:
+            return False
 
         try:
-            assert "alg" in self._dict
+            assert "alg" in jwt.headers
         except AssertionError:
             return False
         else:
             try:
-                assert self._dict["alg"] in SIGNER_ALGS
+                assert jwt.headers["alg"] in SIGNER_ALGS
             except AssertionError:
-                logger.debug("UnknownSignerAlg: %s" % self._dict["alg"])
+                logger.debug("UnknownSignerAlg: %s" % jwt.headers["alg"])
                 return False
             else:
+                self.jwt = jwt
                 return True
 
 
-def factory(jwx):
-    p = jwx.split(".")
+def factory(token):
     _jw = JWS()
-    if _jw.is_jws(p[0]):
+    if _jw.is_jws(token):
         return _jw
     else:
         return None

tests/test_3_jws.py

@@ -11,7 +11,7 @@
 from jwkest.jwk import ECKey
 from jwkest.jwk import import_rsa_key_from_file
 from jwkest.jwk import RSAKey
-from jwkest.jws import SIGNER_ALGS
+from jwkest.jws import SIGNER_ALGS, factory
 from jwkest.jws import JWSig
 from jwkest.jws import JWS
 
@@ -317,7 +317,7 @@ def test_signer_ps512():
     _jws = JWS(payload, alg="PS521")
     _jwt = _jws.sign_compact(keys)
 
-    _rj = JWS()
+    _rj = factory(_jwt)
     info = _rj.verify_compact(_jwt, keys)
     assert info == payload
 
@@ -338,4 +338,4 @@ def test_no_alg_and_alg_none_same():
     assert _jwt0 == _jwt1
 
 if __name__ == "__main__":
-    test_hmac_from_keyrep()
+    test_signer_ps512()

tests/test_4_jwe.py

@@ -11,7 +11,7 @@
 from jwkest import intarr2long
 from jwkest import long2hexseq
 from jwkest.jwk import RSAKey
-from jwkest.jwe import JWE_RSA
+from jwkest.jwe import JWE_RSA, factory
 from jwkest.jwe import JWe
 from jwkest.jwe import JWE
 
@@ -206,11 +206,11 @@ def test_encrypt_decrypt_rsa_cbc():
 
     jwt = _jwe0.encrypt([_key])
 
-    _jwe1 = JWE()
+    _jwe1 = factory(jwt)
     msg = _jwe1.decrypt(jwt, [_key])
 
     assert msg == plain
 
 
 if __name__ == "__main__":
-    test_jwe_09_a1()
+    test_encrypt_decrypt_rsa_cbc()