Skip to content

Proper system exit when device not found #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bugrasan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Proper system exit when device not found #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion onlykey/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@

from .client import OnlyKey, Message, MessageField

only_key = OnlyKey()
# set 0 to disable Traceback output on exceptions
sys.tracebacklimit = 1

try:
only_key = OnlyKey()
except:
raise SystemExit

def cli():

Expand Down
4 changes: 4 additions & 0 deletions onlykey/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,15 @@ def _connect(self):
self._hid = hid.device()
self._hid.open_path(self.path)
self._hid.set_nonblocking(True)
return
else:
# FIDO Alliance Page
if usage_page == 0xf1d0 or interface_number == 1:
self._hid = hid.device()
self._hid.open_path(self.path)
self._hid.set_nonblocking(True)
return
raise OnlyKeyUnavailableException('device not found')

except:
log.exception('failed to connect')
Expand Down