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

LDAP: Only set account name if not returned in LDAP query (#1471)

Browse Source
This commit is contained in:
mdecimus
2025-07-17 15:16:01 +02:00
parent 9e129e2406
commit 4f84533fa1
2 changed files with 193 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/directory/src/backend/ldap/lookup.rs
View File

@@ -33,7 +33,9 @@ impl LdapDirectory {
QueryBy::Name(username) => {
let filter = self.mappings.filter_name.build(username);
if let Some(mut result) = self.find_principal(&mut conn, &filter).await? {
result.principal.name = username.into();
if result.principal.name.is_empty() {
result.principal.name = username.into();
}
(result.principal, result.member_of, None)
} else {
trc::event!(
@@ -112,7 +114,9 @@ impl LdapDirectory {
match result {
Ok(Some(mut result)) => {
result.principal.name = username.into();
if result.principal.name.is_empty() {
result.principal.name = username.into();
}
(result.principal, result.member_of, None)
}
Err(err)
@@ -162,7 +166,9 @@ impl LdapDirectory {
.success()
.is_ok()
{
result.principal.name = username.into();
if result.principal.name.is_empty() {
result.principal.name = username.into();
}
(result.principal, result.member_of, None)
} else {
trc::event!(
@@ -185,7 +191,9 @@ impl LdapDirectory {
let filter = self.mappings.filter_name.build(username);
if let Some(mut result) = self.find_principal(&mut conn, &filter).await? {
if result.principal.verify_secret(secret).await? {
result.principal.name = username.into();
if result.principal.name.is_empty() {
result.principal.name = username.into();
}
(result.principal, result.member_of, None)
} else {
trc::event!(