From 825bc9aa47d63876d81b6cf25817d1669d33cfe8 Mon Sep 17 00:00:00 2001 From: Itai Sadan Date: Fri, 17 Jan 2020 16:22:38 +0200 Subject: [PATCH] Fix command quotes and error logging Fixes error when trying to manually set "multipart form" view. Also fixes "(more in eventlog)" prompt where nothing is written to the event log. --- mitmproxy/tools/console/consoleaddons.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mitmproxy/tools/console/consoleaddons.py b/mitmproxy/tools/console/consoleaddons.py index 7fcd9b484..ac92c96f0 100644 --- a/mitmproxy/tools/console/consoleaddons.py +++ b/mitmproxy/tools/console/consoleaddons.py @@ -276,11 +276,11 @@ class ConsoleAddon: def callback(opt): # We're now outside of the call context... - repl = " ".join(command_lexer.quote(x) for x in args) - repl = repl.replace("{choice}", opt) + repl = " ".join(command_lexer.quote(x.replace("{choice}", opt)) for x in args) try: self.master.commands.execute(subcmd + " " + repl) except exceptions.CommandError as e: + ctx.log.error(str(e)) signals.status_message.send(message=str(e)) self.master.overlay( @@ -539,9 +539,10 @@ class ConsoleAddon: raise exceptions.CommandError("Invalid flowview mode.") try: - cmd = 'view.settings.setval @focus flowview_mode_%s %s' % (idx, mode) + cmd = 'view.settings.setval @focus flowview_mode_%s %s' % (idx, command_lexer.quote(mode)) self.master.commands.execute(cmd) except exceptions.CommandError as e: + ctx.log.error(e) signals.status_message.send(message=str(e)) @command.command("console.flowview.mode.options")