Merge pull request #172 from replydev/fix/refactors

Fix/refactors

Author: replydev

src/argument_functions.rs

@@ -17,7 +17,7 @@ pub fn import(matches: &ArgMatches, database: &mut OTPDatabase) -> Result<String
     } else if matches.get_flag("aegis") {
         importers::aegis::import(path)
     } else if matches.get_flag("aegis-encrypted") {
-        let mut password = utils::prompt_for_passwords("Insert your Aegis password: ", 0, false);
+        let mut password = utils::password("Insert your Aegis password: ", 0);
         let result = importers::aegis_encrypted::import(path, password.as_str());
         password.zeroize();
         result
@@ -94,7 +94,7 @@ fn get_from_args(matches: &ArgMatches) -> Result<OTPElement, String> {
 
 pub fn edit(matches: &ArgMatches, database: &mut OTPDatabase) -> Result<String, String> {
     let mut secret = match matches.get_flag("change-secret") {
-        true => Some(utils::prompt_for_passwords("Insert the secret: ", 0, false)),
+        true => Some(rpassword::prompt_password("Insert the secret: ").unwrap()),
         false => None,
     };
 
@@ -150,7 +150,7 @@ pub fn export(matches: &ArgMatches, database: &mut OTPDatabase) -> Result<String
 }
 
 pub fn change_password(database: &mut OTPDatabase) -> Result<String, String> {
-    let mut new_password = utils::prompt_for_passwords("New password: ", 8, true);
+    let mut new_password = utils::verified_password("New password: ", 8);
     let r = match database.save_with_pw(&new_password) {
         Ok(()) => Ok(String::from("Password changed")),
         Err(e) => Err(format!("An error has occurred: {}", e)),

src/interface/app.rs

@@ -36,10 +36,14 @@ pub struct App {
     pub(crate) current_page: Page,
     pub(crate) search_query: String,
     pub(crate) focus: Focus,
-    pub(crate) popup_text: String,
-    pub(crate) popup_action: PopupAction,
-    pub(crate) popup_percent_x: u16,
-    pub(crate) popup_percent_y: u16,
+    pub(crate) popup: Popup,
+}
+
+pub struct Popup {
+    pub(crate) text: String,
+    pub(crate) action: PopupAction,
+    pub(crate) percent_x: u16,
+    pub(crate) percent_y: u16,
 }
 
 impl App {
@@ -59,10 +63,12 @@ impl App {
             current_page: Main,
             search_query: String::from(""),
             focus: Focus::MainPage,
-            popup_text: String::from(""),
-            popup_action: PopupAction::EditOtp,
-            popup_percent_x: 60,
-            popup_percent_y: 20,
+            popup: Popup {
+                text: String::from(""),
+                action: PopupAction::EditOtp,
+                percent_x: 60,
+                percent_y: 20,
+            },
         }
     }
 
@@ -178,19 +184,23 @@ impl App {
         self.render_table_box(frame, rects[1]);
         frame.render_widget(progress_bar, rects[2]);
         if self.focus == Focus::Popup {
-            let block = Block::default().title("Alert").borders(Borders::ALL);
-            let paragraph = Paragraph::new(&*self.popup_text)
-                .block(block)
-                .alignment(Alignment::Center)
-                .wrap(Wrap { trim: true });
-            let area = centered_rect(self.popup_percent_x, self.popup_percent_y, frame.size());
-            frame.render_widget(Clear, area); //this clears out the background
-            frame.render_widget(paragraph, area);
+            self.render_alert(frame);
         }
     }
 
+    fn render_alert<B: Backend>(&mut self, frame: &mut Frame<'_, B>) {
+        let block = Block::default().title("Alert").borders(Borders::ALL);
+        let paragraph = Paragraph::new(&*self.popup.text)
+            .block(block)
+            .alignment(Alignment::Center)
+            .wrap(Wrap { trim: true });
+        let area = centered_rect(self.popup.percent_x, self.popup.percent_y, frame.size());
+        frame.render_widget(Clear, area);
+        //this clears out the background
+        frame.render_widget(paragraph, area);
+    }
+
     fn render_table_box<B: Backend>(&mut self, frame: &mut Frame<'_, B>, area: Rect) {
-        // TODO If terminal is too little do not show info box
         let constraints = if self.is_large_application(frame) {
             vec![Constraint::Percentage(80), Constraint::Percentage(20)]
         } else {

src/interface/handler.rs

@@ -5,6 +5,7 @@ use crate::interface::enums::Page::*;
 use crate::otp::otp_type::OTPType;
 use crate::utils::{copy_string_to_clipboard, CopyType};
 
+use super::app::Popup;
 use super::enums::Page;
 use super::enums::{Focus, PopupAction};
 
@@ -19,12 +20,12 @@ pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
 }
 
 fn popup_handler(key_event: KeyEvent, app: &mut App) {
-    match app.popup_action {
+    match app.popup.action {
         PopupAction::EditOtp => todo!(),
         PopupAction::DeleteOtp => match key_event.code {
             KeyCode::Char('y') | KeyCode::Char('Y') => {
                 if let Err(e) = delete_selected_code(app) {
-                    app.popup_text = e;
+                    app.popup.text = e;
                     return;
                 }
                 app.focus = Focus::MainPage;
@@ -108,10 +109,12 @@ fn main_handler(key_event: KeyEvent, app: &mut App) {
             } else if app.table.state.selected().is_some() {
                 // Ask the user if he wants to delete the OTP Code
                 show_popup(
-                    String::from("Do you want to delete the selected OTP Code? [Y/N]"),
-                    60,
-                    20,
-                    PopupAction::DeleteOtp,
+                    Popup {
+                        text: String::from("Do you want to delete the selected OTP Code? [Y/N]"),
+                        percent_x: 60,
+                        percent_y: 20,
+                        action: PopupAction::DeleteOtp,
+                    },
                     app,
                 )
             }
@@ -161,7 +164,15 @@ fn main_handler(key_event: KeyEvent, app: &mut App) {
             q, CTRL-D, Esc -> Exit the application
             ",
             );
-            show_popup(info_text, 40, 50, PopupAction::GeneralInfo, app);
+            show_popup(
+                Popup {
+                    text: info_text,
+                    percent_x: 40,
+                    percent_y: 50,
+                    action: PopupAction::GeneralInfo,
+                },
+                app,
+            );
         }
 
         KeyCode::Char('f') | KeyCode::Char('F') => {
@@ -304,21 +315,20 @@ fn search_and_select(app: &mut App) {
     // TODO Handle if no search results
 }
 
-fn show_popup(text: String, percent_x: u16, percent_y: u16, action: PopupAction, app: &mut App) {
+fn show_popup(popup: Popup, app: &mut App) {
     app.focus = Focus::Popup;
-    app.popup_percent_x = percent_x;
-    app.popup_percent_y = percent_y;
-    app.popup_text = text;
-    app.popup_action = action;
+    app.popup = popup;
 }
 
 fn handle_exit(app: &mut App) {
     if app.database.is_modified() {
         show_popup(
-            String::from("Do you want to save your chages? [Y/N]"),
-            60,
-            20,
-            PopupAction::SaveBeforeQuit,
+            Popup {
+                text: String::from("Do you want to save your chages? [Y/N]"),
+                percent_x: 60,
+                percent_y: 20,
+                action: PopupAction::SaveBeforeQuit,
+            },
             app,
         )
     } else {

src/main.rs

@@ -21,10 +21,11 @@ mod reading;
 mod utils;
 
 fn init() -> Result<ReadResult, String> {
-    match utils::create_db_if_needed() {
-        Ok(needs_creation) => {
-            if needs_creation {
-                let mut pw = utils::prompt_for_passwords("Choose a password: ", 8, true);
+    match utils::init_app() {
+        Ok(first_run) => {
+            if first_run {
+                // Let's initialize the database file
+                let mut pw = utils::verified_password("Choose a password: ", 8);
                 let mut database = OTPDatabase {
                     version: CURRENT_DATABASE_VERSION,
                     elements: vec![],

src/otp/algorithms/hotp_maker.rs

@@ -15,9 +15,9 @@ use sha2::{Sha256, Sha512};
 use crate::otp::otp_algorithm::OTPAlgorithm;
 
 pub fn hotp(secret: &str, algorithm: OTPAlgorithm, counter: u64) -> Result<u32, String> {
-    match algorithm.to_string().to_uppercase().as_str() {
-        "SHA256" => generate_hotp::<Sha256>(secret, counter),
-        "SHA512" => generate_hotp::<Sha512>(secret, counter),
+    match algorithm {
+        OTPAlgorithm::Sha256 => generate_hotp::<Sha256>(secret, counter),
+        OTPAlgorithm::Sha512 => generate_hotp::<Sha512>(secret, counter),
         _ => generate_hotp::<Sha1>(secret, counter),
     }
 }

src/reading.rs

@@ -8,7 +8,7 @@ use zeroize::Zeroize;
 pub type ReadResult = (OTPDatabase, Vec<u8>, Vec<u8>);
 
 pub fn get_elements() -> Result<ReadResult, String> {
-    let mut pw = utils::prompt_for_passwords("Password: ", 8, false);
+    let mut pw = utils::password("Password: ", 8);
     let (elements, key, salt) = match read_from_file(&pw) {
         Ok((result, key, salt)) => (result, key, salt),
         Err(e) => return Err(format!("Cannot decrypt existing database: {}", e)),

src/utils.rs

@@ -4,7 +4,6 @@ use copypasta_ext::x11_fork::ClipboardContext;
 use crossterm::style::Print;
 #[cfg(not(debug_assertions))]
 use dirs::home_dir;
-use std::fs::File;
 use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
 use std::{env, io};
@@ -46,24 +45,19 @@ pub fn get_default_db_path() -> PathBuf {
     .join(".cotp/db.cotp")
 }
 
-pub fn create_db_if_needed() -> Result<bool, ()> {
+pub fn init_app() -> Result<bool, ()> {
     let db_path = get_db_path();
     let db_dir = db_path.parent().unwrap();
     if !db_dir.exists() {
-        if let Err(_e) = std::fs::create_dir(db_dir) {
+        if let Err(_e) = std::fs::create_dir_all(db_dir) {
             return Err(());
         }
+        return Ok(true);
     }
-    if !db_path.exists() {
-        return match File::create(db_path) {
-            Ok(_f) => Ok(true),
-            Err(_e) => Err(()),
-        };
-    }
-    Ok(false)
+    Ok(!db_path.exists())
 }
 
-pub fn delete_db() -> std::io::Result<()> {
+pub fn delete_db() -> io::Result<()> {
     std::fs::remove_file(get_db_path())
 }
 
@@ -78,26 +72,30 @@ pub fn percentage() -> u16 {
     (millis_before_next_step() * 100 / 30000) as u16
 }
 
-pub fn prompt_for_passwords(message: &str, minimum_password_length: usize, verify: bool) -> String {
-    let mut password;
+pub fn password(message: &str, minimum_length: usize) -> String {
     loop {
-        password = rpassword::prompt_password(message).unwrap();
-        if verify {
-            let verify_password = rpassword::prompt_password("Retype the same password: ").unwrap();
-            if password != verify_password {
-                println!("Passwords do not match");
-                continue;
-            }
+        let password = rpassword::prompt_password(message).unwrap();
+        if password.chars().count() < minimum_length {
+            println!(
+                "Please insert a password with at least {} digits.",
+                minimum_length
+            );
+            continue;
         }
-        if password.chars().count() >= minimum_password_length {
-            break;
+        return password;
+    }
+}
+
+pub fn verified_password(message: &str, minimum_length: usize) -> String {
+    loop {
+        let password = password(message, minimum_length);
+        let verify_password = rpassword::prompt_password("Retype the same password: ").unwrap();
+        if password != verify_password {
+            println!("Passwords do not match");
+            continue;
         }
-        println!(
-            "Please insert a password with at least {} digits.",
-            minimum_password_length
-        );
+        return password;
     }
-    password
 }
 
 fn in_ssh_shell() -> bool {