fix: update tails server upload methods to return public file URIs

We ran into an issue where we had a different tails_server_base_url from
the tails_server_upload_url. This makes sense where you want to have a
separate base URL for accessing the public files, and a private URL that
is used for pushing the changes (where access controls dictate who can
upload files, and they are restricted on the public URL).

The `upload_tails_file` methods were returning the private URLs and the
calling code was expecting public URLs. The solution was to update the
methods to return the public URLs instead, while still uploading to the
private URLs.

Signed-off-by: Colton Wolkins (Laptop) <colton@indicio.tech>

Author: TheTechmage

acapy_agent/config/argparse.py

@@ -776,6 +776,8 @@ def get_settings(self, args: Namespace) -> dict:
             settings["tails_server_upload_url"] = args.tails_server_base_url
         if args.tails_server_upload_url:
             settings["tails_server_upload_url"] = args.tails_server_upload_url
+        if args.tails_server_upload_url and not args.tails_server_base_url:
+            settings["args.tails_server_base_url"] = args.tails_server_upload_url
         if args.notify_revocation:
             settings["revocation.notify"] = args.notify_revocation
         if args.monitor_revocation_notification:

acapy_agent/tails/anoncreds_tails_server.py

@@ -35,17 +35,24 @@ async def upload_tails_file(
 
         Returns:
             Tuple[bool, str]: tuple with success status and url of uploaded
-            file or error message if failed
+            public file uri or error message if failed
 
         """
         tails_server_upload_url = context.settings.get("tails_server_upload_url")
+        tails_server_base_url = context.settings.get("tails_server_base_url")
 
         if not tails_server_upload_url:
             raise TailsServerNotConfiguredError(
                 "tails_server_upload_url setting is not set"
             )
 
+        if not tails_server_base_url:
+            raise TailsServerNotConfiguredError(
+                "tails_server_base_url setting is not set"
+            )
+
         upload_url = tails_server_upload_url.rstrip("/") + f"/hash/{filename}"
+        public_url = tails_server_base_url.rstrip("/") + f"/hash/{filename}"
 
         try:
             await put_file(
@@ -59,4 +66,4 @@ async def upload_tails_file(
         except PutError as x_put:
             return (False, x_put.message)
 
-        return True, upload_url
+        return True, public_url

acapy_agent/tails/base.py

@@ -31,6 +31,6 @@ async def upload_tails_file(
 
         Returns:
             Tuple[bool, str]: tuple with success status and url of uploaded
-            file or error message if failed
+            public file uri or error message if failed
 
         """

acapy_agent/tails/indy_tails_server.py

@@ -37,10 +37,11 @@ async def upload_tails_file(
 
         Returns:
             Tuple[bool, str]: tuple with success status and url of uploaded
-            file or error message if failed
+            public file uri or error message if failed
 
         """
         tails_server_upload_url = context.settings.get("tails_server_upload_url")
+        tails_server_base_url = context.settings.get("tails_server_base_url")
         genesis_transactions = context.settings.get("ledger.genesis_transactions")
 
         if not genesis_transactions:
@@ -64,7 +65,13 @@ async def upload_tails_file(
                 "tails_server_upload_url setting is not set"
             )
 
+        if not tails_server_base_url:
+            raise TailsServerNotConfiguredError(
+                "tails_server_base_url setting is not set"
+            )
+
         upload_url = tails_server_upload_url.rstrip("/") + f"/{filename}"
+        public_url = tails_server_base_url.rstrip("/") + f"/{filename}"
 
         try:
             await put_file(
@@ -78,4 +85,4 @@ async def upload_tails_file(
         except PutError as x_put:
             return (False, x_put.message)
 
-        return True, upload_url
+        return True, public_url

acapy_agent/tails/tests/test_indy.py

@@ -24,6 +24,7 @@ async def test_upload(self):
         context = InjectionContext(
             settings={
                 "ledger.genesis_transactions": "dummy",
+                "tails_server_base_url": "http://1.2.3.4:8088/tails/",
                 "tails_server_upload_url": "http://1.2.3.4:8088",
             }
         )
@@ -37,10 +38,17 @@ async def test_upload(self):
                 "/tmp/dummy/path",
             )
             assert ok
-            assert text == context.settings["tails_server_upload_url"] + "/" + REV_REG_ID
+
+            # already contains / from config, no need to add it
+            assert text == context.settings["tails_server_base_url"] + REV_REG_ID
+            assert (
+                mock_put.call_args.args[0]
+                == context.settings["tails_server_upload_url"] + "/" + REV_REG_ID
+            )
 
     async def test_upload_indy_vdr(self):
         self.profile = await create_test_profile()
+        self.profile.settings["tails_server_base_url"] = "http://1.2.3.4:8088/tails/"
         self.profile.settings["tails_server_upload_url"] = "http://1.2.3.4:8088"
         mock_multi_ledger_manager = mock.MagicMock(
             BaseMultipleLedgerManager, autospec=True
@@ -69,15 +77,19 @@ async def test_upload_indy_vdr(self):
                 "/tmp/dummy/path",
             )
             assert ok
+
+            # already contains / from config, no need to add it
+            assert text == self.profile.settings["tails_server_base_url"] + REV_REG_ID
             assert (
-                text
+                mock_put.call_args.args[0]
                 == self.profile.settings["tails_server_upload_url"] + "/" + REV_REG_ID
             )
 
     async def test_upload_x(self):
         context = InjectionContext(
             settings={
                 "ledger.genesis_transactions": "dummy",
+                "tails_server_base_url": "http://1.2.3.4:8088/tails/",
                 "tails_server_upload_url": "http://1.2.3.4:8088",
             }
         )