lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-20 13:16:42 +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

15
sshagent/trezor.py
View File

@@ -51,9 +51,11 @@ class Client(object):
self.client.clear_session() self.client.clear_session()
self.client.close() self.client.close()
def get_public_key(self, label): def get_identity(self, label):
identity = self.factory.parse_identity(label) return self.factory.parse_identity(label)
label = _identity_to_string(identity) # update label after parsing
def get_public_key(self, identity):
label = _identity_to_string(identity)
log.info('getting "%s" public key from Trezor...', label) log.info('getting "%s" public key from Trezor...', label)
addr = _get_address(identity) addr = _get_address(identity)
node = self.client.get_public_node(addr, self.curve_name) node = self.client.get_public_node(addr, self.curve_name)
@@ -64,13 +66,12 @@ class Client(object):
def sign_ssh_challenge(self, label, blob): def sign_ssh_challenge(self, label, blob):
identity = self.factory.parse_identity(label) identity = self.factory.parse_identity(label)
msg = _parse_ssh_blob(blob) msg = _parse_ssh_blob(blob)
request = 'user: "{user}"'.format(**msg)
log.info('confirm %s connection to %r using Trezor...', log.info('confirm user %s connection to %r using Trezor...',
request, label) msg['user'], label)
s = self.client.sign_identity(identity=identity, s = self.client.sign_identity(identity=identity,
challenge_hidden=blob, challenge_hidden=blob,
challenge_visual=request, challenge_visual='',
ecdsa_curve_name=self.curve_name) ecdsa_curve_name=self.curve_name)
assert len(s.signature) == 65 assert len(s.signature) == 65
assert s.signature[0] == b'\x00' assert s.signature[0] == b'\x00'

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