summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-21 16:50:59 +0100
committerErik Johnston <erik@matrix.org>2020-10-21 16:53:40 +0100
commitf42fa8b15bf345cc1457077a6cde16193a355b7f (patch)
tree8857e16914ba36aa82b2cb8243df5f29d7718b3e /synapse/handlers/room.py
parentMAU limits are based off of the *authenticated* user (diff)
downloadsynapse-erikj/puppet_tokens.tar.xz
Correctly set authenticated_entity when creating ad hoc requesters github/erikj/puppet_tokens erikj/puppet_tokens
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 11c4355082..7422020f04 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -1250,7 +1250,9 @@ class RoomShutdownHandler: 400, "User must be our own: %s" % (new_room_user_id,) ) - room_creator_requester = create_requester(new_room_user_id) + room_creator_requester = create_requester( + new_room_user_id, authenticated_entity=requester_user_id + ) info, stream_id = await self._room_creation_handler.create_room( room_creator_requester, @@ -1290,7 +1292,9 @@ class RoomShutdownHandler: try: # Kick users from room - target_requester = create_requester(user_id) + target_requester = create_requester( + user_id, authenticated_entity=requester_user_id + ) _, stream_id = await self.room_member_handler.update_membership( requester=target_requester, target=target_requester.user,