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
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
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
Maximilian Hils
12e4785d44
use request/response hooks for trailers
2021-03-15 17:12:10 +01:00
Maximilian Hils
10ee19c138
fix race condition
2021-03-15 11:38:21 +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
6c07dba752
re-add WebSocket injection example
2021-03-14 00:49:24 +01: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
Maximilian Hils
e40bf0251d
docker: build from release dir to speed up context sending ( #4498 )
2021-03-12 07:45:21 +00: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
Peter Dave Hello
aede8849db
Improve Shell Script syntax ( #4497 )
2021-03-11 19:12:03 +01:00
Peter Dave Hello
27ba85bc30
Switch Docker release to be based on Debian instead of Alpine ( #4493 )
2021-03-11 16:49:07 +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
ab1bcfe7d2
websocket: incorporate PR feedback
2021-03-11 10:58:00 +01:00
Maximilian Hils
b8f79ed624
fix #4473 ( #4490 )
2021-03-10 19:54:54 +00:00
Maximilian Hils
d8aeef1bfd
ressurect killed, is_text -> type
2021-03-10 20:29:16 +01:00
Maximilian Hils
a00f247f0e
fix #4487 ( #4488 )
2021-03-09 16:55:13 +00: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
Peter Dave Hello
c3ae2d98db
Refactor docs clirecording Dockerfile ( #4484 )
...
* Delete apt-get lists after apt-get install in docs Dockerfile
* Prevent pip install cache in docs Dockerfile
* Prevent additional & unnecessary apt packages in docs Dockerfile
2021-03-08 17:18:39 +01:00
Maximilian Hils
c40bc2fc2a
Merge pull request #4481 from mhils/minor-fixes
...
Minor fixes
2021-03-07 22:47:04 +01:00
Maximilian Hils
7345daf3f4
[sans-io] Add SOCKS5 proxy mode ( #4482 )
...
* [sans-io] add SOCKS5 proxy mode
* fixup coverage
2021-03-07 22:37:50 +01: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
47982cac10
run most common tests only when invoking tox without args.
...
envlist never really included the full list of environments,
for example cibuild was already missing. This commit tries to
make a reasonable tradeoff between comprehensiveness and local running time
by only running the most frequent error sources.
We still check everything in CI.
2021-03-07 16:17:40 +01:00
