Commit Graph

8788 Commits

Author SHA1 Message Date
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
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
83570c7cba
Merge pull request #4284 from Kriechi/dead-code
refactor and remove dead code
2020-11-09 22:42:56 +01:00
Thomas Kriechbaumer
ff16fbf71e fix docs ci script running locally 2020-11-08 13:17:38 +01: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
Jan Peter Stotz
dde27ba247 asgiapp.py: fix query parameters 2020-11-04 14:20:01 +01:00
Thomas Kriechbaumer
f97826f624
Merge pull request #4267 from mhils/sans-io-adjustments
update verification certs
2020-11-03 20:07:12 +01:00
Thomas Kriechbaumer
447e38e826
Merge pull request #4266 from mhils/goodbye-codeql
Remove CodeQL CI checks
2020-11-03 20:06:07 +01:00
Maximilian Hils
02fad34239 update verification certs 2020-11-03 08:04:15 +01:00
Maximilian Hils
4a3b00b15f
Merge pull request #4265 from mhils/sans-io-adjustments
Sans-IO Adjustments
2020-11-03 07:27:01 +01:00
Maximilian Hils
2ead32652e fix option checks 2020-11-03 07:19:05 +01:00
Maximilian Hils
5e4cf21b76 remove CodeQL CI checks
this brings false-positive security warnings, no actual value, and clogs up CI.
2020-11-03 07:14:47 +01:00
Maximilian Hils
f8b3874034 sync minor sans-io changes 2020-11-03 07:10:13 +01:00
Thomas Kriechbaumer
a42d071995
Merge pull request #4262 from mhils/remove-upstreamed-hooks
Remove upstreamed pyinstaller hooks
2020-11-02 19:16:24 +01:00
Maximilian Hils
e4daa53962 certs.py: typing++ 2020-11-02 03:16:29 +01:00
Maximilian Hils
b6bedb3236 remove upstreamed pyinstaller hooks
These parts have been upstreamed:
 - https://github.com/pyinstaller/pyinstaller-hooks-contrib/pull/39
 - https://github.com/pyinstaller/pyinstaller-hooks-contrib/pull/40
 - https://github.com/pyinstaller/pyinstaller-hooks-contrib/pull/41
2020-11-02 02:39:56 +01:00
Maximilian Hils
e9a2a9c25a update installbuilder 2020-11-02 02:28:44 +01:00
Maximilian Hils
043dbcca5b
fix building windows installer
refs #4261
2020-11-02 02:19:02 +01:00
Thomas Kriechbaumer
aca7284ab6 post-release updates 2020-11-01 16:12:49 +01:00
Thomas Kriechbaumer
a738b335a3 bump version 2020-11-01 15:46:05 +01:00
Thomas Kriechbaumer
e66c7b5960
Merge pull request #4256 from Kriechi/release-prep
release preparations
2020-11-01 15:45:20 +01:00
Thomas Kriechbaumer
5d8f4b8d20 reformat CHANGELOG 2020-11-01 13:39:29 +01:00
Thomas Kriechbaumer
db2959ad53 release preparations 2020-11-01 12:12:51 +01:00
Thomas Kriechbaumer
34a284bf4a
Merge pull request #4255 from mhils/update-cryptography
Update cryptography, change test cert generation to use different CNs
2020-11-01 10:19:14 +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
6da60e3ab9
Merge pull request #4254 from Kriechi/fixes
various trailer-related fixes
2020-10-31 17:46:49 +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
Thomas Kriechbaumer
14b42101d6 Merge pull request #4234 from shiv6146/master
Add support to echo http trailers in dumper addon
2020-10-31 11:05:17 +01:00
Thomas Kriechbaumer
260fb300e5 mitmdump: reorder http trailers and add divider 2020-10-31 11:05:09 +01:00