Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

memleak: immediately store errored flows, refs #4456 (#4461)

Browse Source
This commit is contained in:
Maximilian Hils 2021-02-19 22:23:42 +01:00 committed by GitHub
parent cfaba15c1f
commit 001cf6c10a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mitmproxy/addons/save.py
View File

@ -85,6 +85,9 @@ class Save:
self.stream.add(flow)
self.active_flows.discard(flow)
def tcp_error(self, flow):
self.tcp_end(flow)
def websocket_start(self, flow):
if self.stream:
self.active_flows.add(flow)
@ -94,14 +97,20 @@ class Save:
self.stream.add(flow)
self.active_flows.discard(flow)
def websocket_error(self, flow):
self.websocket_end(flow)
def request(self, flow):
if self.stream:
self.active_flows.add(flow)
def response(self, flow):
if self.stream:
self.stream.add(flow)
self.active_flows.discard(flow)
def request(self, flow):
if self.stream:
self.active_flows.add(flow)
def error(self, flow):
self.response(flow)
def done(self):
if self.stream:

23
test/mitmproxy/addons/test_save.py
View File

@ -39,8 +39,13 @@ def test_tcp(tmpdir):
tt = tflow.ttcpflow()
sa.tcp_start(tt)
sa.tcp_end(tt)
tt = tflow.ttcpflow()
sa.tcp_start(tt)
sa.tcp_error(tt)
tctx.configure(sa, save_stream_file=None)
assert rd(p)
assert len(rd(p)) == 2
def test_websocket(tmpdir):
@ -52,8 +57,13 @@ def test_websocket(tmpdir):
f = tflow.twebsocketflow()
sa.websocket_start(f)
sa.websocket_end(f)
f = tflow.twebsocketflow()
sa.websocket_start(f)
sa.websocket_error(f)
tctx.configure(sa, save_stream_file=None)
assert rd(p)
assert len(rd(p)) == 2
def test_save_command(tmpdir):
@ -89,8 +99,15 @@ def test_simple(tmpdir):
tctx.configure(sa, save_stream_file=None)
assert rd(p)[0].response
tctx.configure(sa, save_stream_file="+" + p)
f = tflow.tflow(err=True)
sa.request(f)
sa.error(f)
tctx.configure(sa, save_stream_file=None)
assert rd(p)[1].error
tctx.configure(sa, save_stream_file="+" + p)
f = tflow.tflow()
sa.request(f)
tctx.configure(sa, save_stream_file=None)
assert not rd(p)[1].response
assert not rd(p)[2].response