Added configuration tests.

Author: rohe

tests/entity_conf.json

@@ -0,0 +1,29 @@
+{
+  "port": 8090,
+  "domain": "127.0.0.1",
+  "base_url": "https://{domain}:{port}",
+  "httpc_params": {
+    "verify": false
+  },
+  "keys": {
+    "private_path": "private/jwks.json",
+    "key_defs": [
+      {
+        "type": "RSA",
+        "key": "",
+        "use": [
+          "sig"
+        ]
+      },
+      {
+        "type": "EC",
+        "crv": "P-256",
+        "use": [
+          "sig"
+        ]
+      }
+    ],
+    "public_path": "static/jwks.json",
+    "read_only": false
+  }
+}

tests/entity_conf.py

@@ -0,0 +1,29 @@
+CONFIG = {
+  "port": 8090,
+  "domain": "127.0.0.1",
+  "base_url": "https://{domain}:{port}",
+  "httpc_params": {
+    "verify": False
+  },
+  "keys": {
+    "private_path": "private/jwks.json",
+    "key_defs": [
+      {
+        "type": "RSA",
+        "key": "",
+        "use": [
+          "sig"
+        ]
+      },
+      {
+        "type": "EC",
+        "crv": "P-256",
+        "use": [
+          "sig"
+        ]
+      }
+    ],
+    "public_path": "static/jwks.json",
+    "read_only": False
+  }
+}

tests/server_conf.json

@@ -0,0 +1,69 @@
+{
+  "logging": {
+    "version": 1,
+    "disable_existing_loggers": false,
+    "root": {
+      "handlers": [
+        "console",
+        "file"
+      ],
+      "level": "DEBUG"
+    },
+    "loggers": {
+      "idp": {
+        "level": "DEBUG"
+      }
+    },
+    "handlers": {
+      "console": {
+        "class": "logging.StreamHandler",
+        "stream": "ext://sys.stdout",
+        "formatter": "default"
+      },
+      "file": {
+        "class": "logging.FileHandler",
+        "filename": "debug.log",
+        "formatter": "default"
+      }
+    },
+    "formatters": {
+      "default": {
+        "format": "%(asctime)s %(name)s %(levelname)s %(message)s"
+      }
+    }
+  },
+  "port": 8090,
+  "domain": "127.0.0.1",
+  "base_url": "https://{domain}:{port}",
+  "httpc_params": {
+    "verify": false
+  },
+  "keys": {
+    "private_path": "private/jwks.json",
+    "key_defs": [
+      {
+        "type": "RSA",
+        "key": "",
+        "use": [
+          "sig"
+        ]
+      },
+      {
+        "type": "EC",
+        "crv": "P-256",
+        "use": [
+          "sig"
+        ]
+      }
+    ],
+    "public_path": "static/jwks.json",
+    "read_only": false
+  },
+  "webserver": {
+    "port": 8090,
+    "domain": "127.0.0.1",
+    "server_cert": "certs/cert.pem",
+    "server_key": "certs/key.pem",
+    "debug": true
+  }
+}

tests/test_20_config.py

@@ -0,0 +1,77 @@
+import os
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Any
+
+import pytest
+
+from oidcmsg.configure import Base
+from oidcmsg.configure import Configuration
+from oidcmsg.configure import create_from_config_file
+from oidcmsg.configure import lower_or_upper
+from oidcmsg.configure import set_domain_and_port
+from oidcmsg.util import rndstr
+
+_dirname = os.path.dirname(os.path.abspath(__file__))
+
+URIS = ["base_url"]
+
+
+class EntityConfiguration(Base):
+    def __init__(self,
+                 conf: Dict,
+                 entity_conf: Optional[Any] = None,
+                 base_path: Optional[str] = '',
+                 domain: Optional[str] = "",
+                 port: Optional[int] = 0,
+                 file_attributes: Optional[List[str]] = None,
+                 uris: Optional[List[str]] = None
+                 ):
+
+        Base.__init__(self, conf, base_path=base_path, file_attributes=file_attributes)
+
+        self.keys = lower_or_upper(conf, 'keys')
+
+        if not domain:
+            domain = conf.get("domain", "127.0.0.1")
+
+        if not port:
+            port = conf.get("port", 80)
+
+        if uris is None:
+            uris = URIS
+        conf = set_domain_and_port(conf, uris, domain, port)
+
+        self.hash_seed = lower_or_upper(conf, 'hash_seed', rndstr(32))
+        self.base_url = conf.get("base_url")
+        self.httpc_params = conf.get("httpc_params", {"verify": False})
+
+
+def test_server_config():
+    c = create_from_config_file(Configuration,
+                                entity_conf=[{"class": EntityConfiguration, "attr": "entity"}],
+                                filename=os.path.join(_dirname, 'server_conf.json'),
+                                base_path=_dirname)
+    assert c
+    assert set(c.web_conf.keys()) == {'port', 'domain', 'server_cert', 'server_key', 'debug'}
+
+    entity_config = c.entity
+    assert entity_config.base_url == "https://127.0.0.1:8090"
+    assert entity_config.httpc_params == {"verify": False}
+
+
+@pytest.mark.parametrize("filename", ['entity_conf.json', 'entity_conf.py'])
+def test_entity_config(filename):
+    configuration = create_from_config_file(EntityConfiguration,
+                                            filename=os.path.join(_dirname, filename),
+                                            base_path=_dirname)
+    assert configuration
+
+    assert configuration.base_url == "https://127.0.0.1:8090"
+    assert configuration.httpc_params == {"verify": False}
+    assert configuration['keys']
+    ni = dict(configuration.items())
+    assert len(ni) == 4
+    assert set(ni.keys()) == {'keys', 'base_url', 'httpc_params', 'hash_seed'}
+