Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix MSC3983 support: Use the unstable /keys/claim federation endpoint if multiple keys are requested #15755

Merged
merged 3 commits into from
Jun 13, 2023
Merged

Fix MSC3983 support: Use the unstable /keys/claim federation endpoint if multiple keys are requested #15755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10c72a3
Fix when to use unstable endpoint.
clokep Jun 9, 2023
12e82fc
Newsfragment
clokep Jun 9, 2023
3723c99
Fix MSC ref
Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/15755.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix requesting multiple keys at once over federation, related to [MSC3983](https://github.com/matrix-org/matrix-spec-proposals/pull/3983).
5 changes: 4 additions & 1 deletion synapse/federation/federation_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ async def claim_client_keys(
use_unstable = False
for user_id, one_time_keys in query.items():
for device_id, algorithms in one_time_keys.items():
if any(count > 1 for count in algorithms.values()):
# If more than one algorithm is requested, attempt to use the unstable
# endpoint.
if sum(algorithms.values()) > 1:
use_unstable = True
if algorithms:
# For the stable query, choose only the first algorithm.
Expand Down Expand Up @@ -296,6 +298,7 @@ async def claim_client_keys(
else:
logger.debug("Skipping unstable claim client keys API")

# TODO Potentially attempt multiple queries and combine the results?
return await self.transport_layer.claim_client_keys(
user, destination, content, timeout
)
Expand Down