Updated some tests

Author: rohe

tests/test_00_endpoint_context.py

@@ -1,7 +1,10 @@
+import io
 from copy import copy
 
 import pytest
+import yaml
 from cryptojwt.key_jar import build_keyjar
+from oidcendpoint.oidc.session import Session
 
 from oidcendpoint.endpoint_context import EndpointContext
 from oidcendpoint.exception import ConfigurationError
@@ -58,6 +61,11 @@
             'path': 'userinfo',
             'class': UserInfo,
             'kwargs': {'db_file': 'users.json'}
+        },
+        'session': {
+            'path': 'end_session',
+            'class': Session,
+            'kwargs': {}
         }
     },
     'authentication': {
@@ -70,6 +78,32 @@
     'template_dir': 'template'
 }
 
+client_yaml = """
+oidc_clients:
+  client1:
+    # client secret is "password"
+    client_secret: "Namnam"
+    redirect_uris:
+      - ['https://openidconnect.net/callback', '']
+    response_types:
+      - code
+  client2:
+    client_secret: "spraket"
+    redirect_uris:
+      - ['https://app1.example.net/foo', '']
+      - ['https://app2.example.net/bar', '']
+    response_types:
+      - code
+  client3:
+    client_secret: '2222222222222222222222222222222222222222'
+    redirect_uris:
+      - ['https://127.0.0.1:8090/authz_cb/bobcat', '']
+    post_logout_redirect_uris:
+      - ['https://openidconnect.net/', '']
+    response_types:
+      - code
+"""
+
 
 def test_capabilities_default():
     endpoint_context = EndpointContext(conf)
@@ -109,3 +143,11 @@ def test_capabilities_no_support():
     _cnf['capabilities'] = {'id_token_signing_alg_values_supported': 'RC4'}
     with pytest.raises(ConfigurationError):
         EndpointContext(_cnf)
+
+
+def test_cdb():
+    endpoint_context = EndpointContext(conf)
+    _clients = yaml.load(io.StringIO(client_yaml))
+    endpoint_context.cdb = _clients['oidc_clients']
+
+    assert set(endpoint_context.cdb.keys()) == {'client1', 'client2', 'client3'}

tests/test_24_authorization_endpoint.py

@@ -1,10 +1,12 @@
+import io
 import json
 import os
 from http.cookies import SimpleCookie
 from urllib.parse import parse_qs
 from urllib.parse import urlparse
 
 import pytest
+import yaml
 from cryptojwt.jwt import utc_time_sans_frac
 from cryptojwt.utils import as_bytes
 from cryptojwt.utils import b64e
@@ -148,6 +150,38 @@ def get_cookie_value(cookie=None, cookie_name=None):
         return None
 
 
+client_yaml = """
+oidc_clients:
+  client_1:
+    "client_secret": 'hemligt'
+    "redirect_uris": 
+        - ['https://example.com/cb', '']
+    "client_salt": "salted"
+    'token_endpoint_auth_method': 'client_secret_post'
+    'response_types': 
+        - 'code'
+        - 'token'
+        - 'code id_token'
+        - 'id_token'
+        - 'code id_token token'
+  client2:
+    client_secret: "spraket"
+    redirect_uris:
+      - ['https://app1.example.net/foo', '']
+      - ['https://app2.example.net/bar', '']
+    response_types:
+      - code
+  client3:
+    client_secret: '2222222222222222222222222222222222222222'
+    redirect_uris:
+      - ['https://127.0.0.1:8090/authz_cb/bobcat', '']
+    post_logout_redirect_uris:
+      - ['https://openidconnect.net/', '']
+    response_types:
+      - code
+"""
+
+
 class TestEndpoint(object):
     @pytest.fixture(autouse=True)
     def create_endpoint(self):
@@ -233,14 +267,8 @@ def create_endpoint(self):
             }
         }
         endpoint_context = EndpointContext(conf)
-        endpoint_context.cdb['client_1'] = {
-            "client_secret": 'hemligt',
-            "redirect_uris": [("https://example.com/cb", None)],
-            "client_salt": "salted",
-            'token_endpoint_auth_method': 'client_secret_post',
-            'response_types': ['code', 'token', 'code id_token', 'id_token',
-                               'code id_token token']
-        }
+        _clients = yaml.load(io.StringIO(client_yaml))
+        endpoint_context.cdb = _clients['oidc_clients']
         endpoint_context.keyjar.import_jwks(
             endpoint_context.keyjar.export_jwks(True, ''), conf['issuer'])
         self.endpoint = Authorization(endpoint_context)
@@ -731,6 +759,8 @@ def test_setup_auth_login_hint2acrs(self):
         assert isinstance(res['method'], NoAuthn)
         assert res['method'].user == 'knoll'
 
+    def test_post_logout_uri(self):
+        pass
 
 def test_inputs():
     elems = inputs({'foo': 'bar', 'home': 'stead'})