Rename OIDC_KEYS to RP_KEYS. Somewhat clearer what they are.

Allow hash_seed to be set in configuration file.

Author: rohe

flask_rp/application.py

@@ -11,12 +11,18 @@
 
 
 def init_oidc_rp_handler(app):
-    oidc_keys_conf = app.config.get('OIDC_KEYS')
+    rp_keys_conf = app.config.get('RP_KEYS')
+    if rp_keys_conf is None:
+        rp_keys_conf = app.config.get('OIDC_KEYS')
+
     verify_ssl = app.config.get('VERIFY_SSL')
+    hash_seed = app.config.get('HASH_SEED')
+    if not hash_seed:
+        hash_seed = "BabyHoldOn"
 
-    if oidc_keys_conf:
-        _kj = init_key_jar(**oidc_keys_conf)
-        _path = oidc_keys_conf['public_path']
+    if rp_keys_conf:
+        _kj = init_key_jar(**rp_keys_conf)
+        _path = rp_keys_conf['public_path']
         if _path.startswith('./'):
             _path = _path[2:]
         elif _path.startswith('/'):
@@ -26,7 +32,7 @@ def init_oidc_rp_handler(app):
         _path = ''
     _kj.verify_ssl = verify_ssl
 
-    rph = RPHandler(base_url=app.config.get('BASEURL'), hash_seed="BabyHoldOn",
+    rph = RPHandler(base_url=app.config.get('BASEURL'), hash_seed=hash_seed,
                     keyjar=_kj, jwks_path=_path,
                     client_configs=app.config.get('CLIENTS'),
                     services=app.config.get('SERVICES'),

flask_rp/conf.yaml

@@ -24,16 +24,13 @@ SECRET_KEY: 'secret_key'
 SESSION_COOKIE_NAME: 'rp_session'
 PREFERRED_URL_SCHEME: 'https'
 
-OIDC_KEYS:
+RP_KEYS:
     'private_path': './private/jwks.json'
     'key_defs': *keydef
     'public_path': './static/jwks.json'
-    # this will create the jwks files if they absent
+    # this will create the jwks files if they are absent
     'read_only': False
 
-# PUBLIC_JWKS_PATH: 'https://127.0.0.1:8090/static/jwks.json'
-# PRIVATE_JWKS_PATH: './private/jwks.json'
-
 client_preferences: &id001
     application_name: rphandler
     application_type: web

flask_rp/example_conf.yaml

@@ -19,8 +19,13 @@ KEYDEFS: &keydef
     "crv": "P-256"
     "use": ["sig"]
 
-PRIVATE_JWKS_PATH: "jwks_dir/jwks.json"
-PUBLIC_JWKS_PATH: 'static/jwks.json'
+RP_KEYS:
+    'private_path': 'jwks_dir/jwks.json'
+    'key_defs': *keydef
+    'public_path': 'static/jwks.json'
+    # this will create the jwks files if they absent
+    'read_only': False
+
 # information used when registering the client, this may be the same for all OPs
 
 services: &services