Commit 4a9f5ef9 authored by Rémy Coutable's avatar Rémy Coutable 🔴 Committed by Rémy Coutable

Merge branch 'fix/2fa-authentication-spoofing' into 'master'

Fix 2FA authentication spoofing

This is security fix for vulnerability described at

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's avatarRémy Coutable <>
parent 2b060c64
Pipeline #1544031 failed with stage