Robin Krahl's fork of nitrocli https://git.ireas.org/nitrocli/atom?h=status 2020-09-11T16:47:52Z 2020-09-11T16:47:52Z Robin Krahl robin.krahl@ireas.org 2020-09-11T16:47:52Z urn:sha1:3004a859d652049bc721960103efe574b567f2e2 cargo fmt 2020-09-11T09:03:32Z Robin Krahl robin.krahl@ireas.org 2020-09-09T19:37:19Z urn: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. 2020-09-09T15:58:47Z Robin Krahl robin.krahl@ireas.org 2020-09-09T11:03:44Z urn: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. 2020-09-09T15:55:50Z Robin Krahl robin.krahl@ireas.org 2020-09-08T16:23:30Z urn: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. 2020-09-07T23:42:56Z Robin Krahl robin.krahl@ireas.org 2020-09-07T18:47:41Z urn: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. 2020-09-07T22:52:07Z Daniel Mueller deso@posteo.net 2020-09-07T22:49:29Z urn:sha1:a4dc74f23ed1ac45a5db497499c2ac334ab295ce 2020-09-07T22:52:07Z Daniel Mueller deso@posteo.net 2020-09-07T22:49:40Z urn:sha1:5de1cc408bbce296801969f563c5ba10fe504b02 2020-09-07T17:14:21Z Robin Krahl robin.krahl@ireas.org 2020-01-25T19:33:57Z urn:sha1:6917be7ab3c5a9d47866a45855c836a9cc6f86ff This patch adds the --serial-number option that allows the user to filter the attached Nitrokey devices by serial number. As the Nitrokey Storage does not include its serial number in the USB device descriptor and as we don't want to connect to it just to query the serial number, this option only works for Nitrokey Storage devices. 2020-09-07T17:05:11Z Robin Krahl robin.krahl@ireas.org 2020-01-25T20:07:07Z urn:sha1:1f8e482cfebb13b64002d65e61e29932770388be This patch introduces two new functions, find_device and connect, to connect to a Nitrokey device. find_device queries the attached Nitrokey devices, applies the filters (currently only the --model option) and returns the first match. connect calls find_device and connects to the returned device. This refactoring allows us to add more device filters, for example a --serial-number option, without code duplication. 2020-08-25T01:04:20Z Daniel Mueller deso@posteo.net 2020-08-25T01:04:20Z urn:sha1:03d04439323f60bc2f4371585ae21404dbcb7eeb In the future we would like to provide more ways for tests to create a Nitrocli instance. In order to prevent explosion of with_XXX methods for each possible combination of arguments, this change allows for an easier configuration of an existing object with builder-pattern-inspired modifier methods.