Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity
5,437 Commits 1 Branch 67 Tags 50 MiB
ba84248910
Commit Graph

5437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
a3329c5a80 scripts: cut traceback properly, fix #1467 2016-09-22 02:03:12 -07:00
Maximilian Hils
f59ae4a57f Merge branch 'fully_transparent' 2016-09-22 01:58:08 -07:00
Maximilian Hils
e5b79a6d72 minor cleanup 2016-09-22 01:58:01 -07:00
smill@cuckoo.sh
ec588f8822 Removed obsolete code. 2016-09-22 08:51:17 +00:00
smill@cuckoo.sh
ab546a7348 Introduced comment regarding socket manipulation through the server_conn stub. 2016-09-22 08:29:07 +00:00
smill@cuckoo.sh
3962a11575 Commented on IP_TRANSPARENT and changed an exception type. 2016-09-22 08:15:34 +00:00
Maximilian Hils
0dbb7033ee ci: enable verbose test logging by default 2016-09-21 22:42:01 -07:00
Maximilian Hils
dbc6344c8c Merge pull request #1522 from chhsiao90/dump-ready-#1505 
Notify when proxy server started
 2016-09-21 22:26:59 -07:00
chhsiao90
d044786ac8 Notify when proxy server started 2016-09-22 13:23:30 +08:00
Maximilian Hils
e4ae35dabb fix mitmdump error logging, fix #1549 (#1565) 
This commit replaces the logging statement introduced in
afe34e8b28 with the previous implementation
where an exception is raised. ProtocolExceptions are normally logged as regular warnings,
achieving the same effect for the end user. However, this retains the full stack trace
for debug-level logging, which makes the analysis of client errors considerably easier.
 2016-09-21 21:49:32 -07:00
Maximilian Hils
9e0b935fa2 Merge pull request #1564 from mhils/issue-1554 
Fix Response.make content-length header
 2016-09-21 21:49:14 -07:00
Maximilian Hils
d5427c7298 Merge pull request #1563 from mhils/fix-1562 
Raise TypeError on invalid header assignment, fix #1562
 2016-09-21 21:00:07 -07:00
Maximilian Hils
f1d519d7c4 fix pathod http2 response creation 2016-09-21 20:36:26 -07:00
Maximilian Hils
0b532789a0 fix Response.make content-length header 2016-09-21 20:34:01 -07:00
Maximilian Hils
770936f1f9 raise TypeError on invalid header assignment, fix #1562 2016-09-21 19:21:32 -07:00
Maximilian Hils
1e5a5b03f8 Merge pull request #1509 from arjun23496/regex_star_mod 
Fixes #1471 - Change .* to match entire body
 2016-09-21 18:13:14 -07:00
Thomas Kriechbaumer
7d4ce1da98 Merge pull request #1559 from dwfreed/patch-1 
console/options: kill -> replay_kill_extra
 2016-09-18 12:49:00 +02:00
Doug Freed
3130d58267 console/options: kill -> replay_kill_extra 
@cortesi renamed the kill option to replay_kill_extra in b0213a2, but
missed a usage here because it was in a string. This fixes opening the
options menu in console.
 2016-09-17 20:10:08 -04:00
Thomas Kriechbaumer
d5c7f78b24 Merge pull request #1558 from vulnminer/patch-1 
Update app.py
 2016-09-17 18:36:41 +02:00
vulnminer
e1f021d732 Update app.py 2016-09-17 18:45:37 +03:00
smill
2d4e4eafe1 Fixed restructuredText error. 2016-09-15 18:54:55 +00:00
smill
7cd8456445 Added a description to the shim loader, and renamed it. 2016-09-14 19:25:53 +00:00
smill
83a28021ad Fixed travis-ci issues. 2016-09-14 19:11:57 +00:00
smill
9429f1bc7b Prevent crash in case of a connection timeout. 2016-09-14 19:10:13 +00:00
Aldo Cortesi
f17c0fdac6 Merge pull request #1552 from cortesi/creplay 
revamp client replay
 2016-09-12 12:29:58 +12:00
Aldo Cortesi
f2e010ebc0 Misc cleanups 2016-09-12 11:27:30 +12:00
Thomas Kriechbaumer
7ecc966d51 Merge pull request #1553 from Kriechi/bump 
bump brotlipy
 2016-09-11 17:14:03 +02:00
Thomas Kriechbaumer
0166f90cbe bump brotlipy 2016-09-11 16:28:07 +02:00
Aldo Cortesi
97b15b58b7 console: update flow list when state is modified 2016-09-11 20:06:21 +12:00
Aldo Cortesi
34e17efaa0 Remove obsolete exceptions.ScriptException 2016-09-11 20:02:05 +12:00
Aldo Cortesi
cfb943bfdd Redesign client replay 
- Move to an addon
- Use a much simpler synchronisation mechanism
 2016-09-11 20:00:34 +12: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
arjun23496
2e1265f75e Changed filter to match replacement for DOTALL 2016-09-09 10:46:16 +05:30
arjun23496
f6ed06bf16 Convert to flags=value for future compatibility 2016-09-09 10:39:28 +05:30
arjun23496
79bbc41cb4 Fixes #1471 - Change .* to match entire body 2016-09-09 10:39:28 +05:30
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