OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor and add validation to _retrieve_cross_signing_keys_for_remote_user

pull/7289/head
Andrew Morgan 2020-04-21 15:35:01 +01:00
parent 1b4dda5a8d
commit 7cb1e4846a
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
synapse/handlers/e2e_keys.py
View File

@ -1051,22 +1051,33 @@ class E2eKeysHandler(object):
return None, None, None return None, None, None
# Process each of the retrieved cross-signing keys # Process each of the retrieved cross-signing keys
final_key = None desired_key = None
final_key_id = None desired_key_id = None
final_verify_key = None desired_verify_key = None
device_ids = [] retrieved_device_ids = []
for key_type in ["master", "self_signing"]: for key_type in ["master", "self_signing"]:
key_content = remote_result.get(key_type + "_key") key_content = remote_result.get(key_type + "_key")
if not key_content: if not key_content:
continue continue
# At the same time, store this key in the db for # Ensure these keys belong to the correct user
# subsequent queries if "user_id" not in key_content:
yield self.store.set_e2e_cross_signing_key( logger.warning(
user.to_string(), key_type, key_content "Invalid %s key retrieved, missing user_id field: %s",
) key_type,
key_content
)
continue
if user.to_string() != key_content["user_id"]:
logger.warning(
"Found %s key of user %s when querying for keys of user %s",
key_type,
key_content["user_id"],
user.to_string(),
)
continue
# Note down the device ID attached to this key # Validate the key contents
try: try:
# verify_key is a VerifyKey from signedjson, which uses # verify_key is a VerifyKey from signedjson, which uses
# .version to denote the portion of the key ID after the # .version to denote the portion of the key ID after the
@ -1081,19 +1092,26 @@ class E2eKeysHandler(object):
e, e,
) )
continue continue
device_ids.append(verify_key.version)
# Note down the device ID attached to this key
retrieved_device_ids.append(verify_key.version)
# If this is the desired key type, save it and its ID/VerifyKey # If this is the desired key type, save it and its ID/VerifyKey
if key_type == desired_key_type: if key_type == desired_key_type:
final_key = key_content desired_key = key_content
final_verify_key = verify_key desired_verify_key = verify_key
final_key_id = key_id desired_key_id = key_id
# At the same time, store this key in the db for subsequent queries
yield self.store.set_e2e_cross_signing_key(
user.to_string(), key_type, key_content
)
# Notify clients that new devices for this user have been discovered # Notify clients that new devices for this user have been discovered
if device_ids: if retrieved_device_ids:
yield self.device_handler.notify_device_update(user.to_string(), device_ids) yield self.device_handler.notify_device_update(user.to_string(), retrieved_device_ids)
return final_key, final_key_id, final_verify_key return desired_key, desired_key_id, desired_verify_key
def _check_cross_signing_key(key, user_id, key_type, signing_key=None): def _check_cross_signing_key(key, user_id, key_type, signing_key=None):