feat: update

Cargo.lock

@@ -2198,6 +2198,7 @@ dependencies = [
  "x509-parser",
  "yubico_manager",
  "yubikey",
+ "zeroize",
 ]
 
 [[package]]

Cargo.toml

@@ -30,6 +30,7 @@ simpledateformat = "0.1.4"
 x509-parser = "0.15.1"
 yubico_manager = "0.9.0"
 yubikey = { version = "0.8.0", features = ["untested"] }
+zeroize = "1.6.0"
 
 [profile.release]
 codegen-units = 1

src/cmd_decrypt.rs

@@ -1,4 +1,3 @@
-use std::fs;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::PathBuf;
@@ -46,16 +45,13 @@ pub fn decrypt(cmd_decrypt: CmdDecrypt) -> XResult<()> {
 
 pub fn decrypt_single(path: &PathBuf, pin: &Option<String>, slot: &Option<String>) -> XResult<()> {
     let path_display = format!("{}", path.display());
-    if !path_display.ends_with(TINY_ENC_FILE_EXT) {
+    util::require_tiny_enc_file_and_exists(path)?;
-        return simple_error!("File is not tiny encrypt file: {}", &path_display);
+
-    }
     let mut file_in = opt_result!(File::open(path), "Open file: {} failed: {}", &path_display);
     let meta = opt_result!(file::read_tiny_encrypt_meta_and_normalize(&mut file_in), "Read file: {}, failed: {}", &path_display);
 
     let path_out = &path_display[0..path_display.len() - TINY_ENC_FILE_EXT.len()];
-    if let Ok(_) = fs::metadata(path_out) {
+    util::require_file_not_exists(path_out)?;
-        return simple_error!("Output file: {} exists", path_out);
-    }
 
     debugging!("Found meta: {}", serde_json::to_string_pretty(&meta).unwrap());
     let selected_envelop = select_envelop(&meta)?;
@@ -69,6 +65,8 @@ pub fn decrypt_single(path: &PathBuf, pin: &Option<String>, slot: &Option<String
     let mut file_out = File::create(path_out)?;
     let _ = decrypt_file(&mut file_in, &mut file_out, &key, &nonce, meta.compress)?;
 
+    util::zeroize(key);
+    util::zeroize(nonce);
     Ok(())
 }
 

src/util.rs

@@ -1,14 +1,42 @@
-use std::io;
+use std::{fs, io};
 use std::io::Write;
+use std::path::{Path, PathBuf};
 
 use base64::Engine;
 use base64::engine::general_purpose;
-use rust_util::{warning, XResult};
+use rust_util::{opt_result, simple_error, warning, XResult};
+use zeroize::Zeroize;
 
 pub const ENC_AES256_GCM_P256: &str = "aes256-gcm-p256";
 pub const TINY_ENC_FILE_EXT: &str = ".tinyenc";
 pub const TINY_ENC_CONFIG_FILE: &str = "~/.tinyencrypt/config-rs.json";
 
+pub fn require_tiny_enc_file_and_exists(path: impl AsRef<Path>) -> XResult<()> {
+    let path = path.as_ref();
+    let path_display = format!("{}", path.display());
+    if !path_display.ends_with(TINY_ENC_FILE_EXT) {
+        return simple_error!("File is not tiny encrypt file: {}", &path_display);
+    }
+    require_file_exists(path)?;
+    Ok(())
+}
+
+pub fn require_file_exists(path: impl AsRef<Path>) -> XResult<()> {
+    let path = path.as_ref();
+    match fs::metadata(path) {
+        Ok(_) => Ok(()),
+        Err(e) => simple_error!("File: {} not exists", path.display()),
+    }
+}
+
+pub fn require_file_not_exists(path: impl AsRef<Path>) -> XResult<()> {
+    let path = path.as_ref();
+    match fs::metadata(path) {
+        Ok(_) => simple_error!("File: {} exists", path.display()),
+        Err(_) => Ok(()),
+    }
+}
+
 pub fn simple_kdf(input: &[u8]) -> Vec<u8> {
     let input = hex::decode(sha256::digest(input)).unwrap();
     let input = hex::decode(sha256::digest(input)).unwrap();
@@ -80,3 +108,8 @@ pub fn get_user_agent() -> String {
             }
     )
 }
+
+pub fn zeroize(object: impl Zeroize) {
+    let mut object = object;
+    object.zeroize();
+}