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

Wrap get_verify_key_from_cross_signing_key in a try/except

anoa/testit
Andrew Morgan 2020-04-16 17:51:00 +01:00
parent a7dadf87be
commit 67851671e5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/e2e_keys.py
View File

@ -1031,8 +1031,11 @@ class E2eKeysHandler(object):
logger.debug("No %s key found for %s", key_type, user_id)
raise NotFoundError("No %s key found for %s" % (key_type, user_id))
key_id, verify_key = get_verify_key_from_cross_signing_key(key)
return key, key_id, verify_key
try:
key_id, verify_key = get_verify_key_from_cross_signing_key(key)
return key, key_id, verify_key
except ValueError:
raise SynapseError(502, "Invalid %s key retrieved from remote server")
def _check_cross_signing_key(key, user_id, key_type, signing_key=None):