Merge branch 'rate-limit-ap-routes' into 'develop'
[#1174] Rate limit AP routes See merge request pleroma/pleroma!1586
This commit is contained in:
		
						commit
						f740d786a3
					
				
					 3 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -563,7 +563,8 @@
 | 
			
		|||
  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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -71,7 +71,8 @@
 | 
			
		|||
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"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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(
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue