nitrocli, branch statusRobin Krahl's fork of nitroclihttps://git.ireas.org/nitrocli/atom?h=status2020-09-11T16:47:52Zfixup! List all matching devices in status commmand2020-09-11T16:47:52ZRobin Krahlrobin.krahl@ireas.org2020-09-11T16:47:52Zurn:sha1:3004a859d652049bc721960103efe574b567f2e2
cargo fmt
List all matching devices in status commmand2020-09-11T09:03:32ZRobin Krahlrobin.krahl@ireas.org2020-09-09T19:37:19Zurn:sha1:ef7b6b03355b82621d16f4f02a5a1a4558ae64cc
Previously, the status command would fail if more than one Nitrokey
device is connected. With this patch, we list all attached devices that
match the specified filter (model, serial number, USB path).
This also casues some changes in the test cases: Previously, we assumed
that status fails for multiple attached devices. We now use the lock
command to produce this behavior.
Refactor find_device into find_devices2020-09-09T19:55:23ZRobin Krahlrobin.krahl@ireas.org2020-09-09T19:24:59Zurn:sha1:70b9a1f0287f2aeda9677110106f43d1048306f3
This patch refactors the find_device function that finds a Nitrokey
device that matches the given filter or returns an error if there are
no or multiple matching Nitrokey devices into the find_devices function
that returns a vector with all matching Nitrokey devices. The check for
exactly one matching device is now performed in the connect function.
Use DeviceModel::as_user_facing_str in status2020-09-09T19:55:12ZRobin Krahlrobin.krahl@ireas.org2020-09-08T17:18:13Zurn:sha1:80fbab0f4dcdd6e172fab00794fb943bbe81fa1e
This match replaces the model names in the status command with calls to
the DeviceModel::as_user_facing_str method.
Rename device path to USB path in list output2020-09-09T15:58:47ZRobin Krahlrobin.krahl@ireas.org2020-09-09T11:03:44Zurn:sha1:663f24b2e41c90709750337e47f2f43b3100422f
For consistency with the --usb-path option, this path renames the device
path column in the output of the list command to USB path.
Add --usb-path option to select device2020-09-09T15:55:50ZRobin Krahlrobin.krahl@ireas.org2020-09-08T16:23:30Zurn:sha1:4a8c01adb5100fd0397aad239edc5e80d13aca13
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.
Add test cases for new connection logic2020-09-07T23:42:56ZRobin Krahlrobin.krahl@ireas.org2020-09-07T18:47:41Zurn:sha1:16f6b3ba0c3535efd1b9288ea1980cdd281b6565
This patch adds test cases for the new connection logic:
- connect_multiple checks that nitrocli aborts if more than one Nitrokey
device is connected and no filter is set.
- connect_serial_number checks that we can use the --serial-number
option to connect to all supported Nitrokey devices.
- connect_wrong_serial_number checks that nitrocli aborts if it can’t
find a device with the requested serial number.
- connect_model checks that we can use the --model option to select the
Nitrokey device to connect to, and that nitrocli aborts if it finds no
matching device or multiple matching devices.
fixup! Refactor connection handling2020-09-07T22:52:07ZDaniel Muellerdeso@posteo.net2020-09-07T22:49:29Zurn:sha1:a4dc74f23ed1ac45a5db497499c2ac334ab295cefixup! Add --serial-number option2020-09-07T22:52:07ZDaniel Muellerdeso@posteo.net2020-09-07T22:49:40Zurn:sha1:5de1cc408bbce296801969f563c5ba10fe504b02fixup! Refactor connection handling2020-09-07T22:30:01ZDaniel Muellerdeso@posteo.net2020-09-07T22:30:01Zurn:sha1:beaf6ee2cba27343194fc555503870c3857f3245