Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-26 21:09:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing null character check on guest_access room state (#8373)

Browse Source 
When updating the `room_stats_state` table, we try to check for null bytes slipping in to the content for state events. It turns out we had added `guest_access` as a field to room_stats_state without including it in the null byte check.

Lo and behold, a null byte in a `m.room.guest_access` event then breaks `room_stats_state` updates.

This PR adds the check for `guest_access`.
This commit is contained in:
Andrew Morgan 2020-09-23 15:58:20 +01:00 committed by GitHub
commit 4bb203ea4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8373.bugfix Normal file
View File

@ -0,0 +1 @@
Include `guest_access` in the fields that are checked for null bytes when updating `room_stats_state`. Broke in v1.7.2.

2
synapse/storage/databases/main/stats.py
View File

@ -210,6 +210,7 @@ class StatsStore(StateDeltasStore):
* topic * topic
* avatar * avatar
* canonical_alias * canonical_alias
* guest_access
A is_federatable key can also be included with a boolean value. A is_federatable key can also be included with a boolean value.
@ -234,6 +235,7 @@ class StatsStore(StateDeltasStore):
"topic", "topic",
"avatar", "avatar",
"canonical_alias", "canonical_alias",
"guest_access",
): ):
field = fields.get(col, sentinel) field = fields.get(col, sentinel)
if field is not sentinel and (not isinstance(field, str) or "\0" in field): if field is not sentinel and (not isinstance(field, str) or "\0" in field):