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

Add comment explaining why this is useful

anoa/testit
Andrew Morgan 2020-04-16 17:59:47 +01:00
parent 0ac339cfe6
commit 2ff55e02c1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/e2e_keys.py
View File

@ -980,7 +980,7 @@ class E2eKeysHandler(object):
Raises: Raises:
NotFoundError: if the key is not found NotFoundError: if the key is not found
SynapseError: if the user_id is invalid SynapseError: if `user_id` is invalid
""" """
user = UserID.from_string(user_id) user = UserID.from_string(user_id)
key = yield self.store.get_e2e_cross_signing_key( key = yield self.store.get_e2e_cross_signing_key(
@ -989,6 +989,11 @@ class E2eKeysHandler(object):
# 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
# cross-sign a remote user, but does not share any rooms with them yet.
# Thus, we would not have their key list yet. We fetch the key here and
# store it just in case.
if ( if (
key is None key is None
and not self.is_mine(user) and not self.is_mine(user)