aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor fixesMaximilian Hils2017-07-302-5/+5
|
* move isatty check to a better placeMaximilian Hils2017-07-302-6/+5
|
* fix tflow.js creation on Windows.Maximilian Hils2017-07-301-1/+1
| | | | | Keep lineendings consistent so that running the tests does not produce a different file on Windows.
* fix tool-specific cmdlineMaximilian Hils2017-07-304-30/+34
| | | | | | | before this commit, all tools only exposed mitmdump cmdline arguments, as run() contained a simple `cmdline.mitmdump()` invocation. This fixes this, and also makes it possible to have cmdline arguments for tool-specific options.
* disentangle ProxyServer and Master classes.Maximilian Hils2017-07-3023-121/+130
| | | | | | The proxy server should ultimately be an addon itself and not be passed to the Master constructor. This commit already removes the server in the majority of instances, and also replaces a large number of ProxyConfig usages with the Options class..
* move web options into their own addonMaximilian Hils2017-07-293-19/+20
|
* Merge pull request #2452 from mattweidner/add_intercept_toggleMaximilian Hils2017-07-297-1/+31
|\ | | | | Add intercept toggle feature.
| * Extended intercept tests to include toggle featureMatt Weidner2017-07-271-0/+12
| |
| * Changed statusbar indicator to 'X' inside the intercept filter bracketsMatt Weidner2017-07-271-2/+2
| |
| * Fixed boolean evaluation syntax inconsistencyMatt Weidner2017-07-271-1/+1
| |
| * Fixed indentationMatt Weidner2017-07-271-2/+2
| |
| * Add intercetp toggle feature.Matt Weidner2017-07-276-1/+19
| |
* | Merge pull request #2480 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-299-10/+24
|\ \ | | | | | | Fix #2448: Improve flow_detail and verbosity options
| * | Fix lint error.Matthew Shao2017-07-281-1/+1
| | |
| * | Update tests for the improved verbosity options.Matthew Shao2017-07-284-4/+4
| | |
| * | Improve verbosity options.Matthew Shao2017-07-285-6/+20
| |/
* | Merge pull request #2471 from ujjwal96/traceback-fixMaximilian Hils2017-07-297-15/+19
|\ \ | | | | | | Fixed addon error in test suite
| * | updated snapshotUjjwal Verma2017-07-281-2/+2
| | |
| * | fixed addon errorUjjwal Verma2017-07-266-13/+17
| | |
* | | Merge pull request #2478 from pauloromeira/fix-typoThomas Kriechbaumer2017-07-291-3/+3
|\ \ \ | |_|/ |/| | docs: Fix typo
| * | docs: Fix typoPaulo Romeira2017-07-291-3/+3
|/ /
* | Merge pull request #2476 from mhils/statusbar-testsMaximilian Hils2017-07-273-11/+46
|\ \ | | | | | | Add console statusbar test
| * | add console statusbar testMaximilian Hils2017-07-273-11/+46
|/ /
* | Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2711-6/+217
|\ \ | | | | | | Add default value suggester in mitmweb options
| * | [web] Minor fix for frontend and tests.Matthew Shao2017-07-273-8/+11
| | |
| * | [web] Minor Fix for backend.Matthew Shao2017-07-273-15/+6
| | |
| * | [web] Fix tests.Matthew Shao2017-07-262-5/+1
| | |
| * | [web] Fix conflict.Matthew Shao2017-07-262-12/+8
| | |
| * | [web] Update tests.Matthew Shao2017-07-265-41/+20
| | |
| * | [web] Load dumped options at start up.Matthew Shao2017-07-261-0/+6
| | |
| * | [web] Update options auto dump for frontend.Matthew Shao2017-07-263-26/+6
| | |
| * | [web] Update POST /options/dump API in backend.Matthew Shao2017-07-261-9/+3
| | |
| * | [web] Update tests.Matthew Shao2017-07-243-2/+44
| | |
| * | [web] Add Download/Load button to OptionEditor.Matthew Shao2017-07-242-1/+28
| | |
| * | [web] Add /options/dump API to backend.Matthew Shao2017-07-241-1/+18
| | |
| * | [web] Update OptManager.save() to suit the need of mitmweb.Matthew Shao2017-07-241-5/+11
| | |
| * | [web] OptionModal component coverge ++.Matthew Shao2017-07-223-1/+116
| | |
| * | [web] Update tests.Matthew Shao2017-07-211-0/+33
| | |
| * | [web] Add default value suggester in option editor.Matthew Shao2017-07-211-0/+27
| | |
* | | Merge pull request #2473 from mengbiping/postpone-connectionMaximilian Hils2017-07-261-10/+13
|\ \ \ | | | | | | | | Respect response to CONNECT created in http_connect function in upstream mode
| * | | add comment explaining upstream connect logicMaximilian Hils2017-07-261-0/+2
| | | |
| * | | Allow http_connect to create a response for CONNECT request so that ↵Biping Meng2017-07-261-10/+11
|/ / / | | | | | | | | | connection to server be postponed in upstream mode.
* | | Merge pull request #2469 from Kriechi/nuke-old-opensslMaximilian Hils2017-07-2515-244/+109
|\ \ \ | | | | | | | | nuke old openssl
| * | | nuke old opensslThomas Kriechbaumer2017-07-2514-228/+29
| | | |
| * | | update cert with too small keyThomas Kriechbaumer2017-07-251-16/+80
| | |/ | |/| | | | | | | | | | | | | $ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes (keep everything default, do not enter a Common Name or FQDN) $ cat key.pem cert.pem > test/mitmproxy/data/no_common_name.pem
* / | Squashed commit of the following:Maximilian Hils2017-07-256-7/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit edfbd41200a854f0bb7bb99f8bb70af9dbb9b8e0 Author: Matt Weidner <matt.weidner@gmail.com> Date: Tue Jul 25 01:19:53 2017 -0500 Extended view.load test to check for unhandled IOError exception. commit a523b534bc59ea97ed1fd5a3e6f78112fee19b6f Author: requires.io <support@requires.io> Date: Mon Jul 24 21:25:04 2017 +0200 [requires.io] dependency update commit c725540c6eb92c003616b649ba43bee1f14e56ac Author: Thomas Kriechbaumer <thomas@kriechbaumer.name> Date: Mon Jul 24 21:01:25 2017 +0200 update travis commit eeb6cfb4c76e60ac1813b839f589cd489c041c6c Author: Thomas Kriechbaumer <Kriechi@users.noreply.github.com> Date: Mon Jul 24 21:03:14 2017 +0200 [requires.io] dependency update on master branch (#2435) commit 51a2672c782ee8ba8c7d5c7116073feccb4d8430 Author: Maximilian Hils <git@maximilianhils.com> Date: Mon Jul 24 19:03:01 2017 +0200 require latest mypy version (refs #2452) commit 5685a4850af6edda7100cae900487955c8b7a3ab Author: Maximilian Hils <git@maximilianhils.com> Date: Fri Jul 21 11:24:42 2017 +0200 fix addon tracebacks `.tb_next` discards the first interesting frame, this shouldn't happen. commit a2da9b6c02030293f3a412d16df819868c581a29 Author: Matt Weidner <matt.weidner@gmail.com> Date: Sat Jul 22 12:30:15 2017 -0500 Added os.path.expanduser() before open() calls with user supplied paths commit 05db6e32c7957f267e97c34aa8f5a3cd6cb7dbb2 Author: Matt Weidner <matt.weidner@gmail.com> Date: Fri Jul 21 16:25:16 2017 -0500 Added support for the ~ path shortcut when loading flows from disk. for consistency. Saving flows supports using paths with the ~ shortcut. commit b7f864b6bbd221093aeb1c384dd16038f490441a Author: Matt Weidner <matt.weidner@gmail.com> Date: Fri Jul 21 16:06:38 2017 -0500 Fixed crash when loading flows from a file that does not exist
* | Merge pull request #2467 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-07-241-1/+1
|\ \ | | | | | | [requires.io] dependency update on master branch
| * | [requires.io] dependency updaterequires.io2017-07-241-1/+1
| | |
* | | Merge pull request #2466 from Kriechi/update-travisThomas Kriechbaumer2017-07-241-28/+6
|\ \ \ | |/ / |/| | update travis
| * | update travisThomas Kriechbaumer2017-07-241-28/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-03 20:16:43 +0000