summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-19 10:50:43 +0100
committerErik Johnston <erik@matrix.org>2015-05-19 10:50:43 +0100
commit5e7883ec194f87eab4f577022e7bad8de4fb0203 (patch)
tree1deb9b8ee772c192f57ae20504c14feed08850e4 /synapse/crypto/keyring.py
parentDo work in parellel when joining a room (diff)
parentSYN-383: Extract the response list from 'server_keys' in the response JSON as... (diff)
downloadsynapse-5e7883ec194f87eab4f577022e7bad8de4fb0203.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/crypto/keyring.py')
-rw-r--r--synapse/crypto/keyring.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index a859872ce2..c7e47f6bf9 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -188,7 +188,7 @@ class Keyring(object):
             # TODO(mark): Set the minimum_valid_until_ts to that needed by
             # the events being validated or the current time if validating
             # an incoming request.
-            responses = yield self.client.post_json(
+            query_response = yield self.client.post_json(
                 destination=perspective_name,
                 path=b"/_matrix/key/v2/query",
                 data={
@@ -204,6 +204,8 @@ class Keyring(object):
 
         keys = {}
 
+        responses = query_response["server_keys"]
+
         for response in responses:
             if (u"signatures" not in response
                     or perspective_name not in response[u"signatures"]):