aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2023-12-21 16:38:15 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2023-12-21 16:38:15 +0100
commite3b11ad1d8249719045329d94f775402aa4ba302 (patch)
tree102efb97275f9279c30022069ff189b93a0eccfe
parente9aabe8e82e3c3a8190c0224cd1fdf2fc4d2505a (diff)
downloadaerogramme-e3b11ad1d8249719045329d94f775402aa4ba302.tar.gz
aerogramme-e3b11ad1d8249719045329d94f775402aa4ba302.zip
fix how mem storage is created
-rw-r--r--src/login/ldap_provider.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/login/ldap_provider.rs b/src/login/ldap_provider.rs
index 009605d..a7f56e4 100644
--- a/src/login/ldap_provider.rs
+++ b/src/login/ldap_provider.rs
@@ -20,6 +20,7 @@ pub struct LdapLoginProvider {
crypto_root_attr: String,
storage_specific: StorageSpecific,
+ in_memory_store: storage::in_memory::MemDb,
}
enum BucketSource {
@@ -82,14 +83,15 @@ impl LdapLoginProvider {
mail_attr: config.mail_attr,
crypto_root_attr: config.crypto_root_attr,
storage_specific: specific,
+ in_memory_store: storage::in_memory::MemDb::new(),
})
}
- fn storage_creds_from_ldap_user(&self, user: &SearchEntry) -> Result<Builder> {
+ async fn storage_creds_from_ldap_user(&self, user: &SearchEntry) -> Result<Builder> {
let storage: Builder = match &self.storage_specific {
- StorageSpecific::InMemory => storage::in_memory::MemBuilder::new(
+ StorageSpecific::InMemory => self.in_memory_store.builder(
&get_attr(user, &self.username_attr)?
- ),
+ ).await,
StorageSpecific::Garage { from_config, bucket_source } => {
let aws_access_key_id = get_attr(user, &from_config.aws_access_key_id_attr)?;
let aws_secret_access_key = get_attr(user, &from_config.aws_secret_access_key_attr)?;
@@ -166,7 +168,7 @@ impl LoginProvider for LdapLoginProvider {
let keys = cr.crypto_keys(password)?;
// storage
- let storage = self.storage_creds_from_ldap_user(&user)?;
+ let storage = self.storage_creds_from_ldap_user(&user).await?;
drop(ldap);
@@ -214,7 +216,7 @@ impl LoginProvider for LdapLoginProvider {
let public_key = cr.public_key()?;
// storage
- let storage = self.storage_creds_from_ldap_user(&user)?;
+ let storage = self.storage_creds_from_ldap_user(&user).await?;
drop(ldap);
Ok(PublicCredentials {