Skip to content
Snippets Groups Projects

Deploy token access for the dependency proxy

Merged Steve Abrams requested to merge 280586-dependency-proxy-deploy-tokens into master
5 files
+ 24
17
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -22,14 +22,23 @@ module Auth
def authenticate_user_from_jwt_token!
return unless dependency_proxy_for_private_groups?
authenticate_with_http_token do |token, _|
@authentication_result = Gitlab::Auth::Result.new(nil, nil, nil, nil) # rubocop:disable Gitlab/ModuleWithInstanceVariables
found_user = user_from_token(token)
sign_in(found_user) if found_user.is_a?(User)
if Feature.enabled?(:dependency_proxy_deploy_tokens)
authenticate_with_http_token do |token, _|
@authentication_result = Gitlab::Auth::Result.new(nil, nil, nil, nil) # rubocop:disable Gitlab/ModuleWithInstanceVariables
found_user = user_from_token(token)
sign_in(found_user) if found_user.is_a?(User)
end
request_bearer_token! unless authenticated_user
else
authenticate_with_http_token do |token, _|
user = user_from_token(token)
sign_in(user) if user
end
request_bearer_token! unless current_user
end
request_bearer_token! unless authenticated_user
end
private
@@ -46,6 +55,7 @@ def request_bearer_token!
def user_from_token(token)
token_payload = DependencyProxy::AuthTokenService.decoded_token_payload(token)
return User.find(token_payload['user_id']) unless Feature.enabled?(:dependency_proxy_deploy_tokens)
if token_payload['user_id']
token_user = User.find(token_payload['user_id'])
Loading