Commit ab680dfc authored by Douwe Maan's avatar Douwe Maan 💒

Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-requests' into 'master'

Backport of gitlab-org/gitlab-ee!5876/

Closes #5974

See merge request gitlab-org/gitlab-ce!19189
parents 8a7d01eb 64679a0d
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment