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

tests++

Browse Source
This commit is contained in:
Maximilian Hils 2019-11-15 21:17:29 +01:00
parent 8f2cee7225
commit 248034c528
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mitmproxy/addons/serverplayback.py
View File

@ -165,7 +165,6 @@ class ServerPlayback:
Returns the next flow object, or None if no matching flow was
found.
"""
request = flow.request
hash = self._hash(flow)
if hash in self.flowmap:
if ctx.options.server_replay_nopop:

34
test/mitmproxy/addons/test_serverplayback.py
View File

@ -1,13 +1,13 @@
import urllib
import pytest
from mitmproxy.test import taddons
from mitmproxy.test import tflow
import mitmproxy.test.tutils
from mitmproxy.addons import serverplayback
from mitmproxy import exceptions
from mitmproxy import io
from mitmproxy.addons import serverplayback
from mitmproxy.test import taddons
from mitmproxy.test import tflow
def tdump(path, flows):
@ -321,7 +321,7 @@ def test_server_playback_full():
with taddons.context(s) as tctx:
tctx.configure(
s,
server_replay_refresh = True,
server_replay_refresh=True,
)
f = tflow.tflow()
@ -345,7 +345,7 @@ def test_server_playback_kill():
with taddons.context(s) as tctx:
tctx.configure(
s,
server_replay_refresh = True,
server_replay_refresh=True,
server_replay_kill_extra=True
)
@ -357,3 +357,25 @@ def test_server_playback_kill():
f.request.host = "nonexistent"
tctx.cycle(s, f)
assert f.reply.value == exceptions.Kill
def test_server_playback_response_deleted():
"""
The server playback addon holds references to flows that can be modified by the user in the meantime.
One thing that can happen is that users remove the response object. This happens for example when doing a client
replay at the same time.
"""
sp = serverplayback.ServerPlayback()
with taddons.context(sp) as tctx:
tctx.configure(sp)
f1 = tflow.tflow(resp=True)
f2 = tflow.tflow(resp=True)
assert not sp.flowmap
sp.load_flows([f1, f2])
assert sp.flowmap
f1.response = f2.response = None
assert not sp.next_flow(f1)
assert not sp.flowmap