Commit Graph

8893 Commits

Author SHA1 Message Date
Maximilian Hils
9d5305301a Merge remote-tracking branch 'origin/master' into fix-ci 2020-04-08 20:21:12 +02:00
Maximilian Hils
4d6886a0f4
Merge pull request #3912 from KevCui/master
#3911 Support keybinding for different contexts with different commands
2020-04-08 17:41:43 +02:00
Maximilian Hils
3ebf112d6d
Merge pull request #3914 from mitmproxy/reduce-certificate-lifetime
Reduce leaf certificate lifetime to one year
2020-04-08 09:17:22 +02:00
Maximilian Hils
ab79bb0313
reduce leaf certificate lifetime to one year
Safari will, later this year, no longer accept new HTTPS certificates that expire more than 13 months from their creation date.
2020-04-08 08:04:44 +02:00
Kevin Cui
4d2cb321d6 #3911 Support keybinding for different contexts with different commands 2020-04-07 16:10:26 +02:00
Maximilian Hils
fbe296aaba
Merge pull request #3893 from matosconsulting/mitmenhancedhostcheck
#3885 handle hyphens in domain name, enhance validation checks
2020-04-06 22:39:56 +02:00
Marcus R. Matos
901c0f6ede #3885 implement simpler regex for host validation 2020-04-05 15:50:28 -05:00
Thomas Kriechbaumer
467234aa96
Merge pull request #3905 from sarthak212/docsdeprecated
docs update
2020-04-05 22:38:50 +02:00
root
e7839a4320 docs update 2020-04-06 00:20:33 +05:30
Maximilian Hils
77914108ee
Merge pull request #3902 from oxr463/fix-web-iface
Rename web-iface to web-host
2020-04-05 18:16:41 +02:00
Lucas Ramage
cea443f21c Rename web-iface to web-host
Bug: https://github.com/mitmproxy/mitmproxy/issues/3891
2020-04-05 10:36:09 -04:00
Thomas Kriechbaumer
481970d9b8
Merge pull request #3846 from kimbo/kl/block-doh
Example for detecting/blocking DNS over HTTTPS queries
2020-04-05 09:09:37 +02:00
kimbo
83987f9b69 broke up long line into multiple lines 2020-04-04 21:27:58 -06:00
kimbo
f36a5b8aa8 replace scraping and DNS lookups with static list 2020-04-04 21:18:58 -06:00
Maximilian Hils
775e6beec5
Merge pull request #3900 from mhils/sans-io-adjustments
Minor sans-io adjustments
2020-04-05 02:07:01 +02:00
Maximilian Hils
72dde3c44f minor sans-io adjustments 2020-04-05 00:51:36 +02:00
Maximilian Hils
0b393b2878
Merge pull request #3899 from mhils/dont-add-host-header
Don't force host header on outgoing requests
2020-04-04 16:26:48 +02:00
Maximilian Hils
5e0a89dbc8 don't force host header on outgoing requests 2020-04-04 16:19:24 +02:00
Thomas Kriechbaumer
ac83db3b84
Merge pull request #3898 from Kriechi/websocket-docs
improve scripting docs
2020-04-04 15:54:00 +02:00
Thomas Kriechbaumer
678be7a052 improve scripting docs 2020-04-04 15:36:13 +02:00
Maximilian Hils
9cc5d933c1
Merge pull request #3897 from mhils/sans-io-adjustments
Sync sans-io adjustments
2020-04-04 15:19:11 +02:00
Maximilian Hils
9897ca7227 sync sans-io adjustments 2020-04-04 15:08:12 +02:00
Marcus R. Matos
2722f4fd76 #3885 handle hyphens in domain name, enhance validation checks, linter updates 2020-04-03 20:15:50 -05:00
Marcus R. Matos
1039d09ed6 #3885 handle hyphens in domain name, enhance validation checks 2020-04-03 19:56:54 -05:00
Maximilian Hils
6acabbb4f5
Merge pull request #3892 from mhils/update-dependencies
Update Dependencies
2020-04-03 19:09:08 +02:00
Maximilian Hils
35cb5ff450 downgrade to py37 for pyinstaller builds 2020-04-03 18:38:01 +02:00
Maximilian Hils
b67736bbef ci: py37 -> py38 2020-04-03 18:26:38 +02:00
Maximilian Hils
7c4488e49a update installbuilder 2020-04-03 18:12:42 +02:00
Maximilian Hils
78cdfa45d7 fix pyinstaller 2020-04-03 17:50:15 +02:00
Maximilian Hils
623055a25a bump dependencies 2020-04-03 17:50:15 +02:00
Maximilian Hils
420da96e92
lint! 2020-04-03 17:47:58 +02:00
Maximilian Hils
c56ca19d7d
fix nonblocking example
this fixes #3877
2020-04-03 17:18:35 +02:00
Maximilian Hils
e9ab1debea
Merge pull request #3889 from oxr463/patch-1
Clarify developer documentation for mitmweb
2020-04-03 17:10:52 +02:00
Maximilian Hils
3c09e1a516
Merge pull request #3692 from mhils/tls13
Update cryptography, enable TLS 1.3
2020-04-03 17:10:32 +02:00
Lucas Ramage
53ee0b23ec
Clarify developer documentation for mitmweb
Bug: https://github.com/mitmproxy/mitmproxy/issues/3888
2020-04-03 10:35:03 -04:00
Maximilian Hils
4bfb81c008 temporarily fix key logging for OpenSSL 1.1.1f 2020-04-03 16:33:53 +02:00
Maximilian Hils
a1169ca3c3 fix compatibility with Python 3.8 on Windows 2020-04-03 12:23:00 +02:00
Maximilian Hils
1e3f1b4d2b fix tls test on Windows 2020-04-03 12:05:06 +02:00
Maximilian Hils
c1f01cc67c bump minimum cryptography version 2020-04-03 11:01:24 +02:00
Maximilian Hils
0b76afdf57
Merge pull request #3882 from mhils/pin-mypy
Update mypy and pin version
2020-04-03 10:44:18 +02:00
Maximilian Hils
19aa7aeeb7 update mypy and pin version 2020-04-02 11:40:50 +02:00
Maximilian Hils
49bc7d944a
Merge pull request #3881 from Prinzhorn/serverconnect
Only emit "serverconnect" after successfully connecting
2020-04-02 11:39:25 +02:00
Alexander Prinzhorn
ca4b7a307f Only emit "serverconnect" after successfully connecting 2020-04-02 11:18:38 +02:00
Maximilian Hils
3046a628fd
Merge pull request #3849 from sarthak212/errorhandling
Fix:Addon OptionsError is neither logged, nor does it stop mitmproxy
2020-04-02 10:13:30 +02:00
root
79b8fcc052 Changes 2020-03-31 10:07:53 +05:30
Maximilian Hils
67368232c5
Merge pull request #3839 from naivekun/fix_for_issue_3833
Fix for issue 3833
2020-03-30 23:09:07 +02:00
Maximilian Hils
7d87154130
Merge pull request #3870 from naivekun/update_document
fix document error
2020-03-30 23:08:17 +02:00
Maximilian Hils
6885e962c3
Merge pull request #3875 from sarthak212/docsdeprecated
c is deprecated
2020-03-30 22:54:05 +02:00
root
b286d35653 c is deprecated 2020-03-31 00:43:22 +05:30
naivekun
fa222dca65 fix document error 2020-03-25 22:02:53 +08:00