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

added sni and ssl_established=true in ServerConnection. removed check for None value of server_conn in http.py

Browse Source
This commit is contained in:
Marcelo Glezer 2015-02-12 13:41:58 -03:00
parent 71a58289e2
commit 010b921a93
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmproxy/flow.py
View File

@ -777,7 +777,9 @@ class FlowMaster(controller.Master):
address=dict(address=(host, port), use_ipv6=False), address=dict(address=(host, port), use_ipv6=False),
state=[], state=[],
source_address=None, #source_address=dict(address=(host, port), use_ipv6=False), source_address=None, #source_address=dict(address=(host, port), use_ipv6=False),
cert=None cert=None,
sni=host,
ssl_established=True
)) ))
f = http.HTTPFlow(c,s); f = http.HTTPFlow(c,s);
headers = ODictCaseless() headers = ODictCaseless()

5
libmproxy/protocol/http.py
View File

@ -1457,10 +1457,7 @@ class RequestReplayThread(threading.Thread):
server = ServerConnection(server_address) server = ServerConnection(server_address)
server.connect() server.connect()
if r.scheme == "https": if r.scheme == "https":
sni = None server.establish_ssl(self.config.clientcerts, sni=self.flow.server_conn.sni)
if self.flow.server_conn:
sni = self.flow.server_conn.sni
server.establish_ssl(self.config.clientcerts, sni=sni)
r.form_out = "relative" r.form_out = "relative"
server.send(r.assemble()) server.send(r.assemble())
self.flow.server_conn = server self.flow.server_conn = server