Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix an issue with quoting and commands | Aldo Cortesi | 2018-02-23 | 1 | -0/+16 |
| | | | | | Previously, quotes would disappear during editing, making it impossible to enter command arguments with spaces. | ||||
* | Flake, be happy | Miroslav | 2018-02-20 | 1 | -2/+0 |
| | |||||
* | one more cleanup | Miroslav | 2018-02-20 | 1 | -1/+0 |
| | |||||
* | Hotkeys cleanup | Miroslav | 2018-02-20 | 1 | -10/+0 |
| | |||||
* | Merge pull request #2881 from cortesi/refreshopt | Maximilian Hils | 2018-02-19 | 3 | -6/+6 |
|\ | | | | | option refresh_server_playback -> server_replay_refresh | ||||
| * | option replay_kill_extra -> server_replay_kill_extra | Aldo Cortesi | 2018-02-20 | 3 | -3/+3 |
| | | | | | | | | Continuing effort to collect all sever replay options under a commmon prefix. | ||||
| * | option refresh_server_playback -> server_replay_refresh | Aldo Cortesi | 2018-02-20 | 2 | -3/+3 |
| | | | | | | | | All other server playback options have this form. | ||||
* | | Merge pull request #2847 from kira0204/key-cookie-issue | Maximilian Hils | 2018-02-12 | 2 | -6/+26 |
|\ \ | | | | | | | Handling empty key with value for cookies, fix #2827 | ||||
| * | | keeping consistency, better testing | kira0204 | 2018-02-11 | 2 | -6/+22 |
| | | | |||||
| * | | fixing logic | kira0204 | 2018-02-07 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #2851 from mhils/always-use-tls-settings | Maximilian Hils | 2018-02-10 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | Use TLS options also for request replay | ||||
| * | | | use TLS options also for request replay, refs #2840 | Maximilian Hils | 2018-02-08 | 1 | -5/+4 |
| | | | | |||||
* | | | | Excess return was deleted | Miroslav | 2018-02-08 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Extend mypy checking, fix #2194 (#2819) | Arushit Mudgal | 2018-02-03 | 1 | -4/+4 |
| | | | |||||
* | | | don't raise when pyperclip doesn't find a clipboard, fix #2816 | Samoilenko Roman | 2018-02-03 | 2 | -2/+19 |
|/ / | |||||
* | | remove quotes around filename | Maximilian Hils | 2018-02-01 | 1 | -0/+12 |
| | | |||||
* | | Fix for #2750 and #2783 (#2809) | Samoilenko Roman | 2018-01-25 | 2 | -0/+34 |
| | | |||||
* | | fix #2800 | Arushit Mudgal | 2018-01-25 | 1 | -1/+17 |
| | | |||||
* | | Fix #2765 (#2792) | Samoilenko Roman | 2018-01-14 | 1 | -0/+4 |
| | | |||||
* | | Fix #2768 (#2778) | Samoilenko Roman | 2018-01-14 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #2793 from kajojify/issue-2399 | Maximilian Hils | 2018-01-14 | 1 | -0/+1 |
|\ \ | | | | | | | Issue 2399 | ||||
| * | | Fix #2399 | Miroslav | 2018-01-14 | 1 | -0/+1 |
| | | | |||||
* | | | store ClientHello extensions with client connection | Maximilian Hils | 2018-01-13 | 2 | -2/+3 |
| | | | |||||
* | | | Merge pull request #2790 from mhils/stateobject-improvements | Maximilian Hils | 2018-01-13 | 2 | -52/+102 |
|\ \ \ | | | | | | | | | stateobject: use typing, enable tuples and more complex datatypes | ||||
| * | | | stateobject: use typing, enable tuples and more complex datatypes | Maximilian Hils | 2018-01-13 | 2 | -52/+102 |
| | | | | |||||
* | | | | improve net.tls.ClientHello API, fix bugs, add tests | Maximilian Hils | 2018-01-13 | 1 | -6/+84 |
| | | | | |||||
* | | | | move ClientHello and related functions to mitmproxy.net.tls | Maximilian Hils | 2018-01-12 | 2 | -26/+24 |
|/ / / | |||||
* | | | Add test for fix#2766. | Matthew Shao | 2018-01-11 | 1 | -0/+4 |
| | | | |||||
* | | | Raise a CommandError for the exception | Matthew Shao | 2018-01-08 | 1 | -3/+4 |
| | | | |||||
* | | | Fix #2760 | Matthew Shao | 2018-01-08 | 1 | -0/+3 |
| | | | |||||
* | | | Fix #2767 (#2770) | Samoilenko Roman | 2018-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | only use annotated tags for version calculation | Maximilian Hils | 2018-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | avoid TLS/SSL ambiguity for Cert class | Thomas Kriechbaumer | 2018-01-07 | 3 | -15/+15 |
| | | | |||||
* | | | rename TLS/SSL-related functions | Thomas Kriechbaumer | 2018-01-06 | 11 | -49/+49 |
| | | | | | | | | | | | | | | | | | | SSL is an outdated protocol superseeded by TLS. Although the commonly used library is called OpenSSL, it is no reason to still use outdated language for function names. | ||||
* | | | rename TLS/SSL-related attributes | Thomas Kriechbaumer | 2018-01-06 | 5 | -10/+10 |
| | | | | | | | | | | | | | | | | | | SSL is an outdated protocol superseeded by TLS. Although the commonly used library is called OpenSSL, it is no reason to still use outdated language for attributes. | ||||
* | | | refactor common.format_keyvals | Maximilian Hils | 2018-01-05 | 2 | -13/+25 |
| | | | | | | | | | | | | | | | | | | | | | the semantics here were really quite unclear, now it is hopefully a bit more obvious what's happening. Once we are Python 3.6+ exclusively, we may consider changing the signature to accept a (order-preserving) dict instead of a list. | ||||
* | | | fix test flow timestamps to values that don't overflow in certain timezones | Maximilian Hils | 2018-01-05 | 4 | -14/+10 |
| | | | |||||
* | | | fix #2470 | Maximilian Hils | 2018-01-04 | 1 | -1/+4 |
| | | | |||||
* | | | do not add leading zeroes to .dev version part. | Maximilian Hils | 2018-01-04 | 1 | -1/+1 |
|/ / | | | | | | | | | wheel normalizes to no leading zeroes, and we don't want to special-case that. | ||||
* | | Merge pull request #2733 from mitmproxy/pyinstaller | Maximilian Hils | 2017-12-30 | 2 | -13/+23 |
|\ \ | | | | | | | Update PyInstaller, add dev version info to builds. | ||||
| * | | single-source version processing | Maximilian Hils | 2017-12-30 | 2 | -13/+23 |
| | | | |||||
* | | | Merge pull request #2703 from mhils/test-defaultkeys | Maximilian Hils | 2017-12-30 | 1 | -0/+23 |
|\ \ \ | | | | | | | | | Test that default key bindings are valid commands | ||||
| * | | | test that defaultkeys are valid commands | Maximilian Hils | 2017-12-29 | 1 | -0/+23 |
| |/ / | |||||
* | | | fix Flow.kill behaviour | Maximilian Hils | 2017-12-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now just sets a kill reply instead of committing directly. First, this seems like the more sane thing to do. Second, we have an iffy race condition where we call Reply.commit() before the addonmanager finishes its invocation, the proxy thread then progresses and sets a new flow.reply attribute, and the addonmanager then gets confused when finishing. This commit doesn't fix that, but mitigates it for Flow.kill which is now committed by the addonmanager. | ||||
* | | | websocket: add flow kill test | Thomas Kriechbaumer | 2017-12-29 | 1 | -0/+19 |
| | | | |||||
* | | | websocket: test killable | Thomas Kriechbaumer | 2017-12-28 | 1 | -0/+15 |
| | | | |||||
* | | | websocket: docs++ and kill messages | Thomas Kriechbaumer | 2017-12-27 | 1 | -0/+6 |
| | | | | | | | | | | | | fixes #2724 | ||||
* | | | Display "*" when listening on all interfaces | Maximilian Hils | 2017-12-26 | 1 | -0/+2 |
|/ / | | | | | | | | | | | | | | | | | | | The set of people who understand "0.0.0.0" (and/or "::") is a subset of the set of people who understand "*", so we can make things easier to understand by using the less technical notation. Empirical Evidence: - https://discourse.mitmproxy.org/t/unable-to-use-mitmproxy-on-windows/735 - https://discourse.mitmproxy.org/t/how-to-view-the-proxy-servers-url/23 | ||||
* | | @concurrent decorator works for class methods. (#2708) | fate0 | 2017-12-26 | 1 | -1/+1 |
| | | | | | | | | | | * @concurrent decorator should works for class methods * modify test for @concurrent decorator in class. * add docs | ||||
* | | cuts: don't crash when retrieving header of a non-existent response | Aldo Cortesi | 2017-12-20 | 1 | -0/+5 |
| | |