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,319 Commits 1 Branch 67 Tags 50 MiB
3b541a0b87
Commit Graph

9319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
f1a925642f
do not copy hugo's install instructions 
that only creates maintenance burden
 2021-04-21 12:00:57 +02:00
Maximilian Hils
44f1e7d584
CI: add deploy-docs env 2021-04-15 16:02:24 +02:00
Maximilian Hils
44fcd688ad
CI: use dedicated deploy environments 2021-04-15 15:45:52 +02:00
Maximilian Hils
4659ab8408
[requires.io] dependency update on main branch (#4559) 
* [requires.io] dependency update

* [requires.io] dependency update

* Update setup.py

Co-authored-by: requires.io <support@requires.io>
 2021-04-14 00:34:46 +02:00
Jannik
20655fd4e2 docs: add more precise instructions on docs setup 2021-04-11 17:39:47 +02:00
Alexander Prinzhorn
b4d0e5b660
keyinfo typing (#4552) 2021-04-07 18:22:54 +02:00
aesyondu
438567f58c
docs(docs-readme): clarify documentation readme (#4538) 
* docs(docs-readme): clarify documentation readme

I was confused what `mitmproxy Python package` meant. At first I did `pipx install mitmproxy`, but that didn't work. Then I realized I needed it as a library/module, not cli.

Changed `build.sh` to `build.py` since it was deleted on commit a7d1f32c89

* Update README.md

Co-authored-by: Maximilian Hils <github@maximilianhils.com>
 2021-04-06 15:40:13 +02:00
Maximilian Hils
1b0fce6aba Revert "Copy examples into Docker image (#4447)" 
This reverts commit a5ed1d377b.
 2021-04-05 10:31:46 +02:00
Anatoli Babenia
a5ed1d377b
Copy examples into Docker image (#4447) 2021-04-05 10:20:52 +02:00
Peter Dave Hello
66c8ecc71e
docker: avoid additional apt packages by --no-install-recommends (#4543) 
This will help we keep the image not too heavy that caused by those
additional, suggestion apt packages.

Only install the packages we explicitly want.
 2021-04-05 10:09:34 +02:00
Peter Dave Hello
b9f9094ec7
docker: clean up tmux dir in clirecording Dockerfile (#4542) 2021-04-05 10:08:57 +02:00
Peter Dave Hello
f1b55fc817
Fix typo: Github should be GitHub (#4541) 2021-04-05 10:08:21 +02:00
Maximilian Hils
0ca458fd64
Merge pull request #4535 from mhils/master-main 
master branch -> main branch
 2021-03-30 17:03:14 +02:00
Maximilian Hils
ead33008bc master branch -> main branch 2021-03-30 15:30:45 +02:00
Maximilian Hils
04bceb0e05
Merge pull request #4533 from mhils/pr-4188 
mitmweb: Make columns configurable/customizable (#4188)
 2021-03-30 13:10:05 +02:00
Maximilian Hils
eefc55f28f coverage++ 2021-03-30 13:03:41 +02:00
Maximilian Hils
68c55979fb update CHANGELOG.md 2021-03-30 11:23:50 +02:00
Maximilian Hils
37672f0be0 give gulp watch func a name 2021-03-30 11:23:50 +02:00
gorogoroumaru
54efe88a45 fix linting issue 2021-03-30 11:23:50 +02:00
gorogoroumaru
1efe44745b make columns configurable and customizable 2021-03-30 11:23:50 +02:00
Maximilian Hils
c996f1ee74
fix codecov report threshold (#4534) 2021-03-30 09:15:12 +00:00
Maximilian Hils
f94a9a3c9d
Merge pull request #4529 from mhils/eager-sans-io 
Sans-IO Improvements: Connection Strategy
 2021-03-30 10:16:57 +02:00
Maximilian Hils
0e8dd730bc
Merge pull request #4532 from mhils/issue-4525 
fix #4525
 2021-03-30 10:02:36 +02:00
Maximilian Hils
77a536edd2 fix #4525 2021-03-30 09:55:16 +02:00
Maximilian Hils
338cd0b00a
Merge pull request #4531 from mhils/selfconnect 
Detect recursive self-connects and stop them
 2021-03-30 09:39:27 +02:00
Maximilian Hils
945e4e3ef5 detect recursive self-connects and stop them (attempt 2) 2021-03-30 09:25:35 +02:00
Maximilian Hils
d0e54bc32c partially revert "detect recursive self-connects and stop them" 
This partially reverts commit be20765129.

The intended solution is prone to race conditions where server_connected
triggers before the new connection is registered. We revert the change here,
but keep the tests.
 2021-03-30 08:56:57 +02:00
Maximilian Hils
be20765129 detect recursive self-connects and stop them 2021-03-29 22:38:11 +02:00
Maximilian Hils
9baaf9dfdb
minor cleanups (#4530) 2021-03-29 17:42:24 +02:00
HereC
de3f089bb0
Add block_list Option to set HTTP status for blocked flows/urls (#4516) 
* Add block_list Option which returns a set HTTP status for a blocked flow filter:URL

* Add changelog entry

* Add blocklist to default AddOns

* Add Nginx 444 status code to list, so it is available for validation

* Add overview of blocklists

* Add allow-only, and more tests

* Fix mypy tox issue

* Finish test coverage with test for invalid filter

* Add PR feedback

* Fix type/scope error

* Fix stray blank line

* Delete concepts-blocklist.md

* Feature in overview

* Add flag to metadata for blocklisted flows.

* minor improvements

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
 2021-03-29 15:30:21 +00:00
Maximilian Hils
2c941b8905
Merge pull request #4528 from mitmproxy/requires-io-master 
[requires.io] dependency update on master branch
 2021-03-29 15:15:51 +02:00
Maximilian Hils
63e31de14e reuse certificate errors to avoid unnecessary connections 2021-03-29 15:07:26 +02:00
Maximilian Hils
d3f3725479 wait for TLS ClientHello when connection_strategy=eager 2021-03-29 15:07:26 +02:00
Maximilian Hils
aa815a5246 make connection_strategy=eager the default 2021-03-29 15:07:26 +02:00
Maximilian Hils
89603e5e6f proxy: properly catch ZeroReturnError 2021-03-29 15:07:26 +02:00
Maximilian Hils
80f208fb2a tlsconfig: don't negotiate ALPN with client if server refused to do so 2021-03-29 15:07:26 +02:00
Maximilian Hils
c195737a0c don't use query content view if data is present 2021-03-29 09:00:32 +02:00
Maximilian Hils
1af5300cd2 speculative fix for #4527 2021-03-29 08:59:53 +02:00
Maximilian Hils
16be78ad0a
Merge pull request #4521 from sanlengjingvv/remote-ip 
Display server ip address in flow detail tab
 2021-03-22 11:35:06 +01:00
Maximilian Hils
9eaa0a4ced
Merge pull request #4520 from sanlengjingvv/jest-timezone 
Set jest time zone, otherwise the test will fail in other time zones
 2021-03-22 11:34:05 +01:00
sanlengjingvv
71ccbd5607 Display server ip address in flow detail tab 2021-03-22 14:41:16 +08:00
sanlengjingvv
6968c7dd7c Set jest time zone, otherwise the test will fail in other time zones 2021-03-22 14:11:40 +08:00
Maximilian Hils
0650f132e9
Merge pull request #4502 from mhils/inject 
Add WebSocket/TCP Message Injection
 2021-03-16 15:07:06 +01:00
Maximilian Hils
fe6f0d368b inject -> inject.tcp/inject.websocket 2021-03-16 15:01:33 +01:00
Maximilian Hils
b767b82c86 console: show websocket connection close 2021-03-16 14:52:48 +01:00
Maximilian Hils
ac9852122f add websocket.timestamp_end 2021-03-16 14:52:15 +01:00
Maximilian Hils
aeb1d2d6e6
Merge pull request #4489 from sanlengjingvv/sans-trailers 
support http/2 response trailers
 2021-03-16 12:13:51 +01:00
Maximilian Hils
80c77c6a79 fix client replay for trailers 2021-03-16 12:08:52 +01:00
Maximilian Hils
f236ee42ed docs: try to explain proxy.layer in a better way 2021-03-16 10:44:53 +01:00
Maximilian Hils
7fae3c8951 code style improvements 2021-03-15 17:24:52 +01:00