Commit Graph

9548 Commits

Author SHA1 Message Date
Maximilian Hils
552e7ca4a0
Merge pull request #4672 from Prinzhorn/endless_emptiness
fix forward empty ws messages
2021-07-15 15:03:04 +02:00
Maximilian Hils
bb40ab9044 WebSocketMessage.kill() -> .drop() 2021-07-15 14:57:43 +02:00
Maximilian Hils
ede52c38c2 add tests for empty websocket messages 2021-07-15 14:56:47 +02:00
Alexander Prinzhorn
8c9c6d965b fix forward empty ws messages 2021-07-15 14:56:47 +02:00
Maximilian Hils
d93f1b77c1 fix set command to not keep old values around 2021-07-15 14:31:52 +02:00
Maximilian Hils
5b4ac96f4c
Merge pull request #4650 from mhils/prinzhorn
[WIP] Fix WebSocket/TCP injection
2021-07-15 13:18:33 +02:00
Maximilian Hils
fbb7d3e4c1 commands: only accept escaped quotes
instead of accepting quotation marks in strings, we now just accept \x22,
which is then unescaped by the str type. This greatly simplifies
the lexing and is more consistent from a user perspective.
2021-07-15 13:12:58 +02:00
zokutyou2@gmail.com
4ab49c5239 fix bug related to tab completion 2021-07-15 19:56:49 +09:00
zokutyou2@gmail.com
689fde87a2 move available commands popover to command help 2021-07-15 19:30:21 +09:00
Maximilian Hils
ac67403f04
Merge pull request #4681 from mhils/tls-handshake-warn
Improve TLS handshake warnings
2021-07-15 12:02:26 +02:00
Maximilian Hils
88086825e5 only warn about failed TLS handshakes if we sent a ServerHello, fix #4678 2021-07-15 11:54:03 +02:00
Maximilian Hils
533223da21 improve warning on TLS handshake errors 2021-07-15 11:34:49 +02:00
Maximilian Hils
18ca5a6369
transparent mode: re-use client SNI when connecting upstream (#4680) 2021-07-15 09:33:20 +00:00
Maximilian Hils
a78069f907
termlog: let click figure out stdout/stderr (#4679)
passing sys.stdout to click does not work under some circumstances.
For example, we cannot `click.echo("\u2026")` from pyinstaller binaries in a Docker container
with `file=sys.stdout`. Instead, we shall pass `err`, which somehow works.
2021-07-15 07:55:57 +00:00
zokutyou2@gmail.com
eec3c35cb1 change command history into mitmproxy's one 2021-07-14 22:03:49 +09:00
zokutyou2@gmail.com
79f4cdd25c display help, description and add tab autocompletion 2021-07-14 21:35:44 +09:00
Maximilian Hils
e63437689e handle escape sequences in mitmproxy.types 2021-07-14 13:17:31 +02:00
Alexander Prinzhorn
aee4df7c4a
remove websocket_error event, fixes #4674
Technically there is no websocket error but different close codes. Similar to how an internal server error is not an error in HTTP, but just a different status code.
2021-07-14 09:09:59 +02:00
Alexander Prinzhorn
1f7745dbb8 rename test 2021-07-14 09:04:57 +02:00
Alexander Prinzhorn
13f115451b update tests 2021-07-13 16:22:10 +02:00
zokutyou2@gmail.com
9513a6d12c update obsolete snapshot 2021-07-13 22:16:10 +09:00
zokutyou2@gmail.com
91772456df update test 2021-07-13 22:13:07 +09:00
zokutyou2@gmail.com
f0b88833c2 add response to fetchMock 2021-07-13 21:54:55 +09:00
zokutyou2@gmail.com
6670dc0666 include package-lock.json 2021-07-13 21:48:22 +09:00
zokutyou2@gmail.com
a689cbe0b0 fix lintings issue and test 2021-07-13 21:43:28 +09:00
Maximilian Hils
8c2d9d9187
[requires.io] dependency update (#4676)
Co-authored-by: requires.io <support@requires.io>
2021-07-13 14:10:10 +02:00
zokutyou2@gmail.com
fc7455b914 transfer the argument suggestion into popup, show available commands, highlight currently typing argument 2021-07-13 20:02:31 +09:00
Alexander Prinzhorn
793f5c5681 fix dumper test cov 2021-07-13 12:51:24 +02:00
Alexander Prinzhorn
eef6522a5e remove websocket_error event, fixes #4674 2021-07-12 16:35:25 +02:00
Alexander Prinzhorn
d4bc25fce9
separate tls_start hooks for client and server, fixes #4665, refs #4547 (#4666) 2021-07-09 20:15:38 +02:00
Maximilian Hils
a51dc10d8b
Merge pull request #4664 from mitmproxy/requires-io-main
[requires.io] dependency update on main branch
2021-06-28 19:03:30 +02:00
zokutyou2@gmail.com
5b229c2dcd fix optionsSpec.js 2021-06-26 10:17:58 +09:00
zokutyou2@gmail.com
b9254379a2 include command.js to commit 2021-06-26 09:44:30 +09:00
zokutyou2@gmail.com
22e5989783 fix web test failure 2021-06-26 09:41:19 +09:00
zokutyou2@gmail.com
05ce8500d1 fix app.py 2021-06-25 22:11:37 +09:00
zokutyou2@gmail.com
feb77ed7ea add command bar to mitmweb 2021-06-25 22:06:35 +09:00
Maximilian Hils
e8fd816b97 web: fix options ducks 2021-06-25 13:08:27 +02:00
Maximilian Hils
53ca9dda90
simplify Server.sni, fix #4547 (#4660) 2021-06-24 15:03:35 +00:00
Maximilian Hils
ad7f1d11e4
fix #4655 (#4659) 2021-06-24 14:42:21 +00:00
Maximilian Hils
adab4d54f5
fix #4576 (#4654) 2021-06-24 14:13:56 +00:00
Maximilian Hils
d9479c1c15
[requires.io] dependency update on main branch (#4658)
* [requires.io] dependency update

* Update setup.py

Co-authored-by: requires.io <support@requires.io>
2021-06-24 14:04:09 +00:00
Maximilian Hils
58e086a2b0
[requires.io] dependency update on main branch (#4653)
* [requires.io] dependency update

* Update tox.ini

* fix mypy complaints

Co-authored-by: requires.io <support@requires.io>
2021-06-24 13:54:07 +00:00
Maximilian Hils
af27556d38 tests++ 2021-06-23 20:24:37 +02:00
Maximilian Hils
4a8870a19e Merge remote-tracking branch 'origin/main' into gsoc 2021-06-23 20:11:28 +02:00
Jesper Bränn
64961232e6
Make it possible to set sequence options (#4210)
* Make it possible to set sequence options

Attempts to fix #3015 through looking at whether or not the option is
of the type Sequence[str].

Treat all deferred options as potentially Sequence options, by making the
deferred dict values a list.

* Add full test coverage to optmanager again

* Document how to set sequence options

* minor improvements

* update changelog

Co-authored-by: Maximilian Hils <git@maximilianhils.com>
2021-06-23 18:08:24 +00:00
Maximilian Hils
7603987ee0
Merge pull request #4640 from mhils/upgrade-docs
Add Addon Upgrade Docs for mitmproxy 7
2021-06-23 14:09:16 +02:00
Maximilian Hils
91bb757660 commands: add bytes type 2021-06-23 13:46:57 +02:00
Maximilian Hils
a19e95e6c9 [wip] injection: change argument type to bytes 2021-06-22 17:49:00 +02:00
Maximilian Hils
1858564b91 add WebSocketMessage.text 2021-06-22 17:39:55 +02:00
Maximilian Hils
a33ab986ba revise based on @prinzhorn's feedback 2021-06-22 16:54:29 +02:00