From d3617db0d28d5860e4d7180fa7e188c94cb00875 Mon Sep 17 00:00:00 2001 From: Viktor Villainov Date: Mon, 31 Dec 2018 00:54:49 -0500 Subject: [PATCH] Make SAM message parser work for both requests and responses --- i2plib/aiosam.py | 2 +- i2plib/sam.py | 12 ++++---- test/test_func.py | 78 +++++++++++++++++++++++++++++------------------ 3 files changed, 55 insertions(+), 37 deletions(-) diff --git a/i2plib/aiosam.py b/i2plib/aiosam.py index cd4e5f4..ff7973f 100644 --- a/i2plib/aiosam.py +++ b/i2plib/aiosam.py @@ -8,7 +8,7 @@ import i2plib.utils BUFFER_SIZE = 65536 def parse_reply(data): - return i2plib.sam.Answer(data.split(b"\n")[0].decode()) + return i2plib.sam.Message(data.split(b"\n")[0].decode()) async def get_sam_socket(sam_address=i2plib.sam.DEFAULT_ADDRESS, loop=None): """A couroutine used to create a new SAM socket. diff --git a/i2plib/sam.py b/i2plib/sam.py index bdb5257..562cc34 100644 --- a/i2plib/sam.py +++ b/i2plib/sam.py @@ -27,8 +27,8 @@ TRANSIENT_DESTINATION = "TRANSIENT" VALID_BASE32_ADDRESS = re.compile(r"^([a-zA-Z0-9]{52}).b32.i2p$") VALID_BASE64_ADDRESS = re.compile(r"^([a-zA-Z0-9-~=]{516,528})$") -class Answer(object): - """Parse answer from SAM bridge to an object""" +class Message(object): + """Parse SAM message to an object""" def __init__(self, s): self.opts = {} if type(s) != str: @@ -36,8 +36,8 @@ class Answer(object): else: self._reply_string = s - self.cmd, opts = self._reply_string.split(" ", 1) - for v in opts.split(" ")[1:]: + self.cmd, self.action, opts = self._reply_string.split(" ", 2) + for v in opts.split(" "): data = v.split("=", 1) if "=" in v else (v, True) self.opts[data[0]] = data[1] @@ -79,8 +79,8 @@ def generate_session_id(length=6): return "i2plib-" + "".join(sid) def get_response(sam_socket): - """Read answer from SAM API""" - return Answer(sam_socket.recv(SAM_BUFSIZE)) + """Read message from SAM API""" + return Message(sam_socket.recv(SAM_BUFSIZE)) # SAM request messages diff --git a/test/test_func.py b/test/test_func.py index a5f9896..1cae6e0 100644 --- a/test/test_func.py +++ b/test/test_func.py @@ -2,40 +2,55 @@ import unittest import asyncio import i2plib +import i2plib.sam BUFFER_SIZE = 65536 -PK_B64 = "5pJLIgm7KCqk-d0As66OdeMRj4moqtD97wOluQh5SXWCbeMfp7cr8cgHU~5rrcN6V~QcIJuqjDpYWojBdjYrc7fAA3iwWpN4fzI05yvE48oOOOLqBq7SvkpyzIhjc0hv81XQIu0LWzXXS~-B61wurJhte-LisF571BzefV5xoaRN8y3A0RidaJyuzVufPP4cKY5NeSsmTY36QRl54PG7iWJSXnLROROlg6qsjoeIV9lyNFY6ZsQKTQzEIInCZaARmNfoJP-MAsOMoj-CRDU2MXhYT~DKdI-rWH579A3wuoEjmlHtHyms7xvwUkb6kIx5UJHZmzF2Hyv3xVrpu0HSkZfUIbzz1lAc4IZ-8jnBjt2RIRpYMNnwZW09HjJXQDd7K-QvpxpK-cqNJcmWehGP7OxLt9Jj6h~8aUFHIJtFI77Zmp~YGf7cO9vCZexeLn7iByqDtfhzTP62IPu0~MJafA4efU83A-DXo8PJhOhl7rYRzH7bWRzB1rhBI~w~TsVOBQAEAAcAAL0me7gfS2H-OZ3FAsPtbUFCFpTcvfLAzBmNxxYU5TflB4KcxNe2isp2UjM7YLCuZg6OCaBSEnoag-ABpJPkY0WIjkqbFzOlowH2oVwevFHrZCFwvf1XVXsyWdupACHmmRHFCHKHMKzolO3Cye0RMH0wIEyMRyIszSThft~keXWyuEwBM4Vros-OKrKN-mBrHNbzQzTiGLS0dVMzdPvG6Pq4t1~wCWqAXrO8n7xU-xQECEpl053Ml5AJyUaCoVj3xqCd4nbrH2~kLmvd9r2nnd-Ig19BFHNALadSYbcH9JEdJZPY~7c505W1xhsrM2PcNnE4hm8DF4R~AddaILD7b2d1l~kehRZpUKdCL~THPTM20kTyN2PFqghIA4Ng-tVmXw==" -PK_B64_CLIENT = "Fyax0ON9-Djvy5G7z7ZRyyu7vjK9-dcg4ei94Lnfd1IEI8DqQj3PTytWql-rltRmeMg9pRAm3XqpTNcGR0a26KR3cFNIwRgCKCQ3BOU8bNZQXpaWEpfhoOGKd5Nt9~qI6M3kFcbv8WWVtlPCNEnzjPbXhr0XLuttYFdOPuCDlzxXEHe8NVMTAhXKiuBox7c8zRB~WT6AMJxedf9u3nXLQOYV~ZT-4-xoHcbp1zwbRnvYJ0yjBNprmaac5xo1Zu~k9q93ug3S08FwwjioDswTl9ZyEJkrxTtaUdH~OwCKRVmXhP-HIKMXeBdDRrPFGBKPe-igAyuIdD5zYlgJwxkYsZAvU8XeQRpck7krFhLSgGez8zlpgZi7oUdbYMC6BpqZpDLppWCl9bOz5tX55gd3nbWEYb0DDlVyCAhBkfznUvmOlHmdcAHGS-B7e4WTi0yRb76hRrecHiX2tqDI7UGTAlTIx0TGW3Pa7gMImb5bV5n5TsYw7qBJABgMPSP6MkjtAAAAfn2Z9dSDlwpIVfjzxqhq7lY9So5O0PYFIFYshZhNim7R6nXJbn-QX9DoZ7JGEx9uXndWu6tEApY6q1OGAeXhjEnHagF1o13GpqZ4wgYuOehaq1fmJyFoeYQToHiBsXyo1FE1GeGV8JYJLOWHLKuxay9Nh84yyJ6XJGgylElqnl4WGiwqc0qsAk7l209agFggMCyqCx~nSFMtfGZ2pKp-i7H3HQC9BM0SednWiVsgRPGG20Z-WoQtHTvj5~VUhIbXpa1BGj~sOydi27A3xQPQYtEXhhfWKRGs7pAaobfaUeSnQ12a09LXO8U53eGPioVdSbTMOTqkuWhGEuXebx9DxV3hUdopRSpKSnCT6U9Fc5GpqRKk" -NAMING_REPLY = "5pJLIgm7KCqk-d0As66OdeMRj4moqtD97wOluQh5SXWCbeMfp7cr8cgHU~5rrcN6V~QcIJuqjDpYWojBdjYrc7fAA3iwWpN4fzI05yvE48oOOOLqBq7SvkpyzIhjc0hv81XQIu0LWzXXS~-B61wurJhte-LisF571BzefV5xoaRN8y3A0RidaJyuzVufPP4cKY5NeSsmTY36QRl54PG7iWJSXnLROROlg6qsjoeIV9lyNFY6ZsQKTQzEIInCZaARmNfoJP-MAsOMoj-CRDU2MXhYT~DKdI-rWH579A3wuoEjmlHtHyms7xvwUkb6kIx5UJHZmzF2Hyv3xVrpu0HSkZfUIbzz1lAc4IZ-8jnBjt2RIRpYMNnwZW09HjJXQDd7K-QvpxpK-cqNJcmWehGP7OxLt9Jj6h~8aUFHIJtFI77Zmp~YGf7cO9vCZexeLn7iByqDtfhzTP62IPu0~MJafA4efU83A-DXo8PJhOhl7rYRzH7bWRzB1rhBI~w~TsVOBQAEAAcAAA==" -CLIENT_DESTINATION = "m6ha8qpiaEuH4OR4MQl2wvAl09sZCHBqi~cOuCBKfLE4F9gkxgYqNPvXU8QQXQ0XHTze~HTA2hNu8mgtCyyMKII4IEyF2CkbhjVF0yYEKDuTAmd-L6NXqj6Wa64X0GdvwdwOHknBNcw7pU8tUbgIu09T-~K6EGzshgmerg03fey1TPC8Q8bbemho-GGZqRyUvWe2U2HmXSis-OyJOGOJChkEfd40lizrEiKtkj8jOLQXxgN2A1oxAtyzN2hkzqK-WwYk8CaNW-SR~nZBFPSDL8KsWWapiSDXG7z8tCjnVana6psk4jms186vuy3Yp302MfLt~hza-5V2622aJENP2ipvfp7O2iaGuaRNTymYn6IDRgD7pM7GIXvtCTCW2GRAKGqf8bjm6GCQu0s0OZuU5M7qoTnJ83SY3sjWd8EBEjFT6NeSu14wdej11Q8itSLP7XOwYFCNNj2jEmKTPcn4I9QkBYy1Zd1P44EUpEuHXn5OWwF-M7sQBx4vn5chzFCuAAAA" -DEST_B32 = "bxwnysaa2nwykldz4ekz6u243x5ctqlcot5acmzj2huylvwr7eyq.b32.i2p" +SERVER_DEST_B64 = "5pJLIgm7KCqk-d0As66OdeMRj4moqtD97wOluQh5SXWCbeMfp7cr8cgHU~5rrcN6V~QcIJuqjDpYWojBdjYrc7fAA3iwWpN4fzI05yvE48oOOOLqBq7SvkpyzIhjc0hv81XQIu0LWzXXS~-B61wurJhte-LisF571BzefV5xoaRN8y3A0RidaJyuzVufPP4cKY5NeSsmTY36QRl54PG7iWJSXnLROROlg6qsjoeIV9lyNFY6ZsQKTQzEIInCZaARmNfoJP-MAsOMoj-CRDU2MXhYT~DKdI-rWH579A3wuoEjmlHtHyms7xvwUkb6kIx5UJHZmzF2Hyv3xVrpu0HSkZfUIbzz1lAc4IZ-8jnBjt2RIRpYMNnwZW09HjJXQDd7K-QvpxpK-cqNJcmWehGP7OxLt9Jj6h~8aUFHIJtFI77Zmp~YGf7cO9vCZexeLn7iByqDtfhzTP62IPu0~MJafA4efU83A-DXo8PJhOhl7rYRzH7bWRzB1rhBI~w~TsVOBQAEAAcAAL0me7gfS2H-OZ3FAsPtbUFCFpTcvfLAzBmNxxYU5TflB4KcxNe2isp2UjM7YLCuZg6OCaBSEnoag-ABpJPkY0WIjkqbFzOlowH2oVwevFHrZCFwvf1XVXsyWdupACHmmRHFCHKHMKzolO3Cye0RMH0wIEyMRyIszSThft~keXWyuEwBM4Vros-OKrKN-mBrHNbzQzTiGLS0dVMzdPvG6Pq4t1~wCWqAXrO8n7xU-xQECEpl053Ml5AJyUaCoVj3xqCd4nbrH2~kLmvd9r2nnd-Ig19BFHNALadSYbcH9JEdJZPY~7c505W1xhsrM2PcNnE4hm8DF4R~AddaILD7b2d1l~kehRZpUKdCL~THPTM20kTyN2PFqghIA4Ng-tVmXw==" +CLIENT_DEST_B64 = "Fyax0ON9-Djvy5G7z7ZRyyu7vjK9-dcg4ei94Lnfd1IEI8DqQj3PTytWql-rltRmeMg9pRAm3XqpTNcGR0a26KR3cFNIwRgCKCQ3BOU8bNZQXpaWEpfhoOGKd5Nt9~qI6M3kFcbv8WWVtlPCNEnzjPbXhr0XLuttYFdOPuCDlzxXEHe8NVMTAhXKiuBox7c8zRB~WT6AMJxedf9u3nXLQOYV~ZT-4-xoHcbp1zwbRnvYJ0yjBNprmaac5xo1Zu~k9q93ug3S08FwwjioDswTl9ZyEJkrxTtaUdH~OwCKRVmXhP-HIKMXeBdDRrPFGBKPe-igAyuIdD5zYlgJwxkYsZAvU8XeQRpck7krFhLSgGez8zlpgZi7oUdbYMC6BpqZpDLppWCl9bOz5tX55gd3nbWEYb0DDlVyCAhBkfznUvmOlHmdcAHGS-B7e4WTi0yRb76hRrecHiX2tqDI7UGTAlTIx0TGW3Pa7gMImb5bV5n5TsYw7qBJABgMPSP6MkjtAAAAfn2Z9dSDlwpIVfjzxqhq7lY9So5O0PYFIFYshZhNim7R6nXJbn-QX9DoZ7JGEx9uXndWu6tEApY6q1OGAeXhjEnHagF1o13GpqZ4wgYuOehaq1fmJyFoeYQToHiBsXyo1FE1GeGV8JYJLOWHLKuxay9Nh84yyJ6XJGgylElqnl4WGiwqc0qsAk7l209agFggMCyqCx~nSFMtfGZ2pKp-i7H3HQC9BM0SednWiVsgRPGG20Z-WoQtHTvj5~VUhIbXpa1BGj~sOydi27A3xQPQYtEXhhfWKRGs7pAaobfaUeSnQ12a09LXO8U53eGPioVdSbTMOTqkuWhGEuXebx9DxV3hUdopRSpKSnCT6U9Fc5GpqRKk" + +SERVER_DEST = i2plib.Destination(SERVER_DEST_B64, has_private_key=True) +CLIENT_DEST = i2plib.Destination(CLIENT_DEST_B64, has_private_key=True) + +SESSION_DEST_MAP = {"ppserver": SERVER_DEST_B64, "ppclient": CLIENT_DEST_B64} async def fake_sam_server_handler(reader, writer): + session = None + data_transfer = False + while True: data = await reader.read(BUFFER_SIZE) if not data: break - if data.startswith(b"HELLO VERSION"): - writer.write(b"HELLO REPLY RESULT=OK VERSION=3.1\n") - elif data.startswith(b"SESSION CREATE STYLE=STREAM ID=ppserver"): - writer.write("SESSION STATUS RESULT=OK DESTINATION={}\n".format( - PK_B64).encode()) - elif data.startswith(b"SESSION CREATE STYLE=STREAM ID=ppclient"): - writer.write("SESSION STATUS RESULT=OK DESTINATION={}\n".format( - PK_B64_CLIENT).encode()) - elif data.startswith(b"NAMING LOOKUP NAME"): - writer.write("NAMING REPLY RESULT=OK NAME=ME VALUE={}\n".format( - NAMING_REPLY).encode()) - elif data.startswith(b"STREAM ACCEPT"): - writer.write(b"STREAM STATUS RESULT=OK\n") - await asyncio.sleep(0.1) - writer.write("{}\n".format(CLIENT_DESTINATION).encode()) - await asyncio.sleep(0.1) - writer.write(b"PING") - elif data.startswith(b"STREAM CONNECT"): - writer.write(b"STREAM STATUS RESULT=OK\n") - elif data.startswith(b"PING"): - writer.write(b"PONG") + + if not data_transfer: + msg = i2plib.sam.Message(data.split(b"\n")[0].decode()) + + if msg.cmd == "HELLO": + writer.write(b"HELLO REPLY RESULT=OK VERSION=3.1\n") + elif msg.cmd == "NAMING" and msg.action == "LOOKUP": + writer.write("NAMING REPLY RESULT=OK NAME=ME VALUE={}\n".format( + SERVER_DEST.base64).encode()) + elif msg.cmd == "SESSION" and msg.action == "CREATE": + session = msg["ID"] + writer.write("SESSION STATUS RESULT=OK DESTINATION={}\n".format( + SESSION_DEST_MAP[session]).encode()) + elif msg.cmd == "STREAM" and msg.action == "ACCEPT": + session = msg["ID"] + if session == "ppserver": + writer.write(b"STREAM STATUS RESULT=OK\n") + await asyncio.sleep(0.1) + writer.write("{}\n".format(CLIENT_DEST.base64).encode()) + await asyncio.sleep(0.1) + data_transfer = True + writer.write(b"PING") + elif msg.cmd == "STREAM" and msg.action == "CONNECT": + session = msg["ID"] + if session == "ppclient": + writer.write(b"STREAM STATUS RESULT=OK\n") + data_transfer = True + else: + if data == b"PING": + writer.write(b"PONG") writer.close() @@ -61,19 +76,20 @@ class TestFuncPingPong(unittest.TestCase): def test_coroutines_ping_pong(self): async def coroutines_test(): _, server_session_writer = await i2plib.create_session("ppserver", - sam_address=self.sam_address, loop=self.loop, destination=PK_B64) + sam_address=self.sam_address, loop=self.loop, destination=SERVER_DEST) server_reader, server_writer = await i2plib.stream_accept("ppserver", sam_address=self.sam_address, loop=self.loop) _, client_session_writer = await i2plib.create_session("ppclient", sam_address=self.sam_address, loop=self.loop) client_reader, client_writer = await i2plib.stream_connect("ppclient", - DEST_B32, sam_address=self.sam_address, loop=self.loop) + SERVER_DEST.base32 + ".b32.i2p", sam_address=self.sam_address, loop=self.loop) client_writer.write(b"PING") incoming = await server_reader.read(BUFFER_SIZE) dest, request = incoming.split(b"\n", 1) remote_destination = i2plib.Destination(dest.decode()) + self.assertEqual(remote_destination.base32, CLIENT_DEST.base32) if not request: request = await server_reader.read(BUFFER_SIZE) self.assertEqual(request, b"PING") @@ -91,12 +107,13 @@ class TestFuncPingPong(unittest.TestCase): def test_context_managers_ping_pong(self): async def context_managers_test(): async def server(sam_address, loop, ready): - async with i2plib.Session("ppserver", sam_address=sam_address, loop=loop, destination=PK_B64): + async with i2plib.Session("ppserver", sam_address=sam_address, loop=loop, destination=SERVER_DEST): ready.release() async with i2plib.StreamAcceptor("ppserver", sam_address=sam_address, loop=loop) as s: incoming = await s.read(BUFFER_SIZE) dest, request = incoming.split(b"\n", 1) remote_destination = i2plib.Destination(dest.decode()) + self.assertEqual(remote_destination.base32, CLIENT_DEST.base32) if not request: request = await s.read(BUFFER_SIZE) self.assertEqual(request, b"PING") @@ -108,7 +125,8 @@ class TestFuncPingPong(unittest.TestCase): await ready.acquire() async with i2plib.Session("ppclient", sam_address=self.sam_address, loop=self.loop): - async with i2plib.StreamConnection("ppclient", DEST_B32, sam_address=self.sam_address, loop=self.loop) as c: + async with i2plib.StreamConnection("ppclient", + SERVER_DEST.base32 + ".b32.i2p", sam_address=self.sam_address, loop=self.loop) as c: c.write(b"PING") response = await c.read(BUFFER_SIZE) self.assertEqual(response, b"PONG")