diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-08-15 15:47:29 -0500 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-08-16 11:19:00 -0500 |
commit | 5f5d8a8e09bbd2fcdfd02c68145a8c1086fe5e7c (patch) | |
tree | 36f0d44ca907f12a319cb68d176c5008aecb3f41 /app/controllers/projects | |
parent | f971026ad3aabcd682c42db6d35e35cb64121f40 (diff) | |
download | gitlab-ce-5f5d8a8e09bbd2fcdfd02c68145a8c1086fe5e7c.tar.gz |
Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/git_http_client_controller.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb index abe47f80858..59395abf401 100644 --- a/app/controllers/projects/git_http_client_controller.rb +++ b/app/controllers/projects/git_http_client_controller.rb @@ -27,9 +27,11 @@ class Projects::GitHttpClientController < Projects::ApplicationController @ci = true elsif auth_result.type == :oauth && !download_request? # Not allowed + elsif auth_result.type == :missing_personal_token + render_missing_personal_token + return # Render above denied access, nothing left to do else @user = auth_result.user - check_2fa(auth_result.type) end if ci? || user @@ -92,13 +94,11 @@ class Projects::GitHttpClientController < Projects::ApplicationController [nil, nil] end - def check_2fa(auth_type) - if user && user.two_factor_enabled? && auth_type == :gitlab_or_ldap - render plain: "HTTP Basic: Access denied\n"\ - "You have 2FA enabled, please use a personal access token for Git over HTTP.\n"\ - "You can generate one at #{profile_personal_access_tokens_url}", - status: 401 - end + def render_missing_personal_token + render plain: "HTTP Basic: Access denied\n"\ + "You have 2FA enabled, please use a personal access token for Git over HTTP.\n"\ + "You can generate one at #{profile_personal_access_tokens_url}", + status: 401 end def repository |