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

Merge pull request #2803 from kajojify/issue-2777

Browse Source 
Persist flowfilter when editing it, fix #2777
This commit is contained in:
Maximilian Hils 2018-02-10 12:41:51 +01:00 committed by GitHub
commit aa41ff78c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ CompletionState = typing.NamedTuple(
) )
class CommandBuffer(): class CommandBuffer:
def __init__(self, master: mitmproxy.master.Master, start: str = "") -> None: def __init__(self, master: mitmproxy.master.Master, start: str = "") -> None:
self.master = master self.master = master
self.text = self.flatten(start) self.text = self.flatten(start)

11
mitmproxy/tools/console/consoleaddons.py
View File

@ -277,6 +277,17 @@ class ConsoleAddon:
""" """
signals.status_prompt_command.send(partial=" ".join(partial)) # type: ignore 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") @command.command("console.view.keybindings")
def view_keybindings(self) -> None: def view_keybindings(self) -> None:
"""View the commands list.""" """View the commands list."""

6
mitmproxy/tools/console/defaultkeys.py
View File

@ -26,8 +26,8 @@ def map(km):
km.add("ctrl b", "console.nav.pageup", ["global"], "Page up") km.add("ctrl b", "console.nav.pageup", ["global"], "Page up")
km.add("I", "console.intercept.toggle", ["global"], "Toggle intercept") km.add("I", "console.intercept.toggle", ["global"], "Toggle intercept")
km.add("i", "console.command set intercept=", ["global"], "Set 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("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 @all", ["flowlist", "flowview"], "Resume all intercepted flows")
km.add("a", "flow.resume @focus", ["flowlist", "flowview"], "Resume this intercepted flow") km.add("a", "flow.resume @focus", ["flowlist", "flowview"], "Resume this intercepted flow")
km.add( km.add(
@ -46,7 +46,7 @@ def map(km):
["flowlist", "flowview"], ["flowlist", "flowview"],
"Export this flow to file" "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("F", "set console_focus_follow=toggle", ["flowlist"], "Set focus follow")
km.add( km.add(
"ctrl l", "ctrl l",