diff --git a/sshagent/server.py b/sshagent/server.py index 9bb78f2..b055b60 100644 --- a/sshagent/server.py +++ b/sshagent/server.py @@ -11,6 +11,7 @@ from . import protocol from . import formats from . import util + @contextlib.contextmanager def unix_domain_socket_server(sock_path): log.debug('serving on SSH_AUTH_SOCK=%s', sock_path) @@ -28,6 +29,7 @@ def unix_domain_socket_server(sock_path): finally: os.remove(sock_path) + def handle_connection(conn, keys, signer): try: log.debug('welcome agent') @@ -41,6 +43,7 @@ def handle_connection(conn, keys, signer): log.exception('error') raise + def server_thread(server, keys, signer): log.debug('server thread started') while True: diff --git a/sshagent/trezor_agent.py b/sshagent/trezor_agent.py index 9b6e477..ace191b 100644 --- a/sshagent/trezor_agent.py +++ b/sshagent/trezor_agent.py @@ -7,6 +7,7 @@ from . import trezor from . import server from . import formats + def main(): fmt = '%(asctime)s %(levelname)-12s %(message)-100s [%(filename)s]' p = argparse.ArgumentParser() diff --git a/sshagent/util.py b/sshagent/util.py index b837b71..49a925c 100644 --- a/sshagent/util.py +++ b/sshagent/util.py @@ -1,11 +1,13 @@ import struct import io + def send(conn, data, fmt=None): if fmt: data = struct.pack(fmt, *data) conn.sendall(data) + def recv(conn, size): try: fmt = size @@ -35,12 +37,14 @@ def read_frame(conn): size, = recv(conn, '>L') return recv(conn, size) + def bytes2num(s): res = 0 for i, c in enumerate(reversed(bytearray(s))): res += c << (i * 8) return res + def num2bytes(value, size): res = [] for i in range(size): @@ -49,9 +53,11 @@ def num2bytes(value, size): assert value == 0 return bytearray(list(reversed(res))) + def pack(fmt, *args): return struct.pack('>' + fmt, *args) + def frame(*msgs): res = io.BytesIO() for msg in msgs: