diff options
| author | Erik Johnston <erik@matrix.org> | 2021-02-03 10:18:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-02-03 10:18:04 +0000 |
| commit | abe0611f354e8e94b9282f1bf54c9b6ae89fe626 (patch) | |
| tree | 66a0e7f1800faa3c47bd45a38a52043a6faae613 /synapse/handlers/room_member.py | |
| parent | Merge branch 'develop' into travis/fosdem/admin-api-groups (diff) | |
| parent | Honour ratelimit flag for application services for invite ratelimiting (#9302) (diff) | |
| download | synapse-abe0611f354e8e94b9282f1bf54c9b6ae89fe626.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.27.0' into fosdem-2021
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index d335da6f19..a5da97cfe0 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -155,10 +155,14 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): """ raise NotImplementedError() - def ratelimit_invite(self, room_id: str, invitee_user_id: str): + def ratelimit_invite(self, room_id: Optional[str], invitee_user_id: str): """Ratelimit invites by room and by target user. + + If room ID is missing then we just rate limit by target user. """ - self._invites_per_room_limiter.ratelimit(room_id) + if room_id: + self._invites_per_room_limiter.ratelimit(room_id) + self._invites_per_user_limiter.ratelimit(invitee_user_id) async def _local_membership_update( @@ -406,7 +410,9 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): if effective_membership_state == Membership.INVITE: target_id = target.to_string() if ratelimit: - self.ratelimit_invite(room_id, target_id) + # Don't ratelimit application services. + if not requester.app_service or requester.app_service.is_rate_limited(): + self.ratelimit_invite(room_id, target_id) # block any attempts to invite the server notices mxid if target_id == self._server_notices_mxid: |