Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity
9,366 Commits 1 Branch 67 Tags 50 MiB
ede52c38c2
Commit Graph

9366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
ede52c38c2 add tests for empty websocket messages 2021-07-15 14:56:47 +02:00
Alexander Prinzhorn
8c9c6d965b fix forward empty ws messages 2021-07-15 14:56:47 +02:00
Maximilian Hils
d93f1b77c1 fix set command to not keep old values around 2021-07-15 14:31:52 +02:00
Maximilian Hils
5b4ac96f4c
Merge pull request #4650 from mhils/prinzhorn 
[WIP] Fix WebSocket/TCP injection
 2021-07-15 13:18:33 +02:00
Maximilian Hils
fbb7d3e4c1 commands: only accept escaped quotes 
instead of accepting quotation marks in strings, we now just accept \x22,
which is then unescaped by the str type. This greatly simplifies
the lexing and is more consistent from a user perspective.
 2021-07-15 13:12:58 +02:00
Maximilian Hils
ac67403f04
Merge pull request #4681 from mhils/tls-handshake-warn 
Improve TLS handshake warnings
 2021-07-15 12:02:26 +02:00
Maximilian Hils
88086825e5 only warn about failed TLS handshakes if we sent a ServerHello, fix #4678 2021-07-15 11:54:03 +02:00
Maximilian Hils
533223da21 improve warning on TLS handshake errors 2021-07-15 11:34:49 +02:00
Maximilian Hils
18ca5a6369
transparent mode: re-use client SNI when connecting upstream (#4680) 2021-07-15 09:33:20 +00:00
Maximilian Hils
a78069f907
termlog: let click figure out stdout/stderr (#4679) 
passing sys.stdout to click does not work under some circumstances.
For example, we cannot `click.echo("\u2026")` from pyinstaller binaries in a Docker container
with `file=sys.stdout`. Instead, we shall pass `err`, which somehow works.
 2021-07-15 07:55:57 +00:00
Maximilian Hils
e63437689e handle escape sequences in mitmproxy.types 2021-07-14 13:17:31 +02:00
Alexander Prinzhorn
aee4df7c4a
remove websocket_error event, fixes #4674 
Technically there is no websocket error but different close codes. Similar to how an internal server error is not an error in HTTP, but just a different status code.
 2021-07-14 09:09:59 +02:00
Alexander Prinzhorn
1f7745dbb8 rename test 2021-07-14 09:04:57 +02:00
Alexander Prinzhorn
13f115451b update tests 2021-07-13 16:22:10 +02:00
Maximilian Hils
8c2d9d9187
[requires.io] dependency update (#4676) 
Co-authored-by: requires.io <support@requires.io>
 2021-07-13 14:10:10 +02:00
Alexander Prinzhorn
793f5c5681 fix dumper test cov 2021-07-13 12:51:24 +02:00
Alexander Prinzhorn
eef6522a5e remove websocket_error event, fixes #4674 2021-07-12 16:35:25 +02:00
Alexander Prinzhorn
d4bc25fce9
separate tls_start hooks for client and server, fixes #4665, refs #4547 (#4666) 2021-07-09 20:15:38 +02:00
Maximilian Hils
a51dc10d8b
Merge pull request #4664 from mitmproxy/requires-io-main 
[requires.io] dependency update on main branch
 2021-06-28 19:03:30 +02:00
Maximilian Hils
53ca9dda90
simplify Server.sni, fix #4547 (#4660) 2021-06-24 15:03:35 +00:00
Maximilian Hils
ad7f1d11e4
fix #4655 (#4659) 2021-06-24 14:42:21 +00:00
Maximilian Hils
adab4d54f5
fix #4576 (#4654) 2021-06-24 14:13:56 +00:00
Maximilian Hils
d9479c1c15
[requires.io] dependency update on main branch (#4658) 
* [requires.io] dependency update

* Update setup.py

Co-authored-by: requires.io <support@requires.io>
 2021-06-24 14:04:09 +00:00
Maximilian Hils
58e086a2b0
[requires.io] dependency update on main branch (#4653) 
* [requires.io] dependency update

* Update tox.ini

* fix mypy complaints

Co-authored-by: requires.io <support@requires.io>
 2021-06-24 13:54:07 +00:00
Maximilian Hils
af27556d38 tests++ 2021-06-23 20:24:37 +02:00
Jesper Bränn
64961232e6
Make it possible to set sequence options (#4210) 
* Make it possible to set sequence options

Attempts to fix #3015 through looking at whether or not the option is
of the type Sequence[str].

Treat all deferred options as potentially Sequence options, by making the
deferred dict values a list.

* Add full test coverage to optmanager again

* Document how to set sequence options

* minor improvements

* update changelog

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
 2021-06-23 18:08:24 +00:00
Maximilian Hils
7603987ee0
Merge pull request #4640 from mhils/upgrade-docs 
Add Addon Upgrade Docs for mitmproxy 7
 2021-06-23 14:09:16 +02:00
Maximilian Hils
91bb757660 commands: add bytes type 2021-06-23 13:46:57 +02:00
Maximilian Hils
a19e95e6c9 [wip] injection: change argument type to bytes 2021-06-22 17:49:00 +02:00
Maximilian Hils
1858564b91 add WebSocketMessage.text 2021-06-22 17:39:55 +02:00
Maximilian Hils
a33ab986ba revise based on @prinzhorn's feedback 2021-06-22 16:54:29 +02:00
Maximilian Hils
f135be8e65
[requires.io] dependency update (#4649) 
Co-authored-by: requires.io <support@requires.io>
 2021-06-21 15:33:29 +00:00
Maximilian Hils
80bcd2f881
[requires.io] dependency update (#4647) 
Co-authored-by: requires.io <support@requires.io>
 2021-06-21 16:56:26 +02:00
Maximilian Hils
ef69701b0a
Merge pull request #4645 from mhils/polish 
Minor UX Improvements
 2021-06-20 02:20:10 +02:00
Maximilian Hils
2fe4a49d8f logging: don't pick up later mutations 2021-06-20 02:15:09 +02:00
Maximilian Hils
d6975e0b80 add next_layer docs + example, minor fixes 2021-06-20 02:15:09 +02:00
Maximilian Hils
159c064fb4 enable addons to hardcode client.alpn 2021-06-19 12:29:18 +02:00
Maximilian Hils
6178b4b72a raise if server address is updated on non-closed connections 2021-06-19 12:28:40 +02:00
Maximilian Hils
15adb2cd79
Update tls_passthrough.py 2021-06-18 08:49:48 +02:00
Maximilian Hils
f342061319
Update addons-api-changelog.md 2021-06-17 20:15:29 +02:00
Maximilian Hils
863c792f41
Merge pull request #4643 from mhils/issue-4642 
Fix HTTPS Reverse Proxy TLS Layer Logic
 2021-06-17 20:12:06 +02:00
Maximilian Hils
74aa5cea56
[requires.io] dependency update (#4641) 
Co-authored-by: requires.io <support@requires.io>
 2021-06-17 20:10:50 +02:00
Maximilian Hils
c075d33997 minor style fix 2021-06-17 20:02:40 +02:00
Maximilian Hils
5c0d700839 fix #4642 2021-06-17 20:02:32 +02:00
Maximilian Hils
0958f39f40 add upgrade docs for mitmproxy 7 2021-06-17 15:53:22 +02:00
Maximilian Hils
34a620e57b
Docker: Add aarch64 Images (#4637) 
* feat(cibuild): add buildx multi arch builds

* chore: add changelog for arm64

* temporarily enable docker ci job for PRs

* Update cibuild.py

* Update cibuild.py

* chore(cibuild): create docker-container xbuilder

* chore(cibuild): fix lint

* temporarily remove run check to see error message

* Update cibuild.py

* Update cibuild.py

* Update cibuild.py

* Update main.yml

* Update main.yml

* Update main.yml

* Update cibuild.py

* Update cibuild.py

* Update Dockerfile

* cleanup #1

* next test

* move to test branch

* fixup

* now upload

* enable armv6/7

* use multi-stage build to reduce image size

* armv7?

* drop armv6/armv7

Co-authored-by: Niels Hofmans <hello@ironpeak.be>
 2021-06-15 13:47:50 +00:00
Maximilian Hils
5120c1dbe2
Merge pull request #4635 from mhils/upstream-auth 
[sans-io] add support for upstream_auth
 2021-06-15 11:00:12 +02:00
Maximilian Hils
fb625c6868 fix h2 bug found via fuzzing 2021-06-15 10:45:26 +02:00
Maximilian Hils
76f0b8f65e fix tests 2021-06-15 10:45:26 +02:00
Maximilian Hils
fa6e8f1e9c [sans-io] add support for upstream_auth 2021-06-15 10:45:26 +02:00