diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-02-17 15:10:50 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-02-17 15:10:50 +1300 |
| commit | afa9104005b5f026daaa15f5f78dbfdf40d448c5 (patch) | |
| tree | 82b37b268b672acc8e8d09842cbbc383e00c46d9 /libmproxy | |
| parent | cbe6982c6d349f0bafc4385176d6be2a020a6c23 (diff) | |
| download | mitmproxy-afa9104005b5f026daaa15f5f78dbfdf40d448c5.tar.gz mitmproxy-afa9104005b5f026daaa15f5f78dbfdf40d448c5.tar.bz2 mitmproxy-afa9104005b5f026daaa15f5f78dbfdf40d448c5.zip | |
Refine verbose mitmdump output.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/dump.py | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 2959e95c..3ef12a04 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -67,17 +67,26 @@ class DumpMaster(flow.FlowMaster): print >> self.outfile, f.client_conn.address[0], print >> self.outfile, f.request.short() print >> self.outfile, self.indent(4, f.request.headers) + print >> self.outfile print >> self.outfile, " <<", f.response.short() print >> self.outfile, self.indent(4, f.response.headers) + print >> self.outfile, "\n\n" elif self.o.verbosity == 3: - print >> self.outfile, ">>" - for i in f.request.request.assemble().splitlines(): - print >> self.outfile, "\t", i - print >> self.outfile, ">>" - print >> self.outfile, "<<" - for i in f.request.assemble().splitlines(): - print >> self.outfile, "\t", i - print >> self.outfile, "<<" + print >> self.outfile, f.client_conn.address[0], + print >> self.outfile, f.request.short() + print >> self.outfile, self.indent(4, f.request.headers) + if utils.isBin(f.request.content): + print >> self.outfile, self.indent(4, utils.hexdump(f.request.content)) + elif f.request.content: + print >> self.outfile, self.indent(4, f.request.content) + print >> self.outfile + print >> self.outfile, " <<", f.response.short() + print >> self.outfile, self.indent(4, f.response.headers) + if utils.isBin(f.response.content): + print >> self.outfile, self.indent(4, utils.hexdump(f.response.content)) + elif f.response.content: + print >> self.outfile, self.indent(4, f.response.content) + print >> self.outfile, "\n\n" self.state.delete_flow(f) if self.o.wfile: self.fwriter.add(f) |