Open only CtapHid device for the respective Nitrokey

src/nitrokey/nk3/_device.py

@@ -5,8 +5,13 @@
 # http://opensource.org/licenses/MIT>, at your option. This file may not be
 # copied, modified, or distributed except according to those terms.
 
-from fido2.hid import CtapHidDevice
+import logging
+import warnings
+from typing import List
 
+from fido2.hid import CtapHidDevice, open_device
+
+from nitrokey import _VID_NITROKEY
 from nitrokey.trussed import Fido2Certs, TrussedDevice, Version
 
 FIDO2_CERTS = [
@@ -26,6 +31,8 @@
     ),
 ]
 
+logger = logging.getLogger(__name__)
+
 
 class NK3(TrussedDevice):
     """A Nitrokey 3 device running the firmware."""
@@ -46,3 +53,26 @@ def name(self) -> str:
     @classmethod
     def from_device(cls, device: CtapHidDevice) -> "NK3":
         return cls(device)
+
+    @classmethod
+    def list(cls) -> List["NK3"]:
+        from . import _PID_NK3_DEVICE
+
+        try:
+            import hid
+        except ImportError as err:
+            logger.warning("Failed to import hid module", exc_info=True)
+            warnings.warn(
+                f"Failed to list NK3s due to a missing library: {err}",
+                category=RuntimeWarning,
+            )
+            return []
+
+        devices = []
+
+        # iterate on all devices found and open them
+        for device in hid.enumerate(
+            vendor_id=_VID_NITROKEY, product_id=_PID_NK3_DEVICE
+        ):
+            devices.append(cls.from_device(open_device(device["path"])))
+        return devices

src/nitrokey/nkpk.py

@@ -5,9 +5,11 @@
 # http://opensource.org/licenses/MIT>, at your option. This file may not be
 # copied, modified, or distributed except according to those terms.
 
+import logging
+import warnings
 from typing import List, Optional, Sequence, Union
 
-from fido2.hid import CtapHidDevice
+from fido2.hid import CtapHidDevice, open_device
 
 from nitrokey import _VID_NITROKEY
 from nitrokey.trussed import Fido2Certs, TrussedDevice, Version
@@ -43,6 +45,8 @@
     ],
 )
 
+logger = logging.getLogger(__name__)
+
 
 class NKPK(TrussedDevice):
     def __init__(self, device: CtapHidDevice) -> None:
@@ -60,6 +64,27 @@ def name(self) -> str:
     def from_device(cls, device: CtapHidDevice) -> "NKPK":
         return cls(device)
 
+    @classmethod
+    def list(cls) -> List["NKPK"]:
+        try:
+            import hid
+        except ImportError as err:
+            logger.warning("Failed to import hid module", exc_info=True)
+            warnings.warn(
+                f"Failed to list NKPKs due to a missing library: {err}",
+                category=RuntimeWarning,
+            )
+            return []
+
+        devices = []
+
+        # iterate on all devices found and open them
+        for device in hid.enumerate(
+            vendor_id=_VID_NITROKEY, product_id=_PID_NKPK_DEVICE
+        ):
+            devices.append(cls.from_device(open_device(device["path"])))
+        return devices
+
 
 class NKPKBootloader(TrussedBootloaderNrf52):
     @property

src/nitrokey/trussed/_device.py

@@ -11,7 +11,7 @@
 import sys
 from abc import abstractmethod
 from enum import Enum
-from typing import Optional, Sequence, TypeVar, Union
+from typing import List, Optional, Sequence, TypeVar, Union
 
 from fido2.hid import CtapHidDevice, open_device
 
@@ -110,15 +110,8 @@ def open(cls: type[T], path: str) -> Optional[T]:
             return None
 
     @classmethod
-    def list(cls: type[T]) -> list[T]:
-        devices = []
-        for device in CtapHidDevice.list_devices():
-            try:
-                devices.append(cls.from_device(device))
-            except ValueError:
-                # not the correct device type, skip
-                pass
-        return devices
+    @abstractmethod
+    def list(cls: type[T]) -> List[T]: ...
 
 
 def _device_path_to_str(path: Union[bytes, str]) -> str: