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

ssh: simple support for multiple public keys loading

Browse Source
This commit is contained in:
Roman Zeyde
2016-11-03 22:23:14 +02:00
parent 6a5acba0b0
commit 021831073e
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
trezor_agent/__main__.py
View File

@@ -117,6 +117,14 @@ def handle_connection_error(func):
return wrapper
def parse_config(fname):
"""Parse config file into a list of Identity objects."""
contents = open(fname).read()
for identity_str, curve_name in re.findall('\<(.*?)\|(.*?)\>', contents):
yield device.interface.Identity(identity_str=identity_str,
curve_name=curve_name)
@handle_connection_error
def run_agent(client_factory=client.Client):
"""Run ssh-agent using given hardware client factory."""
@@ -124,10 +132,14 @@ def run_agent(client_factory=client.Client):
util.setup_logging(verbosity=args.verbose)
conn = client_factory(device=device.detect())
identities = [device.interface.Identity(identity_str=args.identity,
curve_name=args.ecdsa_curve_name)]
for identity in identities:
if args.identity.startswith('/'):
identities = list(parse_config(fname=args.identity))
else:
identities = [device.interface.Identity(
identity_str=args.identity, curve_name=args.ecdsa_curve_name)]
for index, identity in enumerate(identities):
identity.identity_dict['proto'] = 'ssh'
log.info('identity #%d: %s', index, identity)
command = args.command