diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-20 17:15:44 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-20 17:15:44 +0000 |
commit | 6408541075078023b20d4b1c46c2c9163bda3b52 (patch) | |
tree | da78490e9e29d274fbf8128730a240330af32eec /synapse/crypto | |
parent | Merge pull request #394 from matrix-org/erikj/search (diff) | |
download | synapse-6408541075078023b20d4b1c46c2c9163bda3b52.tar.xz |
Don't limit connections to perspective servers
Diffstat (limited to 'synapse/crypto')
-rw-r--r-- | synapse/crypto/keyring.py | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 8b6a59866f..ee7a5e3106 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -381,28 +381,24 @@ class Keyring(object): def get_server_verify_key_v2_indirect(self, server_names_and_key_ids, perspective_name, perspective_keys): - limiter = yield get_retry_limiter( - perspective_name, self.clock, self.store - ) - - with limiter: - # 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. - query_response = yield self.client.post_json( - destination=perspective_name, - path=b"/_matrix/key/v2/query", - data={ - u"server_keys": { - server_name: { - key_id: { - u"minimum_valid_until_ts": 0 - } for key_id in key_ids - } - for server_name, key_ids in server_names_and_key_ids + # 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. + query_response = yield self.client.post_json( + destination=perspective_name, + path=b"/_matrix/key/v2/query", + data={ + u"server_keys": { + server_name: { + key_id: { + u"minimum_valid_until_ts": 0 + } for key_id in key_ids } - }, - ) + for server_name, key_ids in server_names_and_key_ids + } + }, + long_requests=True, + ) keys = {} |