Jinjie Zhang
5876e431ce
fix: fix unused ctx import
2021-08-22 21:36:08 +08:00
Jinjie Zhang
9d31a66570
feat: add --socks5auth option to support socks5 userpassword authentication
2021-08-22 21:31:29 +08:00
Maximilian Hils
d9d9a20ef2
tls: fix TLS1 constant
...
We accidentally reused the value for SSL3 here.
This is not as a bad as a it looks: First, neither version
is enabled by default. Second, because of how Python enums
work, this simply made the `TLS1` version unavailable
as an option (which is how I detected it).
2021-08-22 15:17:57 +02:00
Maximilian Hils
d518622976
Update examples/contrib/README.md
2021-08-22 14:57:20 +02:00
Maximilian Hils
03606fb0c0
fix tests
2021-08-20 18:49:44 +02:00
Maximilian Hils
1f6015d72a
web: update dependencies
2021-08-20 18:47:34 +02:00
Maximilian Hils
46cd40f493
web: test coverage++, adjust commandbar
2021-08-20 18:38:22 +02:00
Maximilian Hils
2945ba925b
please the coverage gods
2021-08-20 15:10:14 +02:00
Maximilian Hils
8561a620c8
minor fixes
2021-08-19 19:15:51 +02:00
Maximilian Hils
3ad4949c0e
fix web tests
2021-08-19 19:15:51 +02:00
Zoltán Reegn
a92eb1c4c8
Add script instructions for MacOS to mitm.it ( #4765 )
2021-08-19 16:14:52 +02:00
Maximilian Hils
0585e690c4
fix tests
2021-08-19 10:53:46 +02:00
Aldo Cortesi
f7f0ac8ba7
[requires.io] dependency update on main branch ( #4764 )
...
* [requires.io] dependency update
* Update setup.py
Co-authored-by: requires.io <support@requires.io>
Co-authored-by: Maximilian Hils <git@maximilianhils.com>
2021-08-19 10:35:14 +02:00
Maximilian Hils
b320c6aa14
Merge remote-tracking branch 'origin/main' into gsoc
2021-08-18 17:39:01 +02:00
Maximilian Hils
65aa0a6ef5
major mitmweb upgrades
2021-08-18 17:38:22 +02:00
Maximilian Hils
46cf75d01e
console: fix cert validity order
2021-08-18 17:33:26 +02:00
Maximilian Hils
f9b63e973e
Remove asyncio event loop workaround for tornado ( #4762 )
...
* remove asyncio event loop workaround for tornado
* Update CHANGELOG.md
2021-08-18 14:12:39 +00:00
Alexander Prinzhorn
edbb3d6791
update ws injection example, fixes #4751 ( #4761 )
...
* update ws injection example, fixes #4751
* Update websocket-inject-message.py
* Revert "Update websocket-inject-message.py"
This reverts commit 86b4cda2f4d6d694db7d0d8b30ec04c3ef123181.
Co-authored-by: Maximilian Hils <github@maximilianhils.com>
Co-authored-by: Maximilian Hils <git@maximilianhils.com>
2021-08-18 11:37:28 +00:00
Povilas Balciunas
b36ce70ead
Add more type hints ( #4754 )
...
* Add more type hints
* Update mitmproxy/net/tls.py
Co-authored-by: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Co-authored-by: Maximilian Hils <github@maximilianhils.com>
Co-authored-by: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
2021-08-18 13:24:36 +02:00
Thomas Kriechbaumer
92518f3b67
Merge pull request #4747 from KORraNpl/korran/fix_DeprecationWarning_in_har_dump.py
...
Fix DeprecationWarning in har_dump.py
2021-08-13 22:42:25 +02:00
Maximilian Hils
a7f27259a7
contentviews: ignore empty data
2021-08-12 10:21:06 +02:00
Maximilian Hils
f8b4c7bd44
add raw export command
2021-08-12 10:19:49 +02:00
Maximilian Hils
8866cc31bd
view: add id-based flow selection
2021-08-12 10:18:56 +02:00
Maximilian Hils
94172594b3
[web] update fontawesome
2021-08-12 10:16:43 +02:00
KORraNpl
52c81c287e
Fix DeprecationWarning in har_dump.py
2021-08-11 20:32:39 +02:00
Maximilian Hils
ab6f1ebb44
Merge pull request #4741 from Mattwmaster58/main
...
case insensitive encoding
2021-08-10 08:18:56 +02:00
Maximilian Hils
4fb3e4c321
treat encoding names case-insensitively, fix #4735
...
Co-authored-by: Mattwmaster58 <mattwmaster58@gmail.com>
2021-08-10 08:11:34 +02:00
Maximilian Hils
1ce7e8e02e
[requires.io] dependency update on main branch ( #4740 )
...
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* Update setup.py
Co-authored-by: requires.io <support@requires.io>
2021-08-10 08:07:49 +02:00
Maximilian Hils
fb53df0cc1
expose full ClientHello object in tls_clienthello hook ( #4744 )
2021-08-09 15:41:05 +00:00
Maximilian Hils
c4dd46c3db
[requires.io] dependency update on main branch ( #4738 )
...
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
Co-authored-by: requires.io <support@requires.io>
2021-08-08 16:16:27 +02:00
Maximilian Hils
fcec63eebc
fix tnetstread crash found via fuzzing
2021-08-08 16:12:37 +02:00
Maximilian Hils
ca1229d60f
Merge pull request #4736 from mhils/py310
...
Add CI for Python 3.10rc1
2021-08-06 13:02:26 +02:00
Maximilian Hils
8ede5a4cb0
fix Python 3.10 compatibility
2021-08-06 10:22:49 +02:00
Maximilian Hils
5990f9e30f
add CI for python 3.10rc1
2021-08-06 10:03:24 +02:00
Maximilian Hils
226e31290c
Merge branch 'main' into gsoc
2021-08-04 19:16:31 +02:00
Maximilian Hils
7efefb716e
docs: remove outdated http/2 advice
2021-08-04 17:30:36 +02:00
Maximilian Hils
4abd00afab
Merge pull request #4731 from aaron-tan/improve-render-size
...
Improve rendering of size column
2021-08-04 17:26:20 +02:00
Maximilian Hils
6aa9d8658f
size column: add a bit more precision
2021-08-04 17:14:42 +02:00
Maximilian Hils
aa2abb9bf4
reopen main for development
2021-08-04 15:12:51 +02:00
Maximilian Hils
8b88e8f0a5
mitmproxy 7.0.2
2021-08-04 15:01:35 +02:00
Maximilian Hils
53a916e39b
fix websocket regression introduced in 7.0.1 ( #4733 )
2021-08-04 12:59:48 +00:00
Aaron Tan
4266c4852c
Improve rendering of size column
2021-08-04 21:02:43 +10:00
Maximilian Hils
88374e958b
reopen main for development
2021-08-03 17:33:06 +02:00
Maximilian Hils
2ebcd5f157
mitmproxy 7.0.1
2021-08-03 17:17:14 +02:00
Maximilian Hils
c90aaf55d9
Minor fixes, Docs++ ( #4730 )
...
* simplify upstream_cert logic
* docs: update ignore domains tutorial
* update certificate docs
* add proxy-auth header for plain http requests, fix #4728
* update CHANGELOG
2021-08-03 17:15:44 +02:00
Maximilian Hils
45123cd287
update CHANGELOG
2021-08-03 17:14:07 +02:00
Maximilian Hils
416e5046bc
add proxy-auth header for plain http requests, fix #4728
2021-08-03 17:02:49 +02:00
Maximilian Hils
359406e7a5
update certificate docs
2021-08-03 17:02:49 +02:00
Maximilian Hils
aca3456fee
docs: update ignore domains tutorial
2021-08-03 16:31:57 +02:00
Maximilian Hils
7d2525b4c7
simplify upstream_cert logic
2021-08-03 16:31:16 +02:00
