diff options
| author | Etienne Baqué <ebaque@gitlab.com> | 2019-07-19 13:44:30 -0400 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-26 19:39:48 -0700 |
| commit | 84d6dcbe5040b9f0475f6b2155800617e397db94 (patch) | |
| tree | ef11e13dc897795a74b8824c2bf0096ce1ed4ecc | |
| parent | a6b60fee67f6ea4d22ab5cb34901d0707829eec0 (diff) | |
| download | gitlab-ce-84d6dcbe5040b9f0475f6b2155800617e397db94.tar.gz | |
Updated call to find deploy token
| -rw-r--r-- | lib/gitlab/auth.rb | 3 | ||||
| -rw-r--r-- | spec/factories/deploy_tokens.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index e17a096ef19..fe40d553b2f 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -202,8 +202,7 @@ module Gitlab def deploy_token_check(login, password) return unless password.present? - token = - DeployToken.active.find_by(token: password) + token = DeployToken.active.find_by_token(password) return unless token && login return if login != token.username diff --git a/spec/factories/deploy_tokens.rb b/spec/factories/deploy_tokens.rb index a96258f5cbe..99486acc2ab 100644 --- a/spec/factories/deploy_tokens.rb +++ b/spec/factories/deploy_tokens.rb @@ -2,7 +2,8 @@ FactoryBot.define do factory :deploy_token do - token { SecureRandom.hex(50) } + token nil + token_encrypted { Gitlab::CryptoHelper.aes256_gcm_encrypt( SecureRandom.hex(50) ) } sequence(:name) { |n| "PDT #{n}" } read_repository true read_registry true |