Don't add methods to Rack::Attack
This commit is contained in:
parent
a7243fc14b
commit
09b01c7560
|
@ -1,40 +1,42 @@
|
||||||
class Rack::Attack
|
module Gitlab::Throttle
|
||||||
def self.settings
|
def self.settings
|
||||||
Gitlab::CurrentSettings.current_application_settings
|
Gitlab::CurrentSettings.current_application_settings
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.throttle_unauthenticated_options
|
def self.unauthenticated_options
|
||||||
limit_proc = proc { |req| settings.throttle_unauthenticated_requests_per_period }
|
limit_proc = proc { |req| settings.throttle_unauthenticated_requests_per_period }
|
||||||
period_proc = proc { |req| settings.throttle_unauthenticated_period_in_seconds.seconds }
|
period_proc = proc { |req| settings.throttle_unauthenticated_period_in_seconds.seconds }
|
||||||
{ limit: limit_proc, period: period_proc }
|
{ limit: limit_proc, period: period_proc }
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.throttle_authenticated_api_options
|
def self.authenticated_api_options
|
||||||
limit_proc = proc { |req| settings.throttle_authenticated_api_requests_per_period }
|
limit_proc = proc { |req| settings.throttle_authenticated_api_requests_per_period }
|
||||||
period_proc = proc { |req| settings.throttle_authenticated_api_period_in_seconds.seconds }
|
period_proc = proc { |req| settings.throttle_authenticated_api_period_in_seconds.seconds }
|
||||||
{ limit: limit_proc, period: period_proc }
|
{ limit: limit_proc, period: period_proc }
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.throttle_authenticated_web_options
|
def self.authenticated_web_options
|
||||||
limit_proc = proc { |req| settings.throttle_authenticated_web_requests_per_period }
|
limit_proc = proc { |req| settings.throttle_authenticated_web_requests_per_period }
|
||||||
period_proc = proc { |req| settings.throttle_authenticated_web_period_in_seconds.seconds }
|
period_proc = proc { |req| settings.throttle_authenticated_web_period_in_seconds.seconds }
|
||||||
{ limit: limit_proc, period: period_proc }
|
{ limit: limit_proc, period: period_proc }
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
throttle('throttle_unauthenticated', throttle_unauthenticated_options) do |req|
|
class Rack::Attack
|
||||||
settings.throttle_unauthenticated_enabled &&
|
throttle('throttle_unauthenticated', Gitlab::Throttle.unauthenticated_options) do |req|
|
||||||
|
Gitlab::Throttle.settings.throttle_unauthenticated_enabled &&
|
||||||
req.unauthenticated? &&
|
req.unauthenticated? &&
|
||||||
req.ip
|
req.ip
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_authenticated_api', throttle_authenticated_api_options) do |req|
|
throttle('throttle_authenticated_api', Gitlab::Throttle.authenticated_api_options) do |req|
|
||||||
settings.throttle_authenticated_api_enabled &&
|
Gitlab::Throttle.settings.throttle_authenticated_api_enabled &&
|
||||||
req.api_request? &&
|
req.api_request? &&
|
||||||
req.authenticated_user_id
|
req.authenticated_user_id
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_authenticated_web', throttle_authenticated_web_options) do |req|
|
throttle('throttle_authenticated_web', Gitlab::Throttle.authenticated_web_options) do |req|
|
||||||
settings.throttle_authenticated_web_enabled &&
|
Gitlab::Throttle.settings.throttle_authenticated_web_enabled &&
|
||||||
req.web_request? &&
|
req.web_request? &&
|
||||||
req.authenticated_user_id
|
req.authenticated_user_id
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue