Merge pull request #18 from IdentityPython/develop

Develop

Author: rohe

.coveragerc

@@ -0,0 +1,3 @@
+# .coveragerc to control coverage.py
+[run]
+source = .

.travis.yml

@@ -11,6 +11,7 @@ addons:
     -
 install:
 - pip install codecov
+- pip install isort
 - pip install tox
 - pip install tox-travis
 script:

README.md

@@ -23,3 +23,4 @@ If some of these keys have a common origin, like described in a JWKS.
 Such a set will be kept in a **keyBundle**.
 Also implemented in this package. 
 
+Please read the [Official Documentation](https://oidcmsg.readthedocs.io/) for getting usage examples and further informations.

setup.py

@@ -56,9 +56,9 @@ def run_tests(self):
     classifiers=[
         "Development Status :: 4 - Beta",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
         "cryptojwt>=1.1.0",

src/oidcmsg/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'Roland Hedberg'
-__version__ = '1.1.0'
+__version__ = '1.1.2'
 
 VERIFIED_CLAIM_PREFIX = '__verified'
 
@@ -29,3 +29,33 @@ def proper_path(path):
         path += "/"
 
     return path
+
+
+# This is for adding a base path to path specified in a configuration
+def add_base_path(conf, item_paths, base_path):
+    for section, items in item_paths.items():
+        if section == "":
+            part = conf
+        else:
+            part = conf.get(section)
+
+        if part:
+            if isinstance(items, list):
+                for attr in items:
+                    _path = part.get(attr)
+                    if _path:
+                        if _path.startswith("/"):
+                            continue
+                        elif _path == "":
+                            part[attr] = "./" + _path
+                        else:
+                            part[attr] = os.path.join(base_path, _path)
+            elif items is None:
+                if part.startswith("/"):
+                    continue
+                elif part == "":
+                    conf[section] = "./"
+                else:
+                    conf[section] = os.path.join(base_path, part)
+            else:  # Assume items is dictionary like
+                add_base_path(part, items, base_path)

src/oidcmsg/context.py

@@ -16,7 +16,7 @@ def add_issuer(conf, issuer):
         if key == 'abstract_storage_cls':
             res[key] = val
         else:
-            _val = copy.deepcopy(val)
+            _val = copy.copy(val)
             _val['issuer'] = quote_plus(issuer)
             res[key] = _val
     return res
@@ -36,7 +36,7 @@ def __init__(self, config=None, keyjar=None, entity_id=''):
             if self.db_conf.get('default'):
                 self.db = init_storage(self.db_conf)
             else:
-                self.db = None
+                self.db = init_storage()
         else:
             self.db = init_storage()
 
@@ -48,10 +48,11 @@ def add_boxes(self, boxes, db_conf):
 
     def _keyjar(self, keyjar=None, db_conf=None, conf=None, entity_id=''):
         if keyjar is None:
+            _storage = None
             if db_conf:
-                _storage = storage_factory(get_storage_conf(db_conf, 'keyjar'))
-            else:
-                _storage = None
+                _cnf = get_storage_conf(db_conf, 'keyjar')
+                if _cnf:
+                    _storage = storage_factory(_cnf)
 
             if 'keys' in conf:
                 args = {k: v for k, v in conf["keys"].items() if k != "uri_path"}

src/oidcmsg/oidc/__init__.py

@@ -1157,7 +1157,8 @@ def factory(msgtype, **kwargs):
     return oauth2.factory(msgtype, **kwargs)
 
 
-def make_openid_request(arq, keys, issuer, request_object_signing_alg, recv):
+def make_openid_request(arq, keys, issuer, request_object_signing_alg, recv, with_jti=False,
+                        lifetime=0):
     """
     Construct the JWT to be passed by value (the request parameter) or by
     reference (request_uri).
@@ -1168,10 +1169,16 @@ def make_openid_request(arq, keys, issuer, request_object_signing_alg, recv):
     :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
+    :param with_jti: Whether a JTI should be included in the JWT.
+    :param lifetime: How long the JWT is expect to be live.
     :return: JWT encoded OpenID request
     """
 
     _jwt = JWT(key_jar=keys, iss=issuer, sign_alg=request_object_signing_alg)
+    if with_jti:
+        _jwt.with_jti = True
+    if lifetime:
+        _jwt.lifetime = lifetime
     return _jwt.pack(arq.to_dict(), owner=issuer, recv=recv)
 
 

src/oidcmsg/storage/extension.py

@@ -47,6 +47,10 @@ def __getitem__(self, k):
     def __setitem__(self, k, v):
         return self.storage.set(k, v)
 
+    @key_label
+    def set(self, k, v):
+        return self.storage.set(k, v)
+
     @key_label
     def __delitem__(self, k):
         del self.storage[k]

src/oidcmsg/storage/init.py

@@ -58,6 +58,8 @@ def init_storage(db_conf=None, key='default'):
     """
 
     if db_conf:
-        return storage_factory(get_storage_conf(db_conf, key))
-    else:
-        return LabeledDict({'label': key})
+        _conf = get_storage_conf(db_conf, key)
+        if _conf:
+            return storage_factory(_conf)
+
+    return LabeledDict({'label': key})

tests/test_05_oauth2.py

@@ -18,11 +18,11 @@
 from oidcmsg.oauth2 import AuthorizationResponse
 from oidcmsg.oauth2 import CCAccessTokenRequest
 from oidcmsg.oauth2 import RefreshAccessTokenRequest
-from oidcmsg.oauth2 import TokenExchangeRequest
-from oidcmsg.oauth2 import TokenExchangeResponse
 from oidcmsg.oauth2 import ResponseMessage
 from oidcmsg.oauth2 import ROPCAccessTokenRequest
 from oidcmsg.oauth2 import TokenErrorResponse
+from oidcmsg.oauth2 import TokenExchangeRequest
+from oidcmsg.oauth2 import TokenExchangeResponse
 from oidcmsg.oauth2 import factory
 from oidcmsg.oauth2 import is_error_message