Commit Graph

9305 Commits

Author SHA1 Message Date
Maximilian Hils
6008b6b299
Merge pull request #4380 from mhils/websocket-option
[sans-io] respect websocket option
2021-01-01 18:05:00 +01:00
Maximilian Hils
2b2b40d53e [sans-io] respect websocket option 2021-01-01 17:35:34 +01:00
Maximilian Hils
0bbb5ca345 reverse proxy: do not assume TLS for non-standard ports 2021-01-01 16:57:50 +01:00
Maximilian Hils
c32c0322a1
Merge pull request #4378 from mhils/fix-h11-compat
fix compat with h11 0.12, add explicit dependency
2021-01-01 15:16:49 +01:00
Maximilian Hils
3432cc397b fix compat with h11 0.12, add explicit dependency 2021-01-01 15:06:29 +01:00
Maximilian Hils
36d5a198b8 fix #4362 2020-12-30 23:06:09 +01:00
Maximilian Hils
86bee371db
[requires.io] dependency update on master branch (#4373)
Co-authored-by: requires.io <support@requires.io>
2020-12-30 22:59:59 +01:00
Maximilian Hils
7d67eefe29
Merge pull request #4374 from mhils/cryptography-certs
Use cryptography for certificate generation
2020-12-30 22:57:00 +01:00
Maximilian Hils
dfba6e81a6 alpn: str -> bytes 2020-12-30 22:52:07 +01:00
Maximilian Hils
8ac5af62f5 cert test coverage++ 2020-12-30 22:29:56 +01:00
Maximilian Hils
abbe9eeb79 sni/alpn: bytes -> str 2020-12-30 20:26:31 +01:00
Maximilian Hils
85c5275ec1 make mypy happy 2020-12-30 15:34:15 +01:00
Maximilian Hils
2a30172525 migrate certs.Cert to pyca/cryptography, re-add mitmcert 2020-12-30 15:20:49 +01:00
Maximilian Hils
48b166ab57 move cert serialization to cryptography 2020-12-29 23:36:12 +01:00
Maximilian Hils
3fe29b27be use cryptography to generate certificates
this fixes #4368, but we are not done here. the goal is to replace most
usages of pyOpenSSL's cert object with cryptography.
2020-12-29 01:19:58 +01:00
Maximilian Hils
74aeb3ae4c add memory leak detect script for certificate generation, refs #4368 2020-12-29 01:17:01 +01:00
Maximilian Hils
7d7c2908b2
Merge pull request #4361 from mitmproxy/requires-io-master
[requires.io] dependency update on master branch
2020-12-28 22:56:29 +01:00
Maximilian Hils
e423bfbbcc make mypy happy 2020-12-28 22:54:38 +01:00
Maximilian Hils
e5912ca13d
Merge pull request #4372 from mhils/cleanup-proxyconfig
cleanup old proxy server
2020-12-28 22:15:36 +01:00
Maximilian Hils
70f1d173e2 Reply: remove return value 2020-12-28 22:09:57 +01:00
Maximilian Hils
1655f54817 cleanup old proxy server 2020-12-28 14:33:10 +01:00
Maximilian Hils
0dbf69dfe9
Merge pull request #4366 from mhils/tls-cleanup
Cleanup TLS Implementation
2020-12-28 12:28:15 +01:00
Maximilian Hils
0679599c7d make default ciphers non-modifiable 2020-12-28 12:24:16 +01:00
Maximilian Hils
a0f923aa14 coverage++ 2020-12-28 09:56:25 +01:00
Maximilian Hils
2db9a43fd6 add type annotations, test sslkeylogfile 2020-12-28 09:44:37 +01:00
requires.io
88e5df978d [requires.io] dependency update 2020-12-24 12:15:47 +01:00
Maximilian Hils
554674f37c
Merge pull request #4367 from timgates42/bugfix_typo_viewer
docs: fix simple typo, viewier -> viewer
2020-12-21 21:49:05 +01:00
Tim Gates
92c380a48e
docs: fix simple typo, viewier -> viewer
There is a small typo in mitmproxy/tools/console/consoleaddons.py.

Should read `viewer` rather than `viewier`.
2020-12-22 07:46:29 +11:00
Maximilian Hils
de46db53e9 minor fixes 2020-12-21 20:52:02 +01:00
Maximilian Hils
57f5d1af63 monkeypatch pyOpenSSL to accept new TLS methods 2020-12-21 16:34:37 +01:00
Maximilian Hils
b0a258f236
Merge pull request #4363 from mhils/cleanup
cleanup
2020-12-21 16:25:11 +01:00
Maximilian Hils
8842abbb4f clean up tls bits 2020-12-21 16:20:03 +01:00
Maximilian Hils
61a2beac3c minor fixes 2020-12-20 14:17:43 +01:00
Maximilian Hils
e4403c1445 cleanup old event hook 2020-12-20 00:55:19 +01:00
Maximilian Hils
8ce4bc7142 additional test speedups 2020-12-20 00:50:40 +01:00
Maximilian Hils
2f725e5f02 massively speed up tests by properly mocking ldap proxyauth 2020-12-20 00:34:30 +01:00
Maximilian Hils
b05c13daa6 remove old mitmproxy.net.tcp code
this is not needed anymore with sans-io
2020-12-20 00:12:21 +01:00
Maximilian Hils
61236759ce
update release instructions 2020-12-19 23:29:44 +01:00
Maximilian Hils
cdb0cf6c0a upstream mode: only negotiate HTTP/1 with secure proxies 2020-12-19 11:24:22 +01:00
requires.io
2738f9ba80 [requires.io] dependency update 2020-12-19 02:46:30 +01:00
requires.io
3ab1ef52c2 [requires.io] dependency update 2020-12-19 00:38:36 +01:00
Maximilian Hils
1ffe406d24
Merge pull request #4359 from mhils/warn-no-nextlayer
Warn if no nextlayer addon is present
2020-12-18 03:08:21 +01:00
Thomas Kriechbaumer
7d417e7902
Merge pull request #4349 from Kriechi/nuke-pathod-pathoc
nuke deprecated components
2020-12-17 23:55:54 +01:00
Thomas Kriechbaumer
24725e94fa fix coverage 2020-12-17 23:50:23 +01:00
Thomas Kriechbaumer
47f8e1d115 asgi: refactor tests to new proxy core 2020-12-15 23:37:39 +01:00
Maximilian Hils
e0d5dea959 warn if no nextlayer addon is present 2020-12-15 23:35:43 +01:00
Maximilian Hils
cfe401c7ba add 6.0.2 changelog 2020-12-15 17:51:15 +01:00
Maximilian Hils
f5ad6d000e
Merge pull request #4357 from mhils/fix-mitmweb
Fix mitmweb's flow serialization
2020-12-15 17:50:02 +01:00
Maximilian Hils
20df9df047 fix mitmweb's flow serialization 2020-12-15 17:36:20 +01:00
Thomas Kriechbaumer
df164f42e1 imports cleanup 2020-12-14 23:52:48 +01:00