diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-02-29 23:08:14 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-29 23:08:14 +0000 |
| commit | 438394d40447bdfb590ff206ad80907294da0e65 (patch) | |
| tree | eba301a4ae02e8306eb8849b8a1f0918f55921da /config | |
| parent | 19e559fe5130f66a967732a40ccea1ac39e85eb8 (diff) | |
| parent | b5465bf385800d52998bca472a19ea1b9db4c252 (diff) | |
| download | pleroma-438394d40447bdfb590ff206ad80907294da0e65.tar.gz pleroma-438394d40447bdfb590ff206ad80907294da0e65.zip | |
Merge branch 'fix/easy-timeline-dos' into 'develop'
Cap the number of requested statuses in timelines to 40 and rate limit them
See merge request pleroma/pleroma!2253
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 0dde1fc85..9c4eb70a3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -599,6 +599,7 @@ config :http_signatures, config :pleroma, :rate_limit, authentication: {60_000, 15}, + timeline: {500, 3}, search: [{1000, 10}, {1000, 30}], app_account_creation: {1_800_000, 25}, relations_actions: {10_000, 10}, diff --git a/config/description.exs b/config/description.exs index bcb69bc41..9fdcfcd96 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2466,6 +2466,12 @@ config :pleroma, :config_description, [ suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]] }, %{ + key: :timeline, + type: [:tuple, {:list, :tuple}], + description: "For requests to timelines (each timeline has it's own limiter)", + suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]] + }, + %{ key: :app_account_creation, type: [:tuple, {:list, :tuple}], description: "For registering user accounts from the same IP address", |