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

agent: fix argument parser

Browse Source
This commit is contained in:
Roman Zeyde
2015-07-04 10:47:32 +03:00
parent 93bac8b011
commit 8273cc89f8
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sshagent/trezor_agent.py
View File

@@ -17,7 +17,9 @@ def main():
g.add_argument('-v', '--verbose', default=0, action='count')
g.add_argument('-q', '--quiet', default=False, action='store_true')
p.add_argument('identity', type=str,
p.add_argument('-p', '--public-key', default=False, action='store_true')
p.add_argument('-i', '--identity', type=str,
help='proto://[user@]host[:port][/path]')
p.add_argument('command', type=str, nargs='*',
help='command to run under the SSH agent')
@@ -32,17 +34,22 @@ def main():
logging.basicConfig(level=loglevel, format=fmt)
with trezor.Client(factory=trezor.TrezorLibrary) as client:
public_keys = [client.get_public_key(i) for i in args.identity]
identity = client.get_identity(label=args.identity)
public_key = client.get_public_key(identity=identity)
if args.public_key:
sys.stdout.write(public_key)
return
command = args.command
command, use_shell = args.command, False
if not command:
command = os.environ['SHELL']
log.info('using %r shell', command)
command, use_shell = os.environ['SHELL'], True
signer = client.sign_ssh_challenge
try:
with server.serve(public_keys=public_keys, signer=signer) as env:
return server.run_process(command=command, environ=env)
with server.serve(public_keys=[public_key], signer=signer) as env:
return server.run_process(
command=command, environ=env, use_shell=use_shell
)
except KeyboardInterrupt:
log.info('server stopped')