Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into proxy-refactor-cb | Maximilian Hils | 2015-08-30 | 1 | -0/+5 |
|\ | |||||
| * | console: add command line flag to disable mouse interaction | Timothy Elliott | 2015-08-19 | 1 | -0/+5 |
| | | | | | | | | | | | | Adds the --no-mouse command line option to disable the mouse. Fixes #685 | ||||
* | | always insert tls layer for inline script upgrades | Maximilian Hils | 2015-08-30 | 1 | -10/+3 |
| | | |||||
* | | move sslversion mapping to netlib | Maximilian Hils | 2015-08-29 | 1 | -5/+5 |
| | | |||||
* | | clean up config/cmdline, fix bugs, remove cruft | Maximilian Hils | 2015-08-28 | 1 | -99/+148 |
|/ | |||||
* | move code from mitmproxy to netlib | Thomas Kriechbaumer | 2015-08-01 | 1 | -1/+4 |
| | |||||
* | SSL Spoof mode | iroiro123 | 2015-06-21 | 1 | -1/+11 |
| | |||||
* | Spoof mode | iroiro123 | 2015-06-20 | 1 | -5/+5 |
| | |||||
* | HTTP Transparent Proxy | iroiro123 | 2015-06-18 | 1 | -0/+5 |
| | |||||
* | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 1 | -10/+10 |
| | |||||
* | console: add a -l flag to set the limit on startup | Aldo Cortesi | 2015-04-15 | 1 | -0/+5 |
| | |||||
* | console: All palettes now explicitly set a background colour | Aldo Cortesi | 2015-04-07 | 1 | -0/+5 |
| | | | | | There's a new option --palette-transparent to turn this off if you want to use your own terminal background. | ||||
* | console: palette picker for the options screen | Aldo Cortesi | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | web: initial attempt at header editor | Maximilian Hils | 2015-03-27 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'onlywade/master' | Maximilian Hils | 2015-03-15 | 1 | -1/+7 |
|\ | | | | | | | | | | | Conflicts: libmproxy/console/__init__.py libmproxy/console/flowlist.py | ||||
| * | Adding a server replay option to ignore host when searching for matching ↵ | Wade Catron | 2015-03-08 | 1 | -1/+7 |
| | | | | | | | | requests | ||||
* | | Better error when invalid palette is specified | Aldo Cortesi | 2015-03-12 | 1 | -1/+1 |
|/ | |||||
* | first steps in scenario support | Marcelo Glezer | 2015-01-05 | 1 | -2/+2 |
| | |||||
* | we do not support https2http in upstream proxy mode | Maximilian Hils | 2015-01-01 | 1 | -10/+18 |
| | |||||
* | Documentation for config files | Aldo Cortesi | 2014-12-28 | 1 | -1/+2 |
| | |||||
* | Minor improvements to osx binary build process | Aldo Cortesi | 2014-12-28 | 1 | -3/+8 |
| | | | | | - Add --shortversion on tools to make packaging easier - Automate tarfile generation | ||||
* | --replay_ignore_payload_params added, to filter params in form posts | Marcelo Glezer | 2014-12-18 | 1 | -2/+14 |
| | |||||
* | append file mode for saving flows merged to master | Marcelo Glezer | 2014-12-11 | 1 | -4/+10 |
| | |||||
* | One common --version flag | Aldo Cortesi | 2014-11-15 | 1 | -15/+5 |
| | |||||
* | Remove last vestiges of argparse | Aldo Cortesi | 2014-11-15 | 1 | -7/+6 |
| | |||||
* | Make sure all command-line arguments have a long form | Aldo Cortesi | 2014-11-15 | 1 | -21/+20 |
| | | | | ... so they can be used in config files | ||||
* | Enable config file parsing | Aldo Cortesi | 2014-11-15 | 1 | -4/+32 |
| | | | | | | | | | | | | | 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 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 |
| |