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

Merge pull request #1998 from mhils/fix-change-upstream

Browse Source 
Fix change_upstream_proxy_server
This commit is contained in:
Maximilian Hils 2017-02-09 16:39:20 +01:00 committed by GitHub
commit 1084588103
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mitmproxy/proxy/protocol/http.py
View File

@ -88,6 +88,10 @@ class UpstreamConnectLayer(base.Layer):
layer() layer()
def _send_connect_request(self): def _send_connect_request(self):
self.log("Sending CONNECT request", "debug", [
"Proxy Server: {}".format(self.ctx.server_conn.address),
"Connect to: {}:{}".format(self.connect_request.host, self.connect_request.port)
])
self.send_request(self.connect_request) self.send_request(self.connect_request)
resp = self.read_response(self.connect_request) resp = self.read_response(self.connect_request)
if resp.status_code != 200: if resp.status_code != 200:
@ -101,6 +105,7 @@ class UpstreamConnectLayer(base.Layer):
pass # swallow the message pass # swallow the message
def change_upstream_proxy_server(self, address): def change_upstream_proxy_server(self, address):
self.log("Changing upstream proxy to {} (CONNECTed)".format(repr(address)), "debug")
if address != self.server_conn.via.address: if address != self.server_conn.via.address:
self.ctx.set_server(address) self.ctx.set_server(address)
@ -432,10 +437,13 @@ class HttpLayer(base.Layer):
except (exceptions.NetlibException, h2.exceptions.H2Error, exceptions.Http2ProtocolException): except (exceptions.NetlibException, h2.exceptions.H2Error, exceptions.Http2ProtocolException):
self.log("Failed to send error response to client: {}".format(message), "debug") self.log("Failed to send error response to client: {}".format(message), "debug")
def change_upstream_proxy_server(self, address) -> None: def change_upstream_proxy_server(self, address):
# Make set_upstream_proxy_server always available, # Make set_upstream_proxy_server always available,
# even if there's no UpstreamConnectLayer # even if there's no UpstreamConnectLayer
if address != self.server_conn.address: if hasattr(self.ctx, "change_upstream_proxy_server"):
self.ctx.change_upstream_proxy_server(address)
elif address != self.server_conn.address:
self.log("Changing upstream proxy to {} (not CONNECTed)".format(repr(address)), "debug")
self.set_server(address) self.set_server(address)
def establish_server_connection(self, host: str, port: int, scheme: str): def establish_server_connection(self, host: str, port: int, scheme: str):

23
test/mitmproxy/test_server.py
View File

@ -995,6 +995,29 @@ class TestUpstreamProxySSL(
assert not self.chain[1].tmaster.state.flows[0].server_conn.via assert not self.chain[1].tmaster.state.flows[0].server_conn.via
assert self.chain[1].tmaster.state.flow_count() == 1 assert self.chain[1].tmaster.state.flow_count() == 1
def test_change_upstream_proxy_connect(self):
# skip chain[0].
self.proxy.tmaster.addons.add(
UpstreamProxyChanger(
("127.0.0.1", self.chain[1].port)
)
)
p = self.pathoc()
with p.connect():
req = p.request("get:'/p/418'")
assert req.status_code == 418
assert self.chain[0].tmaster.state.flow_count() == 0
assert self.chain[1].tmaster.state.flow_count() == 1
class UpstreamProxyChanger:
def __init__(self, addr):
self.address = addr
def request(self, f):
f.live.change_upstream_proxy_server(self.address)
class RequestKiller: class RequestKiller:
def __init__(self, exclude): def __init__(self, exclude):