From cd3e0930019b815f9656db512e2b8ffc167cc0f6 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 3 Sep 2019 21:38:33 -0700 Subject: [PATCH] remove leftover simple security module --- libp2p/security/simple/transport.py | 79 ----------------------------- 1 file changed, 79 deletions(-) delete mode 100644 libp2p/security/simple/transport.py diff --git a/libp2p/security/simple/transport.py b/libp2p/security/simple/transport.py deleted file mode 100644 index 28187d1..0000000 --- a/libp2p/security/simple/transport.py +++ /dev/null @@ -1,79 +0,0 @@ -import asyncio - -from libp2p.crypto.keys import KeyPair -from libp2p.network.connection.raw_connection_interface import IRawConnection -from libp2p.peer.id import ID -from libp2p.security.base_transport import BaseSecureTransport -from libp2p.security.insecure.transport import InsecureSession -from libp2p.security.secure_conn_interface import ISecureConn -from libp2p.transport.exceptions import SecurityUpgradeFailure -from libp2p.utils import encode_fixedint_prefixed, read_fixedint_prefixed - - -class SimpleSecurityTransport(BaseSecureTransport): - key_phrase: str - - def __init__(self, local_key_pair: KeyPair, key_phrase: str) -> None: - super().__init__(local_key_pair) - self.key_phrase = key_phrase - - async def secure_inbound(self, conn: IRawConnection) -> ISecureConn: - """ - Secure the connection, either locally or by communicating with opposing node via conn, - for an inbound connection (i.e. we are not the initiator) - :return: secure connection object (that implements secure_conn_interface) - """ - await conn.write(encode_fixedint_prefixed(self.key_phrase.encode())) - incoming = (await read_fixedint_prefixed(conn)).decode() - - if incoming != self.key_phrase: - raise SecurityUpgradeFailure( - "Key phrase differed between nodes. Expected " + self.key_phrase - ) - - session = InsecureSession( - self.local_peer, self.local_private_key, conn, ID(b"") - ) - # NOTE: Here we calls `run_handshake` for both sides to exchange their public keys and - # peer ids, otherwise tests fail. However, it seems pretty weird that - # `SimpleSecurityTransport` sends peer id through `Insecure`. - await session.run_handshake() - # NOTE: this is abusing the abstraction we have here - # but this code may be deprecated soon and this exists - # mainly to satisfy a test that will go along w/ it - # FIXME: Enable type check back when we can deprecate the simple transport. - session.key_phrase = self.key_phrase # type: ignore - return session - - async def secure_outbound(self, conn: IRawConnection, peer_id: ID) -> ISecureConn: - """ - Secure the connection, either locally or by communicating with opposing node via conn, - for an inbound connection (i.e. we are the initiator) - :return: secure connection object (that implements secure_conn_interface) - """ - await conn.write(encode_fixedint_prefixed(self.key_phrase.encode())) - incoming = (await read_fixedint_prefixed(conn)).decode() - - # Force context switch, as this security transport is built for testing locally - # in a single event loop - await asyncio.sleep(0) - - if incoming != self.key_phrase: - raise SecurityUpgradeFailure( - "Key phrase differed between nodes. Expected " + self.key_phrase - ) - - session = InsecureSession( - self.local_peer, self.local_private_key, conn, peer_id - ) - - # NOTE: Here we calls `run_handshake` for both sides to exchange their public keys and - # peer ids, otherwise tests fail. However, it seems pretty weird that - # `SimpleSecurityTransport` sends peer id through `Insecure`. - await session.run_handshake() - # NOTE: this is abusing the abstraction we have here - # but this code may be deprecated soon and this exists - # mainly to satisfy a test that will go along w/ it - # FIXME: Enable type check back when we can deprecate the simple transport. - session.key_phrase = self.key_phrase # type: ignore - return session