Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Don't allow clients to send tombstones that reference the same room #5801

Merged
merged 3 commits into from
Aug 1, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5801.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Don't allow clients to send tombstone events that reference the room its sent in.
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 7 additions & 0 deletions synapse/events/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,13 @@ def validate_builder(self, event):
if event.content["membership"] not in Membership.LIST:
raise SynapseError(400, "Invalid membership key")

elif event.type == EventTypes.Tombstone:
if "replacement_room" not in event.content:
raise SynapseError(400, "Content has no replacement_room key")

if event.content["replacement_room"] == event.room_id:
raise SynapseError(400, "Tombstone cannot reference itself")
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved

def _ensure_strings(self, d, keys):
for s in keys:
if s not in d:
Expand Down