allow passing message from stdin to encrypt and decrypt

Author: alexng353

src/commands/decrypt.rs

@@ -1,17 +1,36 @@
+use std::io::Read;
+
 use super::*;
 use crate::utils::{config::Config, rpgp::decrypt_full};
 use anyhow::{Context, Result};
 
 /// Decrypt a string using GPG
 #[derive(Parser)]
 pub struct Args {
-    message: String,
+    message: Option<String>,
 }
 
 pub async fn command(args: Args) -> Result<()> {
     let config = Config::get().context("Failed to get config")?;
 
-    let decrypted = decrypt_full(args.message, &config)?;
+    let message = match args.message {
+        Some(m) => m,
+        None => {
+            let mut buffer = String::new();
+            std::io::stdin()
+                .read_to_string(&mut buffer)
+                .context("Failed to read from stdin")?;
+            buffer
+        }
+    };
+
+    if message.is_empty() {
+        return Err(anyhow::anyhow!(
+            "No message provided.\nUsage: envx decrypt [message] or echo [message] | envx decrypt"
+        ));
+    }
+
+    let decrypted = decrypt_full(message, &config)?;
 
     println!("{}", decrypted);
 

src/commands/encrypt.rs

@@ -1,3 +1,5 @@
+use std::io::Read;
+
 use anyhow::Context;
 
 use crate::utils::{
@@ -11,10 +13,11 @@ use super::*;
 #[derive(Parser)]
 pub struct Args {
     /// recipient's public key fingerprint
+    #[clap(long, short)]
     recipient: String,
 
     /// string to encrypt
-    message: String,
+    message: Option<String>,
 }
 
 pub async fn command(args: Args) -> Result<()> {
@@ -28,7 +31,22 @@ pub async fn command(args: Args) -> Result<()> {
     let primary_public_key = std::fs::read_to_string(primary_key_location)
         .context("Failed to read primary key")?;
 
-    let encrypted = encrypt(&args.message, primary_public_key.as_str())?;
+    let message = match args.message {
+        Some(message) => message,
+        None => {
+            let mut message = String::new();
+            std::io::stdin()
+                .read_to_string(&mut message)
+                .context("Failed to read message")?;
+            message
+        }
+    };
+
+    if message.is_empty() {
+        anyhow::bail!("Message is empty");
+    }
+
+    let encrypted = encrypt(&message, primary_public_key.as_str())?;
 
     println!("{}", encrypted);
 

src/commands/keyring/clear.rs

@@ -12,11 +12,22 @@ pub struct Args {
     /// Partial fingerprint of the key to set
     #[clap(short, long)]
     key: Option<String>,
+
+    /// Clear all saved keys
+    #[clap(short, long)]
+    all: bool,
 }
 
 pub async fn command(args: Args) -> Result<()> {
     let config = Config::get()?;
 
+    if args.all {
+        config.keys.iter().for_each(|key| {
+            clear_password(&key.fingerprint).unwrap();
+        });
+        return Ok(());
+    }
+
     let fingerprint = match args.key {
         Some(key) => config.get_key(&key)?.fingerprint,
         None => {

src/commands/keyring/view.rs

@@ -15,9 +15,9 @@ pub struct Args {
     #[clap(short, long)]
     key: Option<String>,
 
-    /// Force, don't prompt for confirmation
+    /// Don't prompt for confirmation
     #[clap(short, long)]
-    force: bool,
+    yes: bool,
 }
 
 pub async fn command(args: Args) -> Result<()> {
@@ -33,7 +33,7 @@ pub async fn command(args: Args) -> Result<()> {
 
     let password = get_password(&fingerprint)?;
 
-    if args.force {
+    if args.yes {
         println!("{}", password);
         return Ok(());
     }