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

lint

pull/7289/head
Andrew Morgan 2020-04-17 11:39:30 +01:00
parent 671178b028
commit 2d88b5d39d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/handlers/e2e_keys.py
View File

@ -962,7 +962,7 @@ class E2eKeysHandler(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_e2e_cross_signing_verify_key( def _get_e2e_cross_signing_verify_key(
self, user_id: str, desired_key_type: str, from_user_id:str = None self, user_id: str, desired_key_type: str, from_user_id: str = None
): ):
"""Fetch or request the given cross-signing public key. """Fetch or request the given cross-signing public key.
@ -989,8 +989,7 @@ class E2eKeysHandler(object):
user_id, desired_key_type, from_user_id user_id, desired_key_type, from_user_id
) )
# If we still can't find the key, and we're looking for keys of another user
# If we still can't find the key, and we're looking for keys of another user,
# then attempt to fetch the missing key from the remote user's server. # then attempt to fetch the missing key from the remote user's server.
# #
# We may run into this in possible edge cases where a user tries to # We may run into this in possible edge cases where a user tries to
@ -1043,7 +1042,11 @@ class E2eKeysHandler(object):
key_id, verify_key = get_verify_key_from_cross_signing_key(key) key_id, verify_key = get_verify_key_from_cross_signing_key(key)
except ValueError as e: except ValueError as e:
logger.debug( logger.debug(
"Invalid %s key retrieved: %s - %s %s", desired_key_type, key, type(e), e "Invalid %s key retrieved: %s - %s %s",
desired_key_type,
key,
type(e),
e,
) )
raise SynapseError( raise SynapseError(
502, "Invalid %s key retrieved from remote server", desired_key_type 502, "Invalid %s key retrieved from remote server", desired_key_type