diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-12-13 11:44:41 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-12-16 13:47:34 +0000 |
| commit | 6577f2d8877b89f7198f7fb03cf57f10a75728ca (patch) | |
| tree | 2775d60a0a0cff23286add4676d14409a8097c83 | |
| parent | Check the room_id of events when fetching room state/auth (#6524) (diff) | |
| download | synapse-6577f2d8877b89f7198f7fb03cf57f10a75728ca.tar.xz | |
Sanity-check room ids in event auth (#6530)
When we do an event auth operation, check that all of the events involved are in the right room.
| -rw-r--r-- | changelog.d/6530.misc | 2 | ||||
| -rw-r--r-- | synapse/event_auth.py | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/changelog.d/6530.misc b/changelog.d/6530.misc new file mode 100644 index 0000000000..f885597426 --- /dev/null +++ b/changelog.d/6530.misc @@ -0,0 +1,2 @@ +Improve sanity-checking when receiving events over federation. + diff --git a/synapse/event_auth.py b/synapse/event_auth.py index ec3243b27b..d184b0273b 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py @@ -48,6 +48,18 @@ def check(room_version, event, auth_events, do_sig_check=True, do_size_check=Tru if not hasattr(event, "room_id"): raise AuthError(500, "Event has no room_id: %s" % event) + room_id = event.room_id + + # I'm not really expecting to get auth events in the wrong room, but let's + # sanity-check it + for auth_event in auth_events.values(): + if auth_event.room_id != room_id: + raise Exception( + "During auth for event %s in room %s, found event %s in the state " + "which is in room %s" + % (event.event_id, room_id, auth_event.event_id, auth_event.room_id) + ) + if do_sig_check: sender_domain = get_domain_from_id(event.sender) |