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

Return 404 instead of 403 when retrieving an event without perms #5798

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5798.bugfix
@@ -0,0 +1 @@
Return 404 instead of 403 when accessing /rooms/{roomId}/event/{eventId} for an event without the appropriate permissions.
10 changes: 9 additions & 1 deletion synapse/rest/client/v1/room.py
Expand Up @@ -568,7 +568,15 @@ def __init__(self, hs):
@defer.inlineCallbacks
def on_GET(self, request, room_id, event_id):
requester = yield self.auth.get_user_by_req(request, allow_guest=True)
event = yield self.event_handler.get_event(requester.user, room_id, event_id)
try:
event = yield self.event_handler.get_event(
requester.user, room_id, event_id
)
except AuthError as e:
# This endpoint is supposed to return a 404 when the requester does
# not have permission to access the event
# https://matrix.org/docs/spec/client_server/r0.5.0#get-matrix-client-r0-rooms-roomid-event-eventid
return (404, e.msg)
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved

time_now = self.clock.time_msec()
if event:
Expand Down