filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auth: Keep OTP Auth and AppPasswords unless the remote directory provides new ones (fixes #2319)

Browse Source
This commit is contained in:
mdecimus
2025-10-26 16:16:22 +01:00
parent 8cee757d7f
commit 2c2dd52a61
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/directory/src/core/principal.rs
View File

@@ -308,6 +308,8 @@ impl Principal {
let mut has_role = false; let mut has_role = false;
let mut has_member_of = false; let mut has_member_of = false;
let mut has_quota = false; let mut has_quota = false;
let mut has_otp_auth = false;
let mut has_app_password = false;
for item in external.data { for item in external.data {
match item { match item {
@@ -323,9 +325,15 @@ impl Principal {
has_role = true; has_role = true;
external_data.insert(item); external_data.insert(item);
} }
PrincipalData::OtpAuth(_) => {
has_otp_auth = true;
external_data.insert(item);
}
PrincipalData::AppPassword(_) => {
has_app_password = true;
external_data.insert(item);
}
PrincipalData::Password(_) PrincipalData::Password(_)
| PrincipalData::AppPassword(_)
| PrincipalData::OtpAuth(_)
| PrincipalData::Description(_) | PrincipalData::Description(_)
| PrincipalData::PrimaryEmail(_) | PrincipalData::PrimaryEmail(_)
| PrincipalData::EmailAlias(_) => { | PrincipalData::EmailAlias(_) => {
@@ -352,6 +360,8 @@ impl Principal {
if external_data.remove(&item) if external_data.remove(&item)
|| match item { || match item {
PrincipalData::EmailAlias(_) => true, PrincipalData::EmailAlias(_) => true,
PrincipalData::AppPassword(_) => !has_app_password,
PrincipalData::OtpAuth(_) => !has_otp_auth,
PrincipalData::Role(_) => !has_role, PrincipalData::Role(_) => !has_role,
PrincipalData::MemberOf(_) => !has_member_of, PrincipalData::MemberOf(_) => !has_member_of,
PrincipalData::DiskQuota(_) => !has_quota, PrincipalData::DiskQuota(_) => !has_quota,