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

Reconnect if the server-connect hook needs the request to decide what to do

Browse Source
This commit is contained in:
Matthias Urlichs 2013-12-12 10:00:23 +01:00
parent 517e5e6688
commit afff1f1734
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libmproxy/proxy.py
View File

@ -141,14 +141,17 @@ class ProxyHandler(tcp.BaseHandler):
breaks, we'll have to do something different with the SNI host breaks, we'll have to do something different with the SNI host
variable on the handler object. variable on the handler object.
`conn_info` holds the initial connection's parameters. `conn_info` holds the initial connection's parameters, as the
The hook might change them. hook might change them. Also, the hook might require an initial
request to figure out connection settings; in this case it can
set require_request, which will cause the connection to be
re-opened after the client's request arrives.
""" """
sc = self.server_conn sc = self.server_conn
if not sni: if not sni:
sni = host sni = host
conn_info = (scheme, host, port, sni) conn_info = (scheme, host, port, sni)
if sc and conn_info != sc.conn_info: if sc and (conn_info != sc.conn_info or request and sc.require_request):
sc.terminate() sc.terminate()
self.server_conn = None self.server_conn = None
self.log( self.log(
@ -163,7 +166,12 @@ class ProxyHandler(tcp.BaseHandler):
if not self.server_conn: if not self.server_conn:
try: try:
self.server_conn = ServerConnection(self.config, scheme, host, port, sni) self.server_conn = ServerConnection(self.config, scheme, host, port, sni)
self.server_conn.request = request # the hook might need it
# Additional attributes, used if the server_connect hook
# needs to change parameters
self.server_conn.request = request
self.server_conn.require_request = False
self.server_conn.conn_info = conn_info self.server_conn.conn_info = conn_info
self.channel.ask(self.server_conn) self.channel.ask(self.server_conn)
self.server_conn.connect() self.server_conn.connect()