Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor http

This commit is contained in:
Thomas Kriechbaumer 2016-08-18 17:33:48 +02:00
parent 87b5312bd5
commit bee7d368dd
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mitmproxy/protocol/http.py
View File

@ -158,7 +158,6 @@ class HttpLayer(base.Layer):
if self.mode == "regular" and request.first_line_format == "authority": if self.mode == "regular" and request.first_line_format == "authority":
self.handle_regular_mode_connect(request) self.handle_regular_mode_connect(request)
return return
except netlib.exceptions.HttpReadDisconnect: except netlib.exceptions.HttpReadDisconnect:
# don't throw an error for disconnects that happen before/between requests. # don't throw an error for disconnects that happen before/between requests.
return return
@ -170,13 +169,18 @@ class HttpLayer(base.Layer):
try: try:
flow = models.HTTPFlow(self.client_conn, self.server_conn, live=self) flow = models.HTTPFlow(self.client_conn, self.server_conn, live=self)
flow.request = request flow.request = request
# set upstream auth # set upstream auth
if self.mode == "upstream" and self.config.upstream_auth is not None: if self.mode == "upstream" and self.config.upstream_auth is not None:
flow.request.headers["Proxy-Authorization"] = self.config.upstream_auth flow.request.headers["Proxy-Authorization"] = self.config.upstream_auth
self.process_request_hook(flow) self.process_request_hook(flow)
if not flow.response: if not flow.response:
self.establish_server_connection(flow) self.establish_server_connection(
flow.request.host,
flow.request.port,
flow.request.scheme
)
self.get_response_from_server(flow) self.get_response_from_server(flow)
else: else:
# response was set by an inline script. # response was set by an inline script.
@ -227,9 +231,9 @@ class HttpLayer(base.Layer):
request.body = b"".join(self.read_request_body(request)) request.body = b"".join(self.read_request_body(request))
return request return request
def send_error_response(self, code, message): def send_error_response(self, code, message, headers=None):
try: try:
response = models.make_error_response(code, message) response = models.make_error_response(code, message, headers)
self.send_response(response) self.send_response(response)
except (netlib.exceptions.NetlibException, h2.exceptions.H2Error, exceptions.Http2ProtocolException): except (netlib.exceptions.NetlibException, h2.exceptions.H2Error, exceptions.Http2ProtocolException):
self.log(traceback.format_exc(), "debug") self.log(traceback.format_exc(), "debug")
@ -343,9 +347,9 @@ class HttpLayer(base.Layer):
flow.response = request_reply flow.response = request_reply
return return
def establish_server_connection(self, flow): def establish_server_connection(self, host, port, scheme):
address = tcp.Address((flow.request.host, flow.request.port)) address = tcp.Address((host, port))
tls = (flow.request.scheme == "https") tls = (scheme == "https")
if self.mode == "regular" or self.mode == "transparent": if self.mode == "regular" or self.mode == "transparent":
# If there's an existing connection that doesn't match our expectations, kill it. # If there's an existing connection that doesn't match our expectations, kill it.