Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing null character check on guest_access room state 

When updating room_stats_state, 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. A further PR will improve this
function so that this hopefully does not happen again in future.
This commit is contained in:
Andrew Morgan 2020-09-22 19:39:29 +01:00
parent 8998217540
commit 4325be1a52
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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):