summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-09 09:54:48 +0000
committerGitHub <noreply@github.com>2020-03-09 09:54:48 +0000
commitbbf725e7da6b1944318bba2664cc0c3b721572be (patch)
tree9218a833396bb1ac125a1de4754489d89a623e7f /synapse
parentAdd type hints to logging/context.py (#6309) (diff)
parentLint (diff)
downloadsynapse-bbf725e7da6b1944318bba2664cc0c3b721572be.tar.xz
Merge pull request #7045 from matrix-org/babolivier/room_keys_check
Make sure that is_verified is a boolean when processing room keys
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/e2e_room_keys.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index f1b4424a02..9abaf13b8f 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -207,6 +207,13 @@ class E2eRoomKeysHandler(object):
             changed = False  # if anything has changed, we need to update the etag
             for room_id, room in iteritems(room_keys["rooms"]):
                 for session_id, room_key in iteritems(room["sessions"]):
+                    if not isinstance(room_key["is_verified"], bool):
+                        msg = (
+                            "is_verified must be a boolean in keys for session %s in"
+                            "room %s" % (session_id, room_id)
+                        )
+                        raise SynapseError(400, msg, Codes.INVALID_PARAM)
+
                     log_kv(
                         {
                             "message": "Trying to upload room key",