diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-11 15:39:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 15:39:38 +0100 |
| commit | cbcbfe64a2b306f0eaff74d4ceb7f2550d8b4b6a (patch) | |
| tree | 8465e03c3d60c0d76aa8c77e2eb4ecd9f503a6b8 /synapse/config | |
| parent | Clean up some code in the retry logic (#6017) (diff) | |
| parent | Update sample config (diff) | |
| download | synapse-cbcbfe64a2b306f0eaff74d4ceb7f2550d8b4b6a.tar.xz | |
Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction
Allow use of different ratelimits for admin redactions.
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/ratelimiting.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/synapse/config/ratelimiting.py b/synapse/config/ratelimiting.py index 33f31cf213..587e2862b7 100644 --- a/synapse/config/ratelimiting.py +++ b/synapse/config/ratelimiting.py @@ -80,6 +80,12 @@ class RatelimitConfig(Config): "federation_rr_transactions_per_room_per_second", 50 ) + rc_admin_redaction = config.get("rc_admin_redaction") + if rc_admin_redaction: + self.rc_admin_redaction = RateLimitConfig(rc_admin_redaction) + else: + self.rc_admin_redaction = None + def generate_config_section(self, **kwargs): return """\ ## Ratelimiting ## @@ -102,6 +108,9 @@ class RatelimitConfig(Config): # - one for login that ratelimits login requests based on the account the # client is attempting to log into, based on the amount of failed login # attempts for this account. + # - one for ratelimiting redactions by room admins. If this is not explicitly + # set then it uses the same ratelimiting as per rc_message. This is useful + # to allow room admins to deal with abuse quickly. # # The defaults are as shown below. # @@ -123,6 +132,10 @@ class RatelimitConfig(Config): # failed_attempts: # per_second: 0.17 # burst_count: 3 + # + #rc_admin_redaction: + # per_second: 1 + # burst_count: 50 # Ratelimiting settings for incoming federation |