Commit Graph

1085 Commits

Author SHA1 Message Date
Maximilian Hils f7c5385679 retain raw filter str on filt objects 2014-11-22 15:27:43 +01:00
Maximilian Hils ec23594191 add sni support to LiveConnection.change_server 2014-11-19 01:27:20 +01:00
Aldo Cortesi aa77a52a06 One common --version flag 2014-11-15 17:58:38 +13:00
Aldo Cortesi 23a4f159fd Remove last vestiges of argparse 2014-11-15 17:51:21 +13:00
Aldo Cortesi 5af7c9ebf4 Exclude main.py from coverage analysis 2014-11-15 17:47:39 +13:00
Aldo Cortesi 7d76f3e992 Make sure all command-line arguments have a long form
... so they can be used in config files
2014-11-15 17:41:04 +13:00
Aldo Cortesi 09c503563a Enable config file parsing
We support 4 different config files:

~/.mitmproxy/common.conf:       Options that are common to all tools
~/.mitmproxy/mitmproxy.conf:    Options for mitmproxy
~/.mitmproxy/mitmdump.conf:     Options for mitmdump
~/.mitmproxy/mitmweb.conf:      Options for mitmweb

Options in the tool-specific config files over-ride options in common.conf. If
a non-common option is put in common.conf, an error will be raised if a
non-supporting tool is used.
2014-11-15 17:25:05 +13:00
Aldo Cortesi 6c1dc4522d Refactor command-line argument definition
- Argument definitions live in cmdline.py
- Parsing and initial processing lives in main.py
2014-11-15 16:29:38 +13:00
Aldo Cortesi 24c4df07e3 First-order integration of configargparser to add config file support 2014-11-15 16:14:08 +13:00
Maximilian Hils c7a96b2fb1 always show error messages 2014-11-15 00:52:26 +01:00
Maximilian Hils afc6ef99ea bump version 2014-11-14 16:18:05 +01:00
Maximilian Hils be449b7129 fix #409 2014-11-14 16:13:45 +01:00
Maximilian Hils 0c52b4e3b9 handle script hooks in replay, fix tests, fix #402 2014-11-14 00:26:22 +01:00
Maximilian Hils 9b5a8af12d fix grideditor bug 2014-11-14 00:21:47 +01:00
Maximilian Hils a325ae638b fix tests 2014-11-11 13:09:05 +01:00
Maximilian Hils f19ee74b99 be more explicit about requirements 2014-11-11 12:30:51 +01:00
Maximilian Hils 6f3b4eee3c fix clear key 2014-11-10 17:35:28 +01:00
Maximilian Hils 807a8eb759 Merge pull request #403 from Lucas-C/master
Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
2014-11-10 17:32:06 +01:00
Maximilian Hils cece3700df fix #402 2014-11-10 17:11:36 +01:00
Lucas Cimon 6f5883a4d1 Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css 2014-11-07 17:02:29 +01:00
Maximilian Hils c3ec551546 fix #401 2014-11-07 09:52:46 +01:00
Maximilian Hils dc142682cb fix #399 2014-11-06 11:25:03 +01:00
Aldo Cortesi a2a87695d3 Reduce loop timeouts to improve mitmproxy responsiveness
Fixes #384
2014-11-06 10:51:30 +13:00
Aldo Cortesi 0fe83ce87b Fix bug in flow dumping, add unit test that should have caught this in the first place 2014-11-06 10:35:00 +13:00
Wade 524 ce18cd8ba4 Fixing issue #392. 2014-10-31 11:50:03 -07:00
Maximilian Hils 3b0964f365 fix #391 2014-10-30 17:38:23 +01:00
Aldo Cortesi 340d0570bf Legibility 2014-10-26 18:32:45 +13:00
Aldo Cortesi 16654ad6a4 Fix crash while streaming
Found using fuzzing. Reproduction with pathoc, given "mitmproxy -s" and
pathod running on 9999:

get:'http://localhost:9999/p/':s'200:b\'foo\':h\'Content-Length\'=\'3\'':i58,'\x1a':r

 return flow.FlowMaster.run(self)
   File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 111, in run
     self.tick(self.masterq, 0.01)
   File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 613, in tick
     return controller.Master.tick(self, q, timeout)
   File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 101, in tick
     self.handle(*msg)
   File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 118, in handle
     m(obj)
   File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 738, in handle_responseheaders
     self.stream_large_bodies.run(f, False)
   File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 155, in run
     r.headers, is_request, flow.request.method, code
   File "/Users/aldo/mitmproxy/mitmproxy/netlib/http.py", line 401, in expected_http_body_size
     raise HttpError(400 if is_request else 502, "Invalid content-length header: %s" % headers["content-length"])
 netlib.http.HttpError: Invalid content-length header: ['\x1a3']
2014-10-26 17:58:36 +13:00
Aldo Cortesi 7aee9a7c31 Spacing and legibility 2014-10-26 17:44:49 +13:00
Aldo Cortesi efd6fdb0e2 Start a fuzzing architecture for mitmproxy 2014-10-26 17:13:25 +13:00
Wade 524 1ef74cf294 Fixing issue #368. 2014-10-24 15:54:51 -07:00
Maximilian Hils c79bdeb4e5 fix #346 2014-10-22 14:03:19 +02:00
Maximilian Hils 6cef6fbfec tweak SSL detection heuristics 2014-10-21 15:08:39 +02:00
Maximilian Hils 37cc6ae0bb fix race conditions in tests 2014-10-19 01:26:08 +02:00
Maximilian Hils e114858438 add generic tcp proxying, fix #374 2014-10-18 18:29:35 +02:00
Maximilian Hils 52b29d4926 remove default_ca 2014-10-18 15:26:10 +02:00
Maximilian Hils d0809a210b fix cert forwarding 2014-10-09 02:47:32 +02:00
Maximilian Hils 7c56a3bb01 Add SOCKS5 mode, fix #305 2014-10-09 01:59:02 +02:00
Maximilian Hils ff366d152e Merge branch 'cert_chains' 2014-10-09 00:51:21 +02:00
Maximilian Hils 5b33f78961 add mini documentation 2014-10-09 00:49:11 +02:00
Maximilian Hils f04693c047 fix typo 2014-10-08 21:41:03 +02:00
Maximilian Hils d5c318b070 fix support for chained certificates 2014-10-08 20:44:52 +02:00
Maximilian Hils 76bd554cd1 Merge branch 'master' of github.com:mitmproxy/mitmproxy 2014-10-07 17:28:13 +02:00
Marcelo Glezer 81f5636389 --replay-ignore-content & --replay-ignore-param ported from branch 0.10 2014-10-03 07:29:44 -03:00
Maximilian Hils 6ce6b1ad69 replay: carry over SNI value 2014-10-02 00:58:40 +02:00
Maximilian Hils 4167713cc0 fix timestamp formatting: end_time may not be set 2014-09-22 17:01:06 +02:00
Maximilian Hils 45f39c2380 beef up event log 2014-09-22 03:06:19 +02:00
Maximilian Hils 84e2a028c2 web: perf improvements 2014-09-22 01:44:46 +02:00
Maximilian Hils 9cda2eb3a3 web: various improvements 2014-09-21 23:43:27 +02:00
Maximilian Hils 60cec1f9b6 clean up timestamp handling 2014-09-21 22:46:48 +02:00