kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

2FA check is now done in the main GitHTTPClientController

Browse source
This commit is contained in:
Patricio Cano 2016-08-11 11:42:34 -05:00
parent 641d061e3c
commit 0f37721b60
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/projects/git_http_client_controller.rb
View file

@ -29,6 +29,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController
# Not allowed
else
@user = auth_result.user
check_2fa(auth_result.type)
end
if ci? || user
@ -91,6 +92,12 @@ 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\nYou have 2FA enabled, please use a personal access token for Git over HTTP\n", status: 401
end
end
def repository
_, suffix = project_id_with_suffix
if suffix == '.wiki.git'