jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpg: move socket path generation into a helper function

Browse Source
This commit is contained in:
Roman Zeyde
2018-02-24 21:03:30 +02:00
parent 199fb299c3
commit b20d98bf57
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libagent/ssh/__init__.py
View File

@@ -213,6 +213,17 @@ def _dummy_context():
yield
def _get_sock_path(args):
sock_path = args.sock_path
if not sock_path:
if args.foreground:
log.error('running in foreground mode requires UNIX socket path')
return 1
else:
sock_path = tempfile.mktemp(prefix='trezor-ssh-agent-')
return sock_path
@handle_connection_error
def main(device_type):
"""Run ssh-agent using given hardware client factory."""
@@ -234,13 +245,7 @@ def main(device_type):
identity.identity_dict['proto'] = u'ssh'
log.info('identity #%d: %s', index, identity.to_string())
sock_path = args.sock_path
if not sock_path:
if args.foreground:
log.error("if running in foreground you must specify the socket path")
return 1
else:
sock_path = tempfile.mktemp(prefix='trezor-ssh-agent-')
sock_path = _get_sock_path(args)
command = args.command
context = _dummy_context()