Merge branch 'handler' into master

Author: rohe

.travis.yml

@@ -16,6 +16,7 @@ install:
 script:
 - codecov --version
 - tox
+- isort --check src tests
 after_success:
 - codecov
 notifications:

setup.py

@@ -61,7 +61,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.7",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
-        "cryptojwt>=1.0.0",
+        "cryptojwt>=1.1.0",
         "pyOpenSSL",
         "filelock>=3.0.12"
     ],

src/oidcmsg/__init__.py

@@ -1,6 +1,5 @@
 __author__ = 'Roland Hedberg'
-__version__ = '1.0.0'
-
+__version__ = '1.1.0'
 
 VERIFIED_CLAIM_PREFIX = '__verified'
 

src/oidcmsg/context.py

@@ -5,9 +5,9 @@
 from cryptojwt.key_jar import init_key_jar
 
 from oidcmsg.message import Message
-from oidcmsg.storage.init import get_storage_class
 from oidcmsg.storage.init import get_storage_conf
 from oidcmsg.storage.init import init_storage
+from oidcmsg.storage.init import storage_factory
 
 
 def add_issuer(conf, issuer):
@@ -32,7 +32,6 @@ def __init__(self, config=None, keyjar=None, entity_id=''):
             _iss = config.get('issuer')
             if _iss:
                 self.db_conf = add_issuer(self.db_conf, _iss)
-            self.storage_cls = get_storage_class(self.db_conf)
 
             if self.db_conf.get('default'):
                 self.db = init_storage(self.db_conf)
@@ -50,19 +49,16 @@ def add_boxes(self, boxes, db_conf):
     def _keyjar(self, keyjar=None, db_conf=None, conf=None, entity_id=''):
         if keyjar is None:
             if db_conf:
-                storage_args = {
-                    'abstract_storage_cls': self.storage_cls,
-                    'storage_conf': get_storage_conf(db_conf, 'keyjar')
-                }
+                _storage = storage_factory(get_storage_conf(db_conf, 'keyjar'))
             else:
-                storage_args = {}
+                _storage = None
 
             if 'keys' in conf:
                 args = {k: v for k, v in conf["keys"].items() if k != "uri_path"}
-                args.update(storage_args)
+                args.update({'storage': _storage})
                 _keyjar = init_key_jar(**args)
             else:
-                _keyjar = KeyJar(**storage_args)
+                _keyjar = KeyJar(storage=_storage)
                 if 'jwks' in conf:
                     _keyjar.import_jwks(conf['jwks'], '')
 

src/oidcmsg/storage/__init__.py

@@ -1,69 +1,51 @@
 import logging
+
 from .utils import importer
 
 logger = logging.getLogger(__name__)
 
 
-class AbstractStorage(object):
+class Storage(object):
     """
-    An AbstractStorage that take a storage engine and offer a standard set
-    of methods and I/O to data.
+    Offers a standard set of methods and I/O on persistent data.
     """
 
-    def __init__(self, conf_dict):
-        if isinstance(conf_dict['handler'], str):
-            _handler = importer(conf_dict['handler'])
-            _args = {k: v for k, v in conf_dict.items() if k != 'handler'}
-            try:
-                self.storage = _handler(_args)
-            except TypeError as e:
-                # needed for globally configured ORM models
-                logger.debug('Abstorage {}: {}'.format(_handler, e))
-                self.storage = _handler()
-        else:
-            self.storage = conf_dict['handler'](conf_dict)
+    def __init__(self, conf_dict=None):
+        pass
 
     def get(self, k, default=None):
-        return self.storage.get(k, default)
-
-    def set(self, k, v):
-        return self.storage.set(k, v)
+        raise NotImplemented()
 
-    def update(self, k, v):
-        return self.storage.update(k, v)
+    def update(self, ava):
+        raise NotImplemented()
 
     def delete(self, k, v):
-        return self.storage.delete(v, k=k)
+        raise NotImplemented()
 
     def __getitem__(self, k):
-        return self.storage.get(k)
+        raise NotImplemented()
 
     def __setitem__(self, k, v):
-        return self.storage.set(k, v)
+        raise NotImplemented()
 
     def __delitem__(self, v):
-        return self.storage.delete(v)
+        raise NotImplemented()
 
     def __call__(self):
-        return self.storage()
-
-    def __repr__(self):
-        return self.__str__()
+        raise NotImplemented()
 
     def __len__(self):
-        return len(self.storage)
+        raise NotImplemented()
 
     def __contains__(self, k):
-        return self.storage.__contains__(k)
-
-    def __str__(self):
-        return self.storage.__str__()
+        raise NotImplemented()
 
     def __iter__(self):
-        return iter(self.storage.__iter__())
+        raise NotImplemented()
 
-    def flush(self):
-        return self.storage.flush()
+    def synch(self):
+        raise NotImplemented()
 
     def keys(self):
-        return self.storage.keys()
+        raise NotImplemented()
+