aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-07-03 02:01:30 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-07-03 02:01:30 +0200
commit9aaf10120d08e12e7aa82fc2184ca7faa35349c3 (patch)
tree2b85293e7871cb96d587aa42b23ca6ddf2756c8d /test
parent9131b96b6338e96894969124afa3e197c7232e9b (diff)
downloadmitmproxy-9aaf10120d08e12e7aa82fc2184ca7faa35349c3.tar.gz
mitmproxy-9aaf10120d08e12e7aa82fc2184ca7faa35349c3.tar.bz2
mitmproxy-9aaf10120d08e12e7aa82fc2184ca7faa35349c3.zip
socks: add assert_socks5 method
Diffstat (limited to 'test')
-rw-r--r--test/test_socks.py57
1 files changed, 57 insertions, 0 deletions
diff --git a/test/test_socks.py b/test/test_socks.py
index a9db4706..eb5d55f9 100644
--- a/test/test_socks.py
+++ b/test/test_socks.py
@@ -9,6 +9,7 @@ def test_client_greeting():
raw = tutils.treader("\x05\x02\x00\xBE\xEF")
out = StringIO()
msg = socks.ClientGreeting.from_file(raw)
+ msg.assert_socks5()
msg.to_file(out)
assert out.getvalue() == raw.getvalue()[:-1]
@@ -18,10 +19,37 @@ def test_client_greeting():
assert 0xEF not in msg.methods
+def test_client_greeting_assert_socks5():
+ raw = tutils.treader("\x00\x00")
+ msg = socks.ClientGreeting.from_file(raw)
+ tutils.raises(socks.SocksError, msg.assert_socks5)
+
+ raw = tutils.treader("HTTP/1.1 200 OK" + " " * 100)
+ msg = socks.ClientGreeting.from_file(raw)
+ try:
+ msg.assert_socks5()
+ except socks.SocksError as e:
+ assert "Invalid SOCKS version" in str(e)
+ assert "HTTP" not in str(e)
+ else:
+ assert False
+
+ raw = tutils.treader("GET / HTTP/1.1" + " " * 100)
+ msg = socks.ClientGreeting.from_file(raw)
+ try:
+ msg.assert_socks5()
+ except socks.SocksError as e:
+ assert "Invalid SOCKS version" in str(e)
+ assert "HTTP" in str(e)
+ else:
+ assert False
+
+
def test_server_greeting():
raw = tutils.treader("\x05\x02")
out = StringIO()
msg = socks.ServerGreeting.from_file(raw)
+ msg.assert_socks5()
msg.to_file(out)
assert out.getvalue() == raw.getvalue()
@@ -29,10 +57,33 @@ def test_server_greeting():
assert msg.method == 0x02
+def test_server_greeting_assert_socks5():
+ raw = tutils.treader("HTTP/1.1 200 OK" + " " * 100)
+ msg = socks.ServerGreeting.from_file(raw)
+ try:
+ msg.assert_socks5()
+ except socks.SocksError as e:
+ assert "Invalid SOCKS version" in str(e)
+ assert "HTTP" in str(e)
+ else:
+ assert False
+
+ raw = tutils.treader("GET / HTTP/1.1" + " " * 100)
+ msg = socks.ServerGreeting.from_file(raw)
+ try:
+ msg.assert_socks5()
+ except socks.SocksError as e:
+ assert "Invalid SOCKS version" in str(e)
+ assert "HTTP" not in str(e)
+ else:
+ assert False
+
+
def test_message():
raw = tutils.treader("\x05\x01\x00\x03\x0bexample.com\xDE\xAD\xBE\xEF")
out = StringIO()
msg = socks.Message.from_file(raw)
+ msg.assert_socks5()
assert raw.read(2) == "\xBE\xEF"
msg.to_file(out)
@@ -43,6 +94,12 @@ def test_message():
assert msg.addr == ("example.com", 0xDEAD)
+def test_message_assert_socks5():
+ raw = tutils.treader("\xEE\x01\x00\x03\x0bexample.com\xDE\xAD\xBE\xEF")
+ msg = socks.Message.from_file(raw)
+ tutils.raises(socks.SocksError, msg.assert_socks5)
+
+
def test_message_ipv4():
# Test ATYP=0x01 (IPV4)
raw = tutils.treader("\x05\x01\x00\x01\x7f\x00\x00\x01\xDE\xAD\xBE\xEF")