diff options
author | Maximilian Hils <git@maximilianhils.com> | 2018-02-19 22:52:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-19 22:52:19 +0100 |
commit | da4c1ee625a3451b58c69454ecd5f4faf3cb67d4 (patch) | |
tree | 60837eeba185531a994af809ea911c493812e431 | |
parent | a9402975dc81d77ffe1c85911b27c7e9a26e8f4a (diff) | |
parent | e9bdada1f59a28e3cb956b25f2445e6c1dc5d939 (diff) | |
download | mitmproxy-da4c1ee625a3451b58c69454ecd5f4faf3cb67d4.tar.gz mitmproxy-da4c1ee625a3451b58c69454ecd5f4faf3cb67d4.tar.bz2 mitmproxy-da4c1ee625a3451b58c69454ecd5f4faf3cb67d4.zip |
Merge pull request #2881 from cortesi/refreshopt
option refresh_server_playback -> server_replay_refresh
-rw-r--r-- | mitmproxy/addons/serverplayback.py | 4 | ||||
-rw-r--r-- | mitmproxy/options.py | 8 | ||||
-rw-r--r-- | mitmproxy/tools/cmdline.py | 2 | ||||
-rw-r--r-- | mitmproxy/tools/console/statusbar.py | 4 | ||||
-rw-r--r-- | test/mitmproxy/addons/test_serverplayback.py | 6 | ||||
-rw-r--r-- | test/mitmproxy/tools/console/test_master.py | 2 | ||||
-rw-r--r-- | test/mitmproxy/tools/console/test_statusbar.py | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/mitmproxy/addons/serverplayback.py b/mitmproxy/addons/serverplayback.py index 20fcfc2a..d8b2299a 100644 --- a/mitmproxy/addons/serverplayback.py +++ b/mitmproxy/addons/serverplayback.py @@ -132,13 +132,13 @@ class ServerPlayback: if rflow: response = rflow.response.copy() response.is_replay = True - if ctx.options.refresh_server_playback: + if ctx.options.server_replay_refresh: response.refresh() f.response = response if not self.flowmap: self.final_flow = f self.stop = True - elif ctx.options.replay_kill_extra: + elif ctx.options.server_replay_kill_extra: ctx.log.warn( "server_playback: killed non-replay request {}".format( f.request.url diff --git a/mitmproxy/options.py b/mitmproxy/options.py index 862380c5..76060548 100644 --- a/mitmproxy/options.py +++ b/mitmproxy/options.py @@ -63,9 +63,9 @@ class Options(optmanager.OptManager): onboarding_port = None # type: int proxyauth = None # type: Optional[str] rawtcp = None # type: bool - refresh_server_playback = None # type: bool + server_replay_refresh = None # type: bool replacements = None # type: Sequence[str] - replay_kill_extra = None # type: bool + server_replay_kill_extra = None # type: bool rfile = None # type: Optional[str] save_stream_file = 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." ) self.add_option( - "replay_kill_extra", bool, False, + "server_replay_kill_extra", bool, False, "Kill extra requests during replay." ) self.add_option( @@ -160,7 +160,7 @@ class Options(optmanager.OptManager): """ ) self.add_option( - "refresh_server_playback", bool, True, + "server_replay_refresh", bool, True, """ Refresh server replay responses by adjusting date, expires and last-modified headers, as well as adjusting cookie expiration. diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py index d611a8d2..d413ff28 100644 --- a/mitmproxy/tools/cmdline.py +++ b/mitmproxy/tools/cmdline.py @@ -87,7 +87,7 @@ def common_options(parser, opts): # Server replay group = parser.add_argument_group("Server Replay") 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") # Replacements diff --git a/mitmproxy/tools/console/statusbar.py b/mitmproxy/tools/console/statusbar.py index ac991ef1..bdb39013 100644 --- a/mitmproxy/tools/console/statusbar.py +++ b/mitmproxy/tools/console/statusbar.py @@ -213,9 +213,9 @@ class StatusBar(urwid.WidgetWrap): opts.append("anticomp") if self.master.options.showhost: opts.append("showhost") - if not self.master.options.refresh_server_playback: + if not self.master.options.server_replay_refresh: opts.append("norefresh") - if self.master.options.replay_kill_extra: + if self.master.options.server_replay_kill_extra: opts.append("killextra") if not self.master.options.upstream_cert: opts.append("no-upstream-cert") diff --git a/test/mitmproxy/addons/test_serverplayback.py b/test/mitmproxy/addons/test_serverplayback.py index 7605a5d9..32249a88 100644 --- a/test/mitmproxy/addons/test_serverplayback.py +++ b/test/mitmproxy/addons/test_serverplayback.py @@ -331,7 +331,7 @@ def test_server_playback_full(): with taddons.context() as tctx: tctx.configure( s, - refresh_server_playback = True, + server_replay_refresh = True, ) f = tflow.tflow() @@ -363,8 +363,8 @@ def test_server_playback_kill(): with taddons.context() as tctx: tctx.configure( s, - refresh_server_playback = True, - replay_kill_extra=True + server_replay_refresh = True, + server_replay_kill_extra=True ) f = tflow.tflow() diff --git a/test/mitmproxy/tools/console/test_master.py b/test/mitmproxy/tools/console/test_master.py index 9779a482..6f46ce9e 100644 --- a/test/mitmproxy/tools/console/test_master.py +++ b/test/mitmproxy/tools/console/test_master.py @@ -8,7 +8,7 @@ from ... import tservers def test_options(): - assert options.Options(replay_kill_extra=True) + assert options.Options(server_replay_kill_extra=True) class TestMaster(tservers.MasterTest): diff --git a/test/mitmproxy/tools/console/test_statusbar.py b/test/mitmproxy/tools/console/test_statusbar.py index b131a5d3..8522eb96 100644 --- a/test/mitmproxy/tools/console/test_statusbar.py +++ b/test/mitmproxy/tools/console/test_statusbar.py @@ -16,8 +16,8 @@ def test_statusbar(monkeypatch): anticache=True, anticomp=True, showhost=True, - refresh_server_playback=False, - replay_kill_extra=True, + server_replay_refresh=False, + server_replay_kill_extra=True, upstream_cert=False, stream_large_bodies="3m", mode="transparent", |