aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/cmdline.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'onlywade/master'Maximilian Hils2015-03-151-1/+7
|\ | | | | | | | | | | Conflicts: libmproxy/console/__init__.py libmproxy/console/flowlist.py
| * Adding a server replay option to ignore host when searching for matching ↵Wade Catron2015-03-081-1/+7
| | | | | | | | requests
* | Better error when invalid palette is specifiedAldo Cortesi2015-03-121-1/+1
|/
* first steps in scenario supportMarcelo Glezer2015-01-051-2/+2
|
* we do not support https2http in upstream proxy modeMaximilian Hils2015-01-011-10/+18
|
* Documentation for config filesAldo Cortesi2014-12-281-1/+2
|
* Minor improvements to osx binary build processAldo Cortesi2014-12-281-3/+8
| | | | | - Add --shortversion on tools to make packaging easier - Automate tarfile generation
* --replay_ignore_payload_params added, to filter params in form postsMarcelo Glezer2014-12-181-2/+14
|
* append file mode for saving flows merged to masterMarcelo Glezer2014-12-111-4/+10
|
* One common --version flagAldo Cortesi2014-11-151-15/+5
|
* Remove last vestiges of argparseAldo Cortesi2014-11-151-7/+6
|
* Make sure all command-line arguments have a long formAldo Cortesi2014-11-151-21/+20
| | | | ... so they can be used in config files
* Enable config file parsingAldo Cortesi2014-11-151-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 definitionAldo Cortesi2014-11-151-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 supportAldo Cortesi2014-11-151-33/+76
|
* Fix crash while streamingAldo Cortesi2014-10-261-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 #374Maximilian Hils2014-10-181-1/+8
|
* remove default_caMaximilian Hils2014-10-181-1/+1
|
* Add SOCKS5 mode, fix #305Maximilian Hils2014-10-091-2/+6
|
* --replay-ignore-content & --replay-ignore-param ported from branch 0.10Marcelo Glezer2014-10-031-0/+13
|
* Basic web service and optionsAldo Cortesi2014-09-141-4/+4
|
* Remove external app option, make tick timeout explicitAldo Cortesi2014-09-141-6/+0
|
* remove proxy mode abstraction: always be clear which mode we are inMaximilian Hils2014-09-081-5/+0
|
* coverage++Maximilian Hils2014-09-061-2/+1
|
* adjust to netlib changesMaximilian Hils2014-08-171-1/+1
|
* implement passthrough mode, fixes #175Maximilian Hils2014-08-091-3/+13
|
* add --stream options, various fixesMaximilian Hils2014-07-211-51/+51
|
* fix command line helpMaximilian Hils2014-07-061-2/+2
|
* Fix proxy optionsAldo Cortesi2014-04-121-2/+2
|
* forward proxy -> upstream proxyMaximilian Hils2014-03-141-6/+6
|
* order command line options, add disting proxy option groupMaximilian Hils2014-03-131-64/+65
|
* adjust command line docs, fix log typoMaximilian Hils2014-03-131-2/+2
|
* adjust tests, fix option handlingMaximilian Hils2014-03-131-1/+0
|
* add -d switch to mitmdump to compensate for old verbosity functionalityMaximilian Hils2014-03-121-0/+1
|
* restrict -e to mitmproxy only (not mitmdump)Maximilian Hils2014-03-121-6/+0
|
* always use relative imports, fix status bar bugMaximilian Hils2014-03-101-2/+4
|
* update docs, fix #215Maximilian Hils2014-03-101-1/+1
|
* add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-101-14/+65
|
* finish proxy.py split upMaximilian Hils2014-03-091-2/+2
|
* Improve explicit certificate specificationAldo Cortesi2014-03-021-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 Cortesi2014-01-271-3/+3
|
* Silence pyflakesAldo Cortesi2014-01-191-2/+0
| | | | And pick up one bug as a consequence.
* Script refactoring: move script command parsing into script module.Aldo Cortesi2014-01-121-1/+1
|
* Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-031-1/+3
|
* Merge branch 'master' into 0.10Maximilian Hils2013-12-081-0/+5
|\
| * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-081-3/+6
| |\ | | | | | | Support multiple scripts and script arguments. refs #76
| * | Added -F http[s]://server:port option that allows MITM to forward traffic to ↵JC2013-08-301-0/+5
| | | | | | | | | | | | another http server upstream.
* | | add option to expose webapp externally, remove distinct ip settingMaximilian Hils2013-08-181-11/+16
| | |
* | | Merge branch 'master' into 0.10Maximilian Hils2013-08-171-15/+18
|\| |
| * | Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-011-15/+0
| | | | | | | | | | | | Thanks to Roy Shamir for reporting this.