Redesigned configuration handling.

Author: rohe

example/flask_rp/application.py

@@ -5,7 +5,6 @@
 from cryptojwt.key_jar import init_key_jar
 from flask.app import Flask
 
-from oidcrp.configure import Configuration
 from oidcrp.rp_handler import RPHandler
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
@@ -14,9 +13,9 @@
 def init_oidc_rp_handler(app):
     _rp_conf = app.rp_config
 
-    if _rp_conf.rp_keys:
-        _kj = init_key_jar(**_rp_conf.rp_keys)
-        _path = _rp_conf.rp_keys['public_path']
+    if _rp_conf.keys:
+        _kj = init_key_jar(**_rp_conf.keys)
+        _path = _rp_conf.keys['public_path']
         # removes ./ and / from the begin of the string
         _path = re.sub('^(.)/', '', _path)
     else:
@@ -31,11 +30,11 @@ def init_oidc_rp_handler(app):
     return rph
 
 
-def oidc_provider_init_app(config_file, name=None, **kwargs):
+def oidc_provider_init_app(config, name=None, **kwargs):
     name = name or __name__
     app = Flask(name, static_url_path='', **kwargs)
 
-    app.rp_config = Configuration.create_from_config_file(config_file)
+    app.rp_config = config
 
     # Session key for the application session
     app.config['SECRET_KEY'] = os.urandom(12).hex()

example/flask_rp/conf.json

@@ -38,22 +38,6 @@
   "httpc_params": {
     "verify": false
   },
-  "keydefs": [
-    {
-      "type": "RSA",
-      "key": "",
-      "use": [
-        "sig"
-      ]
-    },
-    {
-      "type": "EC",
-      "crv": "P-256",
-      "use": [
-        "sig"
-      ]
-    }
-  ],
   "rp_keys": {
     "private_path": "private/jwks.json",
     "key_defs": [
@@ -75,27 +59,6 @@
     "public_path": "static/jwks.json",
     "read_only": false
   },
-  "client_preferences": {
-    "application_name": "rphandler",
-    "application_type": "web",
-    "contacts": [
-      "ops@example.com"
-    ],
-    "response_types": [
-      "code"
-    ],
-    "scope": [
-      "openid",
-      "profile",
-      "email",
-      "address",
-      "phone"
-    ],
-    "token_endpoint_auth_method": [
-      "client_secret_basic",
-      "client_secret_post"
-    ]
-  },
   "services": {
     "discovery": {
       "class": "oidcrp.oidc.provider_info_discovery.ProviderInfoDiscovery",

example/flask_rp/wsgi.py

@@ -1,43 +1,33 @@
 #!/usr/bin/env python3
 
-import logging
 import os
 import sys
 
+from oidcrp.configure import Configuration
+from oidcrp.configure import RPConfiguration
+from oidcrp.configure import create_from_config_file
 from oidcrp.util import create_context
 
 try:
     from . import application
 except ImportError:
     import application
 
-# logger = logging.getLogger("")
-# RP_LOGFILE_NAME = os.environ.get('RP_LOGFILE_NAME', 'flrp.log')
-#
-# hdlr = logging.FileHandler(RP_LOGFILE_NAME)
-# log_format = ("%(asctime)s %(name)s:%(levelname)s "
-#               "%(message)s  [%(name)s.%(funcName)s:%(lineno)s]")
-# base_formatter = logging.Formatter(log_format)
-#
-# hdlr.setFormatter(base_formatter)
-# logger.addHandler(hdlr)
-# logger.setLevel(logging.DEBUG)
-#
-# stdout = logging.StreamHandler()
-# stdout.setFormatter(base_formatter)
-# logger.addHandler(stdout)
-
 dir_path = os.path.dirname(os.path.realpath(__file__))
 
 if __name__ == "__main__":
     conf = sys.argv[1]
     name = 'oidc_rp'
     template_dir = os.path.join(dir_path, 'templates')
-    app = application.oidc_provider_init_app(conf, name,
-                                             template_folder=template_dir)
-    _web_conf = app.rp_config.web_conf
+
+    _config = create_from_config_file(Configuration,
+                                      entity_conf_class=RPConfiguration,
+                                      filename=conf)
+
+    app = application.oidc_provider_init_app(_config.rp, name, template_folder=template_dir)
+    _web_conf = _config.web_conf
     context = create_context(dir_path, _web_conf)
 
     debug = _web_conf.get('debug', True)
-    app.run(host=app.rp_config.domain, port=app.rp_config.port,
+    app.run(host=_web_conf["domain"], port=_web_conf["port"],
             debug=_web_conf.get("debug", False), ssl_context=context)

setup.py

@@ -73,7 +73,7 @@ def run_tests(self):
     ],
     tests_require=[
         'pytest',
-        'pytest-localserver',
+        'pytest-localserver'
     ],
     zip_safe=False,
     cmdclass={'test': PyTest},