diff --git a/src/cli/add_command.rs b/src/cli/add_command.rs index 8c3fa8d..07cd536 100644 --- a/src/cli/add_command.rs +++ b/src/cli/add_command.rs @@ -55,8 +55,9 @@ impl LprsCommand for Add { fn run(mut self, mut vault_manager: Vaults) -> LprsResult<()> { if !self.vault_info.is_empty() { 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.totp_secret = utils::user_secret(self.totp_secret, "TOTP Secret:")?; + 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:", false)?; self.vault_info.custom_fields = self.custom_fields.into_iter().collect(); vault_manager.add_vault(self.vault_info); vault_manager.try_export()?; diff --git a/src/cli/edit_command.rs b/src/cli/edit_command.rs index 81e3c88..8cf4a86 100644 --- a/src/cli/edit_command.rs +++ b/src/cli/edit_command.rs @@ -77,10 +77,10 @@ impl LprsCommand for Edit { vault.name = new_name; } 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() { - 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 { vault.username = Some(new_username); diff --git a/src/cli/export_command.rs b/src/cli/export_command.rs index dcebf62..65fbf8f 100644 --- a/src/cli/export_command.rs +++ b/src/cli/export_command.rs @@ -55,7 +55,7 @@ impl LprsCommand for Export { ); 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()); let exported_data = match self.format { diff --git a/src/cli/import_command.rs b/src/cli/import_command.rs index 4c11e8f..cce9bda 100644 --- a/src/cli/import_command.rs +++ b/src/cli/import_command.rs @@ -60,7 +60,7 @@ impl LprsCommand for Import { ); 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()); let imported_passwords_len = match self.format { diff --git a/src/utils.rs b/src/utils.rs index 5577a04..61b49ee 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -57,6 +57,7 @@ pub fn local_project_file(filename: &str) -> LprsResult { pub fn user_secret( secret: Option>, prompt_message: &str, + confirmation: bool, ) -> LprsResult> { Ok(match secret { None => None, @@ -64,11 +65,13 @@ pub fn user_secret( Some(None) => { log::debug!("User didn't provide a secret, prompting it"); Some( - Password::new(prompt_message) - .without_confirmation() - .with_formatter(&|p| "*".repeat(p.chars().count())) - .with_display_mode(PasswordDisplayMode::Masked) - .prompt()?, + Password { + enable_confirmation: confirmation, + ..Password::new(prompt_message) + .with_formatter(&|p| "*".repeat(p.chars().count())) + .with_display_mode(PasswordDisplayMode::Masked) + } + .prompt()?, ) } })