From dea3f21943f111ae7991eaad380d365c263a9f9b Mon Sep 17 00:00:00 2001 From: Brian May Date: Wed, 16 Mar 2016 18:24:43 +1100 Subject: [PATCH] Write more server tests --- sshuttle/server.py | 3 ++ sshuttle/tests/server/test_server.py | 62 ++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/sshuttle/server.py b/sshuttle/server.py index 4ae2749..78252b8 100644 --- a/sshuttle/server.py +++ b/sshuttle/server.py @@ -17,6 +17,7 @@ from sshuttle.helpers import log, debug1, debug2, debug3, Fatal, \ def _ipmatch(ipstr): + # FIXME: IPv4 only if ipstr == b'default': ipstr = b'0.0.0.0/0' m = re.match(b'^(\d+(\.\d+(\.\d+(\.\d+)?)?)?)(?:/(\d+))?$', ipstr) @@ -38,6 +39,7 @@ def _ipmatch(ipstr): def _ipstr(ip, width): + # FIXME: IPv4 only if width >= 32: return ip else: @@ -45,6 +47,7 @@ def _ipstr(ip, width): def _maskbits(netmask): + # FIXME: IPv4 only if not netmask: return 32 for i in range(32): diff --git a/sshuttle/tests/server/test_server.py b/sshuttle/tests/server/test_server.py index 34ad2a7..bf6985f 100644 --- a/sshuttle/tests/server/test_server.py +++ b/sshuttle/tests/server/test_server.py @@ -1,7 +1,63 @@ +import io +import socket import sshuttle.server +from mock import patch, Mock, call def test__ipmatch(): - assert sshuttle.server._ipmatch("1.2.3.4") is not None - assert sshuttle.server._ipmatch("::1") is not None - assert sshuttle.server._ipmatch("42 Example Street, Melbourne") is None + assert sshuttle.server._ipmatch(b"1.2.3.4") is not None + assert sshuttle.server._ipmatch(b"::1") is None # ipv6 not supported + assert sshuttle.server._ipmatch(b"42 Example Street, Melbourne") is None + + +def test__ipstr(): + assert sshuttle.server._ipstr("1.2.3.4", 24) == "1.2.3.4/24" + assert sshuttle.server._ipstr("1.2.3.4", 32) == "1.2.3.4" + + +def test__maskbits(): + netmask = sshuttle.server._ipmatch(b"255.255.255.0") + sshuttle.server._maskbits(netmask) + + +@patch('sshuttle.server.ssubprocess.Popen') +def test__listroutes(mock_popen): + mock_pobj = Mock() + mock_pobj.stdout = io.BytesIO(b""" +Kernel IP routing table +Destination Gateway Genmask Flags MSS Window irtt Iface +0.0.0.0 192.168.1.1 0.0.0.0 UG 0 0 0 wlan0 +192.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 wlan0 +""") + mock_pobj.wait.return_value = 0 + mock_popen.return_value = mock_pobj + + routes = sshuttle.server._list_routes() + + assert mock_popen.mock_calls == [ + call(['netstat', '-rn'], stdout=-1), + call().wait() + ] + assert routes == [ + (socket.AF_INET, '0.0.0.0', 0), + (socket.AF_INET, '192.168.1.0', 24) + ] + + +@patch('sshuttle.server.ssubprocess.Popen') +def test_listroutes(mock_popen): + mock_pobj = Mock() + mock_pobj.stdout = io.BytesIO(b""" +Kernel IP routing table +Destination Gateway Genmask Flags MSS Window irtt Iface +0.0.0.0 192.168.1.1 0.0.0.0 UG 0 0 0 wlan0 +192.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 wlan0 +""") + mock_pobj.wait.return_value = 0 + mock_popen.return_value = mock_pobj + + routes = sshuttle.server.list_routes() + + assert list(routes) == [ + (socket.AF_INET, '192.168.1.0', 24) + ]