diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-08 10:57:03 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-08 10:57:03 +0000 |
commit | ab680dfc64855ff66a8c36106807a9ef1e4ff771 (patch) | |
tree | 55a92abfb24c63ea30c8fa77f6ca460e654e6e98 | |
parent | 8a7d01ebac078d47b53d705dceba47e308f1347a (diff) | |
parent | 64679a0d9a654d4df88af45b7fdd4e322091f51e (diff) | |
download | gitlab-ce-ab680dfc64855ff66a8c36106807a9ef1e4ff771.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 |