hatter/yubikey-piv-pkcs11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: support pin entry file cmd

Browse Source
This commit is contained in:
Hatter Jiang
2024-08-14 23:55:06 +08:00
parent 55e0bf79dc
commit 5d410e76b2
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
native-pkcs11-piv/src/piv/pinentry.rs
View File

@@ -17,7 +17,9 @@ use std::{env, fs};
use pinentry::PassphraseInput; use pinentry::PassphraseInput;
use secrecy::ExposeSecret; use secrecy::ExposeSecret;
const HOME_ENV: &str = "HOME";
const PIN_ENTRY_ENV: &str = "PIN_ENTRY_CMD"; const PIN_ENTRY_ENV: &str = "PIN_ENTRY_CMD";
const PIN_ENTRY_CMD_FILE: &str = ".pinentry.cmd";
const PIN_ENTRY_1: &str = "/usr/local/MacGPG2/libexec/pinentry-mac.app/Contents/MacOS/pinentry-mac"; const PIN_ENTRY_1: &str = "/usr/local/MacGPG2/libexec/pinentry-mac.app/Contents/MacOS/pinentry-mac";
const PIN_ENTRY_DEFAULT: &str = "pinentry"; const PIN_ENTRY_DEFAULT: &str = "pinentry";
@@ -56,6 +58,11 @@ fn get_pin_entry() -> String {
if let Ok(pin_entry) = env::var(PIN_ENTRY_ENV) { if let Ok(pin_entry) = env::var(PIN_ENTRY_ENV) {
return pin_entry; return pin_entry;
} }
if let Ok(home) = env::var(HOME_ENV) {
if let Ok(pin_entry_cmd) = fs::read_to_string(format!("{}/{}", home, PIN_ENTRY_CMD_FILE)) {
return pin_entry_cmd.trim().to_string();
}
}
if let Ok(m) = fs::metadata(PIN_ENTRY_1) { if let Ok(m) = fs::metadata(PIN_ENTRY_1) {
if m.is_file() { if m.is_file() {
return PIN_ENTRY_1.to_string(); return PIN_ENTRY_1.to_string();