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

client: not visual challength for SSH

Browse Source
This commit is contained in:
Roman Zeyde
2016-05-21 07:43:10 +03:00
parent 0cb7cf0746
commit 51f7d6120b
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
trezor_agent/__main__.py
View File

@@ -1,12 +1,10 @@
"""SSH-agent implementation using hardware authentication devices.""" """SSH-agent implementation using hardware authentication devices."""
import argparse import argparse
import functools
import logging import logging
import os import os
import re import re
import subprocess import subprocess
import sys import sys
import time
from . import client, formats, protocol, server from . import client, formats, protocol, server
@@ -103,16 +101,10 @@ def git_host(remote_name, attributes):
return '{user}@{host}'.format(**match.groupdict()) return '{user}@{host}'.format(**match.groupdict())
def ssh_sign(conn, label, blob):
"""Perform SSH signature using given hardware device connection."""
now = time.strftime('%Y-%m-%d %H:%M:%S')
return conn.sign_ssh_challenge(label=label, blob=blob, visual=now)
def run_server(conn, public_key, command, debug, timeout): def run_server(conn, public_key, command, debug, timeout):
"""Common code for run_agent and run_git below.""" """Common code for run_agent and run_git below."""
try: try:
signer = functools.partial(ssh_sign, conn=conn) signer = conn.sign_ssh_challenge
public_key = formats.import_public_key(public_key) public_key = formats.import_public_key(public_key)
log.info('using SSH public key: %s', public_key['fingerprint']) log.info('using SSH public key: %s', public_key['fingerprint'])
handler = protocol.Handler(keys=[public_key], signer=signer, handler = protocol.Handler(keys=[public_key], signer=signer,

5
trezor_agent/client.py
View File

@@ -59,7 +59,7 @@ class Client(object):
vk = formats.decompress_pubkey(pubkey=pubkey, curve_name=self.curve) vk = formats.decompress_pubkey(pubkey=pubkey, curve_name=self.curve)
return formats.export_public_key(vk=vk, label=label) return formats.export_public_key(vk=vk, label=label)
def sign_ssh_challenge(self, label, blob, visual=''): def sign_ssh_challenge(self, label, blob):
"""Sign given blob using a private key, specified by the label.""" """Sign given blob using a private key, specified by the label."""
identity = self.get_identity(label=label) identity = self.get_identity(label=label)
msg = _parse_ssh_blob(blob) msg = _parse_ssh_blob(blob)
@@ -68,7 +68,6 @@ class Client(object):
log.debug('nonce: %s', binascii.hexlify(msg['nonce'])) log.debug('nonce: %s', binascii.hexlify(msg['nonce']))
log.debug('fingerprint: %s', msg['public_key']['fingerprint']) log.debug('fingerprint: %s', msg['public_key']['fingerprint'])
log.debug('hidden challenge size: %d bytes', len(blob)) log.debug('hidden challenge size: %d bytes', len(blob))
log.debug('visual challenge size: %d bytes = %r', len(visual), visual)
log.info('please confirm user "%s" login to "%s" using %s...', log.info('please confirm user "%s" login to "%s" using %s...',
msg['user'], label, self.device_name) msg['user'], label, self.device_name)
@@ -76,7 +75,7 @@ class Client(object):
try: try:
result = self.client.sign_identity(identity=identity, result = self.client.sign_identity(identity=identity,
challenge_hidden=blob, challenge_hidden=blob,
challenge_visual=visual, challenge_visual='',
ecdsa_curve_name=self.curve) ecdsa_curve_name=self.curve)
except self.call_exception as e: except self.call_exception as e:
code, msg = e.args code, msg = e.args

7
trezor_agent/tests/test_client.py
View File

@@ -90,7 +90,7 @@ def test_ssh_agent():
assert (client.identity_to_string(identity) == assert (client.identity_to_string(identity) ==
client.identity_to_string(ident)) client.identity_to_string(ident))
assert challenge_hidden == BLOB assert challenge_hidden == BLOB
assert challenge_visual == 'VISUAL' assert challenge_visual == ''
assert ecdsa_curve_name == 'nist256p1' assert ecdsa_curve_name == 'nist256p1'
result = mock.Mock(spec=[]) result = mock.Mock(spec=[])
@@ -99,8 +99,7 @@ def test_ssh_agent():
return result return result
c.client.sign_identity = ssh_sign_identity c.client.sign_identity = ssh_sign_identity
signature = c.sign_ssh_challenge(label=label, blob=BLOB, signature = c.sign_ssh_challenge(label=label, blob=BLOB)
visual='VISUAL')
key = formats.import_public_key(PUBKEY_TEXT) key = formats.import_public_key(PUBKEY_TEXT)
serialized_sig = key['verifier'](sig=signature, msg=BLOB) serialized_sig = key['verifier'](sig=signature, msg=BLOB)
@@ -122,7 +121,7 @@ def test_ssh_agent():
c.client.sign_identity = cancel_sign_identity c.client.sign_identity = cancel_sign_identity
with pytest.raises(IOError): with pytest.raises(IOError):
c.sign_ssh_challenge(label=label, blob=BLOB, visual='VISUAL') c.sign_ssh_challenge(label=label, blob=BLOB)
def test_utils(): def test_utils():