diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2018-02-10 12:41:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 12:41:51 +0100 |
| commit | aa41ff78c2847f66905e4c0cf0d85a941a0debfe (patch) | |
| tree | 3071e930fd8331b251e36f47453e0b05d65188ca /mitmproxy | |
| parent | cda7c8d754f6eb71dd059f2bdfe2805f31b02874 (diff) | |
| parent | e64947d3bc00375fcb80898f48add3593b787d24 (diff) | |
| download | mitmproxy-aa41ff78c2847f66905e4c0cf0d85a941a0debfe.tar.gz mitmproxy-aa41ff78c2847f66905e4c0cf0d85a941a0debfe.tar.bz2 mitmproxy-aa41ff78c2847f66905e4c0cf0d85a941a0debfe.zip | |
Merge pull request #2803 from kajojify/issue-2777
Persist flowfilter when editing it, fix #2777
Diffstat (limited to 'mitmproxy')
| -rw-r--r-- | mitmproxy/tools/console/commander/commander.py | 2 | ||||
| -rw-r--r-- | mitmproxy/tools/console/consoleaddons.py | 11 | ||||
| -rw-r--r-- | mitmproxy/tools/console/defaultkeys.py | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/mitmproxy/tools/console/commander/commander.py b/mitmproxy/tools/console/commander/commander.py index e2088e71..566c42e6 100644 --- a/mitmproxy/tools/console/commander/commander.py +++ b/mitmproxy/tools/console/commander/commander.py @@ -47,7 +47,7 @@ CompletionState = typing.NamedTuple( ) -class CommandBuffer(): +class CommandBuffer: def __init__(self, master: mitmproxy.master.Master, start: str = "") -> None: self.master = master self.text = self.flatten(start) diff --git a/mitmproxy/tools/console/consoleaddons.py b/mitmproxy/tools/console/consoleaddons.py index 5907fe95..aa46501b 100644 --- a/mitmproxy/tools/console/consoleaddons.py +++ b/mitmproxy/tools/console/consoleaddons.py @@ -277,6 +277,17 @@ class ConsoleAddon: """ signals.status_prompt_command.send(partial=" ".join(partial)) # type: ignore + @command.command("console.command.set") + def console_command_set(self, option: str) -> None: + """ + Prompt the user to set an option of the form "key[=value]". + """ + option_value = getattr(self.master.options, option, None) + current_value = option_value if option_value else "" + self.master.commands.call( + "console.command set %s=%s" % (option, current_value) + ) + @command.command("console.view.keybindings") def view_keybindings(self) -> None: """View the commands list.""" diff --git a/mitmproxy/tools/console/defaultkeys.py b/mitmproxy/tools/console/defaultkeys.py index d01d9b7e..084ef262 100644 --- a/mitmproxy/tools/console/defaultkeys.py +++ b/mitmproxy/tools/console/defaultkeys.py @@ -26,8 +26,8 @@ def map(km): km.add("ctrl b", "console.nav.pageup", ["global"], "Page up") km.add("I", "console.intercept.toggle", ["global"], "Toggle intercept") - km.add("i", "console.command set intercept=", ["global"], "Set intercept") - km.add("W", "console.command set save_stream_file=", ["global"], "Stream to file") + km.add("i", "console.command.set intercept", ["global"], "Set intercept") + km.add("W", "console.command.set save_stream_file", ["global"], "Stream to file") km.add("A", "flow.resume @all", ["flowlist", "flowview"], "Resume all intercepted flows") km.add("a", "flow.resume @focus", ["flowlist", "flowview"], "Resume this intercepted flow") km.add( @@ -46,7 +46,7 @@ def map(km): ["flowlist", "flowview"], "Export this flow to file" ) - km.add("f", "console.command set view_filter=", ["flowlist"], "Set view filter") + km.add("f", "console.command.set view_filter", ["flowlist"], "Set view filter") km.add("F", "set console_focus_follow=toggle", ["flowlist"], "Set focus follow") km.add( "ctrl l", |