MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 00:03:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fed

Browse source 
add device signatures to device key query results
This commit is contained in:
Hubert Chathi 2020-02-04 12:03:54 -05:00 committed by Erik Johnston
parent 6475382d80
commit 60d0672426
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6844.bugfix Normal file
View file

@ -0,0 +1 @@
Fix an issue with cross-signing where device signatures were not sent to remote servers.

10
synapse/storage/data_stores/main/devices.py
View file

@ -320,6 +320,11 @@ class DeviceWorkerStore(SQLBaseStore):
device_display_name = device.get("device_display_name", None) device_display_name = device.get("device_display_name", None)
if device_display_name: if device_display_name:
result["device_display_name"] = 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: else:
result["deleted"] = True result["deleted"] = True
@ -524,6 +529,11 @@ class DeviceWorkerStore(SQLBaseStore):
device_display_name = device.get("device_display_name", None) device_display_name = device.get("device_display_name", None)
if device_display_name: if device_display_name:
result["device_display_name"] = 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) results.append(result)