diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-03-27 13:30:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 13:30:22 +0000 |
| commit | 12aa5a7fa761a729364d324405a033cf78da26de (patch) | |
| tree | 155476cfc92ee8f1786065dbe348ff20cb74821c | |
| parent | Only import sqlite3 when type checking (#7155) (diff) | |
| download | synapse-12aa5a7fa761a729364d324405a033cf78da26de.tar.xz | |
Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/7150.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/room_keys.py | 2 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/e2e_room_keys.py | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/7150.bugfix b/changelog.d/7150.bugfix new file mode 100644 index 0000000000..1feb294799 --- /dev/null +++ b/changelog.d/7150.bugfix @@ -0,0 +1 @@ +Ensure `is_verified` is a boolean in responses to `GET /_matrix/client/r0/room_keys/keys`. Also warn the user if they forgot the `version` query param. \ No newline at end of file diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py index 38952a1d27..59529707df 100644 --- a/synapse/rest/client/v2_alpha/room_keys.py +++ b/synapse/rest/client/v2_alpha/room_keys.py @@ -188,7 +188,7 @@ class RoomKeysServlet(RestServlet): """ requester = await self.auth.get_user_by_req(request, allow_guest=False) user_id = requester.user.to_string() - version = parse_string(request, "version") + version = parse_string(request, "version", required=True) room_keys = await self.e2e_room_keys_handler.get_room_keys( user_id, version, room_id, session_id diff --git a/synapse/storage/data_stores/main/e2e_room_keys.py b/synapse/storage/data_stores/main/e2e_room_keys.py index 84594cf0a9..23f4570c4b 100644 --- a/synapse/storage/data_stores/main/e2e_room_keys.py +++ b/synapse/storage/data_stores/main/e2e_room_keys.py @@ -146,7 +146,8 @@ class EndToEndRoomKeyStore(SQLBaseStore): room_entry["sessions"][row["session_id"]] = { "first_message_index": row["first_message_index"], "forwarded_count": row["forwarded_count"], - "is_verified": row["is_verified"], + # is_verified must be returned to the client as a boolean + "is_verified": bool(row["is_verified"]), "session_data": json.loads(row["session_data"]), } |