aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix #2399Miroslav2018-01-142-1/+2
| | | |
* | | | Merge pull request #2791 from mhils/tls-extensionsMaximilian Hils2018-01-137-10/+28
|\ \ \ \ | | | | | | | | | | Store ClientHello extensions with client connection
| * | | | store ClientHello extensions with client connectionMaximilian Hils2018-01-137-10/+28
|/ / / /
* | | | Merge pull request #2790 from mhils/stateobject-improvementsMaximilian Hils2018-01-136-106/+190
|\ \ \ \ | | | | | | | | | | stateobject: use typing, enable tuples and more complex datatypes
| * | | | stateobject: use typing, enable tuples and more complex datatypesMaximilian Hils2018-01-136-106/+190
| | | | |
* | | | | Merge pull request #2789 from mhils/move-clienthelloMaximilian Hils2018-01-136-155/+240
|\ \ \ \ \ | |/ / / / |/| | | | Move ClientHello and related functions to mitmproxy.net.tls
| * | | | improve net.tls.ClientHello API, fix bugs, add testsMaximilian Hils2018-01-134-19/+95
| | | | |
| * | | | move ClientHello and related functions to mitmproxy.net.tlsMaximilian Hils2018-01-126-155/+164
|/ / / /
* | | | Merge pull request #2784 from ujjwal96/kaitaiMaximilian Hils2018-01-111-3/+5
|\ \ \ \ | | | | | | | | | | Update GIF parser
| * | | | Update GIF parserUjjwal Verma2018-01-111-3/+5
| | | | |
* | | | | Merge pull request #2780 from ujjwal96/console-fixMaximilian Hils2018-01-112-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix crash when searching
| * | | | | Fix crash when searchingUjjwal Verma2018-01-112-2/+2
| | | | | |
* | | | | | Merge pull request #2781 from MatthewShao/fix#2766Maximilian Hils2018-01-112-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix #2766.
| * | | | | Add test for fix#2766.Matthew Shao2018-01-111-0/+4
| | | | | |
| * | | | | Fix #2766.Matthew Shao2018-01-111-0/+3
|/ / / / /
* | | | | Merge pull request #2773 from MatthewShao/fix#2760Thomas Kriechbaumer2018-01-082-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix #2760
| * | | | | Raise a CommandError for the exceptionMatthew Shao2018-01-082-5/+5
| | | | | |
| * | | | | Fix #2760Matthew Shao2018-01-082-1/+8
|/ / / / /
* | | | | Fix #2767 (#2770)Samoilenko Roman2018-01-072-5/+5
| | | | |
* | | | | only use annotated tags for version calculationMaximilian Hils2018-01-073-2/+6
| | | | |
* | | | | Merge pull request #2764 from Kriechi/ssl-tlsMaximilian Hils2018-01-0731-163/+173
|\ \ \ \ \ | | | | | | | | | | | | rename attributes, function and class names: s/ssl/tls/
| * | | | | avoid TLS/SSL ambiguity for Cert classThomas Kriechbaumer2018-01-0710-33/+33
| | | | | |
| * | | | | rename TLS/SSL-related functionsThomas Kriechbaumer2018-01-0619-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 attributesThomas Kriechbaumer2018-01-0617-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-2688Maximilian Hils2018-01-075-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix #2688
| * | | | | | Fix #2688Miroslav2018-01-075-5/+10
| | |_|/ / / | |/| | | |
* | | | | | Fix #2762 (#2763)Samoilenko Roman2018-01-064-7/+7
| |/ / / / |/| | | | | | | | | | | | | | s/console_order/view_order s/console_order_reversed/view_order_reversed
* | | | | Merge pull request #2759 from mhils/issue-1833Maximilian Hils2018-01-0513-148/+184
|\ \ \ \ \ | | | | | | | | | | | | Fix #1833, clean up common.format_keyvals
| * | | | | fix #1833Maximilian Hils2018-01-051-1/+24
| | | | | |
| * | | | | refactor common.format_keyvalsMaximilian Hils2018-01-056-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 fixesMaximilian Hils2018-01-053-20/+18
| | | | | |
| * | | | | fix test flow timestamps to values that don't overflow in certain timezonesMaximilian Hils2018-01-056-29/+25
|/ / / / /
* | | | | Merge pull request #2754 from mhils/issue-2470Thomas Kriechbaumer2018-01-042-2/+5
|\ \ \ \ \ | | | | | | | | | | | | fix #2470
| * | | | | fix #2470Maximilian Hils2018-01-042-2/+5
| | | | | |
* | | | | | dependency updateMaximilian Hils2018-01-041-1/+1
| | | | | |
* | | | | | Bugs with console fixed. (#2746)Samoilenko Roman2018-01-041-1/+10
| | | | | | | | | | | | | | | | | | Clicking on a tab now focuses it. Fixes #2676.
* | | | | | Merge pull request #2755 from mhils/fix-unfocused-pane-clickMaximilian Hils2018-01-041-14/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix #2738
| * | | | | fix #2738Maximilian Hils2018-01-041-14/+20
| | | | | |
* | | | | | Merge pull request #2756 from mitmproxy/pyinstallerMaximilian Hils2018-01-048-4/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update pysftp, fix wheel testing.
| * | | | | | do not add leading zeroes to .dev version part.Maximilian Hils2018-01-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wheel normalizes to no leading zeroes, and we don't want to special-case that.
| * | | | | | pin snapshot server hostkey, update pysftpMaximilian Hils2018-01-046-2/+10
|/ / / / / /
* | | | | | Merge pull request #2745 from bksahu/patch-1Maximilian Hils2018-01-045-49/+125
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add additional OSes/software specific instructions on mitm.it
| * | | | | | don't use red text for informational messageMaximilian Hils2018-01-041-1/+1
| | | | | | |
| * | | | | | Added favicon and logos in /static/imagesbksahu2018-01-022-0/+0
| | | | | | |
| * | | | | | Added logos to mitm.itbksahu2018-01-023-6/+6
| | | | | | |
| * | | | | | Additional OSes/software added to the listbksahu2018-01-023-44/+120
| | | | | | |
* | | | | | | Merge pull request #2742 from mhils/dataviewer-fix-editMaximilian Hils2018-01-044-75/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Dataviewer: disable (broken) edit
| * | | | | | | dataviewer: disable (broken) editMaximilian Hils2018-01-024-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 linkMaximilian Hils2018-01-021-1/+1
| | | | | | |
* | | | | | | Fix crash when using body filters (#2744)Wouter Visser2018-01-022-7/+7
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | fix crash when using body filters They still don't work, but at least the web interface won't crash.