Commit 3754b406 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'bvl-internal-auth-using-header' into 'master'

Authenticate the internal API using a header

See merge request gitlab-org/gitlab-ce!25924
parents 6fc43e6f b0fac091
...@@ -6,6 +6,7 @@ module API ...@@ -6,6 +6,7 @@ module API
include Helpers::Pagination include Helpers::Pagination
SUDO_HEADER = "HTTP_SUDO".freeze SUDO_HEADER = "HTTP_SUDO".freeze
GITLAB_SHARED_SECRET_HEADER = "Gitlab-Shared-Secret".freeze
SUDO_PARAM = :sudo SUDO_PARAM = :sudo
API_USER_ENV = 'gitlab.api.user'.freeze API_USER_ENV = 'gitlab.api.user'.freeze
...@@ -212,10 +213,12 @@ module API ...@@ -212,10 +213,12 @@ module API
end end
def authenticate_by_gitlab_shell_token! def authenticate_by_gitlab_shell_token!
input = params['secret_token'].try(:chomp) input = params['secret_token']
unless Devise.secure_compare(secret_token, input) input ||= Base64.decode64(headers[GITLAB_SHARED_SECRET_HEADER]) if headers.key?(GITLAB_SHARED_SECRET_HEADER)
unauthorized!
end input&.chomp!
unauthorized! unless Devise.secure_compare(secret_token, input)
end end
def authenticated_with_full_private_access! def authenticated_with_full_private_access!
......
...@@ -26,6 +26,21 @@ describe API::Internal do ...@@ -26,6 +26,21 @@ describe API::Internal do
expect(json_response['redis']).to be(false) expect(json_response['redis']).to be(false)
end end
context 'authenticating' do
it 'authenticates using a header' do
get api("/internal/check"),
headers: { API::Helpers::GITLAB_SHARED_SECRET_HEADER => Base64.encode64(secret_token) }
expect(response).to have_gitlab_http_status(200)
end
it 'returns 401 when no credentials provided' do
get(api("/internal/check"))
expect(response).to have_gitlab_http_status(401)
end
end
end end
describe 'GET /internal/broadcast_message' do describe 'GET /internal/broadcast_message' do
......
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