Changed Exception type

Author: rohe

src/oidcendpoint/common/authorization.py

@@ -89,7 +89,7 @@ def verify_uri(endpoint_context, request, uri_type, client_id=None):
     if not redirect_uris:
         if _cid not in endpoint_context.cdb:
             logger.debug("CIDs: {}".format(list(endpoint_context.cdb.keys())))
-            raise ValueError("No such client")
+            raise KeyError("No such client")
         raise ValueError("No registered {}".format(uri_type))
     else:
         for regbase, rquery in redirect_uris:

tests/test_24_oauth2_authorization_endpoint.py

@@ -262,7 +262,7 @@ def test_verify_uri_noregistered(self):
         _ec = self.endpoint.endpoint_context
         request = {"redirect_uri": "https://rp.example.com/cb"}
 
-        with pytest.raises(ValueError):
+        with pytest.raises(KeyError):
             verify_uri(_ec, request, "redirect_uri", "client_id")
 
     def test_verify_uri_unregistered(self):

tests/test_24_oidc_authorization_endpoint.py

@@ -445,7 +445,7 @@ def test_verify_uri_noregistered(self):
         _ec = self.endpoint.endpoint_context
         request = {"redirect_uri": "https://rp.example.com/cb"}
 
-        with pytest.raises(ValueError):
+        with pytest.raises(KeyError):
             verify_uri(_ec, request, "redirect_uri", "client_id")
 
     def test_verify_uri_unregistered(self):
@@ -993,11 +993,30 @@ def create_endpoint(self):
                     'flag': 'c',
                     "writeback": True
                 }
+            },
+            "jti_db": {
+                "class": 'oidcendpoint.shelve_db.ShelveDataBase',
+                "kwargs": {
+                    "filename": 'jti',
+                    'flag': 'c',
+                    "writeback": True
+                }
+            },
+            "client_db": {
+                "class": 'oidcendpoint.shelve_db.ShelveDataBase',
+                "kwargs": {
+                    "filename": 'client',
+                    'flag': 'c',
+                    "writeback": True
+                }
             }
+
         }
         endpoint_context = EndpointContext(conf)
         _clients = yaml.safe_load(io.StringIO(client_yaml))
-        endpoint_context.cdb = _clients["oidc_clients"]
+        for c,v in _clients["oidc_clients"].items():
+            endpoint_context.cdb[c] = v
+
         endpoint_context.keyjar.import_jwks(
             endpoint_context.keyjar.export_jwks(True, ""), conf["issuer"]
         )
@@ -1194,7 +1213,7 @@ def test_verify_uri_noregistered(self):
         _ec = self.endpoint.endpoint_context
         request = {"redirect_uri": "https://rp.example.com/cb"}
 
-        with pytest.raises(ValueError):
+        with pytest.raises(KeyError):
             verify_uri(_ec, request, "redirect_uri", "client_id")
         self._reset()