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
eefc55f28f
coverage++
2021-03-30 13:03:41 +02: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
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
be20765129
detect recursive self-connects and stop them
2021-03-29 22:38:11 +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
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
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
7fae3c8951
code style improvements
2021-03-15 17:24:52 +01:00
Maximilian Hils
12e4785d44
use request/response hooks for trailers
2021-03-15 17:12:10 +01:00
sanlengjingvv
ed7067d36d
clean code,
...
support request trailers when response body is streamed,
support trailers when body is streamed
2021-03-15 11:30:20 +08:00
sanlengjingvv
a3fd70f240
fix lint error
2021-03-14 18:42:29 +08:00
sanlengjingvv
76d7ee3a2f
support http/2 response trailers
2021-03-14 18:31:14 +08:00
Maximilian Hils
c842abff2d
coverage++
2021-03-13 23:17:07 +01:00
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
