From 9ce2ad16d0d27ec5caaa8794ed68ad87e0d31970 Mon Sep 17 00:00:00 2001 From: Michael Albert Date: Tue, 21 Apr 2020 16:49:58 +0200 Subject: [PATCH 1/4] Allow guests to operate in encrypted rooms Signed-off-by: Michael Albert --- synapse/rest/client/v1/events.py | 2 +- 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 25effd026108..7c74c0779c9a 100644 --- a/synapse/rest/client/v1/events.py +++ b/synapse/rest/client/v1/events.py @@ -81,7 +81,7 @@ def __init__(self, hs): self._event_serializer = hs.get_event_client_serializer() async def on_GET(self, request, event_id): - requester = await self.auth.get_user_by_req(request) + requester = await self.auth.get_user_by_req(request, allow_guest=True) event = await self.event_handler.get_event(requester.user, None, event_id) time_now = self.clock.time_msec() diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 6b5830cc3f53..31503f0292a5 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -442,7 +442,7 @@ def __init__(self, hs): async def on_GET(self, request, room_id): # TODO support Pagination stream API (limit/tokens) - requester = await self.auth.get_user_by_req(request) + requester = await self.auth.get_user_by_req(request, allow_guest=True) handler = self.message_handler # request the state as of a given event, as identified by a stream token, From 1776b00a95e52e34fed4761377a930b1310bf7eb Mon Sep 17 00:00:00 2001 From: Michael Albert Date: Sat, 25 Jul 2020 09:08:18 +0200 Subject: [PATCH 2/4] Remove access to deprecated endpoint --- synapse/rest/client/v1/events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/rest/client/v1/events.py b/synapse/rest/client/v1/events.py index 7c74c0779c9a..25effd026108 100644 --- a/synapse/rest/client/v1/events.py +++ b/synapse/rest/client/v1/events.py @@ -81,7 +81,7 @@ def __init__(self, hs): self._event_serializer = hs.get_event_client_serializer() async def on_GET(self, request, event_id): - requester = await self.auth.get_user_by_req(request, allow_guest=True) + requester = await self.auth.get_user_by_req(request) event = await self.event_handler.get_event(requester.user, None, event_id) time_now = self.clock.time_msec() From 5d323c2dbaec2a972dd4b1ba64df0a826f3acb73 Mon Sep 17 00:00:00 2001 From: Michael Albert Date: Wed, 29 Jul 2020 20:06:03 +0200 Subject: [PATCH 3/4] Add changelog --- changelog.d/7314.guest_access | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7314.guest_access diff --git a/changelog.d/7314.guest_access b/changelog.d/7314.guest_access new file mode 100644 index 000000000000..30720100c298 --- /dev/null +++ b/changelog.d/7314.guest_access @@ -0,0 +1 @@ +Allow guest access to the `GET /_matrix/client/r0/rooms/{room_id}/members` endpoint, according to MSC2689. Contributed by Awesome Technologies Innovationslabor GmbH. From 6fa4d0e8c6158c8edbd7dca0222f7cd31ac3dc6a Mon Sep 17 00:00:00 2001 From: Michael Albert Date: Thu, 30 Jul 2020 11:21:32 +0200 Subject: [PATCH 4/4] Rename changelog --- changelog.d/{7314.guest_access => 7314.misc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{7314.guest_access => 7314.misc} (100%) diff --git a/changelog.d/7314.guest_access b/changelog.d/7314.misc similarity index 100% rename from changelog.d/7314.guest_access rename to changelog.d/7314.misc