Don't use splitquery - deprecated.

Author: rohe

src/oidcendpoint/common/authorization.py

@@ -1,6 +1,5 @@
 import logging
 from urllib.parse import parse_qs
-from urllib.parse import splitquery
 from urllib.parse import unquote
 from urllib.parse import urlencode
 from urllib.parse import urlparse
@@ -15,6 +14,7 @@
 from oidcendpoint.exception import RedirectURIError
 from oidcendpoint.exception import UnknownClient
 from oidcendpoint.user_info import SCOPE2CLAIMS
+from oidcendpoint.util import split_uri
 
 logger = logging.getLogger(__name__)
 
@@ -76,7 +76,7 @@ def verify_uri(endpoint_context, request, uri_type, client_id=None):
     if part.fragment:
         raise URIError("Contains fragment")
 
-    (_base, _query) = splitquery(_redirect_uri)
+    (_base, _query) = split_uri(_redirect_uri)
     if _query:
         _query = parse_qs(_query)
 

src/oidcendpoint/oidc/registration.py

@@ -7,8 +7,6 @@
 from urllib.parse import parse_qs
 from urllib.parse import urlencode
 from urllib.parse import urlparse
-from urllib.parse import urlsplit
-from urllib.parse import urlunsplit
 
 from cryptojwt.jws.utils import alg2keytype
 from oidcmsg.exception import MessageException
@@ -25,6 +23,7 @@
 from oidcendpoint.exception import CapabilitiesMisMatch
 from oidcendpoint.exception import InvalidRedirectURIError
 from oidcendpoint.exception import InvalidSectorIdentifier
+from oidcendpoint.util import split_uri
 
 PREFERENCE2PROVIDER = {
     # "require_signed_request_object": "request_object_algs_supported",
@@ -91,21 +90,6 @@ def secret(seed, sid):
     return csum.hexdigest()
 
 
-def split_uri(uri):
-    p = urlsplit(uri)
-
-    if p.fragment:
-        p = p._replace(fragment='')
-
-    if p.query:
-        o = p._replace(query='')
-        base = urlunsplit(o)
-        return base, parse_qs(p.query)
-    else:
-        base = urlunsplit(p)
-        return base, ''
-
-
 def comb_uri(args):
     for param in ["redirect_uris", "post_logout_redirect_uris"]:
         if param not in args:

src/oidcendpoint/util.py

@@ -1,6 +1,9 @@
 import importlib
 import json
 import logging
+from urllib.parse import parse_qs
+from urllib.parse import urlsplit
+from urllib.parse import urlunsplit
 
 logger = logging.getLogger(__name__)
 
@@ -151,3 +154,19 @@ def get_http_params(config):
 
     return params
 
+
+def split_uri(uri):
+    p = urlsplit(uri)
+
+    if p.fragment:
+        p = p._replace(fragment='')
+
+    if p.query:
+        o = p._replace(query='')
+        base = urlunsplit(o)
+        return base, parse_qs(p.query)
+    else:
+        base = urlunsplit(p)
+        return base, ''
+
+