aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-10-16 23:50:25 -0700
committerGitHub <noreply@github.com>2016-10-16 23:50:25 -0700
commit7047531a3c639f331a5fbca2ab734846f6629f8d (patch)
tree1b8f333449e5ed2c296de160ac02c70edba0404c /test
parent02d3d618204bce2bc0ed088a556a94a8479dcf31 (diff)
parent758860531a5602a3280fc3669aa7dfbc327f1c56 (diff)
downloadmitmproxy-7047531a3c639f331a5fbca2ab734846f6629f8d.tar.gz
mitmproxy-7047531a3c639f331a5fbca2ab734846f6629f8d.tar.bz2
mitmproxy-7047531a3c639f331a5fbca2ab734846f6629f8d.zip
Merge pull request #1619 from mhils/fix-socks-tls
Fix SOCKS5 mode with TLS
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_server.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index 923d8ccf..a175d193 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -536,6 +536,18 @@ class TestSocks5(tservers.SocksModeTest):
assert b"SOCKS5 mode failure" in f.content
+class TestSocks5SSL(tservers.SocksModeTest):
+ ssl = True
+
+ def test_simple(self):
+ p = self.pathoc_raw()
+ with p.connect():
+ p.socks_connect(("localhost", self.server.port))
+ p.convert_to_ssl()
+ f = p.request("get:/p/200")
+ assert f.status_code == 200
+
+
class TestHttps2Http(tservers.ReverseProxyTest):
@classmethod