Commit Graph

9048 Commits

Author SHA1 Message Date
Maximilian Hils
d64b3e9491 implement basic tls layer 2020-12-12 21:24:15 +01:00
Maximilian Hils
40e84eb64a minor changes to sync server 2020-12-12 21:24:15 +01:00
Maximilian Hils
4caa1dffbd replace .send() with async events 2020-12-12 21:24:15 +01:00
Maximilian Hils
063c52065f add async server 2020-12-12 21:24:15 +01:00
Maximilian Hils
2c628eb065 test implementation 2020-12-12 21:24:15 +01:00
Maximilian Hils
961d884730
update PR linter (#4344) 2020-12-12 16:18:49 +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
4f46400184
Merge pull request #4338 from mhils/sans-io-adjustments
Sans-IO Adjustments
2020-12-11 14:09:35 +01:00
Maximilian Hils
01f57346ee sans-io adjustments 2020-12-11 14:09:18 +01:00
Maximilian Hils
39b0b6c110
Merge pull request #4337 from mhils/sans-io-adjustments
Sans-IO Adjustments
2020-12-11 11:10:56 +01:00
Maximilian Hils
3c9999c0c6 sans-io compat++ 2020-12-11 10:54:41 +01:00
Maximilian Hils
00a190221d add 499 status code 2020-12-10 14:29:42 +01:00
Maximilian Hils
a300fc132d
Merge pull request #4334 from mhils/issue-4312
fix #4312
2020-12-10 10:42:31 +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
dc964b3887 fix #4312 2020-12-10 09:54:11 +01:00
Maximilian Hils
009c124dc8 fix #4280 2020-12-10 09:24:28 +01:00
Maximilian Hils
d8eda8daf9 fix docker builds 2020-12-09 16:48:15 +01:00
Maximilian Hils
c7bd491dfa
Merge pull request #4332 from mhils/sans-io-adjustments
sans-io adjustments
2020-12-09 11:49:05 +01:00
Maximilian Hils
79a77a3bfe sans-io adjustments 2020-12-09 11:29:02 +01:00
Maximilian Hils
d6585965de
Merge pull request #4326 from mhils/py38
Update PyInstaller, require Python 3.8
2020-12-07 23:06:38 +01:00
Maximilian Hils
884b5dc234 remove old python leftovers 2020-12-07 22:58:53 +01:00
Maximilian Hils
5527c614b0 Merge branch 'py38' of github.com:mhils/mitmproxy into py38 2020-12-06 14:07:53 +01:00
Maximilian Hils
7767fdb6d5 remove superfluous python version check 2020-12-06 14:06:23 +01:00
Maximilian Hils
276b741482
Merge branch 'master' into py38 2020-12-06 14:05:14 +01:00
Maximilian Hils
ee414cde70 move main file, remove checks for outdated Python
these are now handled by setup.py's python_requires.
2020-12-06 14:03:12 +01:00
Maximilian Hils
41a37eca1c remove legacy main file 2020-12-06 14:01:47 +01:00
Samhita-sopho
6846c8db33
Web UI shows blank for details tab when server address is blank (#4248)
* updated changelog

* Web UI appears blank fix

* Updated DetailsSpec snapshot
2020-12-06 13:56:53 +01:00
Maximilian Hils
1ed3f95067
Merge pull request #4325 from mhils/sans-io-adjustments
Sans-IO Adjustments
2020-12-06 13:49:39 +01:00
Maximilian Hils
a115fff410 minor fixes 2020-12-06 00:28:46 +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
52b46849c4 update pyinstaller, use python3.9 for CI tasks 2020-12-06 00:04:45 +01:00
Maximilian Hils
2d35c7bc4f add sans-io connection attributes
these are required so that we can retain serialization compatibility
while running sans-io and the old core in parallel.
2020-12-05 22:18:30 +01:00
Maximilian Hils
28efd02f79
Merge pull request #4323 from Granitosaurus/replay_http2_host
fix http2 request replay missing host header
2020-12-04 15:47:43 +01:00
Bernardas Ališauskas
09ea9c2600 ensure :authority header is being removed 2020-12-04 17:08:24 +07:00
Bernardas Ališauskas
ab767e31f6 fix http2 host replay 2020-12-03 17:44:33 +07:00
Thomas Kriechbaumer
880cea66bb
Merge pull request #4317 from Kriechi/shutdown-example
add example to shutdown the proxy master
2020-11-29 17:20:31 +01:00
Thomas Kriechbaumer
04cda70d1a add example to shutdown the proxy master 2020-11-29 17:13:44 +01:00
Maximilian Hils
de485bae63
Merge pull request #4298 from mhils/keylog
Use OpenSSL's keylog callback for SSLKEYLOGFILE (#3994)
2020-11-28 00:35:08 +01:00
Maximilian Hils
98d630b89c
SSLKEYLOGFILE: add expanduser 2020-11-28 00:27:13 +01:00
Maximilian Hils
e06c3d68cb update pyOpenSSL 2020-11-27 23:49:04 +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
3d4831eeca
Merge pull request #4313 from felixonmars/patch-1
Remove duplicated flask from dev dependencies
2020-11-26 18:39:08 +01:00
Felix Yan
24c50c42c4
Remove duplicated flask from dev dependencies
It's already in install_requires.
2020-11-27 01:21:58 +08:00
Maximilian Hils
ce53778eee
Merge pull request #4310 from mhils/sans-io-adjustments
Assume keep-alive for HTTP/2
2020-11-24 14:57:26 +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
9c3596219d
Merge pull request #4304 from mhils/debug-async
Add Async Debugging Utilities
2020-11-21 20:38:20 +01:00
Maximilian Hils
bce8bf5f81 make individual coverage checker happy 2020-11-21 20:19:47 +01:00