MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-09-22 01:29:06 +02:00
Code Issues Projects Releases Wiki Activity

Hoist server_name check out of process_v2_response

Browse source 
It's easier to check it in the caller than to complicate the interface with an
extra param.
This commit is contained in:
Richard van der Hoff 2019-04-04 19:12:54 +01:00
parent ef27d434d1
commit 6ae9361510
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
synapse/crypto/keyring.py
View file

@ -495,7 +495,7 @@ class Keyring(object):
) )
processed_response = yield self.process_v2_response( processed_response = yield self.process_v2_response(
perspective_name, response, only_from_server=False perspective_name, response
) )
server_name = response["server_name"] server_name = response["server_name"]
@ -543,6 +543,11 @@ class Keyring(object):
or server_name not in response[u"signatures"]): or server_name not in response[u"signatures"]):
raise KeyLookupError("Key response not signed by remote server") raise KeyLookupError("Key response not signed by remote server")
if response["server_name"] != server_name:
raise KeyLookupError("Expected a response for server %r not %r" % (
server_name, response["server_name"]
))
response_keys = yield self.process_v2_response( response_keys = yield self.process_v2_response(
from_server=server_name, from_server=server_name,
requested_ids=[requested_key_id], requested_ids=[requested_key_id],
@ -560,7 +565,7 @@ class Keyring(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def process_v2_response( def process_v2_response(
self, from_server, response_json, requested_ids=[], only_from_server=True self, from_server, response_json, requested_ids=[],
): ):
"""Parse a 'Server Keys' structure from the result of a /key request """Parse a 'Server Keys' structure from the result of a /key request
@ -586,10 +591,6 @@ class Keyring(object):
We will store the json for these key ids as well as any that are We will store the json for these key ids as well as any that are
actually in the response actually in the response
only_from_server (bool): if True, we will check that the server_name in the
the response (ie, the server which originated the key) matches
from_server.
Returns: Returns:
Deferred[dict[str, nacl.signing.VerifyKey]]: Deferred[dict[str, nacl.signing.VerifyKey]]:
map from key_id to key object map from key_id to key object
@ -616,13 +617,6 @@ class Keyring(object):
old_verify_keys[key_id] = verify_key old_verify_keys[key_id] = verify_key
server_name = response_json["server_name"] server_name = response_json["server_name"]
if only_from_server:
if server_name != from_server:
raise KeyLookupError(
"Expected a response for server %r not %r" % (
from_server, server_name
)
)
for key_id in response_json["signatures"].get(server_name, {}): for key_id in response_json["signatures"].get(server_name, {}):
if key_id not in response_json["verify_keys"]: if key_id not in response_json["verify_keys"]:
raise KeyLookupError( raise KeyLookupError(