diff options
| author | lain <lain@soykaf.club> | 2019-08-21 16:45:20 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-21 16:45:20 +0000 |
| commit | f740d786a37dc85d9b702dd5054d4978ee18a202 (patch) | |
| tree | ad164c84092267de7c5fc7ba4bea2418d0186c2a /lib | |
| parent | 73884441f31092bdb2f509950daf9bd3889a9a8b (diff) | |
| parent | 8d899d61970a566eb828330d1292df31f1f7b938 (diff) | |
| download | pleroma-f740d786a37dc85d9b702dd5054d4978ee18a202.tar.gz pleroma-f740d786a37dc85d9b702dd5054d4978ee18a202.zip | |
Merge branch 'rate-limit-ap-routes' into 'develop'
[#1174] Rate limit AP routes
See merge request pleroma/pleroma!1586
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex index c70063b84..305901dfd 100644 --- a/lib/pleroma/web/ostatus/ostatus_controller.ex +++ b/lib/pleroma/web/ostatus/ostatus_controller.ex @@ -22,6 +22,8 @@ defmodule Pleroma.Web.OStatus.OStatusController do alias Pleroma.Web.Router alias Pleroma.Web.XML + plug(Pleroma.Plugs.RateLimiter, :ap_routes when action in [:object, :activity]) + plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming]) plug( |