aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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.
* | | docs: minor improvementsMaximilian Hils2018-01-011-1/+1
| | |
* | | Merge pull request #2741 from Kriechi/unvendor-wsprotoThomas Kriechbaumer2018-01-019-1440/+11
|\ \ \ | |/ / |/| | unvendor wsproto
| * | unvendor wsprotoThomas Kriechbaumer2018-01-019-1440/+11
|/ /
* | minor fixesMaximilian Hils2017-12-312-1/+5
| |
* | Merge pull request #2733 from mitmproxy/pyinstallerMaximilian Hils2017-12-3011-118/+165
|\ \ | | | | | | Update PyInstaller, add dev version info to builds.
| * | update installbuilderMaximilian Hils2017-12-301-1/+1
| | |
| * | fix #2470Maximilian Hils2017-12-301-2/+3
| | |
| * | fix appveyor build scriptMaximilian Hils2017-12-303-4/+2
| | | | | | | | | | | | | | | we now have a module named "types", which of course confuses Python 3.5. O:-)
| * | single-source version processingMaximilian Hils2017-12-306-67/+95
| | |
| * | rtool: include dev version in binariesMaximilian Hils2017-12-294-37/+77
| | |
| * | tox.ini: python3 -> pythonMaximilian Hils2017-12-291-2/+2
| | | | | | | | | | | | "python3" points to a different binary... on Windows, at least.
| * | remove rtool's setup.py, embrace toxMaximilian Hils2017-12-292-23/+3
| | |
| * | update rtool dependenciesMaximilian Hils2017-12-261-1/+1
| | |
| * | make sure that mitmproxy/rtool dependencies don't clashMaximilian Hils2017-12-261-0/+1
| | |
| * | update pyinstaller :pray:Maximilian Hils2017-12-261-2/+1
| | |
* | | Merge pull request #2703 from mhils/test-defaultkeysMaximilian Hils2017-12-302-6/+33
|\ \ \ | |_|/ |/| | Test that default key bindings are valid commands
| * | test that defaultkeys are valid commandsMaximilian Hils2017-12-292-6/+33
| |/
* | Merge pull request #2732 from mitmproxy/websocket-flow-killMaximilian Hils2017-12-294-16/+32
|\ \ | | | | | | fix flow.kill
| * | fix Flow.kill behaviourMaximilian Hils2017-12-294-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 testThomas Kriechbaumer2017-12-291-0/+19
|/ /
* | Merge pull request #2728 from Kriechi/websocket++Thomas Kriechbaumer2017-12-295-15/+68
|\ \ | | | | | | websocket: docs++ and kill messages
| * | websocket: test killableThomas Kriechbaumer2017-12-281-0/+15
| | |
| * | websocket: docs++ and kill messagesThomas Kriechbaumer2017-12-275-15/+53
|/ / | | | | | | fixes #2724
* / Display "*" when listening on all interfacesMaximilian Hils2017-12-262-0/+4
|/ | | | | | | | | | 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)fate02017-12-262-8/+10
| | | | | * @concurrent decorator should works for class methods * modify test for @concurrent decorator in class. * add docs
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:05:38 +0000