Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 18:18:25 +00:00
Code Issues Projects Releases Wiki Activity
8,771 Commits 1 Branch 67 Tags 50 MiB
6289d9bca8
Commit Graph

8771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
385cddf2b4 update pyinstaller 2020-08-27 10:50:53 +02:00
Maximilian Hils
3b7f5fca41
Merge pull request #4173 from mhils/update-dependencies 
Update Dependencies
 2020-08-27 00:37:57 +02:00
Maximilian Hils
e31f69ff4a fix windows tests failing due to tornado bug 2020-08-27 00:25:08 +02:00
Maximilian Hils
83dac0e999 make mypy happy 2020-08-27 00:25:08 +02:00
Maximilian Hils
cd44256521 update various dependencies 2020-08-27 00:25:08 +02:00
Maximilian Hils
997b496a68 update flake8 and mypy 2020-08-26 23:33:15 +02:00
Maximilian Hils
bf9159937c
Merge pull request #4153 from sanlengjingvv/master 
update compiled mitmweb assets, about #4142
 2020-08-26 23:09:11 +02:00
Maximilian Hils
870eda41af
Merge pull request #4171 from mhils/bump-ldap3 
bump ldap3 dependency
 2020-08-26 23:05:49 +02:00
Maximilian Hils
9156873cf1 bump ldap3 dependency 
apparently older versions cause issues, see mitmproxy/mitmproxy#4168
 2020-08-26 22:58:10 +02:00
sanlengjingvv
ab3a017e0a update compiled mitmweb assets, about #4142 2020-08-14 14:38:27 +08:00
capt8bit
c48a2fcc4f
Add option to control stripping newlines from edited bodies (#4125) 2020-08-14 08:06:12 +02:00
Maximilian Hils
5cb403002f
Merge pull request #4147 from mhils/asgi 
add ASGI support for embedded apps
 2020-08-13 17:40:48 +02:00
Maximilian Hils
fc94bbdabc fix Python 3.6 compatibility 2020-08-13 17:22:32 +02:00
Maximilian Hils
67885320c0 add ASGI support for embedded apps 
This commit replaces our WSGI implementation with a new ASGI one,
which then uses `asgiref`'s compatibility mode to still support WSGI applications.
The ASGI implementation is a bit bare-bone, but good enough for our purposes.

The major changes are:

  - We now support ASGI apps.
  - Instead of taking connections out of mitmproxy's normal processing,
    we now just set flow.response and let things continue as usual.
    This allows users to see responses in mitmproxy, use the response hook
    to modify app responses, etc. Also important for us,
    this makes the new implementation work for shenanigans like sans-io.
 2020-08-13 17:22:31 +02:00
Maximilian Hils
e895c00ff8
Merge pull request #4146 from mhils/onboardingapp 
Revamp onboarding app
 2020-08-13 08:13:25 +02:00
Maximilian Hils
20f6f823ac revamp onboarding app 
- improve and simplify layout
- revise install instructions
- ditch fontawesome to reduce file size
 2020-08-13 08:12:49 +02:00
Maximilian Hils
da327a14da
Merge pull request #4148 from mhils/codecov-again 
Try to fix failing codecov checks
 2020-08-12 17:53:18 +02:00
sanlengjingvv
5d0e1906e6
Show http trailers in web-ui (#4142) 2020-08-12 17:21:31 +02:00
Maximilian Hils
99774ad35b try to fix failing codecov checks 2020-08-12 17:04:50 +02:00
Alexander Prinzhorn
5ebc338fde
Prevent transparent mode from connecting to itself in the basic cases, references #4128 (#4135) 2020-08-11 13:13:09 +02:00
Maximilian Hils
218e69ddb2
Merge pull request #4137 from mhils/killed 
Standardize killed error message
 2020-08-08 00:19:43 +02:00
Maximilian Hils
9d5e59bdfa standardize killed error message 
this is mostly a preparation for sans-io, where we detect kills
using the presence of the error.
 2020-08-08 00:16:29 +02:00
Maximilian Hils
b6ca9a6b1d
Merge pull request #4130 from Prinzhorn/guess_encoding 
Use @charset to decode CSS files if available
 2020-08-08 00:04:15 +02:00
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