diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-16 18:07:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-16 18:07:53 +0300 |
commit | c1f98d9590def61ad2fca09cc06a7a9d52cdebc5 (patch) | |
tree | 84490eecee06513f152cd466ed7c1d23a71a6ddf /lib/gitlab/api_authentication | |
parent | 12166c0faf75479889bc0ac432b85b9dae91552b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/api_authentication')
-rw-r--r-- | lib/gitlab/api_authentication/token_resolver.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/api_authentication/token_resolver.rb b/lib/gitlab/api_authentication/token_resolver.rb index afada055928..3f8025c408a 100644 --- a/lib/gitlab/api_authentication/token_resolver.rb +++ b/lib/gitlab/api_authentication/token_resolver.rb @@ -165,7 +165,9 @@ module Gitlab end def with_deploy_token(raw, &block) - raise ::Gitlab::Auth::UnauthorizedError if Gitlab::ExternalAuthorization.enabled? + unless Gitlab::ExternalAuthorization.allow_deploy_tokens_and_deploy_keys? + raise ::Gitlab::Auth::UnauthorizedError + end token = ::DeployToken.active.find_by_token(raw.password) return unless token |