Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-02-01 15:55:28 +00:00
Code Issues Projects Releases Wiki Activity

Prevent unecessary upstream server connects

Browse Source 
Selectively connect to upstream server based on no_upstream_cert
option. When no_upstream_cert is used during server replay, prevent
connecting to the upstream server unless absolutely necessary.
This commit is contained in:
Terry Long 2015-03-28 00:10:24 -07:00
parent 4c831992aa
commit 4c50c36345
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmproxy/flow.py
View File

@ -240,9 +240,13 @@ class ServerPlaybackState:
_, _, path, _, query, _ = urlparse.urlparse(r.url) _, _, path, _, query, _ = urlparse.urlparse(r.url)
queriesArray = urlparse.parse_qsl(query, keep_blank_values=True) queriesArray = urlparse.parse_qsl(query, keep_blank_values=True)
# scheme should match the client connection to be able to replay
# although r.scheme may have been changed to http to connect to upstream server
scheme = "https" if flow.client_conn and flow.client_conn.ssl_established else "http"
key = [ key = [
str(r.port), str(r.port),
str(r.scheme), str(scheme),
str(r.method), str(r.method),
str(path), str(path),
] ]

6
libmproxy/protocol/http.py
View File

@ -1297,7 +1297,6 @@ class HTTPHandler(ProtocolHandler):
self.c.set_server_address((request.host, request.port)) self.c.set_server_address((request.host, request.port))
# Update server_conn attribute on the flow # Update server_conn attribute on the flow
flow.server_conn = self.c.server_conn flow.server_conn = self.c.server_conn
self.c.establish_server_connection()
self.c.client_conn.send( self.c.client_conn.send(
('HTTP/%s.%s 200 ' % (request.httpversion[0], request.httpversion[1])) + ('HTTP/%s.%s 200 ' % (request.httpversion[0], request.httpversion[1])) +
'Connection established\r\n' + 'Connection established\r\n' +
@ -1498,7 +1497,10 @@ class HTTPHandler(ProtocolHandler):
"Received CONNECT request to SSL port. " "Received CONNECT request to SSL port. "
"Upgrading to SSL...", "debug" "Upgrading to SSL...", "debug"
) )
self.c.establish_ssl(server=True, client=True) server_ssl = not self.c.config.no_upstream_cert
if server_ssl:
self.c.establish_server_connection()
self.c.establish_ssl(server=server_ssl, client=True)
self.c.log("Upgrade to SSL completed.", "debug") self.c.log("Upgrade to SSL completed.", "debug")
if self.c.config.check_tcp(address): if self.c.config.check_tcp(address):

2
libmproxy/protocol/primitives.py
View File

@ -236,7 +236,7 @@ class LiveConnection(object):
ssl_mismatch = ( ssl_mismatch = (
ssl is not None and ssl is not None and
( (
ssl != self.c.server_conn.ssl_established (self.c.server_conn.connection and ssl != self.c.server_conn.ssl_established)
or or
(sni is not None and sni != self.c.server_conn.sni) (sni is not None and sni != self.c.server_conn.sni)
) )

11
test/test_server.py
View File

@ -800,6 +800,17 @@ class TestFakeResponse(tservers.HTTPProxTest):
assert "header_response" in f.headers.keys() assert "header_response" in f.headers.keys()
class TestServerConnect(tservers.HTTPProxTest):
masterclass = MasterFakeResponse
no_upstream_cert = True
ssl = True
def test_unnecessary_serverconnect(self):
"""A replayed/fake response with no_upstream_cert should not connect to an upstream server"""
assert self.pathod("200").status_code == 200
for msg in self.proxy.tmaster.log:
assert "serverconnect" not in msg
class MasterKillRequest(tservers.TestMaster): class MasterKillRequest(tservers.TestMaster):
def handle_request(self, f): def handle_request(self, f):
f.reply(KILL) f.reply(KILL)