summary refs log tree commit diff
path: root/synapse/handlers/e2e_keys.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-29 09:56:41 +0000
committerGitHub <noreply@github.com>2020-01-29 09:56:41 +0000
commit2cad8baa7030a86efc103599d79412741654dc15 (patch)
treee13d4359a193c23c4a44d7ebab365d1bc6306178 /synapse/handlers/e2e_keys.py
parentFix outbound federation request metrics (#6795) (diff)
downloadsynapse-2cad8baa7030a86efc103599d79412741654dc15.tar.xz
Fix bug when querying remote user keys that require a resync. (#6796)
We ended up only returning a single device, rather than all of them.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/e2e_keys.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py
index 2d889364d4..95a9d71f41 100644
--- a/synapse/handlers/e2e_keys.py
+++ b/synapse/handlers/e2e_keys.py
@@ -208,8 +208,9 @@ class E2eKeysHandler(object):
                         )
 
                     user_devices = user_devices["devices"]
+                    user_results = results.setdefault(user_id, {})
                     for device in user_devices:
-                        results[user_id] = {device["device_id"]: device["keys"]}
+                        user_results[device["device_id"]] = device["keys"]
                     user_ids_updated.append(user_id)
                 except Exception as e:
                     failures[destination] = _exception_to_failure(e)