1.2.lts.patch (#3816)

jamshale · ff137 · dbluhm · web-flow · commit c2ed0122f4ee · 2025-07-10T18:59:15.000-07:00
* Don't run workflow for release candidates Signed-off-by: jamshale <jamiehalebc@gmail.com> * Put cred_rev_id read, increment and write in a transaction Signed-off-by: jamshale <jamiehalebc@gmail.com> * Remove header from http/ws responses Signed-off-by: jamshale <jamiehalebc@gmail.com> * 🐛 Fix: emit_event should be lazy by default (#3699) Signed-off-by: ff137 <ff137@proton.me> Signed-off-by: jamshale <jamiehalebc@gmail.com> * fix: multiuse invite derived conns should have msg id Signed-off-by: Daniel Bluhm <dbluhm@pm.me> Signed-off-by: jamshale <jamiehalebc@gmail.com> * 🐛 Fix unchanged endpoint being rewritten to ledger (#3608) Resolves #3607 Signed-off-by: ff137 <ff137@proton.me> Signed-off-by: jamshale <jamiehalebc@gmail.com> * Poetry update Signed-off-by: jamshale <jamiehalebc@gmail.com> --------- Signed-off-by: jamshale <jamiehalebc@gmail.com> Signed-off-by: ff137 <ff137@proton.me> Signed-off-by: Daniel Bluhm <dbluhm@pm.me> Co-authored-by: Mourits de Beer <31511766+ff137@users.noreply.github.com> Co-authored-by: Daniel Bluhm <dbluhm@pm.me>
diff --git a/acapy_agent/admin/server.py b/acapy_agent/admin/server.py
@@ -30,6 +30,7 @@
 from ..transport.queue.basic import BasicMessageQueue
 from ..utils import general as general_utils
 from ..utils.extract_validation_error import extract_validation_error_message
+from ..utils.server import remove_unwanted_headers
 from ..utils.stats import Collector
 from ..utils.task_queue import TaskQueue
 from ..version import __version__
@@ -387,6 +388,8 @@ async def setup_context(request: web.Request, handler):
         ]
         app.add_routes(server_routes)
 
+        app.on_response_prepare.append(remove_unwanted_headers)
+
         plugin_registry = self.context.inject_or(PluginRegistry)
         if plugin_registry:
             await plugin_registry.register_admin_routes(app)
diff --git a/acapy_agent/admin/tests/test_admin_server.py b/acapy_agent/admin/tests/test_admin_server.py
@@ -529,6 +529,20 @@ async def test_server_health_state(self):
             assert response.status == 503
         await server.stop()
 
+    async def test_server_aiohttp_headers_removed(self):
+        settings = {
+            "admin.admin_insecure_mode": True,
+        }
+        server = await self.get_admin_server(settings)
+        await server.start()
+
+        async with self.client_session.get(
+            f"http://127.0.0.1:{self.port}/status/live", headers={}
+        ) as response:
+            assert response.headers.get("Server") is None
+
+        await server.stop()
+
     async def test_upgrade_middleware(self):
         profile = await create_test_profile()
         self.context = AdminRequestContext.test_context({}, profile)
diff --git a/acapy_agent/anoncreds/revocation.py b/acapy_agent/anoncreds/revocation.py
@@ -1001,46 +1001,49 @@ def _has_required_id_and_tails_path():
         rev_list = None
 
         if _has_required_id_and_tails_path():
-            async with self.profile.session() as session:
-                rev_reg_def = await session.handle.fetch(
-                    CATEGORY_REV_REG_DEF, rev_reg_def_id
-                )
-                rev_list = await session.handle.fetch(CATEGORY_REV_LIST, rev_reg_def_id)
-                rev_key = await session.handle.fetch(
+            # We need to make sure the read, index increment, and write
+            # operations are done in a transaction.
+            # TODO: This isn't fully atomic in a clustered environment as the
+            # read transaction may happen concurrently with another.
+            async with self.profile.transaction() as txn:
+                rev_reg_def = await txn.handle.fetch(CATEGORY_REV_REG_DEF, rev_reg_def_id)
+                rev_list = await txn.handle.fetch(CATEGORY_REV_LIST, rev_reg_def_id)
+                rev_key = await txn.handle.fetch(
                     CATEGORY_REV_REG_DEF_PRIVATE, rev_reg_def_id
                 )
 
-            _handle_missing_entries(rev_list, rev_reg_def, rev_key)
+                _handle_missing_entries(rev_list, rev_reg_def, rev_key)
 
-            rev_list_value_json = rev_list.value_json
-            rev_list_tags = rev_list.tags
+                rev_list_value_json = rev_list.value_json
+                rev_list_tags = rev_list.tags
 
-            # If the rev_list state is failed then the tails file was never uploaded,
-            # try to upload it now and finish the revocation list
-            if rev_list_tags.get("state") == RevListState.STATE_FAILED:
-                await self.upload_tails_file(
-                    RevRegDef.deserialize(rev_reg_def.value_json)
-                )
-                rev_list_tags["state"] = RevListState.STATE_FINISHED
-
-            rev_reg_index = rev_list_value_json["next_index"]
-            try:
-                rev_reg_def = RevocationRegistryDefinition.load(rev_reg_def.raw_value)
-                rev_list = RevocationStatusList.load(rev_list_value_json["rev_list"])
-            except AnoncredsError as err:
-                raise AnonCredsRevocationError(
-                    "Error loading revocation registry"
-                ) from err
+                # If the rev_list state is failed then the tails file was never uploaded,
+                # try to upload it now and finish the revocation list
+                if rev_list_tags.get("state") == RevListState.STATE_FAILED:
+                    await self.upload_tails_file(
+                        RevRegDef.deserialize(rev_reg_def.value_json)
+                    )
+                    rev_list_tags["state"] = RevListState.STATE_FINISHED
 
-            # NOTE: we increment the index ahead of time to keep the
-            # transaction short. The revocation registry itself will NOT
-            # be updated because we always use ISSUANCE_BY_DEFAULT.
-            # If something goes wrong later, the index will be skipped.
-            # FIXME - double check issuance type in case of upgraded wallet?
-            if rev_reg_index > rev_reg_def.max_cred_num:
-                raise AnonCredsRevocationRegistryFullError("Revocation registry is full")
-            rev_list_value_json["next_index"] = rev_reg_index + 1
-            async with self.profile.transaction() as txn:
+                rev_reg_index = rev_list_value_json["next_index"]
+                try:
+                    rev_reg_def = RevocationRegistryDefinition.load(rev_reg_def.raw_value)
+                    rev_list = RevocationStatusList.load(rev_list_value_json["rev_list"])
+                except AnoncredsError as err:
+                    raise AnonCredsRevocationError(
+                        "Error loading revocation registry"
+                    ) from err
+
+                # NOTE: we increment the index ahead of time to keep the
+                # transaction short. The revocation registry itself will NOT
+                # be updated because we always use ISSUANCE_BY_DEFAULT.
+                # If something goes wrong later, the index will be skipped.
+                # FIXME - double check issuance type in case of upgraded wallet?
+                if rev_reg_index > rev_reg_def.max_cred_num:
+                    raise AnonCredsRevocationRegistryFullError(
+                        "Revocation registry is full"
+                    )
+                rev_list_value_json["next_index"] = rev_reg_index + 1
                 await txn.handle.replace(
                     CATEGORY_REV_LIST,
                     rev_reg_def_id,
diff --git a/acapy_agent/ledger/indy_vdr.py b/acapy_agent/ledger/indy_vdr.py
@@ -724,6 +724,7 @@ async def update_endpoint_for_did(
             endorser_did: DID of the endorser to use for the transaction
             routing_keys: List of routing keys
         """
+        routing_keys = routing_keys or []  # Ensure list type if None was passed
         public_info = await self.get_wallet_public_did()
         if not public_info:
             raise BadLedgerRequestError(
@@ -742,8 +743,13 @@ async def update_endpoint_for_did(
         existing_routing_keys = (
             all_exist_endpoints.get("routingKeys") if all_exist_endpoints else None
         )
+        existing_routing_keys = existing_routing_keys or []
 
-        if exist_endpoint_of_type != endpoint or existing_routing_keys != routing_keys:
+        endpoint_changed = exist_endpoint_of_type != endpoint
+        routing_keys_changed = set(existing_routing_keys) != set(routing_keys)
+
+        if endpoint_changed or routing_keys_changed:
+            LOGGER.info("Endpoint or routing keys have changed, updating endpoint")
             if self.read_only:
                 raise LedgerError(
                     "Error cannot update endpoint when ledger is in read only mode"
diff --git a/acapy_agent/protocols/didexchange/v1_0/manager.py b/acapy_agent/protocols/didexchange/v1_0/manager.py
@@ -759,6 +759,7 @@ async def _derive_new_conn_from_multiuse_invitation(
         """
         new_conn_rec = ConnRecord(
             invitation_key=conn_rec.invitation_key,
+            invitation_msg_id=conn_rec.invitation_msg_id,
             state=ConnRecord.State.INIT.rfc160,
             accept=conn_rec.accept,
             their_role=conn_rec.their_role,
diff --git a/acapy_agent/protocols/issue_credential/v2_0/models/cred_ex_record.py b/acapy_agent/protocols/issue_credential/v2_0/models/cred_ex_record.py
@@ -207,7 +207,7 @@ async def emit_event(self, session: ProfileSession, payload: Optional[Any] = Non
             payload = V20CredExRecordWebhook(**payload)
             payload = payload.__dict__
 
-        await session.profile.notify(topic, payload)
+        await session.emit_event(topic, payload)
 
     @property
     def record_value(self) -> Mapping:
diff --git a/acapy_agent/protocols/present_proof/v2_0/models/pres_exchange.py b/acapy_agent/protocols/present_proof/v2_0/models/pres_exchange.py
@@ -205,7 +205,7 @@ async def emit_event(self, session: ProfileSession, payload: Optional[Any] = Non
             payload = V20PresExRecordWebhook(**payload)
             payload = payload.__dict__
 
-        await session.profile.notify(topic, payload)
+        await session.emit_event(topic, payload)
 
     @property
     def record_value(self) -> Mapping:
diff --git a/acapy_agent/transport/inbound/http.py b/acapy_agent/transport/inbound/http.py
@@ -5,6 +5,7 @@
 from aiohttp import web
 
 from ...messaging.error import MessageParseError
+from ...utils.server import remove_unwanted_headers
 from ..error import WireFormatParseError
 from ..wire_format import DIDCOMM_V0_MIME_TYPE, DIDCOMM_V1_MIME_TYPE
 from .base import BaseInboundTransport, InboundTransportSetupError
@@ -38,6 +39,7 @@ async def make_application(self) -> web.Application:
         app = web.Application(**app_args)
         app.add_routes([web.get("/", self.invite_message_handler)])
         app.add_routes([web.post("/", self.inbound_message_handler)])
+        app.on_response_prepare.append(remove_unwanted_headers)
         return app
 
     async def start(self) -> None:
diff --git a/acapy_agent/transport/inbound/tests/test_http_transport.py b/acapy_agent/transport/inbound/tests/test_http_transport.py
@@ -106,6 +106,8 @@ async def test_send_receive_message(self):
 
         async with self.client.post("/", json=test_message) as resp:
             assert await resp.json() == {"response": "ok"}
+            # Assert that Server header is cleared
+            assert resp.headers.get("Server") is None
 
         await self.transport.stop()
 
diff --git a/acapy_agent/transport/inbound/tests/test_ws_transport.py b/acapy_agent/transport/inbound/tests/test_ws_transport.py
@@ -101,4 +101,7 @@ async def test_message_and_response(self):
             result = await asyncio.wait_for(ws.receive_json(), 1.0)
             assert result == {"response": "ok"}
 
+            # Check the Server header is removed
+            assert "Server" not in ws._response.headers
+
         await self.transport.stop()
diff --git a/acapy_agent/transport/inbound/ws.py b/acapy_agent/transport/inbound/ws.py
@@ -7,6 +7,7 @@
 from aiohttp import WSMessage, WSMsgType, web
 
 from ...messaging.error import MessageParseError
+from ...utils.server import remove_unwanted_headers
 from ..error import WireFormatParseError
 from .base import BaseInboundTransport, InboundTransportSetupError
 
@@ -48,6 +49,7 @@ async def make_application(self) -> web.Application:
         """Construct the aiohttp application."""
         app = web.Application()
         app.add_routes([web.get("/", self.inbound_message_handler)])
+        app.on_response_prepare.append(remove_unwanted_headers)
         return app
 
     async def start(self) -> None:
diff --git a/acapy_agent/utils/server.py b/acapy_agent/utils/server.py
@@ -0,0 +1,9 @@
+"""Utility functions for server operations in an AcaPy agent."""
+
+
+async def remove_unwanted_headers(
+    request,
+    response,
+) -> None:
+    """Remove unwanted headers from the response."""
+    response.headers.pop("Server", None)
diff --git a/poetry.lock b/poetry.lock
diff --git a/scenarios/examples/multiuse_invitations/docker-compose.yml b/scenarios/examples/multiuse_invitations/docker-compose.yml
diff --git a/scenarios/examples/multiuse_invitations/example.py b/scenarios/examples/multiuse_invitations/example.py
