fix: cherry-pick fixes from main to 1.2.lts (#3577)

* fix: connection reuse with multi-tenancy

Signed-off-by: Daniel Bluhm <[email protected]>

* Fixing tenant endpoint access

Signed-off-by: Thiago Romano <[email protected]>

* Fixing failed test

Signed-off-by: Thiago Romano <[email protected]>

---------

Signed-off-by: Daniel Bluhm <[email protected]>
Signed-off-by: Thiago Romano <[email protected]>
Co-authored-by: Daniel Bluhm <[email protected]>

Author: thiagoromanos

acapy_agent/admin/decorators/auth.py

@@ -78,7 +78,7 @@ async def tenant_auth(request):
             (multitenant_enabled and authorization_header)
             or (not multitenant_enabled and valid_key)
             or (multitenant_enabled and valid_key and base_wallet_allowed_route)
-            or insecure_mode
+            or (insecure_mode and not multitenant_enabled)
             or request.method == "OPTIONS"
         ):
             return await handler(request)

acapy_agent/admin/tests/test_auth.py

@@ -86,11 +86,11 @@ async def test_options_request(self):
         await decor_func(self.request)
         self.decorated_handler.assert_called_once_with(self.request)
 
-    async def test_insecure_mode(self):
+    async def test_insecure_mode_witout_token(self):
         self.profile.settings["admin.admin_insecure_mode"] = True
         decor_func = tenant_authentication(self.decorated_handler)
-        await decor_func(self.request)
-        self.decorated_handler.assert_called_once_with(self.request)
+        with self.assertRaises(web.HTTPUnauthorized):
+            await decor_func(self.request)
 
     async def test_single_tenant_invalid_api_key(self):
         self.profile.settings["multitenant.enabled"] = False

acapy_agent/core/profile.py

@@ -130,6 +130,21 @@ def __repr__(self) -> str:
             self.__class__.__name__, self.backend, self.name
         )
 
+    def __eq__(self, other) -> bool:
+        """Equality checks for profiles.
+
+        Multiple profile instances can exist at the same time but point to the
+        same profile. This allows us to test equality based on the profile
+        pointed to by the instance rather than by object reference comparison.
+        """
+        if not isinstance(other, Profile):
+            return False
+
+        if type(self) is not type(other):
+            return False
+
+        return self.name == other.name
+
 
 class ProfileManager(ABC):
     """Handle provision and open for profile instances."""

acapy_agent/protocols/out_of_band/v1_0/routes.py

@@ -328,6 +328,7 @@ async def invitation_receive(request: web.BaseRequest):
             mediation_id=mediation_id,
         )
     except (DIDXManagerError, StorageError, BaseModelError) as err:
+        LOGGER.exception("Error during receive invitation")
         raise web.HTTPBadRequest(reason=err.roll_up) from err
 
     return web.json_response(result.serialize())