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

Merge branch 'serge'

Browse Source
This commit is contained in:
Roman Zeyde
2018-02-24 21:07:42 +02:00
parent f4208009e0 b20d98bf57
commit 4a9140c42d
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libagent/gpg/__init__.py
View File

@@ -126,7 +126,11 @@ def run_init(device_type, args):
homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name)) homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name))
log.info('GPG home directory: %s', homedir) log.info('GPG home directory: %s', homedir)
check_call(['rm', '-rf', homedir]) if os.path.exists(homedir):
log.error('GPG home directory %s exists, '
'remove it manually if required', homedir)
sys.exit(1)
check_call(['mkdir', '-p', homedir]) check_call(['mkdir', '-p', homedir])
check_call(['chmod', '700', homedir]) check_call(['chmod', '700', homedir])

21
libagent/ssh/__init__.py
View File

@@ -88,6 +88,8 @@ def create_agent_parser(device_type):
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',
help='Daemonize the agent and print its UNIX socket path') help='Daemonize the agent and print its UNIX socket path')
g.add_argument('-f', '--foreground', default=False, action='store_true',
help='Run agent in foreground with specified UNIX socket path')
g.add_argument('-s', '--shell', default=False, action='store_true', g.add_argument('-s', '--shell', default=False, action='store_true',
help=('run ${SHELL} as subprocess under SSH agent, allowing ' help=('run ${SHELL} as subprocess under SSH agent, allowing '
'regular SSH-based tools to be used in the shell')) 'regular SSH-based tools to be used in the shell'))
@@ -211,6 +213,17 @@ def _dummy_context():
yield 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 @handle_connection_error
def main(device_type): def main(device_type):
"""Run ssh-agent using given hardware client factory.""" """Run ssh-agent using given hardware client factory."""
@@ -232,9 +245,7 @@ def main(device_type):
identity.identity_dict['proto'] = u'ssh' identity.identity_dict['proto'] = u'ssh'
log.info('identity #%d: %s', index, identity.to_string()) log.info('identity #%d: %s', index, identity.to_string())
sock_path = args.sock_path sock_path = _get_sock_path(args)
if not sock_path:
sock_path = tempfile.mktemp(prefix='trezor-ssh-agent-')
command = args.command command = args.command
context = _dummy_context() context = _dummy_context()
@@ -248,6 +259,8 @@ def main(device_type):
sys.stdout.flush() sys.stdout.flush()
context = daemon.DaemonContext() context = daemon.DaemonContext()
log.info('running the agent as a daemon on %s', sock_path) log.info('running the agent as a daemon on %s', sock_path)
elif args.foreground:
log.info('running the agent on %s', sock_path)
use_shell = bool(args.shell) use_shell = bool(args.shell)
if use_shell: if use_shell:
@@ -258,7 +271,7 @@ def main(device_type):
conn_factory=lambda: client.Client(device_type()), conn_factory=lambda: client.Client(device_type()),
identities=identities, public_keys=public_keys) identities=identities, public_keys=public_keys)
if command or args.daemonize: if command or args.daemonize or args.foreground:
with context: with context:
return run_server(conn=conn, command=command, sock_path=sock_path, return run_server(conn=conn, command=command, sock_path=sock_path,
debug=args.debug, timeout=args.timeout) debug=args.debug, timeout=args.timeout)