Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-17 23:44:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix remote_key_resource

Browse Source
This commit is contained in:
Richard van der Hoff 2019-05-23 14:52:13 +01:00
parent 895b79ac2e
commit ec24108cc2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/rest/key/v2/remote_key_resource.py
View File

@ -20,7 +20,7 @@ from twisted.web.resource import Resource
from twisted.web.server import NOT_DONE_YET from twisted.web.server import NOT_DONE_YET
from synapse.api.errors import Codes, SynapseError 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.server import respond_with_json_bytes, wrap_json_request_handler
from synapse.http.servlet import parse_integer, parse_json_object_from_request from synapse.http.servlet import parse_integer, parse_json_object_from_request
@ -89,7 +89,7 @@ class RemoteKey(Resource):
isLeaf = True isLeaf = True
def __init__(self, hs): def __init__(self, hs):
self.keyring = hs.get_keyring() self.fetcher = ServerKeyFetcher(hs)
self.store = hs.get_datastore() self.store = hs.get_datastore()
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.federation_domain_whitelist = hs.config.federation_domain_whitelist 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: if cache_misses and query_remote_on_cache_miss:
for server_name, key_ids in cache_misses.items(): for server_name, key_ids in cache_misses.items():
try: try:
yield self.keyring.get_server_verify_key_v2_direct( yield self.fetcher.get_server_verify_key_v2_direct(
server_name, key_ids server_name, key_ids
) )
except KeyLookupError as e: except KeyLookupError as e: