Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | stateobject: use typing, enable tuples and more complex datatypes | Maximilian Hils | 2018-01-13 | 6 | -106/+190 | |
| | | | | | ||||||
* | | | | | Merge pull request #2789 from mhils/move-clienthello | Maximilian Hils | 2018-01-13 | 6 | -155/+240 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Move ClientHello and related functions to mitmproxy.net.tls | |||||
| * | | | | improve net.tls.ClientHello API, fix bugs, add tests | Maximilian Hils | 2018-01-13 | 4 | -19/+95 | |
| | | | | | ||||||
| * | | | | move ClientHello and related functions to mitmproxy.net.tls | Maximilian Hils | 2018-01-12 | 6 | -155/+164 | |
|/ / / / | ||||||
* | | | | Merge pull request #2784 from ujjwal96/kaitai | Maximilian Hils | 2018-01-11 | 1 | -3/+5 | |
|\ \ \ \ | | | | | | | | | | | Update GIF parser | |||||
| * | | | | Update GIF parser | Ujjwal Verma | 2018-01-11 | 1 | -3/+5 | |
| | | | | | ||||||
* | | | | | Merge pull request #2780 from ujjwal96/console-fix | Maximilian Hils | 2018-01-11 | 2 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix crash when searching | |||||
| * | | | | | Fix crash when searching | Ujjwal Verma | 2018-01-11 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2781 from MatthewShao/fix#2766 | Maximilian Hils | 2018-01-11 | 2 | -0/+7 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix #2766. | |||||
| * | | | | | Add test for fix#2766. | Matthew Shao | 2018-01-11 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | Fix #2766. | Matthew Shao | 2018-01-11 | 1 | -0/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2773 from MatthewShao/fix#2760 | Thomas Kriechbaumer | 2018-01-08 | 2 | -1/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix #2760 | |||||
| * | | | | | Raise a CommandError for the exception | Matthew Shao | 2018-01-08 | 2 | -5/+5 | |
| | | | | | | ||||||
| * | | | | | Fix #2760 | Matthew Shao | 2018-01-08 | 2 | -1/+8 | |
|/ / / / / | ||||||
* | | | | | Fix #2767 (#2770) | Samoilenko Roman | 2018-01-07 | 2 | -5/+5 | |
| | | | | | ||||||
* | | | | | only use annotated tags for version calculation | Maximilian Hils | 2018-01-07 | 3 | -2/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #2764 from Kriechi/ssl-tls | Maximilian Hils | 2018-01-07 | 31 | -163/+173 | |
|\ \ \ \ \ | | | | | | | | | | | | | rename attributes, function and class names: s/ssl/tls/ | |||||
| * | | | | | avoid TLS/SSL ambiguity for Cert class | Thomas Kriechbaumer | 2018-01-07 | 10 | -33/+33 | |
| | | | | | | ||||||
| * | | | | | rename TLS/SSL-related functions | Thomas Kriechbaumer | 2018-01-06 | 19 | -63/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 17 | -69/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | Merge pull request #2769 from kajojify/issue-2688 | Maximilian Hils | 2018-01-07 | 5 | -5/+10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix #2688 | |||||
| * | | | | | | Fix #2688 | Miroslav | 2018-01-07 | 5 | -5/+10 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Fix #2762 (#2763) | Samoilenko Roman | 2018-01-06 | 4 | -7/+7 | |
| |/ / / / |/| | | | | | | | | | | | | | | s/console_order/view_order s/console_order_reversed/view_order_reversed | |||||
* | | | | | Merge pull request #2759 from mhils/issue-1833 | Maximilian Hils | 2018-01-05 | 13 | -148/+184 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix #1833, clean up common.format_keyvals | |||||
| * | | | | | fix #1833 | Maximilian Hils | 2018-01-05 | 1 | -1/+24 | |
| | | | | | | ||||||
| * | | | | | refactor common.format_keyvals | Maximilian Hils | 2018-01-05 | 6 | -98/+117 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | minor fixes | Maximilian Hils | 2018-01-05 | 3 | -20/+18 | |
| | | | | | | ||||||
| * | | | | | fix test flow timestamps to values that don't overflow in certain timezones | Maximilian Hils | 2018-01-05 | 6 | -29/+25 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2754 from mhils/issue-2470 | Thomas Kriechbaumer | 2018-01-04 | 2 | -2/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix #2470 | |||||
| * | | | | | fix #2470 | Maximilian Hils | 2018-01-04 | 2 | -2/+5 | |
| | | | | | | ||||||
* | | | | | | dependency update | Maximilian Hils | 2018-01-04 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Bugs with console fixed. (#2746) | Samoilenko Roman | 2018-01-04 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | Clicking on a tab now focuses it. Fixes #2676. | |||||
* | | | | | | Merge pull request #2755 from mhils/fix-unfocused-pane-click | Maximilian Hils | 2018-01-04 | 1 | -14/+20 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix #2738 | |||||
| * | | | | | fix #2738 | Maximilian Hils | 2018-01-04 | 1 | -14/+20 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2756 from mitmproxy/pyinstaller | Maximilian Hils | 2018-01-04 | 8 | -4/+12 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update pysftp, fix wheel testing. | |||||
| * | | | | | | do not add leading zeroes to .dev version part. | Maximilian Hils | 2018-01-04 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wheel normalizes to no leading zeroes, and we don't want to special-case that. | |||||
| * | | | | | | pin snapshot server hostkey, update pysftp | Maximilian Hils | 2018-01-04 | 6 | -2/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2745 from bksahu/patch-1 | Maximilian Hils | 2018-01-04 | 5 | -49/+125 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add additional OSes/software specific instructions on mitm.it | |||||
| * | | | | | | don't use red text for informational message | Maximilian Hils | 2018-01-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Added favicon and logos in /static/images | bksahu | 2018-01-02 | 2 | -0/+0 | |
| | | | | | | | ||||||
| * | | | | | | Added logos to mitm.it | bksahu | 2018-01-02 | 3 | -6/+6 | |
| | | | | | | | ||||||
| * | | | | | | Additional OSes/software added to the list | bksahu | 2018-01-02 | 3 | -44/+120 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #2742 from mhils/dataviewer-fix-edit | Maximilian Hils | 2018-01-04 | 4 | -75/+52 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Dataviewer: disable (broken) edit | |||||
| * | | | | | | | dataviewer: disable (broken) edit | Maximilian Hils | 2018-01-02 | 4 | -75/+52 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The edit functionality was previously broken due to encoding issues, so we just replace the column type with a generic read-only variant. | |||||
* | | | | | | | fix broken link | Maximilian Hils | 2018-01-02 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fix crash when using body filters (#2744) | Wouter Visser | 2018-01-02 | 2 | -7/+7 | |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | fix crash when using body filters They still don't work, but at least the web interface won't crash. | |||||
* | | | | | | docs: minor improvements | Maximilian Hils | 2018-01-01 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2741 from Kriechi/unvendor-wsproto | Thomas Kriechbaumer | 2018-01-01 | 9 | -1440/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | unvendor wsproto | |||||
| * | | | | | unvendor wsproto | Thomas Kriechbaumer | 2018-01-01 | 9 | -1440/+11 | |
|/ / / / / | ||||||
* | | / / | minor fixes | Maximilian Hils | 2017-12-31 | 2 | -1/+5 | |
| |_|/ / |/| | | |