lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-20 04:56:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

trezor: use UI-based passphrase entry

Browse Source 
Now TREZOR_PASSPHRASE environment variable is ignored.
This commit is contained in:
Roman Zeyde
2017-11-16 22:27:30 +02:00
parent a1ecbf447e
commit c4dfca04f2
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libagent/device/trezor.py
View File

@@ -45,7 +45,6 @@ class Trezor(interface.Device):
return trezor_defs return trezor_defs
required_version = '>=1.4.0' required_version = '>=1.4.0'
passphrase = os.environ.get('TREZOR_PASSPHRASE', '')
def _override_pin_handler(self, conn): def _override_pin_handler(self, conn):
cli_handler = conn.callback_PinMatrixRequest cli_handler = conn.callback_PinMatrixRequest
@@ -65,19 +64,26 @@ class Trezor(interface.Device):
conn.callback_PinMatrixRequest = new_handler conn.callback_PinMatrixRequest = new_handler
def _override_passphrase_handler(self, conn):
cli_handler = conn.callback_PassphraseRequest
def new_handler(msg):
if _is_open_tty(sys.stdin):
return cli_handler(msg) # CLI-based PIN handler
passphrase = _message_box('Please enter passphrase:')
return self._defs.PassphraseAck(passphrase=passphrase)
conn.callback_PassphraseRequest = new_handler
def connect(self): def connect(self):
"""Enumerate and connect to the first USB HID interface.""" """Enumerate and connect to the first USB HID interface."""
def passphrase_handler(_):
log.debug('using %s passphrase for %s',
'non-empty' if self.passphrase else 'empty', self)
return self._defs.PassphraseAck(passphrase=self.passphrase)
for d in self._defs.Transport.enumerate(): for d in self._defs.Transport.enumerate():
log.debug('endpoint: %s', d) log.debug('endpoint: %s', d)
transport = self._defs.Transport(d) transport = self._defs.Transport(d)
connection = self._defs.Client(transport) connection = self._defs.Client(transport)
connection.callback_PassphraseRequest = passphrase_handler
self._override_pin_handler(connection) self._override_pin_handler(connection)
self._override_passphrase_handler(connection)
f = connection.features f = connection.features
log.debug('connected to %s %s', self, f.device_id) log.debug('connected to %s %s', self, f.device_id)
log.debug('label : %s', f.label) log.debug('label : %s', f.label)