mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-26 05:06:47 +02:00
Add SSO_SIGNUPS_ALLOWED (#7272)
* Add SSO_SIGNUPS_ALLOWED * Fix regression with domain_allowed in SSO onboarding --------- Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
1 parent
923f5d0b5e
commit
2073c03092
3 files changed
+43
-1
No files matched your search
+27
-1
@@ -234,6 +234,24 @@ async fn sso_login(
|
||||
}
|
||||
)
|
||||
}
|
||||
Some((user, None))
|
||||
if user.private_key.is_none()
|
||||
&& !CONFIG.sso_signups_allowed()
|
||||
&& !CONFIG.is_email_domain_allowed(&user.email)
|
||||
&& !CONFIG.mail_enabled()
|
||||
&& Invitation::find_by_mail(&user.email, conn).await.is_none() =>
|
||||
{
|
||||
error!(
|
||||
"Login failure ({}), no invitation with email ({}) was found",
|
||||
user_infos.identifier, user.email
|
||||
);
|
||||
err_silent!(
|
||||
"Missing invitation",
|
||||
ErrorEvent {
|
||||
event: EventType::UserFailedLogIn
|
||||
}
|
||||
)
|
||||
}
|
||||
Some((user, None)) if user.private_key.is_some() && !CONFIG.sso_signups_match_email() => {
|
||||
error!(
|
||||
"Login failure ({}), existing non SSO user ({}) with same email ({}) and association is disabled",
|
||||
@@ -281,7 +299,15 @@ async fn sso_login(
|
||||
// Will trigger 2FA flow if needed
|
||||
let (user, mut device, twofactor_token, sso_user) = match user_with_sso {
|
||||
None => {
|
||||
if !CONFIG.is_email_domain_allowed(&user_infos.email) {
|
||||
if !CONFIG.is_sso_signup_allowed(&user_infos.email) {
|
||||
if CONFIG.signups_domains_whitelist().is_empty() {
|
||||
err!(
|
||||
"Signups are disabled. You will need an invitation",
|
||||
ErrorEvent {
|
||||
event: EventType::UserFailedLogIn
|
||||
}
|
||||
);
|
||||
}
|
||||
err!(
|
||||
"Email domain not allowed",
|
||||
ErrorEvent {
|
||||
|
||||
Reference in new issue
Block a user