From cfc6e8777e426c02383a5680c5255c28edae700a Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 3 Aug 2011 17:14:11 +1200
Subject: Add script set/unset shortcut for mitmproxy.

---
 libmproxy/console.py | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/libmproxy/console.py b/libmproxy/console.py
index e0f074f5..e973ff7f 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -193,7 +193,7 @@ class ConnectionItem(WWrap):
                 self.master.view_flow(self.flow)
         elif key == "|":
             self.master.path_prompt(
-                "Script: ", self.state.last_script,
+                "Send flow to script: ", self.state.last_script,
                 self.master.run_script, self.flow
             )
         return key
@@ -550,7 +550,7 @@ class ConnectionView(WWrap):
             self.master.view_next_flow(self.flow)
         elif key == "|":
             self.master.path_prompt(
-                "Script: ", self.state.last_script,
+                "Send flow to script: ", self.state.last_script,
                 self.master.run_script, self.flow
             )
         elif key == "z":
@@ -714,6 +714,9 @@ class StatusBar(WWrap):
         if opts:
             r.append("[%s]"%(":".join(opts)))
 
+        if self.master.script:
+            r.append("[script:%s]"%self.master.script.path)
+
         if self.master.debug:
             r.append("[lt:%0.3f]"%self.master.looptime)
 
@@ -962,6 +965,12 @@ class ConsoleMaster(flow.FlowMaster):
             print >> sys.stderr, "Sticky auth error:", r
             sys.exit(1)
 
+        if options.script:
+            err = self.load_script(options.script)
+            if err:
+                print >> sys.stderr, "Script load error:", r
+                sys.exit(1)
+
         self.refresh_server_playback = options.refresh_server_playback
         self.anticache = options.anticache
         self.anticomp = options.anticomp
@@ -980,6 +989,14 @@ class ConsoleMaster(flow.FlowMaster):
 
         self.debug = options.debug
 
+    def set_script(self, path):
+        if not path:
+            return
+        ret = self.load_script(path)
+        if ret:
+            self.statusbar.message(ret)
+        self.state.last_script = path
+
     def toggle_eventlog(self):
         self.eventlog = not self.eventlog
         self.view_connlist()
@@ -1379,6 +1396,7 @@ class ConsoleMaster(flow.FlowMaster):
             ("Q", "quit without confirm prompt"),
             ("r", "replay request"),
             ("R", "revert changes to request"),
+            ("s", "set/unset script"),
             ("S", "server replay"),
             ("t", "set sticky cookie expression"),
             ("u", "set sticky auth expression"),
@@ -1633,6 +1651,16 @@ class ConsoleMaster(flow.FlowMaster):
                                 self.save_flows
                             )
                             k = None
+                        elif k == "s":
+                            if self.script:
+                                self.script = None
+                            else:
+                                self.path_prompt(
+                                    "Set script: ",
+                                    self.state.last_script,
+                                    self.set_script
+                                )
+                            k = None
                         elif k == "S":
                             if not self.server_playback:
                                 self.path_prompt(
-- 
cgit v1.2.3