Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity
9,211 Commits 1 Branch 67 Tags 50 MiB
13db172320
Commit Graph

2318 Commits

Author SHA1 Message Date
Maximilian Hils
13db172320 coverage++ 2021-03-13 14:47:42 +01:00
Maximilian Hils
c331d2eeb2 add TCP message injection 2021-03-12 21:15:07 +01:00
Maximilian Hils
5921c590e3 injection: ConnectionEvent -> Event 2021-03-12 16:42:55 +01:00
Maximilian Hils
07f1bcf543 add WebSocket inject command 2021-03-12 16:28:21 +01:00
Peter Dave Hello
123342ea0b
Improve Markdown syntax(styling) (#4496) 
* Improve Markdown syntax

- Add missing blank lines
- Remove trailing spaces
- Remove additional blank lines
- Fix indentation consistency and correctness

* Update addons-examples.md

Co-authored-by: Maximilian Hils <github@maximilianhils.com>
 2021-03-11 19:13:02 +01:00
Maximilian Hils
70223163de
Merge pull request #4486 from mhils/websocket 
Merge WebSocketFlow into HTTPFlow, add WebSocket UI
 2021-03-11 11:02:40 +01:00
Maximilian Hils
d8aeef1bfd ressurect killed, is_text -> type 2021-03-10 20:29:16 +01:00
Maximilian Hils
e1f938f05b tests++ 2021-03-09 00:55:47 +01:00
Maximilian Hils
eb65bc748b merge WebSocketFlow into HTTPFlow, add WebSocket UI 2021-03-08 19:36:18 +01:00
Maximilian Hils
6d9f00408c
remove old socks proxy code (#4485) 2021-03-08 16:21:40 +00:00
Maximilian Hils
e2772f3eec fixup coverage 2021-03-07 22:35:53 +01:00
Maximilian Hils
d6cd1489d6 [sans-io] add SOCKS5 proxy mode 2021-03-07 22:19:03 +01:00
Maximilian Hils
93de96a720
don't set IP addresses as SNI (#4480) 2021-03-07 15:00:33 +00:00
Maximilian Hils
4bd7b6c4ea
speculative HTTP/2 fixes, refs #4451 (#4464) 2021-02-21 15:36:04 +01:00
Maximilian Hils
593dd93cf8
HTTP/2: Show human-readable error messages (#4462) 2021-02-20 12:49:21 +01:00
Maximilian Hils
001cf6c10a
memleak: immediately store errored flows, refs #4456 (#4461) 2021-02-19 21:23:42 +00:00
Maximilian Hils
cfaba15c1f
fix regression introduced in 70e08c880 (#4459) 2021-02-19 18:34:52 +00:00
Maximilian Hils
70e08c880c
don't reuse closed connections, refs #4451 (#4458) 2021-02-18 22:07:18 +00:00
Daniel Baskal
aebc40c408
Fixes #4416 (#4446) 
* Fixes #4416

Fix ValueError when splitting on a request URI without a path part.

* Fix mypy lintining issue

* Replace .split() with .partition() for cleaner code
 2021-02-14 18:19:00 +01:00
Maximilian Hils
748fc93699
Merge pull request #4422 from mhils/pdoc 
Docs: Add API Reference Using Pdoc
 2021-02-13 00:18:49 +01:00
Maximilian Hils
805aed4f6a docs++ 2021-02-13 00:13:37 +01:00
Denis Kasak
856a35af6d
Use original flow host instead of IP when exporting to curl/httpie. (#4307) 
Use original flow host instead of IP when exporting to curl/httpie.

Unless this is done, the SNI server name will not be sent, often making
the curl/httpie command have different behaviour than the original
request (most often in the form of failing to establish a TLS
connection).

With this change, we always use the original host, fixing this failure.
However, if the original host is a domain, it may sometimes resolve to
a different IP address later on. In curl, we solve this problem by
forcing it to connect to the original IP using `--resolve`. For httpie
there is currently no easy solution (see:
https://github.com/httpie/httpie/issues/414).
 2021-02-09 18:44:46 +00:00
Alexander Prinzhorn
4212a56f25
Collect all flow filter matches before modifying headers, fixes #4245 (#4246) 2021-02-09 19:37:46 +01:00
Maximilian Hils
0ab59e5524 docs++ 2021-02-05 22:04:45 +01:00
Maximilian Hils
ca578181e3 adjust tests, increase coverage 2021-02-05 08:44:17 +01:00
Maximilian Hils
dc6c5f55cd move Connections to mitmproxy.connection 2021-02-05 08:44:17 +01:00
Maximilian Hils
d68c364b35 inline/move http.make_* functions 2021-02-05 08:43:15 +01:00
Maximilian Hils
9409bf0368 move Headers/Message/Request/Response into mitmproxy.http 2021-02-05 08:43:15 +01:00
Maximilian Hils
50ae75aedf
Merge pull request #4413 from r00t-/compat_convert_fix 
fix conversion of old flows failing due to missing array keys
 2021-02-03 19:54:24 +01:00
Maximilian Hils
bd0e5989e2 add websocket flow conversion test 2021-02-03 19:27:15 +01:00
Maximilian Hils
faeb9678f1 test dumpfiles: .bin -> .mitm 2021-02-03 19:27:15 +01:00
Maximilian Hils
fccc153fdb
api docs++ (#4421) 2021-02-03 00:14:54 +01:00
Graham Robbins
2694b05fe9
Extract port number from authority before IDNA decode (#4410) 
* Extract port from authority before IDNA decode

A UnicodeError exception may be raised if the port is present

* Update Changelog

* Test for badly formed byte input
 2021-01-24 20:45:01 +01:00
Thomas B Homburg
4be69a5fc7
GraphQL content-view (#4396) 
* Add GraphQL contentview

* Simpler graphql formatting

* Do not prompt for exit

* Give graphql priority over json

* Revert "Do not prompt for exit"

This reverts commit 386b38f9eb4601ae41365ace5b9689c30761a412.

* Handle batched queries

* Fix flake issues

* typing fix

* Typing fixes

* Add graphql content view test

* Fix reference

* Fixed tests

* flake

* Implement GraphQLView.render_priority

* Show query key stub value

* Code coverage

* Import PARSE_ERROR

* Test for invalid json
 2021-01-22 00:29:09 +01:00
Kamil Borzym
f51019cb63
[#4235] Automatic view mode based on should_render method (#4236) 
* [#4235] Automatic view based on should_render method instead of content_types property

* [#4235] Update CHENGELOG

* [#4235] Fix linter warnings

* Add an explicit test for the new forward-compatible behaviour

* wip

* contentviews: introduce render_priority (2/2)

* coverage++, lint!

* minor fixes

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
 2021-01-17 11:39:51 +01:00
Maximilian Hils
8dda8fc0f7 duplicate hooks: warn instead of raise 
raising causes issues when using pdoc's live reloading, this should fix it.
 2021-01-16 20:31:50 +01:00
Maximilian Hils
ff624d0b87 fix #4387 2021-01-06 10:47:37 +01:00
Maximilian Hils
81f8f06a11 converge on hooks, events, and commands 2021-01-05 22:00:54 +01:00
Maximilian Hils
6c0e4f1cb7 streamline event/hook/command naming conventions 2021-01-05 21:54:44 +01:00
Maximilian Hils
90df4168f8 coverage++ 2021-01-05 21:54:44 +01:00
Maximilian Hils
f9d18745c9 add MitmproxyEvent for addon events 
We previously defined the list of all allowed events in mitmproxy.eventsequence,
without specifying the expected arguments at all. This commit changes our addon
event dispatch to subclasses of MitmproxyEvent, which have well-defined attributes.
 2021-01-05 21:54:44 +01:00
Maximilian Hils
9186c1aeb5 add Client/Server.__str__ 2021-01-05 21:54:44 +01:00
Maximilian Hils
cca242a581 Windows: build pyinstaller onedir and use it for installer 
This greatly improves startup time as pyinstaller doesn't have to
unpack everything on startup. The same also applies to macOS and Linux,
but there we 1) don't have installers to hide all the files and
2) have a filesystem that deals much better with lots of small files.

Additionally, simplify cibuild to be a bit more reasonable.
 2021-01-05 15:56:33 +01:00
Maximilian Hils
ca45548289
Merge pull request #4384 from mhils/mitmproxy.exe 
mitmproxy.exe 🎉🥳
 2021-01-05 08:18:11 +01:00
Maximilian Hils
6cc452db8c
Merge pull request #4381 from mhils/options-cleanup 
Remove unused options, warn about nonfunctioning ones.
 2021-01-05 07:52:14 +01:00
Maximilian Hils
605961c57f build mitmproxy.exe 🎉 2021-01-05 07:46:53 +01:00
Maximilian Hils
63b8685356 add console integration tests 2021-01-04 20:21:42 +01:00
Maximilian Hils
455fee1126 warn about nonfunctioning options, permanently remove unused ones. 
If you are affected by this change, please do reach out by filing an issue.
 2021-01-01 18:34:15 +01:00
Maximilian Hils
67a93239f4 tlsconfig: respect add_upstream_certs_to_client_chain 2021-01-01 18:31:50 +01:00
Maximilian Hils
d8c3e8a56a
Merge pull request #4379 from mhils/reverse-tcp 
Reverse proxy: do not assume TLS for non-standard ports
 2021-01-01 18:08:38 +01:00