Fix up blank password validation and remove exit message

packages/ciphernode/cipher/src/password_manager.rs

@@ -117,9 +117,13 @@ impl PasswordManager for FilePasswordManager {
     async fn set_key(&mut self, contents: Zeroizing<Vec<u8>>) -> Result<()> {
         let path = &self.path;
 
+        if contents.len() == 0 {
+            bail!("Password must contain data!")
+        }
+
         // Check if file exists
         if path.exists() {
-            bail!("Keyfile already exists. Refusing to overwrite.");
+            bail!("Keyfile already exists. Refusing to overwrite.")
         }
 
         // Create new file with restrictive permissions from the start

packages/ciphernode/enclave/src/commands/password/create.rs

@@ -1,18 +1,25 @@
-use anyhow::Result;
+use anyhow::{bail, Result};
 use cipher::{FilePasswordManager, PasswordManager};
 use config::AppConfig;
 use rpassword::prompt_password;
 use zeroize::{Zeroize, Zeroizing};
 
 fn get_zeroizing_pw_vec(input: Option<String>) -> Result<Zeroizing<Vec<u8>>> {
     if let Some(mut pw_str) = input {
+        if pw_str.trim().is_empty() {
+            bail!("Password must not be blank")
+        }
         let pw = Zeroizing::new(pw_str.trim().as_bytes().to_owned());
         pw_str.zeroize();
         return Ok(pw);
     }
 
     // First password entry
     let mut pw_str = prompt_password("\n\nPlease enter a new password: ")?;
+    if pw_str.trim().is_empty() {
+        bail!("Password must not be blank")
+    }
+
     // Second password entry for confirmation
     let mut confirm_pw_str = prompt_password("Please confirm your password: ")?;
 
@@ -21,7 +28,7 @@ fn get_zeroizing_pw_vec(input: Option<String>) -> Result<Zeroizing<Vec<u8>>> {
         // Clean up sensitive data
         pw_str.zeroize();
         confirm_pw_str.zeroize();
-        return Err(anyhow::anyhow!("Passwords do not match"));
+        bail!("Passwords do not match")
     }
 
     let pw = Zeroizing::new(pw_str.trim().as_bytes().to_owned());

packages/ciphernode/enclave/src/main.rs

@@ -63,7 +63,6 @@ pub async fn main() {
         Ok(_) => (),
         Err(err) => {
             eprintln!("{}", err);
-            eprintln!("There was a problem running. Goodbye");
             std::process::exit(1);
         }
     }