Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 4 Wiki Activity

rework static login provider

Browse source
This commit is contained in:
Quentin 2023-12-08 18:13:00 +01:00
parent cf18eb8afb
commit 532c99f3d3
Signed by: quentin
GPG key ID: E9602264D639FF68
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config.rs
View file

@ -124,6 +124,7 @@ pub struct UserEntry {
pub email_addresses: Vec<String>, pub email_addresses: Vec<String>,
pub password: String, pub password: String,
#[serde(flatten)]
pub crypto_root: CryptographyRoot, pub crypto_root: CryptographyRoot,
#[serde(flatten)] #[serde(flatten)]

20
src/login/static_provider.rs
View file

@ -19,12 +19,17 @@ pub struct StaticLoginProvider {
impl StaticLoginProvider { impl StaticLoginProvider {
pub fn new(config: LoginStaticConfig) -> Result<Self> { pub fn new(config: LoginStaticConfig) -> Result<Self> {
let mut lp = Self { let mut lp = Self {
user_list: config.user_list, user_list: config.user_list.clone(),
users: HashMap::new(), users: HashMap::new(),
users_by_email: HashMap::new(), users_by_email: HashMap::new(),
}; };
lp.update_user_list(); lp
.update_user_list()
.context(
format!(
"failed to read {:?}, make sure it exists and it's correctly formatted",
config.user_list))?;
Ok(lp) Ok(lp)
} }
@ -32,17 +37,18 @@ impl StaticLoginProvider {
pub fn update_user_list(&mut self) -> Result<()> { pub fn update_user_list(&mut self) -> Result<()> {
let ulist: UserList = read_config(self.user_list.clone())?; let ulist: UserList = read_config(self.user_list.clone())?;
let users = ulist self.users = ulist
.into_iter() .into_iter()
.map(|(k, v)| (k, Arc::new(v))) .map(|(k, v)| (k, Arc::new(v)))
.collect::<HashMap<_, _>>(); .collect::<HashMap<_, _>>();
let mut users_by_email = HashMap::new();
for (_, u) in users.iter() { self.users_by_email.clear();
for (_, u) in self.users.iter() {
for m in u.email_addresses.iter() { for m in u.email_addresses.iter() {
if users_by_email.contains_key(m) { if self.users_by_email.contains_key(m) {
bail!("Several users have same email address: {}", m); bail!("Several users have same email address: {}", m);
} }
users_by_email.insert(m.clone(), u.clone()); self.users_by_email.insert(m.clone(), u.clone());
} }
} }
Ok(()) Ok(())