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

Merge branch 'master' of ssh.github.com:cortesi/mitmproxy

Browse Source
This commit is contained in:
Aldo Cortesi 2013-12-10 22:24:23 +13:00
commit a600441e37
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libmproxy/proxy.py
View File

@ -213,6 +213,8 @@ class ProxyHandler(tcp.BaseHandler):
request = request_reply request = request_reply
if self.config.reverse_proxy: if self.config.reverse_proxy:
scheme, host, port = self.config.reverse_proxy scheme, host, port = self.config.reverse_proxy
elif self.config.forward_proxy:
scheme, host, port = self.config.forward_proxy
else: else:
scheme, host, port = request.scheme, request.host, request.port scheme, host, port = request.scheme, request.host, request.port
@ -221,12 +223,7 @@ class ProxyHandler(tcp.BaseHandler):
# the case, we want to reconnect without sending an error # the case, we want to reconnect without sending an error
# to the client. # to the client.
while 1: while 1:
if self.config.forward_proxy: sc = self.get_server_connection(cc, scheme, host, port, self.sni)
forward_scheme, forward_host, forward_port = self.config.forward_proxy
sc = self.get_server_connection(cc, forward_scheme, forward_host, forward_port, self.sni)
else:
sc = self.get_server_connection(cc, scheme, host, port, self.sni)
sc.send(request) sc.send(request)
if sc.requestcount == 1: # add timestamps only for first request (others are not directly affected) if sc.requestcount == 1: # add timestamps only for first request (others are not directly affected)
request.tcp_setup_timestamp = sc.tcp_setup_timestamp request.tcp_setup_timestamp = sc.tcp_setup_timestamp
@ -305,7 +302,8 @@ class ProxyHandler(tcp.BaseHandler):
def find_cert(self, cc, host, port, sni): def find_cert(self, cc, host, port, sni):
if self.config.certfile: if self.config.certfile:
return certutils.SSLCert.from_pem(file(self.config.certfile, "r").read()) with open(self.config.certfile, "rb") as f:
return certutils.SSLCert.from_pem(f.read())
else: else:
sans = [] sans = []
if not self.config.no_upstream_cert: if not self.config.no_upstream_cert:
@ -346,10 +344,21 @@ class ProxyHandler(tcp.BaseHandler):
host, port = orig host, port = orig
if port in self.config.transparent_proxy["sslports"]: if port in self.config.transparent_proxy["sslports"]:
scheme = "https" scheme = "https"
if not self.ssl_established:
self.establish_ssl(client_conn, host, port)
else: else:
scheme = "http" scheme = "http"
return self._read_request_transparent(client_conn, scheme, host, port)
def _read_request_transparent(self, client_conn, scheme, host, port):
"""
Read a transparent HTTP request. Transparent means that the client isn't aware of proxying.
In other words, the client request starts with
"GET /foo.html HTTP/1.1"
rather than
"CONNECT example.com:80 HTTP/1.1"
"""
if scheme.lower() == "https" and not self.ssl_established:
self.establish_ssl(client_conn, host, port)
line = self.get_line(self.rfile) line = self.get_line(self.rfile)
if line == "": if line == "":
return None return None
@ -417,23 +426,7 @@ class ProxyHandler(tcp.BaseHandler):
def read_request_reverse(self, client_conn): def read_request_reverse(self, client_conn):
scheme, host, port = self.config.reverse_proxy scheme, host, port = self.config.reverse_proxy
if scheme.lower() == "https" and not self.ssl_established: return self._read_request_transparent(client_conn, scheme, host, port)
self.establish_ssl(client_conn, host, port)
line = self.get_line(self.rfile)
if line == "":
return None
r = http.parse_init_http(line)
if not r:
raise ProxyError(400, "Bad HTTP request line: %s"%repr(line))
method, path, httpversion = r
headers = self.read_headers(authenticate=False)
content = http.read_http_body_request(
self.rfile, self.wfile, headers, httpversion, self.config.body_size_limit
)
return flow.Request(
client_conn, httpversion, host, port, scheme, method, path, headers, content,
self.rfile.first_byte_timestamp, utils.timestamp()
)
def read_request(self, client_conn): def read_request(self, client_conn):
self.rfile.reset_timestamps() self.rfile.reset_timestamps()