aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3912 from KevCui/masterMaximilian Hils2020-04-082-5/+19
|\ | | | | #3911 Support keybinding for different contexts with different commands
| * #3911 Support keybinding for different contexts with different commandsKevin Cui2020-04-072-5/+19
| |
* | Merge pull request #3914 from mitmproxy/reduce-certificate-lifetimeMaximilian Hils2020-04-081-2/+2
|\ \ | |/ |/| Reduce leaf certificate lifetime to one year
| * reduce leaf certificate lifetime to one yearMaximilian Hils2020-04-081-2/+2
|/ | | Safari will, later this year, no longer accept new HTTPS certificates that expire more than 13 months from their creation date.
* Merge pull request #3893 from matosconsulting/mitmenhancedhostcheckMaximilian Hils2020-04-062-1/+60
|\ | | | | #3885 handle hyphens in domain name, enhance validation checks
| * #3885 implement simpler regex for host validationMarcus R. Matos2020-04-052-32/+7
| |
| * #3885 handle hyphens in domain name, enhance validation checks, linter updatesMarcus R. Matos2020-04-032-3/+5
| |
| * #3885 handle hyphens in domain name, enhance validation checksMarcus R. Matos2020-04-032-4/+86
| |
* | Merge pull request #3905 from sarthak212/docsdeprecatedThomas Kriechbaumer2020-04-051-3/+3
|\ \ | | | | | | docs update
| * | docs updateroot2020-04-061-3/+3
| | |
* | | Merge pull request #3902 from oxr463/fix-web-ifaceMaximilian Hils2020-04-054-7/+7
|\ \ \ | | | | | | | | Rename web-iface to web-host
| * | | Rename web-iface to web-hostLucas Ramage2020-04-054-7/+7
|/ / / | | | | | | | | | Bug: https://github.com/mitmproxy/mitmproxy/issues/3891
* | | Merge pull request #3846 from kimbo/kl/block-dohThomas Kriechbaumer2020-04-052-0/+178
|\ \ \ | | | | | | | | Example for detecting/blocking DNS over HTTTPS queries
| * | | broke up long line into multiple lineskimbo2020-04-041-1/+54
| | | |
| * | | replace scraping and DNS lookups with static listkimbo2020-04-041-127/+3
| | | |
| * | | fix lint errorskimbo2020-03-041-3/+17
| | | |
| * | | add block doh example to examples/complex/READMEkimbo2020-03-041-0/+1
| | | |
| * | | example for blocking DNS queries over HTTPSkimbo2020-03-041-0/+234
| | | |
* | | | Merge pull request #3900 from mhils/sans-io-adjustmentsMaximilian Hils2020-04-052-2/+3
|\ \ \ \ | | | | | | | | | | Minor sans-io adjustments
| * | | | minor sans-io adjustmentsMaximilian Hils2020-04-052-2/+3
|/ / / /
* | | | Merge pull request #3899 from mhils/dont-add-host-headerMaximilian Hils2020-04-042-22/+1
|\ \ \ \ | | | | | | | | | | Don't force host header on outgoing requests
| * | | | don't force host header on outgoing requestsMaximilian Hils2020-04-042-22/+1
|/ / / /
* | | | Merge pull request #3898 from Kriechi/websocket-docsThomas Kriechbaumer2020-04-0410-115/+155
|\ \ \ \ | | | | | | | | | | improve scripting docs
| * | | | improve scripting docsThomas Kriechbaumer2020-04-0410-115/+155
| | |_|/ | |/| |
* | | | Merge pull request #3897 from mhils/sans-io-adjustmentsMaximilian Hils2020-04-042-14/+21
|\ \ \ \ | |/ / / |/| | | Sync sans-io adjustments
| * | | sync sans-io adjustmentsMaximilian Hils2020-04-042-14/+21
|/ / /
* | | Merge pull request #3892 from mhils/update-dependenciesMaximilian Hils2020-04-034-18/+14
|\ \ \ | | | | | | | | Update Dependencies
| * | | downgrade to py37 for pyinstaller buildsMaximilian Hils2020-04-031-2/+2
| | | |
| * | | ci: py37 -> py38Maximilian Hils2020-04-031-11/+7
| | | |
| * | | update installbuilderMaximilian Hils2020-04-031-3/+3
| | | |
| * | | fix pyinstallerMaximilian Hils2020-04-031-1/+1
| | | |
| * | | bump dependenciesMaximilian Hils2020-04-032-7/+7
|/ / /
* | | lint!Maximilian Hils2020-04-031-1/+0
| | |
* | | fix nonblocking exampleMaximilian Hils2020-04-031-3/+3
| | | | | | | | | this fixes #3877
* | | Merge pull request #3889 from oxr463/patch-1Maximilian Hils2020-04-031-0/+2
|\ \ \ | | | | | | | | Clarify developer documentation for mitmweb
| * | | Clarify developer documentation for mitmwebLucas Ramage2020-04-031-0/+2
| | | | | | | | | | | | Bug: https://github.com/mitmproxy/mitmproxy/issues/3888
* | | | Merge pull request #3692 from mhils/tls13Maximilian Hils2020-04-0320-386/+440
|\ \ \ \ | |/ / / |/| | | Update cryptography, enable TLS 1.3
| * | | temporarily fix key logging for OpenSSL 1.1.1fMaximilian Hils2020-04-031-5/+22
| | | |
| * | | fix compatibility with Python 3.8 on WindowsMaximilian Hils2020-04-031-0/+8
| | | |
| * | | fix tls test on WindowsMaximilian Hils2020-04-031-0/+4
| | | |
| * | | bump minimum cryptography versionMaximilian Hils2020-04-031-1/+1
| | | |
| * | | use OpenSSL's hostname validationMaximilian Hils2019-11-2315-371/+384
| | | |
| * | | update cryptographyMaximilian Hils2019-11-234-10/+22
| | | |
* | | | Merge pull request #3882 from mhils/pin-mypyMaximilian Hils2020-04-034-4/+4
|\ \ \ \ | | | | | | | | | | Update mypy and pin version
| * | | | update mypy and pin versionMaximilian Hils2020-04-024-4/+4
| | | | |
* | | | | Merge pull request #3881 from Prinzhorn/serverconnectMaximilian Hils2020-04-021-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Only emit "serverconnect" after successfully connecting
| * | | | Only emit "serverconnect" after successfully connectingAlexander Prinzhorn2020-04-021-2/+2
|/ / / /
* | | | Merge pull request #3849 from sarthak212/errorhandlingMaximilian Hils2020-04-023-5/+40
|\ \ \ \ | | | | | | | | | | Fix:Addon OptionsError is neither logged, nor does it stop mitmproxy
| * | | | Changesroot2020-03-311-10/+4
| | | | |
| * | | | remove whitespaceroot2020-03-111-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:28:44 +0000