Commit Graph

9024 Commits

Author SHA1 Message Date
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
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
Maximilian Hils
cfc180e211 human.format_address: add lru cache 2020-11-21 20:01:06 +01:00
Thomas Kriechbaumer
af3dfac855
Merge pull request #4301 from Kriechi/pyupgrade-py36
pyupgrade --py36-plus mitmproxy/**/*.py
2020-11-21 11:05:16 +01:00
Thomas Kriechbaumer
82b5d61456 revert some minor changes 2020-11-21 10:46:19 +01:00
Thomas Kriechbaumer
38cca379df pyupgrade --py36-plus mitmproxy/**/*.py 2020-11-20 19:25:26 +01:00
Maximilian Hils
e36c790d55
Merge pull request #4300 from anneborcherding/fix/webscanner-helper
[contrib addons] updated imports and style.
2020-11-20 10:06:13 +01:00
Anne Borcherding
4fb761eaf0 updated changelog 2020-11-20 09:26:22 +01:00
anneborcherding
97bf522165
Added addon to suppress the sending of 502 Bad Gateway response… (#4299)
* WIP: Added option to suppress the sending of 502 Bad Gateway responses if the server is not responding

* Revert "WIP: Added option to suppress the sending of 502 Bad Gateway responses if the server is not responding"

This reverts commit 21b74f38b7ddeb63c5070cb4ca4928d3c37d12fe.

* Added addon which suppresses the bad gateway error messages sent by mitmproxy

* fix type annotation

Co-authored-by: Maximilian Hils <github@maximilianhils.com>
2020-11-20 09:15:12 +01:00
Anne Borcherding
d4db078312 [contrib addons] updated imports and style. 2020-11-20 09:10:08 +01:00
Thomas Kriechbaumer
5b6d75614e
Merge pull request #4296 from Kriechi/towards-4273
mark pathod/pathoc as deprecated
2020-11-18 23:33:03 +01:00
Thomas Kriechbaumer
6ff3ee0634 mark pathod/pathoc as deprecated 2020-11-18 23:09:24 +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
a9a187d2c1
Merge pull request #4295 from mhils/fix-tests
Skip async tests on old python versions
2020-11-17 19:26:21 +01:00
Maximilian Hils
77758cff93 skip async tests on old python versions 2020-11-17 19:15:24 +01:00
Maximilian Hils
c3ccc25cfb prepare dumper addon for sans-io 2020-11-17 19:08:18 +01:00
Maximilian Hils
739b5b0b74 sans-io compat++ 2020-11-17 17:29:33 +01:00
Maximilian Hils
98f060d019 add sans-io switch 2020-11-17 15:17:05 +01:00
Maximilian Hils
de39f10d24
update slack badge 2020-11-17 14:02:54 +01:00
Maximilian Hils
3fd89e1bb2 add maintenance message to io/protobuf, refs #4290 2020-11-16 20:11:04 +01:00
Maximilian Hils
f61f48c392
Merge pull request #4288 from felixonmars/drop-asynctest
Replace asynctest with stdlib mock
2020-11-16 08:36:58 +01:00