Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Spacing and legibility

Browse Source
This commit is contained in:
Aldo Cortesi 2014-10-26 17:44:49 +13:00
parent efd6fdb0e2
commit 7aee9a7c31
2 changed files with 72 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmproxy/flow.py
View File

@ -719,7 +719,11 @@ class FlowMaster(controller.Master):
if f.live: if f.live:
app = self.apps.get(f.request) app = self.apps.get(f.request)
if app: if app:
err = app.serve(f, f.client_conn.wfile, **{"mitmproxy.master": self}) err = app.serve(
f,
f.client_conn.wfile,
**{"mitmproxy.master": self}
)
if err: if err:
self.add_event("Error in wsgi app. %s"%err, "error") self.add_event("Error in wsgi app. %s"%err, "error")
f.reply(protocol.KILL) f.reply(protocol.KILL)
@ -769,7 +773,6 @@ class FlowMaster(controller.Master):
self.stream = None self.stream = None
class FlowWriter: class FlowWriter:
def __init__(self, fo): def __init__(self, fo):
self.fo = fo self.fo = fo

88
libmproxy/protocol/http.py
View File

@ -313,25 +313,37 @@ class HTTPRequest(HTTPMessage):
request_line_parts = http.parse_init(request_line) request_line_parts = http.parse_init(request_line)
if not request_line_parts: if not request_line_parts:
raise http.HttpError(400, "Bad HTTP request line: %s" % repr(request_line)) raise http.HttpError(
400,
"Bad HTTP request line: %s" % repr(request_line)
)
method, path, httpversion = request_line_parts method, path, httpversion = request_line_parts
if path == '*' or path.startswith("/"): if path == '*' or path.startswith("/"):
form_in = "relative" form_in = "relative"
if not netlib.utils.isascii(path): if not netlib.utils.isascii(path):
raise http.HttpError(400, "Bad HTTP request line: %s" % repr(request_line)) raise http.HttpError(
400,
"Bad HTTP request line: %s" % repr(request_line)
)
elif method.upper() == 'CONNECT': elif method.upper() == 'CONNECT':
form_in = "authority" form_in = "authority"
r = http.parse_init_connect(request_line) r = http.parse_init_connect(request_line)
if not r: if not r:
raise http.HttpError(400, "Bad HTTP request line: %s" % repr(request_line)) raise http.HttpError(
400,
"Bad HTTP request line: %s" % repr(request_line)
)
host, port, _ = r host, port, _ = r
path = None path = None
else: else:
form_in = "absolute" form_in = "absolute"
r = http.parse_init_proxy(request_line) r = http.parse_init_proxy(request_line)
if not r: if not r:
raise http.HttpError(400, "Bad HTTP request line: %s" % repr(request_line)) raise http.HttpError(
400,
"Bad HTTP request line: %s" % repr(request_line)
)
_, scheme, host, port, path, _ = r _, scheme, host, port, path, _ = r
headers = http.read_headers(rfile) headers = http.read_headers(rfile)
@ -343,23 +355,39 @@ class HTTPRequest(HTTPMessage):
method, None, True) method, None, True)
timestamp_end = utils.timestamp() timestamp_end = utils.timestamp()
return HTTPRequest(form_in, method, scheme, host, port, path, httpversion, headers, return HTTPRequest(
content, timestamp_start, timestamp_end) form_in,
method,
scheme,
host,
port,
path,
httpversion,
headers,
content,
timestamp_start,
timestamp_end
)
def _assemble_first_line(self, form=None): def _assemble_first_line(self, form=None):
form = form or self.form_out form = form or self.form_out
if form == "relative": if form == "relative":
path = self.path if self.method != "OPTIONS" else "*" path = self.path if self.method != "OPTIONS" else "*"
request_line = '%s %s HTTP/%s.%s' % \ request_line = '%s %s HTTP/%s.%s' % (
(self.method, path, self.httpversion[0], self.httpversion[1]) self.method, path, self.httpversion[0], self.httpversion[1]
)
elif form == "authority": elif form == "authority":
request_line = '%s %s:%s HTTP/%s.%s' % (self.method, self.host, self.port, request_line = '%s %s:%s HTTP/%s.%s' % (
self.httpversion[0], self.httpversion[1]) self.method, self.host, self.port, self.httpversion[0],
self.httpversion[1]
)
elif form == "absolute": elif form == "absolute":
request_line = '%s %s://%s:%s%s HTTP/%s.%s' % \ request_line = '%s %s://%s:%s%s HTTP/%s.%s' % (
(self.method, self.scheme, self.host, self.port, self.path, self.method, self.scheme, self.host,
self.httpversion[0], self.httpversion[1]) self.port, self.path, self.httpversion[0],
self.httpversion[1]
)
else: else:
raise http.HttpError(400, "Invalid request form") raise http.HttpError(400, "Invalid request form")
return request_line return request_line
@ -371,7 +399,8 @@ class HTTPRequest(HTTPMessage):
'Connection', 'Connection',
'Transfer-Encoding']: 'Transfer-Encoding']:
del headers[k] del headers[k]
if headers["Upgrade"] == ["h2c"]: # Suppress HTTP2 https://http2.github.io/http2-spec/index.html#discover-http if headers["Upgrade"] == ["h2c"]:
# Suppress HTTP2 https://http2.github.io/http2-spec/index.html#discover-http
del headers["Upgrade"] del headers["Upgrade"]
if not 'host' in headers and self.scheme and self.host and self.port: if not 'host' in headers and self.scheme and self.host and self.port:
headers["Host"] = [utils.hostport(self.scheme, headers["Host"] = [utils.hostport(self.scheme,
@ -380,13 +409,16 @@ class HTTPRequest(HTTPMessage):
if self.content: if self.content:
headers["Content-Length"] = [str(len(self.content))] headers["Content-Length"] = [str(len(self.content))]
elif 'Transfer-Encoding' in self.headers: # content-length for e.g. chuncked transfer-encoding with no content elif 'Transfer-Encoding' in self.headers:
# content-length for e.g. chuncked transfer-encoding with no content
headers["Content-Length"] = ["0"] headers["Content-Length"] = ["0"]
return str(headers) return str(headers)
def _assemble_head(self, form=None): def _assemble_head(self, form=None):
return "%s\r\n%s\r\n" % (self._assemble_first_line(form), self._assemble_headers()) return "%s\r\n%s\r\n" % (
self._assemble_first_line(form), self._assemble_headers()
)
def assemble(self, form=None): def assemble(self, form=None):
""" """
@ -396,7 +428,10 @@ class HTTPRequest(HTTPMessage):
Raises an Exception if the request cannot be assembled. Raises an Exception if the request cannot be assembled.
""" """
if self.content == CONTENT_MISSING: if self.content == CONTENT_MISSING:
raise proxy.ProxyError(502, "Cannot assemble flow with CONTENT_MISSING") raise proxy.ProxyError(
502,
"Cannot assemble flow with CONTENT_MISSING"
)
head = self._assemble_head(form) head = self._assemble_head(form)
if self.content: if self.content:
return head + self.content return head + self.content
@ -937,16 +972,23 @@ class HTTPHandler(ProtocolHandler):
try: try:
self.c.server_conn.send(request_raw) self.c.server_conn.send(request_raw)
# Only get the headers at first... # Only get the headers at first...
flow.response = HTTPResponse.from_stream(self.c.server_conn.rfile, flow.request.method, flow.response = HTTPResponse.from_stream(
self.c.server_conn.rfile, flow.request.method,
body_size_limit=self.c.config.body_size_limit, body_size_limit=self.c.config.body_size_limit,
include_body=False) include_body=False
)
break break
except (tcp.NetLibDisconnect, http.HttpErrorConnClosed), v: except (tcp.NetLibDisconnect, http.HttpErrorConnClosed), v:
self.c.log("error in server communication: %s" % repr(v), level="debug") self.c.log(
"error in server communication: %s" % repr(v),
level="debug"
)
if attempt == 0: if attempt == 0:
# In any case, we try to reconnect at least once. # In any case, we try to reconnect at least once. This is
# This is necessary because it might be possible that we already initiated an upstream connection # necessary because it might be possible that we already
# after clientconnect that has already been expired, e.g consider the following event log: # initiated an upstream connection after clientconnect that
# has already been expired, e.g consider the following event
# log:
# > clientconnect (transparent mode destination known) # > clientconnect (transparent mode destination known)
# > serverconnect # > serverconnect
# > read n% of large request # > read n% of large request