Updated to work with cryptojwt 0.4.4

Author: rohe

setup.py

@@ -61,7 +61,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.6",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
-        "cryptojwt",
+        "cryptojwt>=0.4.4",
         "pyOpenSSL",
     ],
     zip_safe=False,

src/oidcmsg/__init__.py

@@ -1,6 +1,7 @@
 __author__ = 'Roland Hedberg'
 __version__ = '0.6.1'
 
+
 def proper_path(path):
     """
     Clean up the path specification so it looks like something I could use.

src/oidcmsg/jwt.py

@@ -714,13 +714,13 @@ def pack(self, alg='', **kwargs):
         else:
             self.pack_init()
 
-        if 'jti' in self.c_param:
-            try:
-                _jti = kwargs['jti']
-            except KeyError:
-                _jti = uuid.uuid4().hex
-
-            self['jti'] = _jti
+        # if 'jti' in self.c_param:
+        #     try:
+        #         _jti = kwargs['jti']
+        #     except KeyError:
+        #         _jti = uuid.uuid4().hex
+        #
+        #     self['jti'] = _jti
 
     def to_jwt(self, key=None, algorithm="", lev=0, lifetime=0):
         self.pack(alg=algorithm, lifetime=lifetime)
@@ -1197,17 +1197,14 @@ def make_openid_request(arq, keys, issuer, request_object_signing_alg, recv):
     The request will be signed
 
     :param arq: The Authorization request
-    :param keys: Keys to use for signing/encrypting
+    :param keys: Keys to use for signing/encrypting. A KeyJar instance
     :param issuer: Who is signing this JSON Web Token
     :param request_object_signing_alg: Which signing algorithm to use
     :param recv: The intended receiver of the request
     :return: JWT encoded OpenID request
     """
 
-    if isinstance(keys, KeyJar):
-        keys = keys.get_signing_key()
-
-    _jwt = JWT(own_keys=keys, iss=issuer, sign_alg=request_object_signing_alg)
+    _jwt = JWT(key_jar=keys, iss=issuer, sign_alg=request_object_signing_alg)
     return _jwt.pack(arq.to_dict(), owner=issuer, recv=recv)
 
 

src/oidcmsg/oidc/__init__.py

@@ -13,14 +13,14 @@
 from cryptojwt.key_bundle import KeyBundle
 from cryptojwt.key_jar import KeyJar
 
-from oidcmsg import time_util
+from oidcmsg import time_util, proper_path
 from oidcmsg.exception import MessageException
 from oidcmsg.exception import MissingRequiredAttribute
 from oidcmsg.exception import NotAllowedValue
 from oidcmsg.exception import OidcMsgError
 from oidcmsg.exception import WrongSigningAlgorithm
 from oidcmsg.oauth2 import ResponseMessage, ROPCAccessTokenRequest
-from oidcmsg.oidc import AccessTokenRequest, make_openid_request
+from oidcmsg.oidc import AccessTokenRequest, make_openid_request, link_deser
 from oidcmsg.oidc import dict_deser
 from oidcmsg.oidc import claims_match
 from oidcmsg.oidc import link_ser
@@ -1048,3 +1048,34 @@ def test_factory_2():
     inst = factory('ROPCAccessTokenRequest', username='me', password='text',
                    scope='mar')
     assert isinstance(inst, ROPCAccessTokenRequest)
+
+
+def test_link_deser():
+    link = Link(href='https://example.com/op',
+                rel="http://openid.net/specs/connect/1.0/issuer")
+
+    jl = link_ser(link, 'json')
+    l2 = link_deser([jl], 'json')
+    assert isinstance(l2[0], Link)
+
+
+def test_link_deser_dict():
+    link = Link(href='https://example.com/op',
+                rel="http://openid.net/specs/connect/1.0/issuer")
+
+    l2 = link_deser([link.to_dict()], 'json')
+    assert isinstance(l2[0], Link)
+
+
+def test_proper_path():
+    p = proper_path('foo/bar')
+    assert p == './foo/bar/'
+
+    p = proper_path('/foo/bar')
+    assert p == './foo/bar/'
+
+    p = proper_path('./foo/bar')
+    assert p == './foo/bar/'
+
+    p = proper_path('../foo/bar')
+    assert p == './foo/bar/'