diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb index ec0f56c583..429dbd3248 100644 --- a/config/initializers/rack_attack.rb +++ b/config/initializers/rack_attack.rb @@ -66,20 +66,16 @@ class Rack::Attack IpBlock.blocked?(req.remote_ip) end - if !!ENV['TH_DEACTIVATE_AUTHED_THROTTLES'] - throttle('throttle_authenticated_api', limit: 1_500, period: 5.minutes) do |req| - req.authenticated_user_id if req.api_request? - end - - throttle('throttle_per_token_api', limit: 300, period: 5.minutes) do |req| - req.authenticated_token_id if req.api_request? - end + throttle('throttle_authenticated_api', limit: 1_500, period: 5.minutes) do |req| + req.authenticated_user_id if req.api_request? end - if !!ENV['TH_DEACTIVATE_UNAUTHED_API_THROTTLES'] - throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req| - req.throttleable_remote_ip if req.api_request? && req.unauthenticated? - end + throttle('throttle_per_token_api', limit: 300, period: 5.minutes) do |req| + req.authenticated_token_id if req.api_request? + end + + throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req| + req.throttleable_remote_ip if req.api_request? && req.unauthenticated? end throttle('throttle_api_media', limit: 30, period: 30.minutes) do |req| @@ -94,10 +90,8 @@ class Rack::Attack req.throttleable_remote_ip if req.post? && req.path == '/api/v1/accounts' end - if !!ENV['TH_DEACTIVATE_AUTHED_THROTTLES'] - throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req| - req.authenticated_user_id if req.paging_request? - end + throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req| + req.authenticated_user_id if req.paging_request? end throttle('throttle_unauthenticated_paging', limit: 300, period: 15.minutes) do |req|