diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-15 09:26:44 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-27 11:41:18 -0600 |
| commit | ce81223d21e9dd09321a08b3ce20c2f2690a7385 (patch) | |
| tree | 2c4d8d2c5242548c4ff39d29e6ca7e7eb5c14528 | |
| parent | 1d2295032d88dc596b617dca3d209fca21505ac3 (diff) | |
| download | gitlab-ce-ce81223d21e9dd09321a08b3ce20c2f2690a7385.tar.gz | |
Merge branch 'sh-fix-otp-backup-invalidation-10-4' into 'security-10-4'
Ensure that OTP backup codes are always invalidated (10.4 port)
See merge request gitlab/gitlabhq!2327
| -rw-r--r-- | app/controllers/concerns/authenticates_with_two_factor.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml | 5 | ||||
| -rw-r--r-- | spec/features/login_spec.rb | 12 |
3 files changed, 18 insertions, 0 deletions
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb index db8c362f125..2753f83c3cf 100644 --- a/app/controllers/concerns/authenticates_with_two_factor.rb +++ b/app/controllers/concerns/authenticates_with_two_factor.rb @@ -56,6 +56,7 @@ module AuthenticatesWithTwoFactor session.delete(:otp_user_id) remember_me(user) if user_params[:remember_me] == '1' + user.save! sign_in(user) else user.increment_failed_attempts! diff --git a/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml b/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml new file mode 100644 index 00000000000..cedb09c9a7a --- /dev/null +++ b/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml @@ -0,0 +1,5 @@ +--- +title: Ensure that OTP backup codes are always invalidated +merge_request: +author: +type: security diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb index 6dfabcc7225..1a4b26b2822 100644 --- a/spec/features/login_spec.rb +++ b/spec/features/login_spec.rb @@ -125,6 +125,18 @@ feature 'Login' do expect { enter_code(codes.sample) } .to change { user.reload.otp_backup_codes.size }.by(-1) end + + it 'invalidates backup codes twice in a row' do + random_code = codes.delete(codes.sample) + expect { enter_code(random_code) } + .to change { user.reload.otp_backup_codes.size }.by(-1) + + gitlab_sign_out + gitlab_sign_in(user) + + expect { enter_code(codes.sample) } + .to change { user.reload.otp_backup_codes.size }.by(-1) + end end context 'with invalid code' do |