diff options
Diffstat (limited to 'libmproxy')
-rw-r--r-- | libmproxy/console.py | 19 | ||||
-rw-r--r-- | libmproxy/flow.py | 22 |
2 files changed, 33 insertions, 8 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index e973ff7f..90075ee1 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -194,7 +194,7 @@ class ConnectionItem(WWrap): elif key == "|": self.master.path_prompt( "Send flow to script: ", self.state.last_script, - self.master.run_script, self.flow + self.master.run_script_once, self.flow ) return key @@ -551,7 +551,7 @@ class ConnectionView(WWrap): elif key == "|": self.master.path_prompt( "Send flow to script: ", self.state.last_script, - self.master.run_script, self.flow + self.master.run_script_once, self.flow ) elif key == "z": if self.state.view_flow_mode == VIEW_FLOW_RESPONSE: @@ -989,6 +989,21 @@ class ConsoleMaster(flow.FlowMaster): self.debug = options.debug + def run_script_once(self, path, f): + ret = self.get_script(path) + if ret[0]: + self.statusbar.message(ret[0]) + s = ret[1] + + if f.request: + s.run("request", f) + if f.response: + s.run("response", f) + if f.error: + s.run("error", f) + self.refresh_connection(f) + self.state.last_script = path + def set_script(self, path): if not path: return diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 89a52eff..1043cb21 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -443,20 +443,30 @@ class FlowMaster(controller.Master): """ pass - def load_script(self, path): + def get_script(self, path): """ - Loads a script. Returns an error description if something went - wrong. + Returns an (error, script) tuple. """ s = script.Script(path, self) try: s.load() except script.ScriptError, v: - return v.args[0] + return (v.args[0], None) ret = s.run("start") if not ret[0] and ret[1]: - return "Error in script start:\n\n" + ret[1][1] - self.script = s + return ("Error in script start:\n\n" + ret[1][1], None) + return (None, s) + + def load_script(self, path): + """ + Loads a script. Returns an error description if something went + wrong. + """ + r = self.get_script(path) + if r[0]: + return r[0] + else: + self.script = r[1] def set_stickycookie(self, txt): if txt: |