Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-02-01 15:55:28 +00:00
Code Issues Projects Releases Wiki Activity

adapt netlib changes

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2015-08-21 10:26:28 +02:00
parent 55cfd259dc
commit 05d26545e4
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmproxy/protocol/http.py
View File

@ -41,7 +41,7 @@ def send_connect_request(conn, host, port, update_state=True):
protocol = http1.HTTP1Protocol(conn) protocol = http1.HTTP1Protocol(conn)
conn.send(protocol.assemble(upstream_request)) conn.send(protocol.assemble(upstream_request))
resp = HTTPResponse.from_protocol(protocol, upstream_request.method) resp = HTTPResponse.from_protocol(protocol, upstream_request)
if resp.status_code != 200: if resp.status_code != 200:
raise proxy.ProxyError(resp.status_code, raise proxy.ProxyError(resp.status_code,
"Cannot establish SSL " + "Cannot establish SSL " +
@ -177,7 +177,7 @@ class HTTPHandler(ProtocolHandler):
# Only get the headers at first... # Only get the headers at first...
flow.response = HTTPResponse.from_protocol( flow.response = HTTPResponse.from_protocol(
self.c.server_conn.protocol, self.c.server_conn.protocol,
flow.request.method, flow.request,
body_size_limit=self.c.config.body_size_limit, body_size_limit=self.c.config.body_size_limit,
include_body=False, include_body=False,
) )
@ -760,7 +760,7 @@ class RequestReplayThread(threading.Thread):
self.flow.server_conn.protocol = http1.HTTP1Protocol(self.flow.server_conn) self.flow.server_conn.protocol = http1.HTTP1Protocol(self.flow.server_conn)
self.flow.response = HTTPResponse.from_protocol( self.flow.response = HTTPResponse.from_protocol(
self.flow.server_conn.protocol, self.flow.server_conn.protocol,
r.method, r,
body_size_limit=self.config.body_size_limit, body_size_limit=self.config.body_size_limit,
) )
if self.channel: if self.channel:

4
libmproxy/protocol/http_wrappers.py
View File

@ -352,12 +352,12 @@ class HTTPResponse(MessageMixin, semantics.Response):
def from_protocol( def from_protocol(
self, self,
protocol, protocol,
request_method, request,
include_body=True, include_body=True,
body_size_limit=None body_size_limit=None
): ):
resp = protocol.read_response( resp = protocol.read_response(
request_method, request,
body_size_limit, body_size_limit,
include_body=include_body include_body=include_body
) )

4
libmproxy/protocol2/http.py
View File

@ -37,7 +37,7 @@ class Http1Layer(Layer):
def read_from_server(self, request): def read_from_server(self, request):
return HTTPResponse.from_protocol( return HTTPResponse.from_protocol(
self.server_protocol, self.server_protocol,
request.method, request,
body_size_limit=self.config.body_size_limit, body_size_limit=self.config.body_size_limit,
include_body=False, include_body=False,
) )
@ -80,7 +80,7 @@ class Http2Layer(Layer):
def read_from_server(self, request): def read_from_server(self, request):
response = HTTPResponse.from_protocol( response = HTTPResponse.from_protocol(
self.server_protocol, self.server_protocol,
request.method, request,
body_size_limit=self.config.body_size_limit, body_size_limit=self.config.body_size_limit,
include_body=False, include_body=False,
) )

9
test/test_protocol_http.py
View File

@ -4,6 +4,7 @@ from cStringIO import StringIO
from mock import MagicMock from mock import MagicMock
from libmproxy.protocol.http import * from libmproxy.protocol.http import *
import netlib.http
from netlib import odict from netlib import odict
from netlib.http import http1 from netlib.http import http1
from netlib.http.semantics import CONTENT_MISSING from netlib.http.semantics import CONTENT_MISSING
@ -27,19 +28,19 @@ class TestHTTPResponse:
"\r\n" "\r\n"
protocol = mock_protocol(s) protocol = mock_protocol(s)
r = HTTPResponse.from_protocol(protocol, "GET") r = HTTPResponse.from_protocol(protocol, netlib.http.EmptyRequest(method="GET"))
assert r.status_code == 200 assert r.status_code == 200
assert r.content == "content" assert r.content == "content"
assert HTTPResponse.from_protocol(protocol, "GET").status_code == 204 assert HTTPResponse.from_protocol(protocol, netlib.http.EmptyRequest(method="GET")).status_code == 204
protocol = mock_protocol(s) protocol = mock_protocol(s)
# HEAD must not have content by spec. We should leave it on the pipe. # HEAD must not have content by spec. We should leave it on the pipe.
r = HTTPResponse.from_protocol(protocol, "HEAD") r = HTTPResponse.from_protocol(protocol, netlib.http.EmptyRequest(method="HEAD"))
assert r.status_code == 200 assert r.status_code == 200
assert r.content == "" assert r.content == ""
tutils.raises( tutils.raises(
"Invalid server response: 'content", "Invalid server response: 'content",
HTTPResponse.from_protocol, protocol, "GET" HTTPResponse.from_protocol, protocol, netlib.http.EmptyRequest(method="GET")
) )