pleroma

commit: f740d786a37dc85d9b702dd5054d4978ee18a202
parent: 73884441f31092bdb2f509950daf9bd3889a9a8b
Author: lain <lain@soykaf.club>
Date:   Wed, 21 Aug 2019 16:45:20 +0000

Merge branch 'rate-limit-ap-routes' into 'develop'

[#1174] Rate limit AP routes

See merge request pleroma/pleroma!1586
Diffstat:
M
config/config.exs
3
++-
M
config/test.exs
3
++-
M
lib/pleroma/web/ostatus/ostatus_controller.ex
2
++

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -563,7 +563,8 @@ config :pleroma, :rate_limit,
   statuses_actions: {10_000, 15},
   status_id_action: {60_000, 3},
   password_reset: {1_800_000, 5},
-  account_confirmation_resend: {8_640_000, 5}
+  account_confirmation_resend: {8_640_000, 5},
+  ap_routes: {60_000, 15}
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
diff --git a/config/test.exs b/config/test.exs
@@ -71,7 +71,8 @@ config :pleroma, Pleroma.ScheduledActivity,
 config :pleroma, :rate_limit,
   search: [{1000, 30}, {1000, 30}],
   app_account_creation: {10_000, 5},
-  password_reset: {1000, 30}
+  password_reset: {1000, 30},
+  ap_routes: nil
 
 config :pleroma, :http_security, report_uri: "https://endpoint.com"
 
diff --git 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(