diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-23 16:28:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 16:28:51 +0100 |
| commit | 8c41c04ee4c43826773f4b273bd26c645527f6ee (patch) | |
| tree | 33f60d113e49126d2a4e5bec04cb7386f4bad028 /synapse/rest | |
| parent | Add config option for setting homeserver's default room version (#5223) (diff) | |
| parent | Fix remote_key_resource (diff) | |
| download | synapse-8c41c04ee4c43826773f4b273bd26c645527f6ee.tar.xz | |
Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers
Factor out KeyFetchers from KeyRing
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/key/v2/remote_key_resource.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/key/v2/remote_key_resource.py b/synapse/rest/key/v2/remote_key_resource.py index eb8782aa6e..21c3c807b9 100644 --- a/synapse/rest/key/v2/remote_key_resource.py +++ b/synapse/rest/key/v2/remote_key_resource.py @@ -20,7 +20,7 @@ from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET from synapse.api.errors import Codes, SynapseError -from synapse.crypto.keyring import KeyLookupError +from synapse.crypto.keyring import KeyLookupError, ServerKeyFetcher from synapse.http.server import respond_with_json_bytes, wrap_json_request_handler from synapse.http.servlet import parse_integer, parse_json_object_from_request @@ -89,7 +89,7 @@ class RemoteKey(Resource): isLeaf = True def __init__(self, hs): - self.keyring = hs.get_keyring() + self.fetcher = ServerKeyFetcher(hs) self.store = hs.get_datastore() self.clock = hs.get_clock() self.federation_domain_whitelist = hs.config.federation_domain_whitelist @@ -217,7 +217,7 @@ class RemoteKey(Resource): if cache_misses and query_remote_on_cache_miss: for server_name, key_ids in cache_misses.items(): try: - yield self.keyring.get_server_verify_key_v2_direct( + yield self.fetcher.get_server_verify_key_v2_direct( server_name, key_ids ) except KeyLookupError as e: |