implement account create

This commit is contained in:
Quentin 2023-12-08 19:06:12 +01:00
parent 532c99f3d3
commit 23f918fd0e
Signed by: quentin
GPG key ID: E9602264D639FF68
2 changed files with 79 additions and 12 deletions

View file

@ -1,5 +1,5 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::io::Read; use std::io::{Read, Write};
use std::net::SocketAddr; use std::net::SocketAddr;
use std::path::PathBuf; use std::path::PathBuf;
@ -131,6 +131,18 @@ pub struct UserEntry {
pub storage: StaticStorage, pub storage: StaticStorage,
} }
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct SetupEntry {
#[serde(default)]
pub email_addresses: Vec<String>,
#[serde(default)]
pub clear_password: Option<String>,
#[serde(flatten)]
pub storage: StaticStorage,
}
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(tag = "role")] #[serde(tag = "role")]
pub enum AnyConfig { pub enum AnyConfig {
@ -150,6 +162,16 @@ pub fn read_config<T: serde::de::DeserializeOwned>(config_file: PathBuf) -> Resu
Ok(toml::from_str(&config)?) Ok(toml::from_str(&config)?)
} }
pub fn write_config<T: Serialize>(config_file: PathBuf, config: &T) -> Result<()> {
let mut file = std::fs::OpenOptions::new()
.write(true)
.open(config_file.as_path())?;
file.write_all(toml::to_string(config)?.as_bytes())?;
Ok(())
}
fn default_mail_attr() -> String { fn default_mail_attr() -> String {
"mail".into() "mail".into()
} }

View file

@ -14,11 +14,12 @@ mod storage;
use std::path::PathBuf; use std::path::PathBuf;
use anyhow::Result; use anyhow::{bail, Result, Context};
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use config::*; use config::*;
use server::Server; use server::Server;
use login::{static_provider::*, *};
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[clap(author, version, about, long_about = None)] #[clap(author, version, about, long_about = None)]
@ -57,23 +58,28 @@ enum CompanionCommand {
enum ProviderCommand { enum ProviderCommand {
/// Runs the IMAP+LMTP server daemon /// Runs the IMAP+LMTP server daemon
Daemon, Daemon,
/// Reload the daemon
Reload, Reload,
/// Manage static accounts
#[clap(subcommand)] #[clap(subcommand)]
Account(AccountManagement), Account(AccountManagement),
} }
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
enum AccountManagement { enum AccountManagement {
/// Add an account
Add { Add {
#[clap(short, long)] #[clap(short, long)]
login: String, login: String,
#[clap(short, long)] #[clap(short, long)]
setup: PathBuf, setup: PathBuf,
}, },
/// Delete an account
Delete { Delete {
#[clap(short, long)] #[clap(short, long)]
login: String, login: String,
}, },
/// Change password for a given account
ChangePassword { ChangePassword {
#[clap(short, long)] #[clap(short, long)]
login: String login: String
@ -98,7 +104,7 @@ async fn main() -> Result<()> {
let args = Args::parse(); let args = Args::parse();
let any_config = read_config(args.config_file)?; let any_config = read_config(args.config_file)?;
match (args.command, any_config) { match (&args.command, any_config) {
(Command::Companion(subcommand), AnyConfig::Companion(config)) => match subcommand { (Command::Companion(subcommand), AnyConfig::Companion(config)) => match subcommand {
CompanionCommand::Daemon => { CompanionCommand::Daemon => {
let server = Server::from_companion_config(config).await?; let server = Server::from_companion_config(config).await?;
@ -112,7 +118,7 @@ async fn main() -> Result<()> {
}, },
CompanionCommand::Account(cmd) => { CompanionCommand::Account(cmd) => {
let user_file = config.users.user_list; let user_file = config.users.user_list;
account_management(cmd, user_file); account_management(&args.command, cmd, user_file)?;
} }
}, },
(Command::Provider(subcommand), AnyConfig::Provider(config)) => match subcommand { (Command::Provider(subcommand), AnyConfig::Provider(config)) => match subcommand {
@ -128,7 +134,7 @@ async fn main() -> Result<()> {
UserManagement::Static(conf) => conf.user_list, UserManagement::Static(conf) => conf.user_list,
UserManagement::Ldap(_) => panic!("LDAP account management is not supported from Aerogramme.") UserManagement::Ldap(_) => panic!("LDAP account management is not supported from Aerogramme.")
}; };
account_management(cmd, user_file); account_management(&args.command, cmd, user_file)?;
} }
}, },
(Command::Provider(_), AnyConfig::Companion(_)) => { (Command::Provider(_), AnyConfig::Companion(_)) => {
@ -142,16 +148,55 @@ async fn main() -> Result<()> {
Ok(()) Ok(())
} }
fn account_management(cmd: AccountManagement, users: PathBuf) { fn account_management(root: &Command, cmd: &AccountManagement, users: PathBuf) -> Result<()> {
let mut ulist: UserList = read_config(users.clone())?;
match cmd { match cmd {
Add => { AccountManagement::Add { login, setup } => {
unimplemented!(); tracing::debug!(user=login, "will-create");
}, let stp: SetupEntry = read_config(setup.clone())?;
Delete => { tracing::debug!(user=login, "loaded setup entry");
unimplemented!(); let crypto_root = match root {
}, Command::Provider(_) => CryptographyRoot::PasswordProtected,
ChangePassword => { Command::Companion(_) => {
unimplemented!(); // @TODO use keyring by default instead of inplace in the future
}, // @TODO generate keys
CryptographyRoot::InPlace {
master_key: "".to_string(),
secret_key: "".to_string(),
} }
}
};
let password = match stp.clear_password {
Some(pwd) => pwd,
None => {
let password = rpassword::prompt_password("Enter password: ")?;
let password_confirm = rpassword::prompt_password("Confirm password: ")?;
if password != password_confirm {
bail!("Passwords don't match.");
}
password
}
};
let hash = hash_password(password.as_str()).context("unable to hash password")?;
ulist.insert(login.clone(), UserEntry {
email_addresses: stp.email_addresses,
password: hash,
crypto_root,
storage: stp.storage,
});
write_config(users.clone(), &ulist)?;
},
AccountManagement::Delete { login } => {
unimplemented!();
},
AccountManagement::ChangePassword { login } => {
unimplemented!();
},
};
Ok(())
} }