tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix DoS when there is a cycle in redaction events

Browse source 
Make sure that synapse doesn't explode when a redaction redacts itself, or
there is a larger cycle.
This commit is contained in:
Richard van der Hoff 2019-07-26 06:36:48 +00:00
parent 70e18cee00
commit 0f2ecb961e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/storage/events_worker.py
View file

@ -637,6 +637,10 @@ class EventsWorkerStore(SQLBaseStore):
# we choose to ignore redactions of m.room.create events. # we choose to ignore redactions of m.room.create events.
return None return None
if original_ev.type == "m.room.redaction":
# ... and redaction events
return None
redaction_map = yield self._get_events_from_cache_or_db(redactions) redaction_map = yield self._get_events_from_cache_or_db(redactions)
for redaction_id in redactions: for redaction_id in redactions: