feat: Support changing master password #50

Merged
awiteb merged 2 commits from awiteb/feat-change-master-password into master 2024-05-16 22:41:21 +02:00 AGit
5 changed files with 15 additions and 11 deletions
Showing only changes of commit 74a42d9813 - Show all commits

View file

@ -55,8 +55,9 @@ impl LprsCommand for Add {
fn run(mut self, mut vault_manager: Vaults) -> LprsResult<()> { fn run(mut self, mut vault_manager: Vaults) -> LprsResult<()> {
if !self.vault_info.is_empty() { if !self.vault_info.is_empty() {
self.vault_info.name = self.vault_info.name.trim().to_string(); self.vault_info.name = self.vault_info.name.trim().to_string();
self.vault_info.password = utils::user_secret(self.password, "Vault password:")?; self.vault_info.password = utils::user_secret(self.password, "Vault password:", false)?;
self.vault_info.totp_secret = utils::user_secret(self.totp_secret, "TOTP Secret:")?; self.vault_info.totp_secret =
utils::user_secret(self.totp_secret, "TOTP Secret:", false)?;
self.vault_info.custom_fields = self.custom_fields.into_iter().collect(); self.vault_info.custom_fields = self.custom_fields.into_iter().collect();
vault_manager.add_vault(self.vault_info); vault_manager.add_vault(self.vault_info);
vault_manager.try_export()?; vault_manager.try_export()?;

View file

@ -77,10 +77,10 @@ impl LprsCommand for Edit {
vault.name = new_name; vault.name = new_name;
} }
if self.password.is_some() { if self.password.is_some() {
vault.password = utils::user_secret(self.password, "New vault password:")?; vault.password = utils::user_secret(self.password, "New vault password:", false)?;
} }
if self.totp_secret.is_some() { if self.totp_secret.is_some() {
vault.totp_secret = utils::user_secret(self.totp_secret, "TOTP Secret:")?; vault.totp_secret = utils::user_secret(self.totp_secret, "TOTP Secret:", false)?;
} }
if let Some(new_username) = self.username { if let Some(new_username) = self.username {
vault.username = Some(new_username); vault.username = Some(new_username);

View file

@ -55,7 +55,7 @@ impl LprsCommand for Export {
); );
let encryption_key: Option<[u8; 32]> = let encryption_key: Option<[u8; 32]> =
utils::user_secret(self.encryption_password, "Encryption Password:")? utils::user_secret(self.encryption_password, "Encryption Password:", false)?
.map(|p| sha2::Sha256::digest(p).into()); .map(|p| sha2::Sha256::digest(p).into());
let exported_data = match self.format { let exported_data = match self.format {

View file

@ -60,7 +60,7 @@ impl LprsCommand for Import {
); );
let decryption_key: Option<[u8; 32]> = let decryption_key: Option<[u8; 32]> =
utils::user_secret(self.decryption_password, "Decryption password:")? utils::user_secret(self.decryption_password, "Decryption password:", false)?
.map(|p| sha2::Sha256::digest(p).into()); .map(|p| sha2::Sha256::digest(p).into());
let imported_passwords_len = match self.format { let imported_passwords_len = match self.format {

View file

@ -57,6 +57,7 @@ pub fn local_project_file(filename: &str) -> LprsResult<PathBuf> {
pub fn user_secret( pub fn user_secret(
secret: Option<Option<String>>, secret: Option<Option<String>>,
prompt_message: &str, prompt_message: &str,
confirmation: bool,
) -> LprsResult<Option<String>> { ) -> LprsResult<Option<String>> {
Ok(match secret { Ok(match secret {
None => None, None => None,
@ -64,11 +65,13 @@ pub fn user_secret(
Some(None) => { Some(None) => {
log::debug!("User didn't provide a secret, prompting it"); log::debug!("User didn't provide a secret, prompting it");
Some( Some(
Password::new(prompt_message) Password {
.without_confirmation() enable_confirmation: confirmation,
.with_formatter(&|p| "*".repeat(p.chars().count())) ..Password::new(prompt_message)
.with_display_mode(PasswordDisplayMode::Masked) .with_formatter(&|p| "*".repeat(p.chars().count()))
.prompt()?, .with_display_mode(PasswordDisplayMode::Masked)
}
.prompt()?,
) )
} }
}) })