From 71572761240b18645b16adb0bd607d2092865ba0 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 18 Jun 2019 17:43:34 +0100 Subject: Don't process 3PIDs in _apply_restricted --- synapse/third_party_rules/access_rules.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'synapse/third_party_rules/access_rules.py') diff --git a/synapse/third_party_rules/access_rules.py b/synapse/third_party_rules/access_rules.py index fbd829cdd2..d13f8de888 100644 --- a/synapse/third_party_rules/access_rules.py +++ b/synapse/third_party_rules/access_rules.py @@ -242,7 +242,9 @@ class RoomAccessRules(object): """ # "restricted" currently means that users can only invite users if their server is # included in a limited list of domains. - if event.type != EventTypes.Member and event.type != EventTypes.ThirdPartyInvite: + # We're not filtering on m.room.third_party_member events here because the + # filtering on threepids is done in check_threepid_can_be_invited. + if event.type != EventTypes.Member: return True invitee_domain = get_domain_from_id(event.state_key) return invitee_domain not in self.domains_forbidden_when_restricted -- cgit 1.5.1