summary refs log tree commit diff
path: root/synapse/rest
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/rest
parentMAU limits are based off of the *authenticated* user (diff)
downloadsynapse-github/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/rest')
-rw-r--r--synapse/rest/admin/rooms.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py
index f5304ff43d..ee345e12ce 100644
--- a/synapse/rest/admin/rooms.py
+++ b/synapse/rest/admin/rooms.py
@@ -309,7 +309,9 @@ class JoinRoomAliasServlet(RestServlet):
                 400, "%s was not legal room ID or room alias" % (room_identifier,)
             )
 
-        fake_requester = create_requester(target_user)
+        fake_requester = create_requester(
+            target_user, authenticated_entity=requester.authenticated_entity
+        )
 
         # send invite if room has "JoinRules.INVITE"
         room_state = await self.state_handler.get_current_state(room_id)