Backup_Repos/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-05-08 04:23:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge 082acbe5d4 into f21a3adae2

Browse source
This commit is contained in:
Kowalski Dragon 2026-05-03 14:57:48 +02:00 committed by GitHub
commit 681be5721f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/identity.rs
View file

@ -311,7 +311,11 @@ async fn _sso_login(
Some((mut user, sso_user)) => {
let mut device = get_device(&data, conn, &user).await?;
let twofactor_token = twofactor_auth(&mut user, &data, &mut device, ip, client_version, conn).await?;
let twofactor_token = if CONFIG.sso_skip_2fa() {
None
} else {
twofactor_auth(&mut user, &data, &mut device, ip, client_version, conn).await?
};
if user.private_key.is_none() {
// User was invited a stub was created

2
src/config.rs
View file

@ -830,6 +830,8 @@ make_config! {
sso_auth_only_not_session: bool, true, def, false;
/// Client cache for discovery endpoint. |> Duration in seconds (0 or less to disable). More details: https://github.com/dani-garcia/vaultwarden/wiki/Enabling-SSO-support-using-OpenId-Connect#client-cache
sso_client_cache_expiration: u64, true, def, 0;
/// Skip 2FA for SSO login |> Disable two-factor authentication requirement for SSO login
sso_skip_2fa: bool, true, def, false;
/// Log all tokens |> `LOG_LEVEL=debug` or `LOG_LEVEL=info,vaultwarden::sso=debug` is required
sso_debug_tokens: bool, true, def, false;
},