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

Fix MSC3983 support: only one OTK per device was returned through federation #15770

Merged
merged 5 commits into from
Jun 13, 2023
Merged

Fix MSC3983 support: only one OTK per device was returned through federation #15770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9768de
Only one OTK was returned through federation
MatMaul Jun 10, 2023
88623ea
Add changelog
Jun 12, 2023
cdab9c5
Improve changelog
Jun 12, 2023
6ef8155
Update changelog
Jun 13, 2023
e29d001
crlf
Jun 13, 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/15770.bugfix
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).
4 changes: 3 additions & 1 deletion synapse/federation/federation_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,9 @@ async def on_claim_client_keys(
for user_id, device_keys in result.items():
for device_id, keys in device_keys.items():
for key_id, key in keys.items():
json_result.setdefault(user_id, {})[device_id] = {key_id: key}
json_result.setdefault(user_id, {}).setdefault(device_id, {})[
key_id
] = key

logger.info(
"Claimed one-time-keys: %s",
Expand Down