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

Only setdefault for signatures if device has key_json #7177

Merged
merged 4 commits into from
Mar 31, 2020
Merged

Only setdefault for signatures if device has key_json #7177

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5ca560
Only setdefault for signatures if device has key_json
anoadragon453 Mar 30, 2020
8fc53f2
Add changelog
anoadragon453 Mar 30, 2020
d38ea3b
Fix another instance
anoadragon453 Mar 30, 2020
9c0e8d2
Rewrite changelog
anoadragon453 Mar 31, 2020
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/7177.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mitigation for a bug in `_get_e2e_device_keys_txn` which broke federation for some servers.
24 changes: 14 additions & 10 deletions synapse/storage/data_stores/main/devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,16 @@ def _get_device_update_edus_by_remote(self, destination, from_stream_id, query_m
key_json = device.get("key_json", None)
if key_json:
result["keys"] = db_to_json(key_json)

if "signatures" in device:
for sig_user_id, sigs in device["signatures"].items():
result["keys"].setdefault("signatures", {}).setdefault(
sig_user_id, {}
).update(sigs)

device_display_name = device.get("device_display_name", None)
if device_display_name:
result["device_display_name"] = device_display_name
if "signatures" in device:
for sig_user_id, sigs in device["signatures"].items():
result["keys"].setdefault("signatures", {}).setdefault(
sig_user_id, {}
).update(sigs)
else:
result["deleted"] = True

Expand Down Expand Up @@ -493,14 +495,16 @@ def _get_devices_with_keys_by_user_txn(self, txn, user_id):
key_json = device.get("key_json", None)
if key_json:
result["keys"] = db_to_json(key_json)

if "signatures" in device:
for sig_user_id, sigs in device["signatures"].items():
result["keys"].setdefault("signatures", {}).setdefault(
sig_user_id, {}
).update(sigs)

device_display_name = device.get("device_display_name", None)
if device_display_name:
result["device_display_name"] = device_display_name
if "signatures" in device:
for sig_user_id, sigs in device["signatures"].items():
result["keys"].setdefault("signatures", {}).setdefault(
sig_user_id, {}
).update(sigs)

results.append(result)

Expand Down