diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 13:38:58 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 13:45:28 +0200 |
| commit | 6d43c95b7011ec7ec4600e00bdc8df76bb39813c (patch) | |
| tree | f9ee7a65904f14286d302d1af51add94922fb50d /lib/gitlab/auth.rb | |
| parent | 79f60e2b5cf388416cdc5948e19ae0401f97d353 (diff) | |
| download | gitlab-ce-6d43c95b7011ec7ec4600e00bdc8df76bb39813c.tar.gz | |
Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index ca2a0920c00..7464d6082cb 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -11,7 +11,6 @@ module Gitlab build_access_token_check(login, password) || user_with_password_for_git(login, password) || oauth_access_token_check(login, password) || - lfs_token_check(login, password) || personal_access_token_check(login, password) || Result.new @@ -103,30 +102,6 @@ module Gitlab end end - def lfs_token_check(login, password) - deploy_key_matches = login.match(/\Alfs\+deploy-key-(\d+)\z/) - - actor = - if deploy_key_matches - DeployKey.find(deploy_key_matches[1]) - else - User.by_login(login) - end - - if actor - token_handler = Gitlab::LfsToken.new(actor) - - authentication_abilities = - if token_handler.user? - full_authentication_abilities - else - read_authentication_abilities - end - - Result.new(actor, nil, token_handler.type, authentication_abilities) if Devise.secure_compare(token_handler.value, password) - end - end - def build_access_token_check(login, password) return unless login == 'gitlab-ci-token' return unless password |