Skip to content

added: pin-helper option #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shimunn wants to merge 1 commit into
base: 0.3.0-alpha
Choose a base branch
from
Open

added: pin-helper option #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,14 @@ pub fn get_input(
authenticator.pin && may_require_pin()?,
authenticator.pin_prefixed,
) {
(true, false) => (Some(read_pin()?), salt.obtain_sha256(password_helper)?),
(true, false) => {
let pin = if let Some(ref pin_helper) = authenticator.pin_helper {
pin_helper.obtain()
} else {
read_pin()
};
(Some(pin?), salt.obtain_sha256(password_helper)?)
}
(true, true) => read_password_pin_prefixed(|| {
salt.obtain(password_helper).and_then(|secret| {
String::from_utf8(secret).map_err(|e| Fido2LuksError::from(e))
Expand Down
7 changes: 6 additions & 1 deletion src/cli_args/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ pub struct AuthenticatorParameters {
#[structopt(short = "P", long = "pin")]
pub pin: bool,

/// Script to be called to retrive the authenticator PIN
/// {n}Will be ignored if `pin-prefixed` is set
#[structopt(name = "pin-helper", long = "pin-helper", env = "FIDO2LUKS_PIN_HELPER")]
pub pin_helper: Option<PasswordHelper>,

/// Request PIN and password combined `pin:password` when using an password helper
#[structopt(long = "pin-prefixed")]
pub pin_prefixed: bool,
Expand Down Expand Up @@ -134,7 +139,7 @@ pub struct SecretParameters {
default_value = "ask"
)]
pub salt: SecretInput,
/// Script used to obtain passwords, overridden by --interactive flag
/// Script to be used to obtain passwords, overridden by --interactive flag
#[structopt(
name = "password-helper",
env = "FIDO2LUKS_PASSWORD_HELPER",
Expand Down