using dialoguer for prompting new password

rustic-rs · Jun 24, 2023 · b1a006e · b1a006e
1 parent 1d3fee3
commit b1a006e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -109,6 +109,7 @@ merge = { workspace = true }
 directories = { workspace = true }
 nom = { workspace = true }
 rpassword = { workspace = true }
+dialoguer = "0.10.4"
 bytesize = { workspace = true }
 indicatif = { workspace = true }
 path-dedot = { workspace = true }

diff --git a/src/commands/init.rs b/src/commands/init.rs
@@ -8,7 +8,7 @@ use anyhow::{bail, Result};
 use crate::{commands::get_repository, Application, RUSTIC_APP};
 
 use bytes::Bytes;
-use rpassword::prompt_password;
+use dialoguer::Password;
 
 use rustic_core::{
     hash, random_poly, ConfigFile, DecryptBackend, DecryptWriteBackend, FileType, Id, Key, KeyFile,
@@ -81,28 +81,18 @@ pub(crate) fn save_config(
 
     let pass = password.map_or_else(
         || -> String {
-            let password_initial = match prompt_password("enter password for new key: ") {
-                Ok(password) => password,
-                Err(err) => {
-                    status_err!("{}", err);
-                    RUSTIC_APP.shutdown(Shutdown::Crash);
-                }
-            };
+            let password_result = Password::new().with_prompt("enter password for new key")
+                .with_confirmation("confirm password", "passwords do not match")
+                .interact();
 
-            let password_confirm = match prompt_password("confirm password: ") {
-                Ok(password) => password,
+            let password = match password_result {
+                Ok(it) => it,
                 Err(err) => {
                     status_err!("{}", err);
                     RUSTIC_APP.shutdown(Shutdown::Crash);
                 }
             };
-
-            if password_initial != password_confirm {
-                status_err!("Fatal: passwords do not match");
-                RUSTIC_APP.shutdown(Shutdown::Crash);
-            }
-
-            password_initial
+            password
         },
         |pass| pass,
     );

diff --git a/src/commands/key.rs b/src/commands/key.rs
@@ -12,7 +12,8 @@ use anyhow::Result;
 
 use std::{fs::File, io::BufReader};
 
-use rpassword::{prompt_password, read_password_from_bufread};
+use rpassword::read_password_from_bufread;
+use dialoguer::Password;
 
 use rustic_core::{hash, FileType, KeyFile, WriteBackend};
 
@@ -80,28 +81,18 @@ impl AddCmd {
 
         let pass = self.new_password_file.as_ref().map_or_else(
             || -> String {
-                let password_initial = match prompt_password("enter password for new key: ") {
-                    Ok(password) => password,
-                    Err(err) => {
-                        status_err!("{}", err);
-                        RUSTIC_APP.shutdown(Shutdown::Crash);
-                    }
-                };
-
-                let password_confirm = match prompt_password("confirm password: ") {
-                    Ok(password) => password,
+                let password_result = Password::new().with_prompt("enter password for new key")
+                    .with_confirmation("confirm password", "passwords do not match")
+                    .interact();
+
+                let password = match password_result {
+                    Ok(it) => it,
                     Err(err) => {
                         status_err!("{}", err);
                         RUSTIC_APP.shutdown(Shutdown::Crash);
                     }
                 };
-
-                if password_initial != password_confirm {
-                    status_err!("Fatal: passwords do not match");
-                    RUSTIC_APP.shutdown(Shutdown::Crash);
-                }
-
-                password_initial
+                password
             },
             |file| {
                 let mut file = BufReader::new(match File::open(file) {