dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-04-29 23:31:07 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix 2FA for Android (#7093)
Some checks failed
Build / Build and Test ${{ matrix.channel }} (msrv) (push) Has been cancelled
Details
Build / Build and Test ${{ matrix.channel }} (rust-toolchain) (push) Has been cancelled
Details
Check templates / Validate docker templates (push) Has been cancelled
Details
Hadolint / Validate Dockerfile syntax (push) Has been cancelled
Details
Release / Build Vaultwarden containers (amd64, alpine) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (amd64, debian) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (arm/v6, alpine) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (arm/v6, debian) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (arm/v7, alpine) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (arm/v7, debian) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (arm64, alpine) (push) Has been cancelled
Details
Release / Build Vaultwarden containers (arm64, debian) (push) Has been cancelled
Details
Trivy / Trivy Scan (push) Has been cancelled
Details
Code Spell Checking / Run typos spell checking (push) Has been cancelled
Details
Security Analysis with zizmor / Run zizmor (push) Has been cancelled
Details
Release / Merge manifests (alpine) (push) Has been cancelled
Details
Release / Merge manifests (debian) (push) Has been cancelled
Details

Browse Source 
The `RecoveryCode` Type should not be sent as a valid type which can be used.
Fixes #7092

Signed-off-by: BlackDex <black.dex@gmail.com>
This commit is contained in:
Mathijs van Veluw 2026-04-13 21:47:20 +02:00 committed by GitHub
parent bb549986e6
commit e7e4b9a86d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/identity.rs
View File

@ -756,13 +756,8 @@ async fn twofactor_auth(
// Add TwoFactorTypes which are not stored as a record but might be enabled
// Since these types could also be not valid, we do some custom checks here
twofactor_ids.extend(
[
(!CONFIG.disable_2fa_remember() && device.twofactor_remember.is_some())
.then_some(TwoFactorType::Remember as i32),
user.totp_recover.is_some().then_some(TwoFactorType::RecoveryCode as i32),
]
.into_iter()
.flatten(),
(!CONFIG.disable_2fa_remember() && device.twofactor_remember.is_some())
.then_some(TwoFactorType::Remember as i32),
);
let selected_id = data.two_factor_provider.unwrap_or(twofactor_ids[0]); // If we aren't given a two factor provider, assume the first one