From b7d7d20a38b3ce21485c022c3162857a53d0beb8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 21 Mar 2019 12:11:40 +0000 Subject: Correctly handle 3PID invites in create room spam check We also add an option to outright deny third party invites --- synapse/handlers/room.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'synapse/handlers') diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 581cff9526..a710b51c3d 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -269,6 +269,7 @@ class RoomCreationHandler(BaseHandler): if not is_requester_admin and not self.spam_checker.user_may_create_room( user_id, invite_list=[], + third_party_invite_list=[], cloning=True, ): raise SynapseError(403, "You are not permitted to create rooms") @@ -492,6 +493,7 @@ class RoomCreationHandler(BaseHandler): yield self.auth.check_auth_blocking(user_id) invite_list = config.get("invite", []) + invite_3pid_list = config.get("invite_3pid", []) if (self._server_notices_mxid is not None and requester.user.to_string() == self._server_notices_mxid): @@ -505,6 +507,7 @@ class RoomCreationHandler(BaseHandler): if not is_requester_admin and not self.spam_checker.user_may_create_room( user_id, invite_list=invite_list, + third_party_invite_list=invite_3pid_list, cloning=False, ): raise SynapseError(403, "You are not permitted to create rooms") @@ -559,8 +562,6 @@ class RoomCreationHandler(BaseHandler): requester, ) - invite_3pid_list = config.get("invite_3pid", []) - visibility = config.get("visibility", None) is_public = visibility == "public" -- cgit 1.5.1