diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2020-09-08 18:23:30 +0200 |
---|---|---|
committer | Daniel Mueller <deso@posteo.net> | 2020-09-09 08:55:50 -0700 |
commit | 4a8c01adb5100fd0397aad239edc5e80d13aca13 (patch) | |
tree | 8bd215f32d2fee5b185efbcd36888c6fe44ffaea /src/commands.rs | |
parent | 16f6b3ba0c3535efd1b9288ea1980cdd281b6565 (diff) | |
download | nitrocli-4a8c01adb5100fd0397aad239edc5e80d13aca13.tar.gz nitrocli-4a8c01adb5100fd0397aad239edc5e80d13aca13.tar.bz2 |
Add --usb-path option to select device
This patch adds the --usb-path option as an additional way to filter the
Nitrokey device to connect to. While the serial number is a better
identifier in theory, the Nitrokey Storage devices do not send their
serial number in the USB device descriptor. Having the --usb-path
options allows users to select one of multiple Nitrokey Storage devices.
While we could directly call the nitrokey::Manager::connect_path
function with the specified path, we integrate the --usb-path option
into the existing find_device function for consistent error messages and
to avoid having to duplicate the --model and --serial-number checks.
Diffstat (limited to 'src/commands.rs')
-rw-r--r-- | src/commands.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/commands.rs b/src/commands.rs index 455ff4d..d352ca2 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -55,6 +55,9 @@ fn format_filter(config: &config::Config) -> String { .collect::<Vec<_>>(); filters.push(format!("serial number in [{}]", serial_numbers.join(", "))); } + if let Some(path) = &config.usb_path { + filters.push(format!("usb path={}", path)); + } if filters.is_empty() { String::new() } else { @@ -75,7 +78,8 @@ fn find_device(config: &config::Config) -> anyhow::Result<nitrokey::DeviceInfo> .serial_number .map(|sn| config.serial_numbers.contains(&sn)) .unwrap_or_default() - }); + }) + .filter(|device| config.usb_path.is_none() || config.usb_path.as_ref() == Some(&device.path)); let device = iter .next() @@ -83,8 +87,8 @@ fn find_device(config: &config::Config) -> anyhow::Result<nitrokey::DeviceInfo> anyhow::ensure!( iter.next().is_none(), - "Multiple Nitrokey devices found{}. Use the --model and --serial-number options to \ - select one", + "Multiple Nitrokey devices found{}. Use the --model, --serial-number, and --usb-path options \ + to select one", format_filter(config) ); Ok(device) |