Commit 842f683f authored by Thong Kuah's avatar Thong Kuah

Move CI_REGISTRY_USER to Gitlab::Auth

As it is information related to auth, it makes more sense to be in that
module.
parent d85d238a
...@@ -524,8 +524,6 @@ module Ci ...@@ -524,8 +524,6 @@ module Ci
end end
end end
CI_REGISTRY_USER = 'gitlab-ci-token'
def persisted_variables def persisted_variables
Gitlab::Ci::Variables::Collection.new.tap do |variables| Gitlab::Ci::Variables::Collection.new.tap do |variables|
break variables unless persisted? break variables unless persisted?
...@@ -537,7 +535,7 @@ module Ci ...@@ -537,7 +535,7 @@ module Ci
.append(key: 'CI_JOB_TOKEN', value: token.to_s, public: false, masked: true) .append(key: 'CI_JOB_TOKEN', value: token.to_s, public: false, masked: true)
.append(key: 'CI_BUILD_ID', value: id.to_s) .append(key: 'CI_BUILD_ID', value: id.to_s)
.append(key: 'CI_BUILD_TOKEN', value: token.to_s, public: false, masked: true) .append(key: 'CI_BUILD_TOKEN', value: token.to_s, public: false, masked: true)
.append(key: 'CI_REGISTRY_USER', value: CI_REGISTRY_USER) .append(key: 'CI_REGISTRY_USER', value: ::Gitlab::Auth::CI_REGISTRY_USER)
.append(key: 'CI_REGISTRY_PASSWORD', value: token.to_s, public: false, masked: true) .append(key: 'CI_REGISTRY_PASSWORD', value: token.to_s, public: false, masked: true)
.append(key: 'CI_REPOSITORY_URL', value: repo_url.to_s, public: false) .append(key: 'CI_REPOSITORY_URL', value: repo_url.to_s, public: false)
.concat(deploy_token_variables) .concat(deploy_token_variables)
......
...@@ -27,6 +27,7 @@ module Gitlab ...@@ -27,6 +27,7 @@ module Gitlab
DEFAULT_SCOPES = [:api].freeze DEFAULT_SCOPES = [:api].freeze
CI_JOB_USER = 'gitlab-ci-token' CI_JOB_USER = 'gitlab-ci-token'
CI_REGISTRY_USER = 'gitlab-ci-token'
class << self class << self
prepend_if_ee('EE::Gitlab::Auth') # rubocop: disable Cop/InjectEnterpriseEditionModule prepend_if_ee('EE::Gitlab::Auth') # rubocop: disable Cop/InjectEnterpriseEditionModule
...@@ -128,7 +129,7 @@ module Gitlab ...@@ -128,7 +129,7 @@ module Gitlab
# rubocop:enable Gitlab/RailsLogger # rubocop:enable Gitlab/RailsLogger
def skip_rate_limit?(login:) def skip_rate_limit?(login:)
::Ci::Build::CI_REGISTRY_USER == login CI_REGISTRY_USER == login
end end
def look_to_limit_user(actor) def look_to_limit_user(actor)
......
...@@ -82,7 +82,7 @@ module Gitlab ...@@ -82,7 +82,7 @@ module Gitlab
login, password = user_name_and_password(current_request) login, password = user_name_and_password(current_request)
return unless login.present? && password.present? return unless login.present? && password.present?
return unless ::Ci::Build::CI_REGISTRY_USER == login return unless ::Gitlab::Auth::CI_REGISTRY_USER == login
job = ::Ci::Build.find_by_token(password) job = ::Ci::Build.find_by_token(password)
raise UnauthorizedError unless job raise UnauthorizedError unless job
......
...@@ -554,7 +554,7 @@ RSpec.describe Gitlab::Auth::AuthFinders do ...@@ -554,7 +554,7 @@ RSpec.describe Gitlab::Auth::AuthFinders do
end end
context 'with CI username' do context 'with CI username' do
let(:username) { ::Ci::Build::CI_REGISTRY_USER } let(:username) { ::Gitlab::Auth::CI_REGISTRY_USER }
let(:user) { create(:user) } let(:user) { create(:user) }
let(:build) { create(:ci_build, user: user) } let(:build) { create(:ci_build, user: user) }
...@@ -727,7 +727,7 @@ RSpec.describe Gitlab::Auth::AuthFinders do ...@@ -727,7 +727,7 @@ RSpec.describe Gitlab::Auth::AuthFinders do
context 'when the job token is provided via basic auth' do context 'when the job token is provided via basic auth' do
let(:route_authentication_setting) { { job_token_allowed: :basic_auth } } let(:route_authentication_setting) { { job_token_allowed: :basic_auth } }
let(:username) { Ci::Build::CI_REGISTRY_USER } let(:username) { ::Gitlab::Auth::CI_REGISTRY_USER }
let(:token) { job.token } let(:token) { job.token }
before do before do
......
...@@ -8,7 +8,7 @@ module HttpBasicAuthHelpers ...@@ -8,7 +8,7 @@ module HttpBasicAuthHelpers
end end
def job_basic_auth_header(job) def job_basic_auth_header(job)
basic_auth_header(Ci::Build::CI_REGISTRY_USER, job.token) basic_auth_header(::Gitlab::Auth::CI_REGISTRY_USER, job.token)
end end
def client_basic_auth_header(client) def client_basic_auth_header(client)
......
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