Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix tflow.js creation on Windows. | Maximilian Hils | 2017-07-30 | 1 | -1/+1 |
| | | | | | Keep lineendings consistent so that running the tests does not produce a different file on Windows. | ||||
* | fix tool-specific cmdline | Maximilian Hils | 2017-07-30 | 2 | -11/+6 |
| | | | | | | | 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 Hils | 2017-07-30 | 14 | -73/+57 |
| | | | | | | 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.. | ||||
* | Merge pull request #2452 from mattweidner/add_intercept_toggle | Maximilian Hils | 2017-07-29 | 1 | -0/+12 |
|\ | | | | | Add intercept toggle feature. | ||||
| * | Extended intercept tests to include toggle feature | Matt Weidner | 2017-07-27 | 1 | -0/+12 |
| | | |||||
* | | Merge pull request #2480 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-29 | 4 | -4/+4 |
|\ \ | | | | | | | Fix #2448: Improve flow_detail and verbosity options | ||||
| * | | Update tests for the improved verbosity options. | Matthew Shao | 2017-07-28 | 4 | -4/+4 |
| |/ | |||||
* | | Merge pull request #2471 from ujjwal96/traceback-fix | Maximilian Hils | 2017-07-29 | 4 | -11/+15 |
|\ \ | |/ |/| | Fixed addon error in test suite | ||||
| * | fixed addon error | Ujjwal Verma | 2017-07-26 | 4 | -11/+15 |
| | | |||||
* | | add console statusbar test | Maximilian Hils | 2017-07-27 | 3 | -11/+46 |
| | | |||||
* | | Merge pull request #2460 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-27 | 1 | -1/+3 |
|\ \ | | | | | | | Add default value suggester in mitmweb options | ||||
| * | | [web] Minor Fix for backend. | Matthew Shao | 2017-07-27 | 1 | -2/+2 |
| | | | |||||
| * | | [web] Fix tests. | Matthew Shao | 2017-07-26 | 2 | -5/+1 |
| | | | |||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-26 | 2 | -11/+2 |
| | | | |||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-24 | 2 | -1/+16 |
| |/ | |||||
* | | Merge pull request #2469 from Kriechi/nuke-old-openssl | Maximilian Hils | 2017-07-25 | 9 | -145/+90 |
|\ \ | | | | | | | nuke old openssl | ||||
| * | | nuke old openssl | Thomas Kriechbaumer | 2017-07-25 | 8 | -129/+10 |
| | | | |||||
| * | | update cert with too small key | Thomas Kriechbaumer | 2017-07-25 | 1 | -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 Hils | 2017-07-25 | 1 | -0/+4 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | fix loading scripts with same filename | Maximilian Hils | 2017-07-20 | 2 | -0/+25 |
| | |||||
* | Update test_allowremote.py | Thomas Kriechbaumer | 2017-07-15 | 1 | -31/+28 |
| | |||||
* | Allow remote addon | Ujjwal Verma | 2017-07-15 | 1 | -0/+41 |
| | |||||
* | Merge pull request #2427 from ujjwal96/protobuf | Thomas Kriechbaumer | 2017-07-10 | 6 | -43/+92 |
|\ | | | | | Kaitai parser for protobuf | ||||
| * | Kaitai parser for protobuf | Ujjwal Verma | 2017-07-10 | 6 | -43/+92 |
| | | |||||
* | | Merge pull request #2423 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-05 | 2 | -4/+25 |
|\ \ | | | | | | | [web] [WIP] Mitmweb options editor content | ||||
| * | | Fix the test for websocket connection. | Matthew Shao | 2017-07-05 | 1 | -2/+22 |
| | | | |||||
| * | | [web] Add keys argument for dump_dict in optmanager. | Matthew Shao | 2017-07-05 | 2 | -2/+3 |
| | | | |||||
* | | | add websocket streaming option | Ujjwal Verma | 2017-07-04 | 1 | -0/+1 |
| | | | |||||
* | | | fix HTTP retry if sending a request fails once | Ujjwal Verma | 2017-07-04 | 1 | -6/+41 |
| | | | |||||
* | | | websocket streaming | Ujjwal Verma | 2017-07-04 | 2 | -1/+41 |
| | | | |||||
* | | | request streaming for HTTP/2 | Ujjwal Verma | 2017-07-04 | 1 | -2/+122 |
| | | | |||||
* | | | request streaming for HTTP/1 | Ujjwal Verma | 2017-07-04 | 1 | -7/+2 |
| |/ |/| | |||||
* | | Fixes #2315 | Ujjwal Verma | 2017-06-28 | 1 | -0/+15 |
|/ | |||||
* | Merge pull request #2402 from ujjwal96/request-replay | Maximilian Hils | 2017-06-27 | 1 | -2/+14 |
|\ | | | | | Fixes #2197 | ||||
| * | request replay test | Ujjwal Verma | 2017-06-26 | 1 | -2/+14 |
| | | |||||
* | | Merge pull request #2411 from ujjwal96/ico-parser | Maximilian Hils | 2017-06-25 | 2 | -2/+24 |
|\ \ | | | | | | | ICO content view | ||||
| * | | Added test | Ujjwal Verma | 2017-06-25 | 2 | -2/+24 |
| |/ | |||||
* | | Merge pull request #2395 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-06-24 | 3 | -0/+23 |
|\ \ | |/ |/| | [WIP] Add RESTful API for mitmweb option | ||||
| * | Minor Update for /options API of mitmweb. | Matthew Shao | 2017-06-24 | 2 | -2/+3 |
| | | |||||
| * | Add test for POST /options API of mitmweb. | Matthew Shao | 2017-06-23 | 1 | -0/+4 |
| | | |||||
| * | Add test for typespec_to_str. | Matthew Shao | 2017-06-14 | 1 | -0/+8 |
| | | |||||
| * | Minor Update and add test. | Matthew Shao | 2017-06-13 | 1 | -0/+5 |
| | | |||||
| * | Add tests for dump_dicts in optmanager.py. | Matthew Shao | 2017-06-12 | 1 | -0/+5 |
| | | |||||
* | | console: console.key.bind console.key.unbind commands | Aldo Cortesi | 2017-06-14 | 1 | -0/+35 |
| | | |||||
* | | console: teach keymap to understand "space" | Aldo Cortesi | 2017-06-13 | 1 | -0/+5 |
| | | | | | | | | Urwid uses " ", which is not a great user experience. | ||||
* | | console: key binding viewer | Aldo Cortesi | 2017-06-13 | 1 | -1/+1 |
| | | | | | | | | Read-only for now. | ||||
* | | view: show a message if we remove more than one flow from view | Aldo Cortesi | 2017-06-13 | 1 | -0/+10 |
| | | |||||
* | | commands: teach parser correct annotations for variable args | Aldo Cortesi | 2017-06-13 | 1 | -1/+1 |
| | | | | | | | | We should annotate with the base type, not the resulting sequence. | ||||
* | | config: don't crash with a config file containing only comments | Aldo Cortesi | 2017-06-13 | 1 | -0/+4 |
| | | |||||
* | | Test for streaming | Ujjwal Verma | 2017-06-12 | 1 | -0/+37 |
|/ |