cinderella

commit 7386e6ce8c70dd5f643fed651e9ce918b606df31
parent 8c00336267510d6336c665104df8db97c86f4a9a
Author: Stefan Koch <programming@stefan-koch.name>
Date:   Sun,  8 Dec 2019 13:09:11 +0100

catch error when crypto file does not exist

Diffstat:
M
src/crypto.rs
 | 
26
+++++++++++++++++++++-----

1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/crypto.rs b/src/crypto.rs
@@ -56,18 +56,25 @@ pub fn encrypt_string(plaintext: &str, password: &str) -> Vec<u8> {
 }
 
 pub fn decrypt_file(filepath: &Path, password: &str) -> Result<String, ()> {
-    let r = File::open(filepath).unwrap();
-    let f: CryptoFile = rmp_serde::from_read(r).unwrap();
-    let salted_key = gen_salted_key(password, f.pwsalt);
+    let r = File::open(filepath);
 
-    secretbox::open(&f.content, &f.nonce, &salted_key.key)
-        .map(|bytes| String::from_utf8(bytes).unwrap())
+    match r {
+        Err(_) => Err(()),
+        Ok(r) => {
+            let f: CryptoFile = rmp_serde::from_read(r).unwrap();
+            let salted_key = gen_salted_key(password, f.pwsalt);
+
+            secretbox::open(&f.content, &f.nonce, &salted_key.key)
+                .map(|bytes| String::from_utf8(bytes).unwrap())
+        },
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use std::io::Write;
+    use std::path::PathBuf;
     use tempfile::NamedTempFile;
 
     #[test]
@@ -85,4 +92,13 @@ mod tests {
 
         assert_eq!(plaintext, decrypted);
     }
+
+    #[test]
+    fn test_decrypt_with_missing_file() {
+        let path = PathBuf::from("/tmp/something/that/does/not/exist");
+
+        let result = decrypt_file(&path, "");
+
+        assert!(result.is_err(), "decrypting missing file should return err");
+    }
 }