fixup! PR IdentityPython#405: apply changes from review

bajnokk · Jun 13, 2023 · 73f632d · 73f632d
1 parent acf7806
commit 73f632d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/src/satosa/backends/base.py b/src/satosa/backends/base.py
@@ -3,6 +3,9 @@
 """
 
 from ..attribute_mapping import AttributeMapper
+from ..util import join_paths
+
+from urllib.parse import urlparse
 
 
 class BackendModule(object):
@@ -30,7 +33,10 @@ def __init__(self, auth_callback_func, internal_attributes, base_url, name):
         self.internal_attributes = internal_attributes
         self.converter = AttributeMapper(internal_attributes)
         self.base_url = base_url.rstrip("/") if base_url else ""
+        self.base_path = urlparse(self.base_url).path.lstrip("/")
         self.name = name
+        self.endpoint_baseurl = join_paths(self.base_url, self.name)
+        self.endpoint_basepath = urlparse(self.endpoint_baseurl).path.lstrip("/")
 
     def start_auth(self, context, internal_request):
         """

diff --git a/src/satosa/frontends/saml2.py b/src/satosa/frontends/saml2.py
@@ -33,6 +33,7 @@
 from ..response import Response
 from ..response import ServiceError
 from ..saml_util import make_saml_response
+from ..util import join_paths
 from satosa.exception import SATOSAError
 import satosa.util as util
 
@@ -511,14 +512,18 @@ def _register_endpoints(self, providers):
         """
         url_map = []
 
-        backend_providers = "|".join(providers)
+        backend_providers = "(" + "|".join(providers) + ")"
         for endp_category in self.endpoints:
             for binding, endp in self.endpoints[endp_category].items():
                 endp_path = urlparse(endp).path
                 url_map.append(
                     (
-                        "^{}/({})/{}$".format(self.base_path, backend_providers, endp_path),
-                        functools.partial(self.handle_authn_request, binding_in=binding)
+                        "^{}$".format(
+                            join_paths(self.base_path, backend_providers, endp_path)
+                        ),
+                        functools.partial(
+                            self.handle_authn_request, binding_in=binding
+                        ),
                     )
                 )
 
@@ -766,14 +771,20 @@ def _register_endpoints(self, providers):
         """
         url_map = []
 
-        backend_providers = "|".join(providers)
+        backend_providers = "(" + "|".join(providers) + ")"
         for endp_category in self.endpoints:
             for binding, endp in self.endpoints[endp_category].items():
                 endp_path = urlparse(endp).path
                 url_map.append(
                     (
-                        "^{}/({})/\S+/{}$".format(self.base_path, backend_providers, endp_path),
-                        functools.partial(self.handle_authn_request, binding_in=binding)
+                        "^{}$".format(
+                            join_paths(
+                                self.base_path, backend_providers, "\S+", endp_path
+                            )
+                        ),
+                        functools.partial(
+                            self.handle_authn_request, binding_in=binding
+                        ),
                     )
                 )
 

diff --git a/src/satosa/micro_services/account_linking.py b/src/satosa/micro_services/account_linking.py
@@ -165,7 +165,7 @@ def register_endpoints(self):
         return [
             (
                 "^{}$".format(
-                    join_paths(self.endpoint_basepath, self.endpoint)
+                    join_paths(self.base_path, "account_linking", self.endpoint)
                 ),
                 self._handle_al_response,
             )

diff --git a/src/satosa/micro_services/base.py b/src/satosa/micro_services/base.py
@@ -4,6 +4,8 @@
 import logging
 from urllib.parse import urlparse
 
+from ..util import join_paths
+
 logger = logging.getLogger(__name__)
 
 

diff --git a/src/satosa/micro_services/consent.py b/src/satosa/micro_services/consent.py
@@ -242,7 +242,7 @@ def register_endpoints(self):
         return [
             (
                 "^{}$".format(
-                    join_paths(self.endpoint_basepath, self.endpoint)
+                    join_paths(self.base_path, "consent", self.endpoint)
                 ),
                 self._handle_consent_response,
             )