From aefb30ea60255166a4d6b3da8e669a4e89485f6e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 12 Mar 2014 22:13:00 +0100 Subject: restrict -e to mitmproxy only (not mitmdump) --- libmproxy/dump.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 6573d97d..c200e50e 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -15,7 +15,6 @@ class Options(object): "anticache", "anticomp", "client_replay", - "eventlog", "keepserving", "kill", "no_server", @@ -66,7 +65,6 @@ class DumpMaster(flow.FlowMaster): self.o = options self.anticache = options.anticache self.anticomp = options.anticomp - self.eventlog = options.eventlog self.showhost = options.showhost self.refresh_server_playback = options.refresh_server_playback @@ -142,9 +140,9 @@ class DumpMaster(flow.FlowMaster): return flows def add_event(self, e, level="info"): - if self.eventlog: - print >> self.outfile, e - self.outfile.flush() + #FIXME refactor_loglevel + print >> self.outfile, e + self.outfile.flush() def indent(self, n, t): l = str(t).strip().split("\n") -- cgit v1.2.3 From 7e86744226cc881507bc6c6931316b6b73ed03ec Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 12 Mar 2014 22:39:23 +0100 Subject: add -d switch to mitmdump to compensate for old verbosity functionality --- libmproxy/dump.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index c200e50e..1b8e6665 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -15,6 +15,7 @@ class Options(object): "anticache", "anticomp", "client_replay", + "flow_detail", "keepserving", "kill", "no_server", @@ -125,7 +126,7 @@ class DumpMaster(flow.FlowMaster): try: self.load_flows(freader) except flow.FlowReadError, v: - self.add_event("Flow file corrupted. Stopped loading.") + self.add_event("Flow file corrupted. Stopped loading.", "error") if self.o.app: self.start_app(self.o.app_host, self.o.app_port, self.o.app_external) @@ -139,10 +140,11 @@ class DumpMaster(flow.FlowMaster): raise DumpError(v.strerror) return flows - def add_event(self, e, level="info"): - #FIXME refactor_loglevel - print >> self.outfile, e - self.outfile.flush() + def add_event(self, e, level="error"): + needed = dict(error=1, info=2, debug=3)[level] + if self.o.verbosity >= needed: + print >> self.outfile, e + self.outfile.flush() def indent(self, n, t): l = str(t).strip().split("\n") @@ -154,12 +156,12 @@ class DumpMaster(flow.FlowMaster): return if f.response: - sz = utils.pretty_size(len(f.response.content)) - if self.o.verbosity > 0: + if self.o.flow_detail > 0: + sz = utils.pretty_size(len(f.response.content)) result = " << %s %s"%(str_response(f.response), sz) - if self.o.verbosity > 1: + if self.o.flow_detail > 1: result = result + "\n\n" + self.indent(4, f.response.headers) - if self.o.verbosity > 2: + if self.o.flow_detail > 2: if utils.isBin(f.response.content): d = netlib.utils.hexdump(f.response.content) d = "\n".join("%s\t%s %s"%i for i in d) @@ -172,16 +174,16 @@ class DumpMaster(flow.FlowMaster): elif f.error: result = " << %s"%f.error.msg - if self.o.verbosity == 1: + if self.o.flow_detail == 1: print >> self.outfile, str_request(f.request, self.showhost) print >> self.outfile, result - elif self.o.verbosity == 2: + elif self.o.flow_detail == 2: print >> self.outfile, str_request(f.request, self.showhost) print >> self.outfile, self.indent(4, f.request.headers) print >> self.outfile print >> self.outfile, result print >> self.outfile, "\n" - elif self.o.verbosity >= 3: + elif self.o.flow_detail >= 3: print >> self.outfile, str_request(f.request, self.showhost) print >> self.outfile, self.indent(4, f.request.headers) if utils.isBin(f.request.content): @@ -191,7 +193,7 @@ class DumpMaster(flow.FlowMaster): print >> self.outfile print >> self.outfile, result print >> self.outfile, "\n" - if self.o.verbosity: + if self.o.flow_detail: self.outfile.flush() def handle_log(self, l): -- cgit v1.2.3 From 4d9799f1037b46fe610b875bd2dd8aacb8966ec9 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 13 Mar 2014 01:04:45 +0100 Subject: add support for log levels --- libmproxy/dump.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 1b8e6665..1f107241 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -140,8 +140,8 @@ class DumpMaster(flow.FlowMaster): raise DumpError(v.strerror) return flows - def add_event(self, e, level="error"): - needed = dict(error=1, info=2, debug=3)[level] + def add_event(self, e, level="info"): + needed = dict(error=1, info=1, debug=2).get(level, 1) if self.o.verbosity >= needed: print >> self.outfile, e self.outfile.flush() @@ -196,10 +196,6 @@ class DumpMaster(flow.FlowMaster): if self.o.flow_detail: self.outfile.flush() - def handle_log(self, l): - self.add_event(l.msg) - l.reply() - def handle_request(self, r): f = flow.FlowMaster.handle_request(self, r) if f: -- cgit v1.2.3