2

src/cli_args/mod.rs

@@ -1,4 +1,5 @@
 use std::fmt::{Display, Error, Formatter};
+use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
 use std::str::FromStr;
 use structopt::clap::AppSettings;
@@ -31,6 +32,12 @@ impl FromStr for HexEncoded {
     }
 }
 
+impl Hash for HexEncoded {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.0.hash(state)
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub struct CommaSeparated<T: FromStr + Display>(pub Vec<T>);
 
@@ -128,8 +135,7 @@ pub struct SecretParameters {
     #[structopt(
         name = "password-helper",
         env = "FIDO2LUKS_PASSWORD_HELPER",
-        long = "password-helper",
-        default_value = "/usr/bin/env systemd-ask-password 'Please enter second factor for LUKS disk encryption!'"
+        long = "password-helper"
     )]
     pub password_helper: Option<PasswordHelper>,
 }
@@ -269,8 +275,14 @@ pub enum TokenCommand {
     Add {
         #[structopt(env = "FIDO2LUKS_DEVICE")]
         device: PathBuf,
-        #[structopt(flatten)]
-        credentials: Credentials,
+        /// FIDO credential ids, separated by ',' generate using fido2luks credential
+        #[structopt(
+            name = "credential-ids",
+            env = "FIDO2LUKS_CREDENTIAL_ID",
+            short = "c",
+            long = "creds"
+        )]
+        credentials: CommaSeparated<HexEncoded>,
         /// Slot to which the credentials will be added
         #[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
         slot: u32,
@@ -279,8 +291,14 @@ pub enum TokenCommand {
     Remove {
         #[structopt(env = "FIDO2LUKS_DEVICE")]
         device: PathBuf,
-        #[structopt(flatten)]
-        credentials: Credentials,
+        /// FIDO credential ids, separated by ',' generate using fido2luks credential
+        #[structopt(
+            name = "credential-ids",
+            env = "FIDO2LUKS_CREDENTIAL_ID",
+            short = "c",
+            long = "creds"
+        )]
+        credentials: CommaSeparated<HexEncoded>,
         /// Token from which the credentials will be removed
         #[structopt(long = "token")]
         token_id: Option<u32>,