Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Ratelimit 3pid invites #5104

Merged
merged 4 commits into from
May 7, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5104.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the ratelimting on third party invites.
10 changes: 10 additions & 0 deletions synapse/handlers/room_member.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
from synapse.util.async_helpers import Linearizer
from synapse.util.distributor import user_joined_room, user_left_room

from ._base import BaseHandler

logger = logging.getLogger(__name__)

id_server_scheme = "https://"
Expand Down Expand Up @@ -71,6 +73,11 @@ def __init__(self, hs):
self.spam_checker = hs.get_spam_checker()
self._server_notices_mxid = self.config.server_notices_mxid

# This is only used to get at ratelimit function, and
# maybe_kick_guest_users. It's fine there are multiple of these as
# it doesn't store state.
self.base_handler = BaseHandler(hs)

@abc.abstractmethod
def _remote_join(self, requester, remote_room_hosts, room_id, user, content):
"""Try and join a room that this server is not in
Expand Down Expand Up @@ -702,6 +709,9 @@ def do_3pid_invite(
Codes.FORBIDDEN,
)

# Check whether we'll be ratelimited
yield self.base_handler.ratelimit(requester, update=False)
babolivier marked this conversation as resolved.
Show resolved Hide resolved

invitee = yield self._lookup_3pid(
id_server, medium, address
)
Expand Down