summary refs log tree commit diff
path: root/synapse/storage/event_federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-02 14:22:05 +0100
committerGitHub <noreply@github.com>2018-08-02 14:22:05 +0100
commita937497cf5920fd0815cd62dafaf8482f7656e05 (patch)
tree87d443fb1275e1cf931c9c8eb720c1772714a487 /synapse/storage/event_federation.py
parentUpdate r0.33.0 release notes (diff)
parentchangelog (diff)
downloadsynapse-a937497cf5920fd0815cd62dafaf8482f7656e05.tar.xz
Merge pull request #3641 from matrix-org/rav/room_id_check
Validation for events/rooms in fed requests
Diffstat (limited to 'synapse/storage/event_federation.py')
-rw-r--r--synapse/storage/event_federation.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index 8d366d1b91..7cd77c1c29 100644
--- a/synapse/storage/event_federation.py
+++ b/synapse/storage/event_federation.py
@@ -343,6 +343,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore,
                 table="events",
                 keyvalues={
                     "event_id": event_id,
+                    "room_id": room_id,
                 },
                 retcol="depth",
                 allow_none=True,