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

option replay_kill_extra -> server_replay_kill_extra

Browse Source 
Continuing effort to collect all sever replay options under a commmon prefix.
This commit is contained in:
Aldo Cortesi 2018-02-20 09:46:47 +13:00
parent 8129b93bb0
commit e9bdada1f5
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/addons/serverplayback.py
View File

@ -137,7 +137,7 @@ class ServerPlayback:
if not self.flowmap: if not self.flowmap:
self.final_flow = f self.final_flow = f
self.stop = True self.stop = True
elif ctx.options.replay_kill_extra: elif ctx.options.server_replay_kill_extra:
ctx.log.warn( ctx.log.warn(
"server_playback: killed non-replay request {}".format( "server_playback: killed non-replay request {}".format(
f.request.url f.request.url

4
mitmproxy/options.py
View File

@ -67,7 +67,7 @@ class Options(optmanager.OptManager):
rawtcp = None # type: bool rawtcp = None # type: bool
server_replay_refresh = None # type: bool server_replay_refresh = None # type: bool
replacements = None # type: Sequence[str] replacements = None # type: Sequence[str]
replay_kill_extra = None # type: bool server_replay_kill_extra = None # type: bool
rfile = None # type: Optional[str] rfile = None # type: Optional[str]
save_stream_file = None # type: Optional[str] save_stream_file = None # type: Optional[str]
save_stream_filter = None # type: Optional[str] save_stream_filter = None # type: Optional[str]
@ -137,7 +137,7 @@ class Options(optmanager.OptManager):
"Replay client requests from a saved file." "Replay client requests from a saved file."
) )
self.add_option( self.add_option(
"replay_kill_extra", bool, False, "server_replay_kill_extra", bool, False,
"Kill extra requests during replay." "Kill extra requests during replay."
) )
self.add_option( self.add_option(

2
mitmproxy/tools/cmdline.py
View File

@ -87,7 +87,7 @@ def common_options(parser, opts):
# Server replay # Server replay
group = parser.add_argument_group("Server Replay") group = parser.add_argument_group("Server Replay")
opts.make_parser(group, "server_replay", metavar="PATH", short="S") opts.make_parser(group, "server_replay", metavar="PATH", short="S")
opts.make_parser(group, "replay_kill_extra") opts.make_parser(group, "server_replay_kill_extra")
opts.make_parser(group, "server_replay_nopop") opts.make_parser(group, "server_replay_nopop")
# Replacements # Replacements

2
mitmproxy/tools/console/statusbar.py
View File

@ -213,7 +213,7 @@ class StatusBar(urwid.WidgetWrap):
opts.append("showhost") opts.append("showhost")
if not self.master.options.server_replay_refresh: if not self.master.options.server_replay_refresh:
opts.append("norefresh") opts.append("norefresh")
if self.master.options.replay_kill_extra: if self.master.options.server_replay_kill_extra:
opts.append("killextra") opts.append("killextra")
if not self.master.options.upstream_cert: if not self.master.options.upstream_cert:
opts.append("no-upstream-cert") opts.append("no-upstream-cert")

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

@ -364,7 +364,7 @@ def test_server_playback_kill():
tctx.configure( tctx.configure(
s, s,
server_replay_refresh = True, server_replay_refresh = True,
replay_kill_extra=True server_replay_kill_extra=True
) )
f = tflow.tflow() f = tflow.tflow()

2
test/mitmproxy/tools/console/test_master.py
View File

@ -21,7 +21,7 @@ def test_format_keyvals():
def test_options(): def test_options():
assert options.Options(replay_kill_extra=True) assert options.Options(server_replay_kill_extra=True)
class TestMaster(tservers.MasterTest): class TestMaster(tservers.MasterTest):

2
test/mitmproxy/tools/console/test_statusbar.py
View File

@ -17,7 +17,7 @@ def test_statusbar(monkeypatch):
anticomp=True, anticomp=True,
showhost=True, showhost=True,
server_replay_refresh=False, server_replay_refresh=False,
replay_kill_extra=True, server_replay_kill_extra=True,
upstream_cert=False, upstream_cert=False,
stream_large_bodies="3m", stream_large_bodies="3m",
mode="transparent", mode="transparent",