Merge pull request #18 from IdentityPython/develop

Develop

Author: rohe

flask_op/server.py

@@ -53,7 +53,7 @@
 
 def main(config_file, args):
     logging.basicConfig(level=logging.DEBUG)
-    config = Configuration.create_from_config_file(config_file)
+    config = Configuration.create_from_config_file(config_file, base_path=dir_path)
     app = oidc_provider_init_app(config, 'oidc_op')
 
     web_conf = config.webserver

setup.py

@@ -62,7 +62,7 @@ def run_tests(self):
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
         "pyyaml",
-        'oidcendpoint>=1.0.0'
+        'oidcendpoint>=1.1.0'
     ],
     zip_safe=False,
     cmdclass={'test': PyTest},

src/oidcop/__init__.py

@@ -1 +1 @@
-__version__ = '0.6.0'
+__version__ = '0.6.2'

src/oidcop/configure.py

@@ -2,8 +2,10 @@
 
 import os
 from typing import Dict
+from typing import Optional
 
 from cryptojwt.key_bundle import init_key
+from oidcmsg import add_base_path
 
 from oidcop.logging import configure_logging
 from oidcop.utils import load_yaml_config
@@ -13,13 +15,39 @@
 except ImportError:
     from oidcendpoint import rndstr as rnd_token
 
+DEFAULT_ITEM_PATHS = {
+    "webserver": ['server_key', 'server_cert'],
+    "op": {
+        "server_info": {
+            "session_key": ["filename"],
+            "template_dir": None,
+            "token_handler_args": {
+                "jwks_def": ["private_path", "public_path"]
+            },
+            "keys": ["private_path", "public_path"],
+            "cookie_dealer": {
+                "kwargs": {
+                    "sign_jwk": ["private_path", "public_path"],
+                    "enc_jwk": ["private_path", "public_path"]
+                }
+            }
+        }
+    }
+}
+
 
 class Configuration:
     """OP Configuration"""
 
-    def __init__(self, conf: Dict) -> None:
+    def __init__(self, conf: Dict, base_path: str = '', item_paths: Optional[dict] = None) -> None:
         self.logger = configure_logging(config=conf.get('logging')).getChild(__name__)
-        self.op = None
+        self.op = {}
+        if item_paths is None:
+            item_paths = DEFAULT_ITEM_PATHS
+
+        if base_path and item_paths:
+            # this adds a base path to all paths in the configuration
+            add_base_path(conf, item_paths, base_path)
 
         # OIDC provider configuration
         for section in ['op', 'webserver', 'httpc_params', 'jinja_env']:
@@ -47,6 +75,7 @@ def __init__(self, conf: Dict) -> None:
                     setattr(self, param, _pre)
 
     @classmethod
-    def create_from_config_file(cls, filename: str):
+    def create_from_config_file(cls, filename: str, base_path: str = '',
+                                item_paths: Optional[dict] = None):
         """Load configuration as YAML"""
-        return cls(load_yaml_config(filename))
+        return cls(load_yaml_config(filename), base_path, item_paths)