Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

438394d4

Commit 438394d4 authored 5 years ago by rinpatch

Downloads
- Plain Diff

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

parents 19e559fe b5465bf3

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 4 additions, 0 deletions

CHANGELOG.md
config/config.exs 1 addition, 0 deletions

config/config.exs
config/description.exs 6 additions, 0 deletions

config/description.exs
docs/configuration/cheatsheet.md 1 addition, 0 deletions

docs/configuration/cheatsheet.md
lib/pleroma/pagination.ex 6 additions, 1 deletion

lib/pleroma/pagination.ex
lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex 8 additions, 2 deletions

lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex
lib/pleroma/plugs/rate_limiter/rate_limiter.ex 10 additions, 5 deletions

lib/pleroma/plugs/rate_limiter/rate_limiter.ex
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex 11 additions, 0 deletions

...eroma/web/mastodon_api/controllers/timeline_controller.ex
test/plugs/rate_limiter_test.exs 31 additions, 0 deletions

test/plugs/rate_limiter_test.exs

with 78 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment