Fix secret padding parsing, fix warnings

Author: replydev

src/argument_functions.rs

@@ -38,8 +38,15 @@ pub fn import(args: Vec<String>){
                 return;
             }
         }
-        database_loader::overwrite_database(elements);
-        println!("Successfully imported database");
+        
+        match database_loader::overwrite_database(elements){
+            Ok(()) => {
+                println!("Successfully imported database");
+            },
+            Err(e) => {
+                println!("An error occurred during database overwriting: {}",e);
+            }
+        }
     }
     else{
         println!("Invalid arguments, type cotp --import [APPNAME] [PATH]");

src/cryptograpy.rs

@@ -28,10 +28,8 @@ fn argon_derive_key(key: &mut[u8;32],password_bytes: &[u8],salt: &pwhash::argon2
         pwhash::argon2id13::OPSLIMIT_INTERACTIVE,
         pwhash::argon2id13::MEMLIMIT_INTERACTIVE);
     match result{
-        Ok(&[u8]) => Ok(Key(*key)),
-        Ok(&[]) => Ok(Key(*key)),
-        Ok(&[_,_,..]) =>Ok(Key(*key)),
-        Err(()) => Err(String::from("Failed to derive encryption key"))
+        Err(()) => Err(String::from("Failed to derive encryption key")),
+        _=> Ok(Key(*key)),
     }
 }
 

src/database_loader.rs

@@ -84,7 +84,7 @@ pub fn read_from_file() -> Result<Vec<OTPElement>,String>{
 
 pub fn check_secret(secret: &str) -> bool{
     //only uppercase characters and numbers
-    let upper_secret = secret.to_uppercase();
+    let upper_secret = secret.to_uppercase().replace("=", "");
     return upper_secret.chars().all(char::is_alphanumeric);
 }
 
@@ -99,8 +99,10 @@ pub fn add_element(secret: &String,issuer: &String,label: &String) -> Result<(),
         Err(e) => return Err(e)
     }
     elements.push(otp_element);
-    overwrite_database(elements);
-    Ok(())
+    match overwrite_database(elements){
+        Ok(()) => Ok(()),
+        Err(e) => Err(format!("{}",e))
+    }
 }
 
 pub fn remove_element_from_db(mut id: usize) -> Result<(),String>{
@@ -127,8 +129,10 @@ pub fn remove_element_from_db(mut id: usize) -> Result<(),String>{
                     break;
                 }
             }
-            overwrite_database(elements);
-            Ok(())
+            match overwrite_database(elements){
+                Ok(()) => Ok(()),
+                Err(e) => Err(format!("{}",e)),
+            }
         },
         Err(e) => Err(e)
     } 
@@ -162,8 +166,10 @@ pub fn edit_element(mut id: usize, secret: &str,issuer: &str,label: &str) -> Res
                     break;
                 }
             }
-            overwrite_database(elements);
-            Ok(())
+            match overwrite_database(elements){
+                Ok(()) => Ok(()),
+                Err(e) => Err(format!("{}",e)),
+            }
         },
         Err(e) => Err(e)
     }

src/importers/aegis.rs

@@ -5,31 +5,31 @@ use serde::Deserialize;
 
 #[derive(Deserialize)]
 struct AegisJson{
-    version: u64,
-    header: AegisHeader,
+    //version: u64,
+    //header: AegisHeader,
     db: AegisDb,
 }
 
 #[derive(Deserialize)]
 struct AegisHeader{
-    slots: Option<String>,
-    params: Option<String>,
+    //slots: Option<String>,
+    //params: Option<String>,
 }
 
 #[derive(Deserialize)]
 struct AegisDb{
-    version: u64,
+    //version: u64,
     entries: Vec<AegisElement>,
 }
 
 #[derive(Deserialize)]
 struct AegisElement{
     #[serde(rename = "type")]
     _type: String,
-    uuid: String,
+    //uuid: String,
     name: String,
     issuer: String,
-    icon: Option<String>,
+    //icon: Option<String>,
     info: AegisInfo,
 }
 

src/main.rs

@@ -31,15 +31,19 @@ fn init() -> Result<(), String>{
         _=> {},
     }
     match utils::create_db_if_needed() {
-        Ok(()) => {},
+        Ok(value) => {
+            if value {
+                match database_loader::overwrite_database_json("[]"){
+                    Ok(()) => return Ok(()),
+                    Err(_e) => return Err(String::from("An error occurred during database overwriting")),
+                }
+            }
+            Ok(())
+        },
         Err(()) => {
             return Err(String::from("An error occurred during database creation"));
         },
     }
-    match database_loader::overwrite_database_json("[]"){
-        Ok(()) => Ok(()),
-        Err(_e) => Err(String::from("An error occurred during database overwriting")),
-    }
 }
 
 fn main() {

src/utils.rs

@@ -1,9 +1,8 @@
 use std::fs::{File};
 use std::io::prelude::*;
-use std::path::{Path,PathBuf};
+use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
 use dirs::home_dir;
-use crate::database_loader;
 
 #[cfg(debug_assertions)]
 pub fn get_db_path() -> PathBuf{
@@ -26,22 +25,22 @@ fn get_cotp_folder() -> PathBuf{
     cotp_dir.join(".cotp")
 }
 
-pub fn create_db_if_needed() -> Result<(),()>{
+pub fn create_db_if_needed() -> Result<bool,()>{
     let cotp_folder = get_cotp_folder();
     if !cotp_folder.exists(){
         match std::fs::create_dir(cotp_folder){
-            Ok(()) => println!("Created .cotp folder"),
-            Err(_e) => (),
+            Ok(()) => {},
+            Err(_e) => {},
         }
     }
     let db_path = get_db_path();
     if !db_path.exists() {
         match std::fs::File::create(db_path){
-            Ok(_f) => return Ok(()),
+            Ok(_f) => return Ok(true),
             Err(_e) => return Err(()),
         }
     }
-    Ok(())
+    Ok(false)
 }
 
 pub fn write_to_file(content: &str, file: &mut File) -> Result<(),std::io::Error>{