Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-05-02 21:34:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Check whether to ratelimit sooner to avoid work

Browse source
This commit is contained in:
Erik Johnston 2016-10-19 10:45:24 +01:00
parent 50ac1d843d
commit 550308c7a1
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
synapse/handlers/message.py
View file

@ -16,7 +16,7 @@
from twisted.internet import defer
from synapse.api.constants import EventTypes, Membership
from synapse.api.errors import AuthError, Codes, SynapseError
from synapse.api.errors import AuthError, Codes, SynapseError, LimitExceededError
from synapse.crypto.event_signing import add_hashes_and_signatures
from synapse.events.utils import serialize_event
from synapse.events.validator import EventValidator
@ -239,6 +239,18 @@ class MessageHandler(BaseHandler):
"Tried to send member event through non-member codepath"
)
time_now = self.clock.time()
allowed, time_allowed = self.ratelimiter.send_message(
event.sender, time_now,
msg_rate_hz=self.hs.config.rc_messages_per_second,
burst_count=self.hs.config.rc_message_burst_count,
update=False,
)
if not allowed:
raise LimitExceededError(
retry_after_ms=int(1000 * (time_allowed - time_now)),
)
user = UserID.from_string(event.sender)
assert self.hs.is_mine(user), "User must be our own: %s" % (user,)