Skip to content
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

Wait that udev has set owner and group #116

Closed
wants to merge 1 commit into from
Closed

Wait that udev has set owner and group #116

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
2 changes: 0 additions & 2 deletions solo/cli/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import json
import sys
import tempfile
import time

import click
import requests
Expand Down Expand Up @@ -184,7 +183,6 @@ def update(serial, yes, local_firmware_server, alpha):
if not solo_client.is_solo_bootloader():
print("Switching into bootloader mode...")
solo_client.enter_bootloader_or_die()
time.sleep(0.5)
solo_client = solo.client.find(serial)

solo_client.set_reboot(False)
Expand Down
18 changes: 18 additions & 0 deletions solo/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@

import base64
import json
import os
import struct
import sys
import tempfile
import time

from cryptography import x509
from cryptography.hazmat.backends import default_backend
from fido2._pyu2f import hidtransport
from fido2.attestation import Attestation
from fido2.client import Fido2Client
from fido2.ctap import CtapError
Expand Down Expand Up @@ -259,10 +261,26 @@ def enter_solo_bootloader(self):
this command will tell the token to boot directly to the bootloader
so it can be reprogrammed
"""
statinfo = os.stat(self.dev.descriptor["path"])
serial_number = self.dev.descriptor.get("serial_number")

if self.exchange != self.exchange_hid:
self.send_data_hid(CTAPHID.INIT, "\x11\x11\x11\x11\x11\x11\x11\x11")
self.send_data_hid(SoloBootloader.HIDCommandEnterBoot, "")

print("Wait for device %r..." % serial_number)
for i in range(0, 5):
time.sleep(0.5)
for d in hidtransport.hid.Enumerate():
if hidtransport.HidUsageSelector(d):
if d.get("serial_number") == serial_number:
statnew = os.stat(d["path"])
if (
statinfo.st_uid == statnew.st_uid
and statinfo.st_gid == statnew.st_gid
):
break

def enter_bootloader_or_die(self):
try:
self.enter_solo_bootloader()
Expand Down