diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-07-24 17:52:44 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-07-24 17:52:44 +0200 |
commit | 0892649d319d542897e4761cd75dc8206ec9a7b1 (patch) | |
tree | 833c4233335b9418658189e82937447defb90580 /test/test_server.py | |
parent | e0d1e8caf64e049d103a1273d83207dbf5df775b (diff) | |
parent | cedc0407de2fc4018c3d1852fc5678d532dc8e6e (diff) | |
download | mitmproxy-0892649d319d542897e4761cd75dc8206ec9a7b1.tar.gz mitmproxy-0892649d319d542897e4761cd75dc8206ec9a7b1.tar.bz2 mitmproxy-0892649d319d542897e4761cd75dc8206ec9a7b1.zip |
Merge pull request #675 from Kriechi/protocol-refactor
HTTP protocol refactoring
Diffstat (limited to 'test/test_server.py')
-rw-r--r-- | test/test_server.py | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/test/test_server.py b/test/test_server.py index 2805e936..10822ae4 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -1,15 +1,17 @@ import socket import time -from libmproxy.proxy.config import HostMatcher -import libpathod -from netlib import tcp, http_auth, http, socks -from libpathod import pathoc, pathod +from OpenSSL import SSL + +from netlib import tcp, http, socks from netlib.certutils import SSLCert -import tutils -import tservers +from netlib.http import authentication +from libpathod import pathoc, pathod + +from libmproxy.proxy.config import HostMatcher from libmproxy.protocol import KILL, Error from libmproxy.protocol.http import CONTENT_MISSING -from OpenSSL import SSL +import tutils +import tservers """ Note that the choice of response code in these tests matters more than you @@ -182,6 +184,9 @@ class TcpMixin: class AppMixin: def test_app(self): ret = self.app("/") + print(ret) + print(ret.status_code) + print(ret.content) assert ret.status_code == 200 assert "mitmproxy" in ret.content @@ -295,8 +300,8 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin): class TestHTTPAuth(tservers.HTTPProxTest): - authenticator = http_auth.BasicProxyAuth( - http_auth.PassManSingleUser( + authenticator = http.authentication.BasicProxyAuth( + http.authentication.PassManSingleUser( "test", "test"), "realm") @@ -310,8 +315,8 @@ class TestHTTPAuth(tservers.HTTPProxTest): h'%s'='%s' """ % ( self.server.port, - http_auth.BasicProxyAuth.AUTH_HEADER, - http.assemble_http_basic_auth("basic", "test", "test") + http.authentication.BasicProxyAuth.AUTH_HEADER, + authentication.assemble_http_basic_auth("basic", "test", "test") )) assert ret.status_code == 202 @@ -526,7 +531,7 @@ class TestHttps2Http(tservers.ReverseProxTest): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc( + p = pathoc.Pathoc( ("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None ) p.connect() @@ -765,22 +770,15 @@ class TestStreamRequest(tservers.HTTPProxTest): (self.server.urlbase, spec)) connection.send("\r\n") - httpversion, code, msg, headers, content = http.read_response( - fconn, "GET", None, include_body=False) + protocol = http.http1.HTTP1Protocol(rfile=fconn) + resp = protocol.read_response("GET", None, include_body=False) - assert headers["Transfer-Encoding"][0] == 'chunked' - assert code == 200 + assert resp.headers["Transfer-Encoding"][0] == 'chunked' + assert resp.status_code == 200 chunks = list( - content for _, - content, - _ in http.read_http_body_chunked( - fconn, - headers, - None, - "GET", - 200, - False)) + content for _, content, _ in protocol.read_http_body_chunked( + resp.headers, None, "GET", 200, False)) assert chunks == ["this", "isatest", ""] connection.close() |