kaslo/synapse
1
0
Fork 0
Code Wiki Activity

add another check that the item is not None

Browse Source
This commit is contained in:
Hubert Chathi
2019-12-11 13:31:39 -05:00
parent ede5a638a5
commit 020c2abafc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/e2e_keys.py
View File

@@ -296,7 +296,11 @@ class E2eKeysHandler(object):
if "self_signing" in user_info:
self_signing_keys[user_id] = user_info["self_signing"]
if from_user_id in keys and "user_signing" in keys[from_user_id]:
if (
from_user_id in keys
and keys[from_user_id] is not None
and "user_signing" in keys[from_user_id]
):
# users can see other users' master and self-signing keys, but can
# only see their own user-signing keys
user_signing_keys[from_user_id] = keys[from_user_id]["user_signing"]