Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity
8,898 Commits 1 Branch 67 Tags 50 MiB
467dc81d19
Commit Graph

8898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
06f67d6c55
Merge branch 'master' into guess_encoding 2020-08-07 19:01:37 +02:00
Maximilian Hils
029b077e0b
Merge pull request #4134 from Prinzhorn/websocket_content_typing 
Updated typing for WebsocketMessage.content
 2020-08-07 12:31:02 +02:00
Alexander Prinzhorn
2bb5f7b973 Updated typing for WebsocketMessage.content 2020-08-07 12:03:13 +02:00
Maximilian Hils
fd4379aa2c
Merge pull request #4133 from rugk/patch-2 
Fix intercept toggeling doc
 2020-08-06 22:09:12 +02:00
rugk
9e4f7d47f7
Fix link to anticache docs in mitmweb (#4126) 2020-08-06 22:04:33 +02:00
Maximilian Hils
b52e093ae2
increase pytest verbosity harder to catch flaky test 2020-08-06 21:55:37 +02:00
rugk
2917b9620a
Fix intercept toggeling 
Fixes https://github.com/mitmproxy/mitmproxy/issues/4109
 2020-08-06 21:42:35 +02:00
Alexander Prinzhorn
2fe8f3a218 Use @charset to decode CSS files if available 2020-08-06 15:01:23 +02:00
gorogoroumaru
2f33d6cb1c
add tls/security details of connection/request (TLS protocol, cipher) to mitmweb (#4117) 2020-07-30 13:36:57 +02:00
Maximilian Hils
b1e1b1f66b
use codecov projects (#4120) 2020-07-30 13:36:02 +02:00
Maximilian Hils
2e4eed2d2c
Merge pull request #4119 from mhils/assertion-cov 
Don't count overage for AssertionErrors
 2020-07-30 11:27:11 +02:00
Maximilian Hils
ab1e607c70 increase pytest verbosity to catch flaky test 2020-07-30 09:23:41 +02:00
Maximilian Hils
15270dfaf0 don't count overage for AssertionErrors 
A common pattern in sans-io is to essentially match on all variants of
an enum, and then have a `else: raise AssertionError` in the end.
This increases robustness as we spot incomplete coverage instead of
silently passing. However, it makes no sense to explicitly test these
asserts.
 2020-07-30 09:07:35 +02:00
Maximilian Hils
408bd7fd4c
Merge pull request #4115 from veehaitch/urwid-2.1.1 
Update to urwid 2.1.1
 2020-07-30 06:40:07 +02:00
Vincent Haupert
b175bc84e3
Require at least urwid 2.1.1 
refs https://github.com/mitmproxy/mitmproxy/issues/3936
refs https://github.com/urwid/urwid/issues/419
 2020-07-30 00:12:02 +02:00
Vincent Haupert
ea91772172
Revert "downgrade & pin urwid to 2.0.1 (#4086)" 
This reverts commit 2dfcb537f2.

This commit was introduced in response to an upstream issue with urwid
2.1.0 which is fixed in 2.1.1.
 2020-07-30 00:12:00 +02:00
Maximilian Hils
1e5464a9e6 ci: test old python releases, pin binary environments 2020-07-27 18:06:55 +02:00
Maximilian Hils
abb8ccc210
Merge pull request #4102 from mplattner/fix-map-addons-docs 
fix docs for Map* addons
 2020-07-27 15:28:08 +02:00
Martin Plattner
6e210f1445 fix docs for Map* addons 2020-07-23 19:27:32 +02:00
Thomas Kriechbaumer
04d2b0ab35
Merge pull request #4097 from rbdixon/fix_compat_flow_no_response 
Fix incompatibility reading version 7 files when flow has no response.
 2020-07-22 18:47:36 +02:00
Maximilian Hils
ac7f05efe9
Merge pull request #3996 from MrNbaYoh/master 
First step to fix #848 by adding a relax_http_form_validation option.
 2020-07-22 18:33:29 +02:00
Maximilian Hils
a5e8b5516c
Merge pull request #4096 from tasn/msgpack 
Add a msgpack content viewer.
 2020-07-22 18:32:19 +02:00
Maximilian Hils
e1523323c5
Merge pull request #4099 from mhils/fix-mypy 
Fix http.Response.make type annotation
 2020-07-22 18:30:07 +02:00
Maximilian Hils
647eab557b lint! 2020-07-22 18:28:40 +02:00
Maximilian Hils
407f9e7a8f fix http.Response.make type annotation 2020-07-22 18:25:13 +02:00
Tom Hacohen
1bca5597f6 Fix lint errors 2020-07-22 17:06:58 +03:00
Tom Hacohen
008ba5d726 Improve the formatting of the msgpack content viewer. 2020-07-22 17:06:58 +03:00
Brad Dixon
742a5d812d Add test case for flow with no response. 2020-07-22 10:05:03 -04:00
Tom Hacohen
5fd702934c Add a msgpack content viewer. 2020-07-22 16:47:08 +03:00
Brad Dixon
05a6c56b72 Fix incompatibility reading version 7 files when flow has no response. 
A flow can be stored without a response. The compatibility functions
for version 8 and 9 assumed that all flows had a response. This changes
fixes that assumption.
 2020-07-21 15:56:21 -04:00
gorogoroumaru
3e7f9e488a
Add utc_to_local option (#4081) 2020-07-21 08:59:09 +02:00
Maximilian Hils
46fbba639d
Merge pull request #4088 from mhils/http-authority 
HTTPRequest -> http.Request, add request.authority
 2020-07-19 11:43:43 +02:00
Martin Plattner
fc58a4dbf4 post-release updates 2020-07-18 23:09:52 +02:00
Martin Plattner
cc75d7109d bump version to 5.2 2020-07-18 22:05:03 +02:00
Maximilian Hils
366014d0a3
Merge pull request #4069 from mplattner/maplocal-addon 
MapLocal addon
 2020-07-18 14:24:45 +02:00
Maximilian Hils
fb743c7da7 map local: minor fixes 2020-07-18 14:12:45 +02:00
Martin Plattner
c98f12c4f3 map addons: fix tests 2020-07-17 19:55:34 +02:00
Martin Plattner
0c8a46253b map local: align ascii figures in docs 2020-07-17 17:54:46 +02:00
Martin Plattner
ebf857a88e map local: add warning if no candidate exists 2020-07-17 17:41:41 +02:00
Martin Plattner
b3c809c45a map local: improve candidate generation (url dec.) 2020-07-17 17:29:36 +02:00
Martin Plattner
565cbb2504 add server header to responses from MapLocal 2020-07-17 14:58:47 +02:00
Martin Plattner
627a03c8e0 move parse_spec to util.spec 2020-07-17 14:56:33 +02:00
Maximilian Hils
06734f498d fix flaky test socket 2020-07-16 22:13:48 +02:00
Maximilian Hils
50a1f6bdd1
Merge pull request #4089 from Kriechi/fix-3990 
match HTTP-WebSocket handshake flow for ~websocket filter
 2020-07-16 18:43:06 +02:00
Thomas Kriechbaumer
04abe6b85b match HTTP-WebSocket handshake flow with ~websocket 
fixes #3990
 2020-07-16 17:49:47 +02:00
Maximilian Hils
5af57cfa99 HTTPRequest -> http.Request, add request.authority 2020-07-16 16:55:15 +02:00
Maximilian Hils
2dfcb537f2
downgrade & pin urwid to 2.0.1 (#4086) 
refs https://github.com/mitmproxy/mitmproxy/issues/3936
refs https://github.com/mitmproxy/mitmproxy/issues/3967
 2020-07-16 16:52:52 +02:00
Maximilian Hils
e39b52b159
Merge pull request #3989 from nikitastupin/master 
Add minimal TCP interception and modification!
 2020-07-15 21:55:43 +02:00
Nikita Stupin
cf63396d84 Fix bug: TCP interception do not adhere ctx.options.intercept_active 2020-07-15 22:38:00 +03:00
Nikita Stupin
7d9e3dd9a3 Add tests for TCP flow interception 2020-07-15 22:36:00 +03:00