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

Fixed SQL secrets directory query

Browse Source
This commit is contained in:
mdecimus
2025-03-20 09:41:27 +01:00
parent 552347b792
commit c0eb3a5ae8
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
crates/directory/src/backend/sql/lookup.rs
View File

@@ -9,15 +9,15 @@ use store::{NamedRows, Rows, Value};
use trc::AddContext;
use crate::{
Principal, QueryBy, ROLE_ADMIN, ROLE_USER, Type,
backend::{
RcptType,
internal::{
PrincipalField, PrincipalValue,
lookup::DirectoryStore,
manage::{self, ManageDirectory, UpdatePrincipal},
PrincipalField, PrincipalValue,
},
RcptType,
},
Principal, QueryBy, Type, ROLE_ADMIN, ROLE_USER,
};
use super::{SqlDirectory, SqlMappings};
@@ -89,17 +89,43 @@ impl SqlDirectory {
)
.caused_by(trc::location!())?
{
Some(principal)
Some(mut principal) => {
// Obtain secrets
if !self.mappings.query_secrets.is_empty() {
let secrets = self
.sql_store
.sql_query::<Rows>(
&self.mappings.query_secrets,
vec![username.into()],
)
.await
.caused_by(trc::location!())?;
if !secrets.rows.is_empty() {
principal.set(
PrincipalField::Secrets,
PrincipalValue::StringList(secrets.into()),
);
}
}
if principal
.verify_secret(secret)
.await
.caused_by(trc::location!())? =>
{
(
Some(principal.with_field(PrincipalField::Name, username.to_string())),
None,
)
.caused_by(trc::location!())?
{
(
Some(
principal
.with_field(PrincipalField::Name, username.to_string()),
),
None,
)
} else {
(None, None)
}
}
_ => (None, None),
}
}
@@ -152,23 +178,6 @@ impl SqlDirectory {
);
}
// Obtain secrets
if !self.mappings.query_secrets.is_empty() {
external_principal.set(
PrincipalField::Secrets,
PrincipalValue::StringList(
self.sql_store
.sql_query::<Rows>(
&self.mappings.query_secrets,
vec![external_principal.name().into()],
)
.await
.caused_by(trc::location!())?
.into(),
),
);
}
// Obtain account ID if not available
let mut principal = if let Some(stored_principal) = stored_principal {
stored_principal