Merge remote-tracking branch 'solokeys/main' into main

# Conflicts:
#	CHANGELOG.md
#	README.md
#	pyproject.toml
#	solo/VERSION
#	solo/client.py

Author: onlykey

.envrc

@@ -1,2 +1,3 @@
 # to use this, install [direnv](https://direnv.net/)
 source venv/bin/activate
+unset PS1

CHANGELOG.md

@@ -0,0 +1,216 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.0.30] - 2021-04-29
+- Replace old python-fido2 internal method used with fix from @enrikb
+
+## [0.0.29] - 2021-04-28
+- Fix some typos in last release @enrikb
+
+## [0.0.28] - 2021-04-25
+- Upgraded to new 0.9.1 fido2 library
+- Removed use of serial_number if it's not present in upstream fido2 library
+- Removed use of UDP communication
+- bumped isort version to >=5.0.0 and changed Makefile accordingly, see [Upgrading isort to 5.0.0](https://pycqa.github.io/isort/docs/upgrade_guides/5.0.0/)
+
+## [0.0.27] - 2021-01-20
+- pin fido2 dep to 0.8 series @uli-heller
+- improve programming robustness @enrikb
+- prompt for PIN in `solo key verify`, if needed @enrikb
+
+## [0.0.26] - 2020-07-17
+- fix bungled reference to `STABLE_VERSION` file
+
+## [0.0.25] - 2020-07-17
+- credential management commands @rgerganov
+- static password vendor command @rgerganov
+- sign-file vendor command @rgerganov
+- typo @lolaum
+- use `main` as main branch
+
+## [0.0.24] - 2020-02-27
+## Added
+- Add command to disable bootloader-access / updates on Solo devices
+- Improve admin/root/udev warning for Linux and Windows
+- Add ping command
+
+## [0.0.23] - 2019-01-20
+## Changed
+- Fix Timeout
+
+## [0.0.22] - 2019-01-20
+### Changed
+- Fix fallout of move to fido2 0.8
+
+## [0.0.21] - 2019-12-01
+### Changed
+- Update to use python-fido2 v0.8
+
+## [0.0.20] - 2019-12-01
+### Added
+- Add fingerprints for checking more Solo model certificates (Tap, Somu, Solo)
+
+### Changed
+- Attestation key marker in mergehex operation
+
+## [0.0.19] - 2019-11-09
+### Added
+- `solo key set-pin` and `change-pin` commands.
+
+## [0.0.18] - 2019-10-29
+### Added
+### Changed
+- When signing, signatures were incorrectly annotated with `2.3.0` version.  updated to `2.5.3`.
+
+## [0.0.17] - 2019-10-28
+### Added
+### Changed
+- remove `--hacker` and `--secure` options when auto-updating.
+- pull `firmware-*.json` instead of choosing between hacker and secure
+
+## [0.0.16] - 2019-10-28
+### Added
+- option to specify attestation certificate with attestation key
+- mergehex operation adds in attestation certificate
+- mergehex operation adds in lock status with `--lock` flag
+
+### Changed
+- attestation key requires associate attestation cert
+- sign operation adds 2 signatures for 2 different versions of solo bootloader
+- solo version attempts to uses HID version command to additionally see lock status of key.
+
+## [0.0.15] - 2019-08-30
+### Added
+- `solo.hmac_secret.make_credential` method
+- separate `solo key make-credential` CLI target
+
+### Changed
+- remove credential generation from `solo.hmac_secret.simple_secret`
+- demand `credential_id` in `solo key challenge-response`
+
+## [0.0.14] - 2019-08-30
+### Added
+- challenge-response via `hmac-secret`
+
+## [0.0.13] - 2019-08-19
+### Changed
+- implement passing PIN to `solo key verify`
+
+## [0.0.12] - 2019-08-08
+### Changed
+- update fido2 to 0.7.0
+
+## [0.0.11] - 2019-05-27
+### Changed
+- adjust to and pin fido2 0.6.0 dependency (@conorpp)
+- only warn if run as sudo
+
+## [0.0.10] - 2019-03-18
+### Added
+- solo client improvements
+- experimental interface to feed kernel entropy from key:
+`sudo ALLOW_ROOT= /path/to/solo key rng feedkernel`
+
+## [0.0.9] - 2019-03-18
+### Added
+- enforce `solo` command does not run as root
+
+## [0.0.8] - 2019-03-18
+### Added
+- `solo key probe` interface
+### Changed
+- fixes to set options bytes to leave DFU mode
+
+## [0.0.7] - 2019-03-08
+### Changed
+- Exit properly on boot to bootloader failure
+- `--alpha` flag for `update`
+
+## [0.0.6] - 2019-02-27
+### Changed
+- Fix bootloader-version command (@Thor77)
+- Reboot to bootloader in `program` if necessary
+### Added
+- yes flag for `update`
+
+## [0.0.6a3] - 2019-02-20
+### Changed
+- Typo
+
+## [0.0.6a2] - 2019-02-20
+### Added
+- Monkey-patch to communicate via UDP with software key
+- Flag `--udp` to use it for certain `solo key` commands
+
+## [0.0.6a1] - 2019-02-19
+### Added
+- Serial number support
+
+## [0.0.5] - 2019-02-18
+### Changed
+- Initial feedback from https://github.com/solokeys/solo/issues/113
+
+## [0.0.4] - 2019-02-18
+### Changed
+- Enforce passing exactly one of `--hacker|--secure` in `solo key update`
+
+## [0.0.3] - 2019-02-18
+### Changed
+- Bugfix in `solo.dfu`
+- Minor improvements
+
+## [0.0.2] - 2019-02-18
+### Changed
+- Fix broken `solo program dfu` command
+- Remove `solotool` script installation
+- Add Python version classifiers
+
+## [0.0.1] - 2019-02-17
+### Added
+- Implement `solo key update [--hacker]`
+
+## [0.0.1a8] - 2019-02-17
+### Added
+- Forgot to add some files in last release
+- Add client/dfu find\_all methods
+- Add `solo ls` command
+
+## [0.0.1a7] - 2019-02-16
+### Added
+- More implementation of `solo program aux` (mode changes)
+- Implement `solo program bootloader`.
+- More comments
+
+## [0.0.1a6] - 2019-02-16
+### Changed
+- Implements part of `solo program dfu` and `solo program aux`
+- Adds Conor's change allowing to pass in raw devices to DFU+SoloClient
+
+## [0.0.1a5] - 2019-02-16
+### Changed
+- Unwrap genkey from CLI to operations
+
+## [0.0.1a4] - 2019-02-16
+### Added
+- Everything moved out of solotool, except programming chunk
+
+## [0.0.1a3] - 2019-02-16
+### Added
+- Start redo of CLI using click
+
+## [0.0.1a2] - 2019-02-15
+### Changed
+- Bugfixes related to refactor
+
+## [0.0.1a1] - 2019-02-15
+### Changed
+- Start to split out commands, helpers and client
+
+## [0.0.1a0] - 2019-02-15
+### Added
+- Initial import of `solotool.py` script from [solo](https://github.com/solokeys/solo)

Makefile

@@ -6,7 +6,7 @@ init: update-venv
 # ensure this passes before commiting
 check: lint
 	black --check solo/
-	isort --check-only --recursive solo/
+	isort --profile black --check-only solo/
 
 # automatic code fixes
 fix: black isort
@@ -15,7 +15,7 @@ black:
 	black solo/
 
 isort:
-	isort -y --recursive solo/
+	isort --profile black solo/
 
 lint:
 	flake8 solo/

dev-requirements.txt

@@ -3,7 +3,8 @@
 
 black
 flake8
-flit
+flit_core==2.3.0
+flit==2.3.0
 ipython
-isort
+isort>=5.0.0
 

pyproject.toml

@@ -1,3 +1,4 @@
+
 [build-system]
 requires = ["flit"]
 build-backend = "flit.buildapi"
@@ -11,10 +12,10 @@ home-page = "https://github.com/trustcrypto/onlykey-solo-python"
 requires-python = ">=3.6"
 description-file = "README.md"
 requires = [
-  "click >= 7.0",
+  "click >= 7.1",
   "cryptography",
   "ecdsa",
-  "fido2 >= 0.8.1",
+  "fido2 >= 0.9.1",
   "intelhex",
   "pyserial",
   "pyusb",

solo/VERSION

@@ -1 +1,2 @@
 0.0.28
+

solo/cli/__init__.py

@@ -18,7 +18,6 @@
 from solo.cli.monitor import monitor
 from solo.cli.program import program
 
-from . import _patches  # noqa  (since otherwise "unused")
 from ._checks import init_checks
 
 init_checks()
@@ -136,10 +135,20 @@ def ls(all):
     print(":: Solos")
     for c in solos:
         descriptor = c.dev.descriptor
-        if "serial_number" in descriptor:
-            print(f"{descriptor['serial_number']}: {descriptor['product_string']}")
+
+        if hasattr(descriptor, "product_name"):
+            product_name = descriptor.product_name
+        elif c.is_solo_bootloader():
+            product_name = "Solo Bootloader device"
+        else:
+            product_name = "FIDO2 device"
+
+        if hasattr(descriptor, "serial_number"):
+            serial_or_path = descriptor.serial_number
         else:
-            print(f"{descriptor['path']}: {descriptor['product_string']}")
+            serial_or_path = descriptor.path
+
+        print(f"{serial_or_path}: {product_name}")
 
     if all:
         print(":: Potential Solos in DFU mode")