Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor command-line argument definition | Aldo Cortesi | 2014-11-15 | 1 | -7/+114 |
| | | | | | - Argument definitions live in cmdline.py - Parsing and initial processing lives in main.py | ||||
* | First-order integration of configargparser to add config file support | Aldo Cortesi | 2014-11-15 | 1 | -33/+76 |
| | |||||
* | Fix crash while streaming | Aldo Cortesi | 2014-10-26 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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'] | ||||
* | add generic tcp proxying, fix #374 | Maximilian Hils | 2014-10-18 | 1 | -1/+8 |
| | |||||
* | remove default_ca | Maximilian Hils | 2014-10-18 | 1 | -1/+1 |
| | |||||
* | Add SOCKS5 mode, fix #305 | Maximilian Hils | 2014-10-09 | 1 | -2/+6 |
| | |||||
* | --replay-ignore-content & --replay-ignore-param ported from branch 0.10 | Marcelo Glezer | 2014-10-03 | 1 | -0/+13 |
| | |||||
* | Basic web service and options | Aldo Cortesi | 2014-09-14 | 1 | -4/+4 |
| | |||||
* | Remove external app option, make tick timeout explicit | Aldo Cortesi | 2014-09-14 | 1 | -6/+0 |
| | |||||
* | remove proxy mode abstraction: always be clear which mode we are in | Maximilian Hils | 2014-09-08 | 1 | -5/+0 |
| | |||||
* | coverage++ | Maximilian Hils | 2014-09-06 | 1 | -2/+1 |
| | |||||
* | adjust to netlib changes | Maximilian Hils | 2014-08-17 | 1 | -1/+1 |
| | |||||
* | implement passthrough mode, fixes #175 | Maximilian Hils | 2014-08-09 | 1 | -3/+13 |
| | |||||
* | add --stream options, various fixes | Maximilian Hils | 2014-07-21 | 1 | -51/+51 |
| | |||||
* | fix command line help | Maximilian Hils | 2014-07-06 | 1 | -2/+2 |
| | |||||
* | Fix proxy options | Aldo Cortesi | 2014-04-12 | 1 | -2/+2 |
| | |||||
* | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 1 | -6/+6 |
| | |||||
* | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 1 | -64/+65 |
| | |||||
* | adjust command line docs, fix log typo | Maximilian Hils | 2014-03-13 | 1 | -2/+2 |
| | |||||
* | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 1 | -1/+0 |
| | |||||
* | add -d switch to mitmdump to compensate for old verbosity functionality | Maximilian Hils | 2014-03-12 | 1 | -0/+1 |
| | |||||
* | restrict -e to mitmproxy only (not mitmdump) | Maximilian Hils | 2014-03-12 | 1 | -6/+0 |
| | |||||
* | always use relative imports, fix status bar bug | Maximilian Hils | 2014-03-10 | 1 | -2/+4 |
| | |||||
* | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 1 | -1/+1 |
| | |||||
* | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 1 | -14/+65 |
| | |||||
* | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 1 | -2/+2 |
| | |||||
* | Improve explicit certificate specification | Aldo Cortesi | 2014-03-02 | 1 | -1/+1 |
| | | | | | - Support cert/key in the same PEM file - Rationalize arguments, expand tests, clean up a bit | ||||
* | Use the mitm.it domain for the app, turn it on by default. | Aldo Cortesi | 2014-01-27 | 1 | -3/+3 |
| | |||||
* | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 1 | -2/+0 |
| | | | | And pick up one bug as a consequence. | ||||
* | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 1 | -1/+1 |
| | |||||
* | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -0/+5 |
|\ | |||||
| * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 1 | -3/+6 |
| |\ | | | | | | | Support multiple scripts and script arguments. refs #76 | ||||
| * | | Added -F http[s]://server:port option that allows MITM to forward traffic to ↵ | JC | 2013-08-30 | 1 | -0/+5 |
| | | | | | | | | | | | | another http server upstream. | ||||
* | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -11/+16 |
| | | | |||||
* | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 1 | -15/+18 |
|\| | | |||||
| * | | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 1 | -15/+0 |
| | | | | | | | | | | | | Thanks to Roy Shamir for reporting this. | ||||
| * | | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 1 | -0/+18 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 1 | -3/+6 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 1 | -3/+6 |
| | | |||||
* | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 1 | -1/+1 |
|/ | |||||
* | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 1 | -1/+8 |
| | |||||
* | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 1 | -0/+6 |
| | | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode | ||||
* | Remove cert_wait_time flag. | Aldo Cortesi | 2013-01-06 | 1 | -5/+0 |
| | | | | | We now cater for this by generating certs with a commencement date an hour in the past in netlib. | ||||
* | Refactor proxy auth a bit | Aldo Cortesi | 2013-01-02 | 1 | -25/+8 |
| | | | | | | - Remove authentication scheme option. We only support basic at the moment - we'll add the option back when we diversify. - Add some meta variables to make printout nicer | ||||
* | adding some simple authetication code to limit proxy access | israel | 2012-12-30 | 1 | -1/+47 |
| | |||||
* | Command-line options for header setting. | Aldo Cortesi | 2012-08-19 | 1 | -25/+78 |
| | |||||
* | add dummy cert dir | Maximilian Hils | 2012-08-17 | 1 | -2/+2 |
| | |||||
* | use argparse instead of optparse | Maximilian Hils | 2012-08-17 | 1 | -42/+38 |
| | |||||
* | Adds --dummy-certs option to specify certdir | Jim Lloyd | 2012-08-06 | 1 | -0/+6 |
| | | | | | | If --dummy-certs=CERTSDIR is provided, use CERTSDIR as the location for generating/finding the dummy certs. And in this case, preserve the CERTSDIR directory on exit. |