summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-10 18:35:45 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-10 18:35:45 +0000
commit3c9b5d590395e3794fe9b7025eba5044e4bef483 (patch)
treecb0531fd582cce3d23bd7fec6fd76e8c5911b396 /synapse
parentMerge pull request #5479 from matrix-org/erikj/add_create_room_hook_develop (diff)
parentMerge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid (diff)
downloadsynapse-3c9b5d590395e3794fe9b7025eba5044e4bef483.tar.xz
Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room_member.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py

index 790aeba9f5..7f1ee95a7a 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py
@@ -784,6 +784,15 @@ class RoomMemberHandler(object): Codes.FORBIDDEN, ) + can_invite = yield self.third_party_event_rules.check_threepid_can_be_invited( + medium, address, room_id, + ) + if not can_invite: + raise SynapseError( + 403, "This third-party identifier can not be invited in this room", + Codes.FORBIDDEN, + ) + invitee = yield self._lookup_3pid( id_server, medium, address )