mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 05:36:07 +10:00
Rémy CoutableandRémy Coutable
4a9f5ef931
Fix 2FA authentication spoofing This is security fix for vulnerability described at https://gitlab.com/gitlab-org/gitlab-ce/issues/14900. Attacker was able to bypass password authentication of users that have 2FA enabled, and consequently sign is as a different user, without knowing his password, if he managed to guess 2FA One Time Password for that user. It was also possible to enumerate users and check if they have 2FA enabled, because GitLab responded with different error for each case. This MR attempts to change default user search scope if `otp_user_id` session variable has been set. If it is present, it means that user has 2FA enabled, and has already been verified with login and password. In this case we should look for user with `otp_user_id` first, before picking it up by `login`. Both, 2FA authentication spoofing and 2FA discovery have been covered by specs. Current 2FA code is a bit tricky, so it probably needs some refactoring. Signed-off-by: Rémy Coutable <remy@rymai.me>
102 lines
3.1 KiB
Ruby
102 lines
3.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe SessionsController do
|
|
describe '#create' do
|
|
before do
|
|
@request.env['devise.mapping'] = Devise.mappings[:user]
|
|
end
|
|
|
|
context 'when using standard authentications' do
|
|
context 'invalid password' do
|
|
it 'does not authenticate user' do
|
|
post(:create, user: { login: 'invalid', password: 'invalid' })
|
|
|
|
expect(response)
|
|
.to set_flash.now[:alert].to /Invalid login or password/
|
|
end
|
|
end
|
|
|
|
context 'when using valid password' do
|
|
let(:user) { create(:user) }
|
|
|
|
it 'authenticates user correctly' do
|
|
post(:create, user: { login: user.username, password: user.password })
|
|
|
|
expect(response).to set_flash.to /Signed in successfully/
|
|
expect(subject.current_user). to eq user
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when using two-factor authentication' do
|
|
let(:user) { create(:user, :two_factor) }
|
|
|
|
def authenticate_2fa(user_params)
|
|
post(:create, { user: user_params }, { otp_user_id: user.id })
|
|
end
|
|
|
|
##
|
|
# See #14900 issue
|
|
#
|
|
context 'when authenticating with login and OTP of another user' do
|
|
context 'when another user has 2FA enabled' do
|
|
let(:another_user) { create(:user, :two_factor) }
|
|
|
|
context 'when OTP is valid for another user' do
|
|
it 'does not authenticate' do
|
|
authenticate_2fa(login: another_user.username,
|
|
otp_attempt: another_user.current_otp)
|
|
|
|
expect(subject.current_user).to_not eq another_user
|
|
end
|
|
end
|
|
|
|
context 'when OTP is invalid for another user' do
|
|
it 'does not authenticate' do
|
|
authenticate_2fa(login: another_user.username,
|
|
otp_attempt: 'invalid')
|
|
|
|
expect(subject.current_user).to_not eq another_user
|
|
end
|
|
end
|
|
|
|
context 'when authenticating with OTP' do
|
|
context 'when OTP is valid' do
|
|
it 'authenticates correctly' do
|
|
authenticate_2fa(otp_attempt: user.current_otp)
|
|
|
|
expect(subject.current_user).to eq user
|
|
end
|
|
end
|
|
|
|
context 'when OTP is invalid' do
|
|
before { authenticate_2fa(otp_attempt: 'invalid') }
|
|
|
|
it 'does not authenticate' do
|
|
expect(subject.current_user).to_not eq user
|
|
end
|
|
|
|
it 'warns about invalid OTP code' do
|
|
expect(response).to set_flash.now[:alert]
|
|
.to /Invalid two-factor code/
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when another user does not have 2FA enabled' do
|
|
let(:another_user) { create(:user) }
|
|
|
|
it 'does not leak that 2FA is disabled for another user' do
|
|
authenticate_2fa(login: another_user.username,
|
|
otp_attempt: 'invalid')
|
|
|
|
expect(response).to set_flash.now[:alert]
|
|
.to /Invalid two-factor code/
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|