From ff62b918049f97a3b9aae0165b02ed33110d9482 Mon Sep 17 00:00:00 2001 From: Char Howland Date: Tue, 30 May 2023 15:09:35 -0600 Subject: [PATCH] feat: update to use tails server image with backwards compatible put, get file methods Signed-off-by: Char Howland --- aries_cloudagent/anoncreds/revocation.py | 2 +- aries_cloudagent/revocation/routes.py | 4 +++- aries_cloudagent/tails/anoncreds_tails_server.py | 2 +- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aries_cloudagent/anoncreds/revocation.py b/aries_cloudagent/anoncreds/revocation.py index 74727b53a0..b45d09232a 100644 --- a/aries_cloudagent/anoncreds/revocation.py +++ b/aries_cloudagent/anoncreds/revocation.py @@ -371,7 +371,7 @@ def generate_public_tails_uri(self, rev_reg_def: RevRegDef): raise AnonCredsRevocationError("tails_server_base_url not configured") public_tails_uri = ( - tails_base_url.rstrip("/") + f"/{rev_reg_def.value.tails_hash}" + tails_base_url.rstrip("/") + f"/hash/{rev_reg_def.value.tails_hash}" ) self._check_url(public_tails_uri) diff --git a/aries_cloudagent/revocation/routes.py b/aries_cloudagent/revocation/routes.py index 4155919638..9ac67d782f 100644 --- a/aries_cloudagent/revocation/routes.py +++ b/aries_cloudagent/revocation/routes.py @@ -1319,7 +1319,9 @@ async def on_revocation_registry_init_event(profile: Profile, event: Event): # Generate the registry and upload the tails file async def generate(rr_record: IssuerRevRegRecord) -> dict: await rr_record.generate_registry(profile) - public_uri = tails_base_url.rstrip("/") + f"/{registry_record.revoc_reg_id}" + public_uri = ( + tails_base_url.rstrip("/") + f"/{registry_record.revoc_reg_id}" + ) # TODO: update to include /hash await rr_record.set_tails_file_public_uri(profile, public_uri) rev_reg_resp = await rr_record.send_def( profile, diff --git a/aries_cloudagent/tails/anoncreds_tails_server.py b/aries_cloudagent/tails/anoncreds_tails_server.py index bb175dbfc9..2447ba6e7a 100644 --- a/aries_cloudagent/tails/anoncreds_tails_server.py +++ b/aries_cloudagent/tails/anoncreds_tails_server.py @@ -47,7 +47,7 @@ async def upload_tails_file( "tails_server_upload_url setting is not set" ) - upload_url = tails_server_upload_url.rstrip("/") + f"/{filename}" + upload_url = tails_server_upload_url.rstrip("/") + f"/hash/{filename}" try: await put_file( diff --git a/docker-compose.yml b/docker-compose.yml index 5f1423ef2b..9037211eb1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,7 @@ services: tails: platform: linux/amd64 - image: ghcr.io/indicio-tech/tails-server:sha-d45f581 + image: ghcr.io/indicio-tech/tails-server:sha-3d2feb2 ports: - 6543:6543 environment: