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

Remove stray print & massage whitespace a bit

This commit is contained in:
Aldo Cortesi 2015-06-25 10:27:22 +12:00
parent becc790d83
commit 876252eba8
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libmproxy/protocol/http.py
View File

@ -1314,9 +1314,7 @@ class HTTPHandler(ProtocolHandler):
pass pass
elif request.form_in == self.expected_form_in: elif request.form_in == self.expected_form_in:
request.form_out = self.expected_form_out request.form_out = self.expected_form_out
if request.form_in == "absolute": if request.form_in == "absolute":
if request.scheme != "http": if request.scheme != "http":
raise http.HttpError( raise http.HttpError(
@ -1328,7 +1326,7 @@ class HTTPHandler(ProtocolHandler):
# value at flow.server_conn # value at flow.server_conn
self.c.set_server_address((request.host, request.port)) self.c.set_server_address((request.host, request.port))
flow.server_conn = self.c.server_conn flow.server_conn = self.c.server_conn
elif request.form_in == "relative": elif request.form_in == "relative":
if self.c.config.mode == "spoof": if self.c.config.mode == "spoof":
# Host header # Host header
@ -1340,22 +1338,21 @@ class HTTPHandler(ProtocolHandler):
) )
p = http.parse_url("http://" + h) p = http.parse_url("http://" + h)
request.scheme = p[0] request.scheme = p[0]
request.host = p[1] request.host = p[1]
request.port = p[2] request.port = p[2]
self.c.set_server_address((request.host, request.port)) self.c.set_server_address((request.host, request.port))
flow.server_conn = self.c.server_conn flow.server_conn = self.c.server_conn
if self.c.config.mode == "sslspoof": if self.c.config.mode == "sslspoof":
# SNI is processed in server.py # SNI is processed in server.py
if not (flow.server_conn and flow.server_conn.ssl_established): if not (flow.server_conn and flow.server_conn.ssl_established):
print ":::::::::::::::"
raise http.HttpError( raise http.HttpError(
400, 400,
"Invalid request: No host information" "Invalid request: No host information"
) )
return None return None
raise http.HttpError( raise http.HttpError(
400, "Invalid HTTP request form (expected: %s, got: %s)" % ( 400, "Invalid HTTP request form (expected: %s, got: %s)" % (
self.expected_form_in, request.form_in self.expected_form_in, request.form_in