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

Make changelog more useful

anoa/testit
Andrew Morgan 2020-04-16 17:23:28 +01:00
parent e91373c1fa
commit c215378411
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/7289.bugfix
View File

@ -1 +1 @@
Query remote user's cross-signing keys on local user cross-signing signature upload if necessary. Fix an edge-case where it was not possible to cross-sign a user which did not share a room with any user on your homeserver. The bug only affected Synapse deployments in worker mode.

5
synapse/handlers/e2e_keys.py
View File

@ -973,6 +973,8 @@ class E2eKeysHandler(object):
self, user_id, desired_key_type, from_user_id=None self, user_id, desired_key_type, from_user_id=None
): ):
"""Fetch the cross-signing public key from storage and interpret it. """Fetch the cross-signing public key from storage and interpret it.
If we cannot find the public key locally, we query the keys from the
homeserver they belong to, then update our local copy.
Args: Args:
user_id (str): the user whose key should be fetched user_id (str): the user whose key should be fetched
@ -994,11 +996,10 @@ 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 don't get "user_signing" keys from remote servers, so disallow that here
if ( if (
key is None key is None
and not self.is_mine(user) and not self.is_mine(user)
# We don't get "user_signing" keys from remote servers, so disallow that here
and desired_key_type != "user_signing" and desired_key_type != "user_signing"
): ):
try: try: