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

Remove extraneous key_id and verify_key

pull/7289/head
Andrew Morgan 2020-04-20 11:57:13 +01:00
parent 5990d1c9c6
commit 4f8ba5c7b7
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
synapse/handlers/e2e_keys.py
View File

@ -987,9 +987,6 @@ class E2eKeysHandler(object):
SynapseError: if `user_id` is invalid SynapseError: if `user_id` is invalid
""" """
user = UserID.from_string(user_id) user = UserID.from_string(user_id)
key_id = None
verify_key = None
key = yield self.store.get_e2e_cross_signing_key( key = yield self.store.get_e2e_cross_signing_key(
user_id, key_type, from_user_id user_id, key_type, from_user_id
) )
@ -1016,17 +1013,15 @@ class E2eKeysHandler(object):
logger.debug("No %s key found for %s", key_type, user_id) logger.debug("No %s key found for %s", key_type, user_id)
raise NotFoundError("No %s key found for %s" % (key_type, user_id)) raise NotFoundError("No %s key found for %s" % (key_type, user_id))
# If we retrieved the keys remotely, these values will already be set try:
if key_id is None or verify_key is None: key_id, verify_key = get_verify_key_from_cross_signing_key(key)
try: except ValueError as e:
key_id, verify_key = get_verify_key_from_cross_signing_key(key) logger.debug(
except ValueError as e: "Invalid %s key retrieved: %s - %s %s", key_type, key, type(e), e,
logger.debug( )
"Invalid %s key retrieved: %s - %s %s", key_type, key, type(e), e, raise SynapseError(
) 502, "Invalid %s key retrieved from remote server", key_type
raise SynapseError( )
502, "Invalid %s key retrieved from remote server", key_type
)
return key, key_id, verify_key return key, key_id, verify_key
@ -1094,7 +1089,7 @@ class E2eKeysHandler(object):
continue continue
device_ids.append(verify_key.version) device_ids.append(verify_key.version)
# If this is the desired key type, save it and it's 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 final_key = key_content
final_verify_key = verify_key final_verify_key = verify_key