lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-05-09 13:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ssh: allow setting passphrase cache expriration duration

Browse Source
This commit is contained in:
Roman Zeyde
2018-04-25 00:01:55 +03:00
parent b1bd6cb690
commit 2ca3941cfa
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libagent/device/trezor.py
View File

@@ -47,8 +47,7 @@ class Trezor(interface.Device):
conn.callback_PinMatrixRequest = new_handler conn.callback_PinMatrixRequest = new_handler
# Remembers the passphrase for an hour. cached_passphrase_ack = util.ExpiringCache(seconds=float('inf'))
cached_passphrase_ack = util.ExpiringCache(seconds=60*60)
cached_state = None cached_state = None
def _override_passphrase_handler(self, conn): def _override_passphrase_handler(self, conn):

4
libagent/ssh/__init__.py
View File

@@ -89,6 +89,8 @@ def create_agent_parser(device_type):
help='Path to PIN entry UI helper.') help='Path to PIN entry UI helper.')
p.add_argument('--passphrase-entry-binary', type=str, default='pinentry', p.add_argument('--passphrase-entry-binary', type=str, default='pinentry',
help='Path to passphrase entry UI helper.') help='Path to passphrase entry UI helper.')
p.add_argument('--cache-expiry-seconds', type=float, default=float('inf'),
help='Expire passphrase from cache after this duration.')
g = p.add_mutually_exclusive_group() g = p.add_mutually_exclusive_group()
g.add_argument('-d', '--daemonize', default=False, action='store_true', g.add_argument('-d', '--daemonize', default=False, action='store_true',
@@ -274,6 +276,8 @@ def main(device_type):
# override default PIN/passphrase entry tools (relevant for TREZOR/Keepkey): # override default PIN/passphrase entry tools (relevant for TREZOR/Keepkey):
device_type.ui = device.ui.UI(device_type=device_type, config=vars(args)) device_type.ui = device.ui.UI(device_type=device_type, config=vars(args))
device_type.cached_passphrase_ack = util.ExpiringCache(
args.cache_expiry_seconds)
conn = JustInTimeConnection( conn = JustInTimeConnection(
conn_factory=lambda: client.Client(device_type()), conn_factory=lambda: client.Client(device_type()),