From e8645b465f858e3433fc03c2c4238ad53cbd3d28 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Aug 2024 14:07:17 +0300 Subject: [PATCH 1/2] Fix fetching signing keys when `old_verify_keys` is omitted --- changelog.d/17568.bugfix | 1 + synapse/crypto/keyring.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/17568.bugfix diff --git a/changelog.d/17568.bugfix b/changelog.d/17568.bugfix new file mode 100644 index 0000000000..1d0ed0d3ed --- /dev/null +++ b/changelog.d/17568.bugfix @@ -0,0 +1 @@ +Fix fetching federation signing keys from servers that omit `old_verify_keys`. Contributed by @tulir @ Beeper diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 8c301e077c..643d2d4e66 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -589,7 +589,7 @@ async def process_v2_response( % (server_name,) ) - for key_id, key_data in response_json["old_verify_keys"].items(): + for key_id, key_data in response_json.get("old_verify_keys", {}).items(): if is_signing_algorithm_supported(key_id): key_base64 = key_data["key"] key_bytes = decode_base64(key_base64) From 1acdfbb26e5235798704d4b3938dc88031e4444b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Aug 2024 14:17:58 +0300 Subject: [PATCH 2/2] Add . --- changelog.d/17568.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/17568.bugfix b/changelog.d/17568.bugfix index 1d0ed0d3ed..71a1f12915 100644 --- a/changelog.d/17568.bugfix +++ b/changelog.d/17568.bugfix @@ -1 +1 @@ -Fix fetching federation signing keys from servers that omit `old_verify_keys`. Contributed by @tulir @ Beeper +Fix fetching federation signing keys from servers that omit `old_verify_keys`. Contributed by @tulir @ Beeper.