Commit 8bb1931e authored by Patricio Cano's avatar Patricio Cano

Deny Git over HTTP access to users that have 2FA enabled, unless they use a Personal Access Token.

parent c5a7a70d
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
= page_title = page_title
%p %p
You can generate a personal access token for each application you use that needs access to the GitLab API. You can generate a personal access token for each application you use that needs access to the GitLab API.
%p
You can also use personal access tokens to authenticate against Git over HTTP. Use them specially when you
have 2FA enabled.
.col-lg-9 .col-lg-9
- if flash[:personal_access_token] - if flash[:personal_access_token]
......
...@@ -198,6 +198,47 @@ describe 'Git HTTP requests', lib: true do ...@@ -198,6 +198,47 @@ describe 'Git HTTP requests', lib: true do
end end
end end
context 'when user has 2FA enabled' do
before do
@user = create(:user, :two_factor)
project.team << [@user, :master]
end
context 'when username and password are provided' do
it 'rejects the clone attempt' do
download("#{project.path_with_namespace}.git", user: @user.username, password: @user.password) do |response|
expect(response).to have_http_status(401)
expect(response.body).to include('You have 2FA enabled, please use a personal access token for Git over HTTP')
end
end
it 'rejects the push attempt' do
upload("#{project.path_with_namespace}.git", user: @user.username, password: @user.password) do |response|
expect(response).to have_http_status(401)
expect(response.body).to include('You have 2FA enabled, please use a personal access token for Git over HTTP')
end
end
end
context 'when username and personal access token are provided' do
before do
@token = create(:personal_access_token, user: @user)
end
it 'allows clones' do
download("#{project.path_with_namespace}.git", user: @user.username, password: @token.token) do |response|
expect(response).to have_http_status(200)
end
end
it 'allows pushes' do
upload("#{project.path_with_namespace}.git", user: @user.username, password: @token.token) do |response|
expect(response).to have_http_status(200)
end
end
end
end
context "when blank password attempts follow a valid login" do context "when blank password attempts follow a valid login" do
def attempt_login(include_password) def attempt_login(include_password)
password = include_password ? user.password : "" password = include_password ? user.password : ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment