aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | |
* | | Merge pull request #2459 from mhils/fix-tbThomas Kriechbaumer2017-07-241-1/+1
|\ \ \ | |/ / |/| | Fix addon tracebacks
| * | fix addon tracebacksMaximilian Hils2017-07-211-1/+1
| |/ | | | | | | | | `.tb_next` discards the first interesting frame, this shouldn't happen.
* | [requires.io] dependency update on master branch (#2435)Thomas Kriechbaumer2017-07-241-2/+2
| |
* | require latest mypy version (refs #2452)Maximilian Hils2017-07-241-1/+1
|/
* Merge pull request #2430 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2017-236/+679
|\ | | | | [web] [WIP] Mitmweb options
| * [web] Remove js/ducks/ui/option.jsMatthew Shao2017-07-202-78/+0
| |
| * [web] Minor fix and update tests.Matthew Shao2017-07-2012-83/+404
| |
| * [web] Fix line breaking in StringSequenceOption.Matthew Shao2017-07-191-1/+1
| |
| * [web] sorting the options and minor improve ux.Matthew Shao2017-07-183-267/+13
| |
| * Merge branch 'mitmweb-options' of https://github.com/MatthewShao/mitmproxy ↵Matthew Shao2017-07-1839-256/+1109
| |\ | | | | | | | | | into mitmweb-options
| | * [web] options: add some styling, minor fixesMaximilian Hils2017-07-172-19/+36
| | |
| | * [web] options: make help and err permanently visible, improve perfMaximilian Hils2017-07-1710-338/+260
| | |
| | * [web] Update OptionMaster.Matthew Shao2017-07-172-73/+44
| | |
| | * [web] Add reducer and actions for option editor.Matthew Shao2017-07-172-1/+42
| | |
| | * [web] Add simple validation and improve UI.Matthew Shao2017-07-173-18/+61
| | |
| | * [web] Update error msg in PUT /options API.Matthew Shao2017-07-171-1/+1
| | |
| | * [web] Update tests.Matthew Shao2017-07-171-4/+16
| | |
| | * [web] Try StringSequence update logic and add tooltip.Matthew Shao2017-07-171-38/+138
| | |
| | * [web] Update test.Matthew Shao2017-07-171-80/+99
| | |
| | * [web] Add PureStringSequenceOption type to OptionMaster.jsxMatthew Shao2017-07-172-48/+82
| | |
| * | [web] Update OptionMaster.Matthew Shao2017-07-172-73/+44
| | |
| * | [web] Add reducer and actions for option editor.Matthew Shao2017-07-172-1/+42
| | |
| * | [web] Add simple validation and improve UI.Matthew Shao2017-07-153-18/+61
| | |
| * | [web] Update error msg in PUT /options API.Matthew Shao2017-07-151-1/+1
| | |
| * | [web] Update tests.Matthew Shao2017-07-101-4/+16
| | |
| * | [web] Try StringSequence update logic and add tooltip.Matthew Shao2017-07-101-38/+138
| | |
| * | [web] Update test.Matthew Shao2017-07-071-80/+99
| | |
| * | [web] Add PureStringSequenceOption type to OptionMaster.jsxMatthew Shao2017-07-072-48/+82
| | |
* | | Merge pull request #2454 from mhils/minor-improvementsMaximilian Hils2017-07-206-63/+73
|\ \ \ | | | | | | | | Minor improvements
| * | | update mypyMaximilian Hils2017-07-204-14/+14
| | | |
| * | | fix type declarationMaximilian Hils2017-07-201-1/+1
| | | |
| * | | shorten option helpMaximilian Hils2017-07-203-18/+17
| | | | | | | | | | | | | | | | | | | | We can have longer versions in the docs, but this makes the options pages quite hard to parse.
| * | | make eventsequence.iterate extendableMaximilian Hils2017-07-151-39/+55
| | | |
| * | | remove `--shortversion`Maximilian Hils2017-07-151-6/+1
| | |/ | |/| | | | | | | this has no benefit over --version and clutters our cmdline options.
* | | Merge pull request #2455 from mhils/script-fixesMaximilian Hils2017-07-203-4/+38
|\ \ \ | | | | | | | | Fix loading scripts with same filename
| * | | replace deprecated use of SourceFileLoader.load_moduleMaximilian Hils2017-07-201-2/+4
| | | |
| * | | fix loading scripts with same filenameMaximilian Hils2017-07-203-3/+35
|/ / /
* | | Merge pull request #2436 from ujjwal96/addonThomas Kriechbaumer2017-07-153-0/+69
|\ \ \ | | | | | | | | Allow remote Addon
| * | | Update test_allowremote.pyThomas Kriechbaumer2017-07-151-31/+28
| | | |
| * | | Allow remote addonUjjwal Verma2017-07-153-0/+72
|/ / /
* / / make issue template more conciseMaximilian Hils2017-07-131-7/+1
|/ /
* | Merge pull request #2427 from ujjwal96/protobufThomas Kriechbaumer2017-07-1010-65/+372
|\ \ | | | | | | Kaitai parser for protobuf
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 00:03:36 +0000