diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-08 10:57:03 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-12 11:44:32 +0200 |
| commit | f0c05c1fd5c293c879eddcc15518597c60119acb (patch) | |
| tree | 24578059b452f9fdf701e8b7a8c28f0876b90fb1 | |
| parent | 4b61289088721c083e5285e8ef221cef2f778b96 (diff) | |
| download | gitlab-ce-f0c05c1fd5c293c879eddcc15518597c60119acb.tar.gz | |
Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-requests' into 'master'
Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5876/
Closes #5974
See merge request gitlab-org/gitlab-ce!19189
| -rw-r--r-- | config/initializers/rack_attack_global.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/rack_attack_global.rb b/config/initializers/rack_attack_global.rb index a90516eee7d..45963831c41 100644 --- a/config/initializers/rack_attack_global.rb +++ b/config/initializers/rack_attack_global.rb @@ -26,7 +26,7 @@ class Rack::Attack throttle('throttle_unauthenticated', Gitlab::Throttle.unauthenticated_options) do |req| Gitlab::Throttle.settings.throttle_unauthenticated_enabled && req.unauthenticated? && - !req.api_internal_request? && + !req.should_be_skipped? && req.ip end @@ -59,6 +59,10 @@ class Rack::Attack path =~ %r{^/api/v\d+/internal/} end + def should_be_skipped? + api_internal_request? + end + def web_request? !api_request? end |