Merge pull request openwallet-foundation#3346 from jamshale/fix/multi…

…tenancy-anoncreds-tails-upload Fix tails upload for anoncreds multitenancy
jamshale · Nov 22, 2024 · e27598d · e27598d
2 parents 3c7dee8 + 8e704bb
commit e27598d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/acapy_agent/anoncreds/revocation.py b/acapy_agent/anoncreds/revocation.py
@@ -32,6 +32,8 @@
 from ..core.error import BaseError
 from ..core.event_bus import Event, EventBus
 from ..core.profile import Profile, ProfileSession
+from ..multitenant.base import BaseMultitenantManager
+from ..tails.anoncreds_tails_server import AnonCredsTailsServer
 from ..tails.base import BaseTailsServer
 from .error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
 from .events import RevListFinishedEvent, RevRegDefFinishedEvent
@@ -694,7 +696,12 @@ def get_local_tails_path(self, rev_reg_def: RevRegDef) -> str:
 
     async def upload_tails_file(self, rev_reg_def: RevRegDef):
         """Upload the local tails file to the tails server."""
-        tails_server = self.profile.inject_or(BaseTailsServer)
+        multitenant_mgr = self.profile.inject_or(BaseMultitenantManager)
+        if multitenant_mgr:
+            tails_server = AnonCredsTailsServer()
+        else:
+            tails_server = self.profile.inject_or(BaseTailsServer)
+
         if not tails_server:
             raise AnonCredsRevocationError("Tails server not configured")
         if not Path(self.get_local_tails_path(rev_reg_def)).is_file():

diff --git a/acapy_agent/anoncreds/tests/test_revocation.py b/acapy_agent/anoncreds/tests/test_revocation.py
@@ -48,7 +48,7 @@
             "accum_key": {"z": "1 0BB...386"},
         },
         tails_hash="58NNWYnVxVFzAfUztwGSNBL4551XNq6nXk56pCiKJxxt",
-        tails_location="http://tails-server.com",
+        tails_location="https://tails-server.com",
     ),
     issuer_id="CsQY9MGeD3CQP4EyuVFo5m",
     type="CL_ACCUM",
@@ -836,21 +836,40 @@ def test_generate_public_tails_uri(self):
 
     async def test_upload_tails_file(self):
         self.profile.inject_or = mock.Mock(
-            return_value=mock.MagicMock(
-                upload_tails_file=mock.CoroutineMock(
-                    side_effect=[
-                        (True, "http://tails-server.com"),
-                        (None, "http://tails-server.com"),
-                        (True, "not-http://tails-server.com"),
-                    ]
-                )
-            )
+            side_effect=[
+                None,
+                mock.MagicMock(
+                    upload_tails_file=mock.CoroutineMock(
+                        return_value=(True, "https://tails-server.com")
+                    )
+                ),
+            ]
         )
         # valid
         await self.revocation.upload_tails_file(rev_reg_def)
         # upload fails
+        self.profile.inject_or = mock.Mock(
+            side_effect=[
+                None,
+                mock.MagicMock(
+                    upload_tails_file=mock.CoroutineMock(
+                        return_value=(None, "https://tails-server.com"),
+                    )
+                ),
+            ]
+        )
         with self.assertRaises(test_module.AnonCredsRevocationError):
             await self.revocation.upload_tails_file(rev_reg_def)
+        self.profile.inject_or = mock.Mock(
+            side_effect=[
+                None,
+                mock.MagicMock(
+                    upload_tails_file=mock.CoroutineMock(
+                        return_value=(True, "not-http://tails-server.com"),
+                    )
+                ),
+            ]
+        )
         # tails location does not match
         with self.assertRaises(test_module.AnonCredsRevocationError):
             await self.revocation.upload_tails_file(rev_reg_def)