chore: unit tests speed up with default http timeout + warning on unknow conf param

peppelinux · peppelinux · commit 0123d25953e8 · 2021-10-26T22:08:26.000+02:00
diff --git a/src/oidcop/configure.py b/src/oidcop/configure.py
@@ -13,6 +13,9 @@
 from oidcop.scopes import SCOPE2CLAIMS
 from oidcop.utils import load_yaml_config
 
+logger = logging.getLogger(__name__)
+
+
 DEFAULT_FILE_ATTRIBUTE_NAMES = [
     "server_key",
     "server_cert",
@@ -84,7 +87,8 @@
 
 AS_DEFAULT_CONFIG = copy.deepcopy(OP_DEFAULT_CONFIG)
 AS_DEFAULT_CONFIG["claims_interface"] = {
-    "class": "oidcop.session.claims.OAuth2ClaimsInterface", "kwargs": {}}
+    "class": "oidcop.session.claims.OAuth2ClaimsInterface", "kwargs": {}
+}
 
 
 def add_base_path(conf: Union[dict, str], base_path: str, file_attributes: List[str]):
@@ -207,8 +211,6 @@ class EntityConfiguration(Base):
         "template_dir": None,
         "token_handler_args": {},
         "userinfo": None,
-        "password": None,
-        "salt": None,
     }
 
     def __init__(
@@ -241,7 +243,9 @@ def __init__(
                     self.format(_val, base_path=base_path, file_attributes=file_attributes,
                                 domain=domain, port=port)
                 else:
-                    continue
+                    logger.warning(
+                        f"{key} is not a valid configuration parameter"
+                    )
 
             if key == "template_dir":
                 _val = os.path.abspath(_val)
diff --git a/tests/op_config.json b/tests/op_config.json
@@ -216,6 +216,7 @@
       }
     }
   },
+  "stupid_fake_thing": "asdasd",
   "httpc_params": {
     "verify": false
   },
diff --git a/tests/test_00_server.py b/tests/test_00_server.py
@@ -36,8 +36,7 @@ def full_path(local_file):
 
 CONF = {
     "issuer": "https://example.com/",
-    "password": "mycket hemligt",
-    "verify_ssl": False,
+    "httpc_params": {"verify": False, "timeout": 1},
     "capabilities": {},
     "keys": {"uri_path": "static/jwks.json", "key_defs": KEYDEFS, "read_only": True},
     "endpoint": {
diff --git a/tests/test_01_util.py b/tests/test_01_util.py
@@ -12,11 +12,10 @@
 
 conf = {
     "issuer": "https://example.com/",
-    "password": "mycket hemligt",
+    "httpc_params": {"verify": False, "timeout": 1},
     "token_expires_in": 600,
     "grant_expires_in": 300,
     "refresh_token_expires_in": 86400,
-    "verify_ssl": False,
     "capabilities": {},
     "jwks_uri": "https://example.com/jwks.json",
     "keys": {"private_path": "own/jwks.json", "key_defs": KEYDEFS, "uri_path": "static/jwks.json",},
diff --git a/tests/test_02_client_authn.py b/tests/test_02_client_authn.py
@@ -36,9 +36,10 @@
 
 CONF = {
     "issuer": "https://example.com/",
-    "password": "mycket hemligt",
     "grant_expires_in": 300,
-    "verify_ssl": False,
+    "httpc_params": {
+        "verify": False
+    },
     "endpoint": {
         "token": {
             "path": "token",
diff --git a/tests/test_05_id_token.py b/tests/test_05_id_token.py
@@ -64,8 +64,7 @@ def full_path(local_file):
 
 conf = {
     "issuer": "https://example.com/",
-    "password": "mycket hemligt",
-    "verify_ssl": False,
+    "httpc_params": {"verify": False, "timeout": 1},
     "keys": {"key_defs": KEYDEFS, "uri_path": "static/jwks.json"},
     "token_handler_args": {
         "jwks_def": {
diff --git a/tests/test_05_jwt_token.py b/tests/test_05_jwt_token.py
@@ -99,8 +99,7 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": ISSUER,
-            "password": "mycket hemligt",
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "capabilities": CAPABILITIES,
             "keys": {"uri_path": "jwks.json", "key_defs": KEYDEFS},
             "token_handler_args": {
diff --git a/tests/test_06_session_manager.py b/tests/test_06_session_manager.py
@@ -37,11 +37,10 @@ class TestSessionManager:
     def create_session_manager(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
             "keys": {"key_defs": KEYDEFS, "uri_path": "static/jwks.json"},
             "jwks_uri": "https://example.com/jwks.json",
             "token_handler_args": {
diff --git a/tests/test_08_session_life.py b/tests/test_08_session_life.py
@@ -30,11 +30,10 @@ def setup_token_handler(self):
         password = "The longer the better. Is this close to enough ?"
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
             "keys": {"key_defs": KEYDEFS, "uri_path": "static/jwks.json"},
             "jwks_uri": "https://example.com/jwks.json",
             "token_handler_args": {
@@ -249,11 +248,10 @@ class TestSessionJWTToken:
     def setup_session_manager(self):
         conf = {
             "issuer": ISSUER,
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
             "capabilities": CAPABILITIES,
             "keys": {"uri_path": "jwks.json", "key_defs": KEYDEFS},
             "token_handler_args": {
diff --git a/tests/test_09_cookie_handler.py b/tests/test_09_cookie_handler.py
@@ -249,7 +249,7 @@ def test_compute_session_state():
 #
 # conf = {
 #     "issuer": "https://example.com/",
-#     "password": "mycket hemligt",
+#     "httpc_params": {"verify": False, "timeout": 1},
 #     "token_expires_in": 600,
 #     "grant_expires_in": 300,
 #     "refresh_token_expires_in": 86400,
diff --git a/tests/test_12_user_authn.py b/tests/test_12_user_authn.py
@@ -30,9 +30,8 @@ class TestUserAuthn(object):
     def create_endpoint_context(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "grant_expires_in": 300,
-            "verify_ssl": False,
             "endpoint": {
                 "authorization": {
                     "path": "{}/authorization",
diff --git a/tests/test_20_endpoint.py b/tests/test_20_endpoint.py
@@ -43,11 +43,10 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
             "endpoint": {"endpoint": {"path": "endpoint", "class": Endpoint, "kwargs": {}},},
             "keys": {
                 "public_path": "jwks.json",
diff --git a/tests/test_21_oidc_discovery_endpoint.py b/tests/test_21_oidc_discovery_endpoint.py
@@ -21,11 +21,10 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "endpoint": {
                 "webfinger": {
                     "path": ".well-known/webfinger",
diff --git a/tests/test_22_oidc_provider_config_endpoint.py b/tests/test_22_oidc_provider_config_endpoint.py
@@ -54,8 +54,9 @@ class TestEndpoint(object):
     def conf(self):
         return {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
-            "verify_ssl": False,
+            "httpc_params": {
+              "verify": False
+            },
             "capabilities": CAPABILITIES,
             "keys": {"uri_path": "static/jwks.json", "key_defs": KEYDEFS},
             "endpoint": {
diff --git a/tests/test_23_oidc_registration_endpoint.py b/tests/test_23_oidc_registration_endpoint.py
@@ -76,10 +76,7 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
-            "httpc_params": {
-                "verify": False, "timeout": 1
-            },
+            "httpc_params": {"verify": False, "timeout": 1},
             "capabilities": {
                 "subject_types_supported": ["public", "pairwise", "ephemeral"],
                 "grant_types_supported": [
diff --git a/tests/test_24_oauth2_token_endpoint.py b/tests/test_24_oauth2_token_endpoint.py
@@ -80,8 +80,9 @@ def full_path(local_file):
 def conf():
     return {
         "issuer": "https://example.com/",
-        "password": "mycket hemligt",
-        "verify_ssl": False,
+        "httpc_params": {
+        "verify": False
+        },
         "capabilities": CAPABILITIES,
         "keys": {"uri_path": "jwks.json", "key_defs": KEYDEFS},
         "token_handler_args": {
diff --git a/tests/test_24_oidc_authorization_endpoint.py b/tests/test_24_oidc_authorization_endpoint.py
@@ -1226,11 +1226,11 @@ class TestUserAuthn(object):
     def create_endpoint_context(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "endpoint": {
                 "authorization": {
                     "path": "{}/authorization",
diff --git a/tests/test_26_oidc_userinfo_endpoint.py b/tests/test_26_oidc_userinfo_endpoint.py
@@ -86,8 +86,7 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "capabilities": CAPABILITIES,
             "cookie_handler": {
                 "class": CookieHandler,
diff --git a/tests/test_31_oauth2_introspection.py b/tests/test_31_oauth2_introspection.py
@@ -96,8 +96,7 @@ class TestEndpoint:
     def create_endpoint(self, jwt_token):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "capabilities": CAPABILITIES,
             "keys": {"uri_path": "jwks.json", "key_defs": KEYDEFS},
             "token_handler_args": {
diff --git a/tests/test_32_oidc_read_registration.py b/tests/test_32_oidc_read_registration.py
@@ -79,11 +79,10 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
             "capabilities": CAPABILITIES,
             "keys": {"key_defs": KEYDEFS, "uri_path": "static/jwks.json"},
             "cookie_handler": {
diff --git a/tests/test_34_oidc_sso.py b/tests/test_34_oidc_sso.py
@@ -125,11 +125,10 @@ class TestUserAuthn(object):
     def create_endpoint_context(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
+            "httpc_params": {"verify": False, "timeout": 1},
             "token_expires_in": 600,
             "grant_expires_in": 300,
             "refresh_token_expires_in": 86400,
-            "verify_ssl": False,
             "endpoint": {
                 "authorization": {
                     "path": "{}/authorization",
diff --git a/tests/test_35_oidc_token_endpoint.py b/tests/test_35_oidc_token_endpoint.py
@@ -100,8 +100,7 @@ def full_path(local_file):
 def conf():
     return {
         "issuer": "https://example.com/",
-        "password": "mycket hemligt",
-        "verify_ssl": False,
+        "httpc_params": {"verify": False, "timeout": 1},
         "capabilities": CAPABILITIES,
         "keys": {"uri_path": "jwks.json", "key_defs": KEYDEFS},
         "token_handler_args": {
diff --git a/tests/test_36_oauth2_token_exchange.py b/tests/test_36_oauth2_token_exchange.py
@@ -85,8 +85,7 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
-            "password": "mycket hemligt",
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "capabilities": CAPABILITIES,
             "cookie_handler": {
                 "class": CookieHandler,
diff --git a/tests/test_50_persistence.py b/tests/test_50_persistence.py
@@ -76,8 +76,7 @@ def full_path(local_file):
 
 ENDPOINT_CONTEXT_CONFIG = {
     "issuer": "https://example.com/",
-    "password": "mycket hemligt",
-    "verify_ssl": False,
+    "httpc_params": {"verify": False, "timeout": 1},
     "capabilities": CAPABILITIES,
     "keys": {"uri_path": "jwks.json", "key_defs": KEYDEFS},
     "token_handler_args": {
diff --git a/tests/test_60_dpop.py b/tests/test_60_dpop.py
@@ -119,8 +119,7 @@ class TestEndpoint(object):
     def create_endpoint(self):
         conf = {
             "issuer": ISSUER,
-            "password": "mycket hemligt",
-            "verify_ssl": False,
+            "httpc_params": {"verify": False, "timeout": 1},
             "capabilities": CAPABILITIES,
             "add_on": {
                 "dpop": {

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`	`},`
	`219`	`+ "stupid_fake_thing": "asdasd",`
`219`	`220`	`"httpc_params": {`
`220`	`221`	`"verify": false`
`221`	`222`	`},`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ def test_compute_session_state():`
`249`	`249`	`#`
`250`	`250`	`# conf = {`
`251`	`251`	`# "issuer": "https://example.com/",`
`252`		`-# "password": "mycket hemligt",`
	`252`	`+# "httpc_params": {"verify": False, "timeout": 1},`
`253`	`253`	`# "token_expires_in": 600,`
`254`	`254`	`# "grant_expires_in": 300,`
`255`	`255`	`# "refresh_token_expires_in": 86400,`