CTAP: Retry on channel busy

Yubico · Sep 3, 2024 · 0781dbd · 0781dbd
1 parent d5192a9
commit 0781dbd
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/fido2/hid/__init__.py b/fido2/hid/__init__.py
@@ -167,6 +167,18 @@ def call(
         on_keepalive: Optional[Callable[[int], None]] = None,
     ) -> bytes:
         event = event or Event()
+
+        while True:
+            try:
+                return self._do_call(cmd, data, event, on_keepalive)
+            except CtapError as e:
+                if e.code == CtapError.ERR.CHANNEL_BUSY:
+                    if not event.wait(0.1):
+                        logger.warning("CTAP channel busy, trying again...")
+                        continue  # Keep retrying on BUSY while not cancelled
+                raise
+
+    def _do_call(self, cmd, data, event, on_keepalive):
         remaining = data
         seq = 0