Commit Graph

2157 Commits

Author SHA1 Message Date
Maximilian Hils
b5a3343d03 [sans-io] add ALPN support to TLS layer, tests++ 2020-12-12 21:24:17 +01:00
Maximilian Hils
3f7b850268 [sans-io] test server tls 2020-12-12 21:24:17 +01:00
Maximilian Hils
4cd83ee0af [sans-io] minor test improvements 2020-12-12 21:24:17 +01:00
Maximilian Hils
c6262f9e9c [sans-io] remove hook reply
This is not desired as hooks modify the passed object itself
instead of returning a custom reply.
2020-12-12 21:24:17 +01:00
Maximilian Hils
1fa2e59734 [sans-io] add initial tls tests 2020-12-12 21:24:17 +01:00
Maximilian Hils
9ea0259bb7 [sans-io] improve ClientHello parsing, add tests 2020-12-12 21:24:17 +01:00
Ujjwal Verma
0cb06b428e Moved tests 2020-12-12 21:24:17 +01:00
Maximilian Hils
08ecb21a78
sans-io adjustments (#4342) 2020-12-12 16:09:11 +01:00
林玮 (Jade Lin)
380ac072aa
ASGIApp should ignore the HTTP flows loaded from somewhere (#4324) 2020-12-12 11:17:38 +01:00
Maximilian Hils
01f57346ee sans-io adjustments 2020-12-11 14:09:18 +01:00
Maximilian Hils
5c734b3cd6
Merge pull request #4333 from mhils/issue-4280
fix #4280
2020-12-10 09:55:29 +01:00
Maximilian Hils
009c124dc8 fix #4280 2020-12-10 09:24:28 +01:00
Maximilian Hils
c5eae9d752 drop support for Python 3.6 and 3.7
We require Python 3.8 for sans-io (#1775),
so we need to drop support for older versions.
2020-12-06 00:25:09 +01:00
Maximilian Hils
4b8fcc8650 use OpenSSL's keylog callback for SSLKEYLOGFILE, refs #3994 2020-11-27 23:49:04 +01:00
Maximilian Hils
b01d574d8b
Merge pull request #4309 from jrblixt/InformUnderscoreFormat-Issue_4054
Inform user when underscore-formatted options are used.
2020-11-26 18:39:45 +01:00
Maximilian Hils
6d8a315c5d assume keep-alive for HTTP/2 2020-11-24 14:48:22 +01:00
jrblixt
ce528a9ff3 Inform user when underscore-formatted options are used. 2020-11-24 01:37:54 -07:00
Maximilian Hils
bce8bf5f81 make individual coverage checker happy 2020-11-21 20:19:47 +01:00
Maximilian Hils
9b0c4e2338 debug: dump asyncio tasks 2020-11-21 20:06:11 +01:00
Maximilian Hils
9b7dfb0fc9 add asyncio_utils 2020-11-21 20:01:11 +01:00
Thomas Kriechbaumer
38cca379df pyupgrade --py36-plus mitmproxy/**/*.py 2020-11-20 19:25:26 +01:00
Thomas Kriechbaumer
44a1848799
Merge pull request #4292 from Kriechi/fix-4287
command-history: fail-safe file handling
2020-11-18 22:45:22 +01:00
Thomas Kriechbaumer
3c50523025 command-history: fail-safe file handling 2020-11-17 23:08:57 +01:00
Maximilian Hils
4351262c95
Merge pull request #4294 from mhils/sans-io-adjustments
Add a switch for sans-io proxy core
2020-11-17 21:58:27 +01:00
Maximilian Hils
1490d665fe lint! 2020-11-17 20:20:38 +01:00
Maximilian Hils
77758cff93 skip async tests on old python versions 2020-11-17 19:15:24 +01:00
Maximilian Hils
739b5b0b74 sans-io compat++ 2020-11-17 17:29:33 +01:00
Felix Yan
0b0a6cfef6
Replace asynctest with stdlib mock
This is an implementation of
https://github.com/mitmproxy/mitmproxy/issues/4020

Tested to work fine here with Python 3.8.6.
2020-11-14 05:27:35 +08:00
Thomas Kriechbaumer
6289d9bca8 refactor and remove dead code 2020-11-08 13:07:44 +01:00
Thomas Kriechbaumer
488be14412
Merge pull request #4283 from Kriechi/decouple++
websocket: decouple from pathod
2020-11-07 17:15:04 +01:00
Thomas Kriechbaumer
f47bf6fe4f websocket: decouple from pathod 2020-11-07 17:04:57 +01:00
Maximilian Hils
b45147e91d
Merge pull request #4271 from jpstotz/asgi-query
asgiapp.py: fix query parameters
2020-11-07 09:48:56 +01:00
Thomas Kriechbaumer
232c71b2e0
Merge pull request #4268 from Kriechi/cleanup
detangle custom websockets implementation and replace it with mostly …
2020-11-06 22:21:24 +01:00
Thomas Kriechbaumer
c8f9823704 detangle custom websockets implementation and replace it with mostly wsproto 2020-11-06 22:08:14 +01:00
Jan Peter Stotz
66322c57e1 unit test for issue #4270 added 2020-11-06 11:32:19 +01:00
Maximilian Hils
02fad34239 update verification certs 2020-11-03 08:04:15 +01:00
Maximilian Hils
2ead32652e fix option checks 2020-11-03 07:19:05 +01:00
Maximilian Hils
f8b3874034 sync minor sans-io changes 2020-11-03 07:10:13 +01:00
Maximilian Hils
dd8d338a62 update cryptography, change test cert generation to use different CNs 2020-11-01 01:38:10 +01:00
Thomas Kriechbaumer
0f7f4ba949 various trailer-related fixes 2020-10-31 17:30:15 +01:00
Thomas Kriechbaumer
c0e846b700 fix invididual test coverage 2020-10-31 11:59:51 +01:00
Thomas Kriechbaumer
a415c218ea fix http trailer tests 2020-10-31 11:42:26 +01:00
Shiva
f4b9930b05 Added support to echo http trailers in dumper addon 2020-10-31 11:04:56 +01:00
Thomas Kriechbaumer
730ee85469
Merge branch 'master' into send-http1-trailers 2020-10-21 20:17:24 +02:00
Thomas Kriechbaumer
b167f9fd2d http2: fix missing END_STREAM flag on requests without body
fixes #4231
2020-10-17 16:59:24 +02:00
Blake Burkhart
21330f511e is_http10 and is_http11 properties to requests 2020-10-13 09:21:15 -05:00
Blake Burkhart
b17857c7ae Send http/1 request and response trailer headers 2020-10-08 20:43:28 -05:00
Miro Karvonen
abbdc31ad3 Review comment fixes, passphrase is now always required to be bytes in add_cert_file and from_store. 2020-08-31 09:01:45 +03:00
mirosyn
3ef1f966d2
Merge branch 'master' into issue-4178-passphrase 2020-08-28 17:16:12 +03:00
Miro Karvonen
adc2e8d2b6 new commandline argument --cert-passphrase added. For decrypting the private key that is provided with the --certs command 2020-08-28 16:58:20 +03:00