diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2010-03-01 14:25:37 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2010-03-01 14:25:37 +1300 |
| commit | 6300a57212499cf8daf126eeec26c489fbcc71cd (patch) | |
| tree | 7bb61842c03de2267e247cf36a62c892d907ffe5 | |
| parent | 639b1557a60d473643ece32bc5117dcbbcc43fda (diff) | |
| download | mitmproxy-6300a57212499cf8daf126eeec26c489fbcc71cd.tar.gz mitmproxy-6300a57212499cf8daf126eeec26c489fbcc71cd.tar.bz2 mitmproxy-6300a57212499cf8daf126eeec26c489fbcc71cd.zip | |
Don't intercept replays - it makes no sense to do so.
| -rw-r--r-- | libmproxy/console.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index e717c13f..73e629b3 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -1117,6 +1117,16 @@ class ConsoleMaster(controller.Master): self.sync_list_view() self.refresh_connection(f) + def process_flow(self, f, r): + if f.match(self.state.beep): + urwid.curses_display.curses.beep() + if f.match(self.state.intercept) and not f.is_replay(): + f.intercept() + else: + r.ack() + self.sync_list_view() + self.refresh_connection(f) + def handle_request(self, r): f = self.state.add_request(r) if not f: @@ -1128,14 +1138,7 @@ class ConsoleMaster(controller.Master): self.stickyhosts[hid] = f.request.headers["cookie"] elif hid in self.stickyhosts: f.request.headers["cookie"] = self.stickyhosts[hid] - if f.match(self.state.beep): - urwid.curses_display.curses.beep() - if f.match(self.state.intercept): - f.intercept() - else: - r.ack() - self.sync_list_view() - self.refresh_connection(f) + self.process_flow(f, r) def handle_response(self, r): f = self.state.add_response(r) @@ -1146,12 +1149,5 @@ class ConsoleMaster(controller.Master): hid = (f.request.host, f.request.port) if f.response.headers.has_key("set-cookie"): self.stickyhosts[hid] = f.response.headers["set-cookie"] + self.process_flow(f, r) - if f.match(self.state.beep): - urwid.curses_display.curses.beep() - if f.match(self.state.intercept): - f.intercept() - else: - r.ack() - self.sync_list_view() - self.refresh_connection(f) |