summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-07-31 08:47:25 -0700
committerMichael Kozono <mkozono@gmail.com>2019-07-31 08:47:25 -0700
commitfd4c523c0a466f7e42d3a2da8990eb20fbe0a4a1 (patch)
tree5d61f4f4df153bc8b4cfd754ab35eacb3ae190f1
parent0cebc1e99a2cbd82757892d21b33edc216348a34 (diff)
downloadgitlab-ce-mk/fix-rate-limiting-for-job-token-requests.tar.gz
Fix rate limiting for job token requestsmk/fix-rate-limiting-for-job-token-requests
Valid job token requests were being rate limited by the unauthenticated request throttle.
-rw-r--r--lib/gitlab/auth/request_authenticator.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/auth/request_authenticator.rb b/lib/gitlab/auth/request_authenticator.rb
index 95d2336f74e..8fa79b92270 100644
--- a/lib/gitlab/auth/request_authenticator.rb
+++ b/lib/gitlab/auth/request_authenticator.rb
@@ -24,7 +24,9 @@ module Gitlab
end
def find_sessionless_user(request_format)
- find_user_from_web_access_token(request_format) || find_user_from_feed_token(request_format)
+ find_user_from_web_access_token(request_format) ||
+ find_user_from_feed_token(request_format) ||
+ find_user_from_job_token(request_format)
rescue Gitlab::Auth::AuthenticationError
nil
end