Thomas Kriechbaumer
0166f90cbe
bump brotlipy
2016-09-11 16:28:07 +02:00
Aldo Cortesi
c3f07f354f
Merge pull request #1551 from cortesi/sreplay
...
console: fix/improve server replay
2016-09-11 17:48:30 +12:00
Aldo Cortesi
6427176cf1
console: fix/improve server replay
...
- Fix "S" shortcut in list view
- Consolidate replay from file in global R shortcut
- Fix help
2016-09-11 15:37:11 +12:00
Aldo Cortesi
734d177007
Merge pull request #1550 from cortesi/script
...
Add "run_once" support to the script addon, use it in mitmproxy
2016-09-11 13:43:20 +12:00
Aldo Cortesi
6b9221ffeb
Add "run_once" support to the script addon, use it in mitmproxy
...
Fixes #1418
2016-09-11 13:22:01 +12:00
Aldo Cortesi
387e91f9a6
Merge pull request #1548 from cortesi/opts
...
Make various replay-related options clearer
2016-09-10 12:39:21 +12:00
Aldo Cortesi
9b814ca067
options.replay_ignore* -> options.server_replay_ignore*
2016-09-10 10:21:52 +12:00
Aldo Cortesi
8677e91074
options.nopop -> options.server_replay_nopop
2016-09-10 10:09:07 +12:00
Aldo Cortesi
5ebe8c1bc8
options.rheaders -> options.server_replay_use_headers
2016-09-10 10:09:07 +12:00
Aldo Cortesi
b0213a2c0e
options.kill -> options.replay_kill_extra
2016-09-10 10:09:07 +12:00
Aldo Cortesi
01cdaf4133
Merge pull request #1545 from cortesi/tsync
...
Roll out synchronisation for mitmproxy tests
2016-09-10 10:07:11 +12:00
Aldo Cortesi
4ff8a72521
Roll out synchronisation for mitmproxy tests
...
This extends some of the work I did for pathod and netlib to the mitmproxy test
suite. It also fixes what may be a leak in replays.
Failing on connection leak is disabled on Windows for the moment.
Fixes #1535
2016-09-10 09:18:11 +12:00
Aldo Cortesi
9c54432253
Merge pull request #1542 from cortesi/replayconsole
...
Fix server replay in mitmproxy console
2016-09-09 13:24:18 +12:00
Aldo Cortesi
c1bb582129
Fix interactive server replay in mitmproxy console
2016-09-09 11:15:07 +12:00
Aldo Cortesi
715e47e3d4
Extend addons.Addons with a get method that retrieves an addon by name
2016-09-09 10:31:34 +12:00
Aldo Cortesi
d4f291a8ad
Fix immediate server replay-related crash in mitmproxy
2016-09-09 10:03:36 +12:00
Aldo Cortesi
ea49b8a2e2
Merge pull request #1532 from cortesi/playback
...
Playback and fix construct breakage
2016-09-07 12:59:11 +12:00
Aldo Cortesi
6c970cfd4c
Fix byte/string comparison error in server playback
2016-09-07 12:11:10 +12:00
Thomas Kriechbaumer
7841d73cb2
Merge pull request #1531 from Schamper/encoding-patch
...
Fix decoding when content-encoding: none
2016-09-06 20:29:59 +02:00
Schamper
5728a1c900
Make 'none' synonymous to 'identity'
2016-09-06 17:00:08 +02:00
Aldo Cortesi
9abdd3a8d9
Move server playback in to an addon
...
- Move server playback into an addon
- Implement a better sync strategy to decide when to exit if keepserving is
off. We now wait for the final flow played back to no longer be live.
- Leave interactive server playback in mitmproxy console broken for now - there
are broader addon-related changes that need to be made for that, and this patch
is already big.
Fixes #1229
2016-09-06 23:48:02 +12:00
Schamper
85e1539d0a
Add test
2016-09-06 11:07:50 +02:00
Schamper
c16417248c
Also fix for encoding
2016-09-06 10:37:24 +02:00
Schamper
8702c9357d
Fix decoding when content-encoding: none
2016-09-06 10:24:36 +02:00
Aldo Cortesi
c76d83f749
Merge pull request #1515 from Kriechi/bump-brotli
...
bump brotli dependency
2016-09-05 10:15:23 +12:00
Thomas Kriechbaumer
c0b12da401
change test value
2016-09-04 09:31:45 +02:00
Thomas Kriechbaumer
4c7f99d2be
improve netlib.encoding
2016-09-04 09:31:44 +02:00
Thomas Kriechbaumer
09d60b2fa3
bump brotli dependency
2016-09-04 09:31:44 +02:00
Aldo Cortesi
0483486c62
Merge pull request #1523 from Kriechi/http2
...
improve error handling in http2
2016-09-04 11:02:48 +12:00
Thomas Kriechbaumer
3da9e37d9e
http2: improve connection lost
2016-09-03 16:56:21 +02:00
Thomas Kriechbaumer
d895d6caf0
improve CI
2016-09-03 13:48:28 +02:00
Thomas Kriechbaumer
e273a29a8c
http2: improve kill and cleanup threads
2016-09-03 13:46:54 +02:00
Thomas Kriechbaumer
69b770469e
http2: assemble connect-request from object
2016-09-03 12:31:35 +02:00
Thomas Kriechbaumer
ea2a51d3be
http2: fixes
2016-09-03 11:50:37 +02:00
Thomas Kriechbaumer
5dda9505b6
http2: improve framereader
2016-09-03 10:00:31 +02:00
Thomas Kriechbaumer
043180a8fa
http2: improve closed connection handling
2016-09-03 10:00:31 +02:00
Thomas Kriechbaumer
9b5acc19e2
http2: improve zombie exception handling
2016-09-03 10:00:31 +02:00
Thomas Kriechbaumer
0badb3ec91
cleanup
2016-09-03 10:00:31 +02:00
Aldo Cortesi
b476966a45
Merge pull request #1513 from Kriechi/bump-dep
...
cryptography 1.5
2016-09-03 11:08:53 +12:00
Aldo Cortesi
46143ba004
Merge pull request #1482 from Kriechi/improve-docs
...
update docs: how mitmproxy works
2016-09-03 09:59:54 +12:00
Thomas Kriechbaumer
cf53a93c4c
cleanup travis
2016-09-01 13:37:40 +02:00
Thomas Kriechbaumer
76854b7770
cryptography 1.5
2016-09-01 13:37:40 +02:00
Thomas Kriechbaumer
55d938b880
Merge pull request #1488 from mitmproxy/websockets
...
add WebSockets support
2016-09-01 10:39:57 +02:00
Thomas Kriechbaumer
0d0c2c788d
cleanup tests
2016-09-01 10:12:13 +02:00
Thomas Kriechbaumer
823d8a5da8
add docs for websocket_handshake hook
2016-09-01 09:57:36 +02:00
Thomas Kriechbaumer
cd3d30633f
websockets: update protocol detection
2016-09-01 09:57:35 +02:00
Thomas Kriechbaumer
e5b0dae7e9
add websockets support to mitmproxy
2016-09-01 09:57:18 +02:00
Thomas Kriechbaumer
d12515f84b
websockets: refactor implementation and add tests
2016-09-01 09:56:14 +02:00
Thomas Kriechbaumer
281d779fa3
Merge pull request #1517 from cortesi/httperrs
...
Improve the way we handle upstream errors
2016-09-01 09:55:51 +02:00
Aldo Cortesi
afe34e8b28
Improve the way we handle upstream errors
...
- Don't log a traceback for either HTTP or HTTPS DNS resolution or TCP
connection errors. These are "ordinary" errors, not mitmproxy issues.
- Ensure that the error handler is correctly called for SSL-related protocol
errors.
2016-09-01 12:32:09 +12:00
