mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 08:00:53 +00:00
Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fed
add device signatures to device key query results
This commit is contained in:
commit
74bf3fdbb9
2 changed files with 11 additions and 0 deletions
1
changelog.d/6844.bugfix
Normal file
1
changelog.d/6844.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Fix an issue with cross-signing where device signatures were not sent to remote servers.
|
|
@ -320,6 +320,11 @@ class DeviceWorkerStore(SQLBaseStore):
|
|||
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
|
||||
|
||||
|
@ -524,6 +529,11 @@ class DeviceWorkerStore(SQLBaseStore):
|
|||
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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue