summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-02 11:22:40 +0100
committerGitHub <noreply@github.com>2019-05-02 11:22:40 +0100
commitc193b39134e0afb5a185b535bf79027d1fa699d0 (patch)
treeaa3674c9fe285f74e6ba3ff67e50ce851cfb74c7 /synapse/handlers/room.py
parentFactor out an "assert_requester_is_admin" function (#5120) (diff)
parentAdd some limitations to alias creation (diff)
downloadsynapse-c193b39134e0afb5a185b535bf79027d1fa699d0.tar.xz
Merge pull request #5124 from matrix-org/babolivier/aliases
Add some limitations to alias creation
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 17628e2684..e37ae96899 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -402,7 +402,7 @@ class RoomCreationHandler(BaseHandler):
                 yield directory_handler.create_association(
                     requester, RoomAlias.from_string(alias),
                     new_room_id, servers=(self.hs.hostname, ),
-                    send_event=False,
+                    send_event=False, check_membership=False,
                 )
                 logger.info("Moved alias %s to new room", alias)
             except SynapseError as e:
@@ -538,6 +538,7 @@ class RoomCreationHandler(BaseHandler):
                 room_alias=room_alias,
                 servers=[self.hs.hostname],
                 send_event=False,
+                check_membership=False,
             )
 
         preset_config = config.get(