diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-02 15:21:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 15:21:59 +0100 |
| commit | 50d9d9740803205410aa5dad32ff258696f22594 (patch) | |
| tree | 7215683a26e68d76d3733f69d29f061df7077ae7 /synapse/rest/client | |
| parent | Merge pull request #3641 from matrix-org/rav/room_id_check (diff) | |
| parent | changelogs (diff) | |
| download | synapse-50d9d9740803205410aa5dad32ff258696f22594.tar.xz | |
Merge pull request #3642 from matrix-org/rav/another_room_id_check
Check room visibility for /event/ requests
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/events.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/events.py b/synapse/rest/client/v1/events.py index b70c9c2806..0f3a2e8b51 100644 --- a/synapse/rest/client/v1/events.py +++ b/synapse/rest/client/v1/events.py @@ -88,7 +88,7 @@ class EventRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, event_id): requester = yield self.auth.get_user_by_req(request) - event = yield self.event_handler.get_event(requester.user, event_id) + event = yield self.event_handler.get_event(requester.user, None, event_id) time_now = self.clock.time_msec() if event: diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 3d62447854..2a679ac830 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -508,7 +508,7 @@ class RoomEventServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id, event_id): requester = yield self.auth.get_user_by_req(request) - event = yield self.event_handler.get_event(requester.user, event_id) + event = yield self.event_handler.get_event(requester.user, room_id, event_id) time_now = self.clock.time_msec() if event: |