Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-12-23 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow for HID path changing after re-insert.

Browse Source
This commit is contained in:
Dain Nilsson 2022-03-18 11:58:47 +01:00
parent 89c868ecc6
commit 0392d51d1f
No known key found for this signature in database
GPG Key ID: F04367096FBA95E8
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ykman-rpc/rpc/fido.py
View File

@ -121,20 +121,25 @@ class Ctap2Node(RpcNode):
logger.debug(f"Reset over USB: {dev_path}")
signal("reset", dict(state="remove"))
removed = False
removed_state = None
while not event.wait(0.5):
sleep(0.5)
keys = list_ctap()
present = {k.descriptor.path for k in keys}
if dev_path not in present:
if not removed:
if removed_state is None:
if dev_path not in present:
signal("reset", dict(state="insert"))
removed = True
elif removed:
key = next(k for k in keys if k.descriptor.path == dev_path)
connection = key.open_connection(FidoConnection)
signal("reset", dict(state="touch"))
return connection
removed_state = present
else:
added = present - removed_state
if len(added) == 1:
dev_path = next(iter(added)) # Path may have changed
key = next(k for k in keys if k.descriptor.path == dev_path)
connection = key.open_connection(FidoConnection)
signal("reset", dict(state="touch"))
return connection
elif len(added) > 1:
raise ValueError("Multiple YubiKeys inserted")
raise TimeoutException()