Merge branch 'main' into gm/p256-w3c-ldp

acapy_agent/admin/decorators/auth.py

@@ -2,7 +2,7 @@
 
 import functools
 import re
-from typing import Optional, Pattern
+from typing import List, Optional, Pattern
 
 from aiohttp import web
 
@@ -65,8 +65,12 @@ async def tenant_auth(request):
         )
         insecure_mode = bool(profile.settings.get("admin.admin_insecure_mode"))
         multitenant_enabled = profile.settings.get("multitenant.enabled")
+        base_wallet_routes = profile.settings.get("multitenant.base_wallet_routes")
         base_wallet_allowed_route = _base_wallet_route_access(
-            profile.settings.get("multitenant.base_wallet_routes"), request.path
+            [base_wallet_routes]
+            if isinstance(base_wallet_routes, str)
+            else base_wallet_routes,
+            request.path,
         )
 
         # CORS fix: allow OPTIONS method access to paths without a token
@@ -88,19 +92,22 @@ async def tenant_auth(request):
     return tenant_auth
 
 
-def _base_wallet_route_access(additional_routes: str, request_path: str) -> bool:
+def _base_wallet_route_access(additional_routes: List[str], request_path: str) -> bool:
     """Check if request path matches additional routes."""
-    additional_routes_pattern = _build_additional_routes_pattern(additional_routes)
+    additional_routes_pattern = (
+        _build_additional_routes_pattern(additional_routes) if additional_routes else None
+    )
     return _matches_additional_routes(additional_routes_pattern, request_path)
 
 
-def _build_additional_routes_pattern(pattern_string: str) -> Optional[Pattern]:
+def _build_additional_routes_pattern(pattern_list: List[str]) -> Optional[Pattern]:
     """Build pattern from space delimited list of paths."""
     # create array and add word boundary to avoid false positives
-    if pattern_string:
-        paths = pattern_string.split(" ")
-        return re.compile("^((?:)" + "|".join(paths) + ")$")
-    return None
+    all_paths = []
+    for pattern in pattern_list:
+        paths = pattern.split(" ")
+        all_paths = all_paths + paths
+    return re.compile("^((?:)" + "|".join(all_paths) + ")$")
 
 
 def _matches_additional_routes(pattern: Pattern, path: str) -> bool:

acapy_agent/admin/tests/test_auth.py

@@ -134,8 +134,25 @@ async def test_multi_tenant_valid_auth_header(self):
         await decor_func(self.request)
         self.decorated_handler.assert_called_once_with(self.request)
 
-    async def test_base_wallet_additional_route_allowed(self):
-        self.profile.settings["multitenant.base_wallet_routes"] = "/extra-route"
+    async def test_base_wallet_additional_route_allowed_string(self):
+        self.profile.settings["multitenant.base_wallet_routes"] = (
+            "/not-this-route /extra-route"
+        )
+        self.request = mock.MagicMock(
+            __getitem__=lambda _, k: self.request_dict[k],
+            headers={"x-api-key": "admin_api_key"},
+            method="POST",
+            path="/extra-route",
+        )
+        decor_func = tenant_authentication(self.decorated_handler)
+        await decor_func(self.request)
+        self.decorated_handler.assert_called_once_with(self.request)
+
+    async def test_base_wallet_additional_route_allowed_list(self):
+        self.profile.settings["multitenant.base_wallet_routes"] = [
+            "/extra-route",
+            "/not-this-route",
+        ]
         self.request = mock.MagicMock(
             __getitem__=lambda _, k: self.request_dict[k],
             headers={"x-api-key": "admin_api_key"},