aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable config file parsingAldo Cortesi2014-11-152-5/+49
| | | | | | | | | | | | | 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.
* Refactor command-line argument definitionAldo Cortesi2014-11-152-122/+124
| | | | | - Argument definitions live in cmdline.py - Parsing and initial processing lives in main.py
* Adjust testsAldo Cortesi2014-11-152-9/+9
|
* Remove sortedcontainers from deps - we don't use itAldo Cortesi2014-11-151-1/+0
|
* First-order integration of configargparser to add config file supportAldo Cortesi2014-11-156-71/+165
|
* Some additions to the release checklistAldo Cortesi2014-11-151-0/+15
|
* always show error messagesMaximilian Hils2014-11-152-2/+2
|
* Changelog, plus fix date of previous releaseAldo Cortesi2014-11-151-1/+6
|
* bump versionMaximilian Hils2014-11-141-1/+1
|
* fix #409Maximilian Hils2014-11-141-1/+5
|
* handle script hooks in replay, fix tests, fix #402Maximilian Hils2014-11-143-43/+55
|
* fix grideditor bugMaximilian Hils2014-11-141-0/+2
|
* docs++Maximilian Hils2014-11-131-0/+9
|
* fix testsMaximilian Hils2014-11-112-2/+3
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-11-114-19/+11
|\
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-11-117-24/+28
| |\
| * | Remove entry points in favor of vanilla scripts, fix test-releaseAldo Cortesi2014-11-112-17/+9
| | |
| * | Minor doc adjustmentsAldo Cortesi2014-11-072-2/+2
| | |
* | | be more explicit about requirementsMaximilian Hils2014-11-112-2/+6
| |/ |/|
* | fix clear keyMaximilian Hils2014-11-101-4/+5
| |
* | Merge pull request #403 from Lucas-C/masterMaximilian Hils2014-11-101-6/+5
|\ \ | | | | | | Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
| * | Using uppercase C to 'clear' display mode, because lowercase 'c' is used for cssLucas Cimon2014-11-071-6/+5
| | |
* | | fix #402Maximilian Hils2014-11-101-1/+2
| | |
* | | update change_upstream_proxy exampleMaximilian Hils2014-11-101-2/+2
|/ /
* | fix testsMaximilian Hils2014-11-071-9/+13
| |
* | fix #401Maximilian Hils2014-11-071-8/+4
| |
* | fix #399Maximilian Hils2014-11-062-3/+6
|/
* Reduce loop timeouts to improve mitmproxy responsivenessAldo Cortesi2014-11-062-4/+11
| | | | Fixes #384
* Fix bug in flow dumping, add unit test that should have caught this in the ↵Aldo Cortesi2014-11-062-2/+16
| | | | first place
* We don't need requests for mitmproxyAldo Cortesi2014-11-052-4/+1
|
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-11-043-11/+33
|\
| * Merge pull request #393 from onlywade/masterMaximilian Hils2014-11-012-9/+31
| |\ | | | | | | Fixing issue #392, adding tests.
| | * Updating OPTIONS test with related issue number.Wade 5242014-10-311-1/+1
| | |
| | * Fixing issue #392.Wade 5242014-10-311-3/+2
| | |
| | * Adding some test coverage for handling HTTP OPTIONS requests.Wade 5242014-10-311-6/+29
| |/
| * fix #391Maximilian Hils2014-10-301-2/+2
| |
* | Release prep: binaries build script, release checklist, fuzzingAldo Cortesi2014-11-026-6/+27
|/
* LegibilityAldo Cortesi2014-10-263-50/+128
|
* Fix crash while streamingAldo Cortesi2014-10-264-26/+53
| | | | | | | | | | | | | | | | | | | | | | | | 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']
* Spacing and legibilityAldo Cortesi2014-10-262-27/+72
|
* Start a fuzzing architecture for mitmproxyAldo Cortesi2014-10-269-9/+61
|
* Merge pull request #387 from onlywade/masterMaximilian Hils2014-10-251-2/+3
|\ | | | | Fixing issue #368.
| * Fixing issue #368.Wade 5242014-10-241-2/+3
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-10-2312-225/+361
|\ | | | | | | | | Conflicts: doc-src/modes.html
| * Document http2https and https2httpAldo Cortesi2014-10-232-1/+30
| |
| * Correct docs - we no longer support change of basic proxy mode in the ↵Aldo Cortesi2014-10-232-6/+0
| | | | | | | | console app
| * More refactoring of installation docsAldo Cortesi2014-10-232-20/+45
| | | | | | | | | | | | - Make it clear that README.md only has the hacking installation instructions - Beef up install.html
| * Keep sidebar ordering alphabetical, add SOCKS documentationAldo Cortesi2014-10-234-5/+17
| |
| * CHANGELOG and CONTRIBUTORSAldo Cortesi2014-10-232-27/+84
| |
| * First redraft of modes documentationAldo Cortesi2014-10-231-143/+155
| |