Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity
7,172 Commits 1 Branch 67 Tags 50 MiB
f5fafbfcb5
Commit Graph

7172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
f5fafbfcb5 vendoring of wsproto 
https://github.com/python-hyper/wsproto.git
commit 5ea2da61266796666f5de6461aaae22e6b00deba
 2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer
70e1409261 docs++: add websocket PING/PONG 2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer
3cb459d56d docs++: add individual protocol pages 2017-12-12 22:09:46 +01:00
Ujjwal Verma
5214f544e7 Use wsproto for websockets 2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer
130021b76d prepare WebSocket stack to move to wsproto 2017-12-12 22:09:46 +01:00
Maximilian Hils
8e9194c2b4 fix #2529 2017-12-12 16:46:35 +01:00
Maximilian Hils
4d924dcfe2 fix #2651 2017-12-12 15:56:16 +01:00
Aldo Cortesi
472d122c12
Merge pull request #2662 from mhils/pathod-connect-host 
Add host header to pathoc's CONNECT requests
 2017-12-12 21:54:27 +13:00
Aldo Cortesi
25cf3db658
Merge pull request #2661 from mhils/browser-win 
Fix browser addon on Windows
 2017-12-12 09:10:05 +13:00
Maximilian Hils
7f8a598097 add host header to pathoc's CONNECT requests 
This is required by the new HTTP RFCs.
 2017-12-11 20:20:03 +01:00
Aldo Cortesi
4912920573
Merge branch 'master' into browser-win 2017-12-12 08:03:09 +13:00
Thomas Kriechbaumer
b09c28d8a6
[requires.io] dependency update on master branch (#2637) 2017-12-11 17:04:33 +01:00
Maximilian Hils
7654ad2d31 fix browser addon on Windows 2017-12-11 10:46:55 +01:00
Aldo Cortesi
b8cbb4dce8 commands: verify command function signatures before call (#2659) 
Fixes #2652, and many other possible crashes on user input.
 2017-12-11 10:03:07 +01:00
Aldo Cortesi
472a740440
Merge pull request #2656 from cortesi/browseraddon 
browser addon: start an isolated browser attached to the proxy
 2017-12-11 09:13:30 +13:00
Aldo Cortesi
aeefcd08a4 browser addon: start an isolated browser attached to the proxy 
A simple addon that starts an instance of Chrome attached to the current
proxy. The instance is isolated in its own user data directory, and addons are
turned off.

Future work:

- I wasn't able to test the Windows executable path - a Windows dev should
confirm this for us.
- In future it would be nice to support other browsers like Firefox.
 2017-12-10 18:26:24 +13:00
Suraj Tripathi
5067438ec1 Bug in expected_http_body_size fix (#2642) 
fixes #2618
 2017-11-27 19:01:32 +01:00
Matthew Shao
46901d1d55 Fix #2635, mitmdump does not apply filter to saved data. (#2636) 2017-11-22 14:26:20 +11:00
Maximilian Hils
168c72a55f
Merge pull request #2621 from mhils/clientreplay 
Improve Clientreplay
 2017-11-16 18:33:08 +11:00
Thomas Kriechbaumer
59af6af0f7
[requires.io] dependency update on master branch (#2629) 2017-11-15 12:56:38 +01:00
Thomas Kriechbaumer
58c330e7f1
Merge pull request #2626 from mitmproxy/requires-io-master 
[requires.io] dependency update on master branch
 2017-11-11 11:47:02 +01:00
requires.io
d00804656d [requires.io] dependency update 2017-11-10 21:44:26 +01:00
Thomas Kriechbaumer
68c259293e
[requires.io] dependency update on master branch (#2623) 2017-11-10 11:14:41 +01:00
Maximilian Hils
4a2a718bc2 improve clientreplay addon 
- always refresh UI after flow is finished (refs #2616)
 - count currently active replay
 - make replay thread daemonic so that users can exit mitmproxy
   if replay hangs. This is not perfect yet, but vastly better
   than how it has been.
 2017-11-07 11:49:12 +01:00
Maximilian Hils
e6e28c2ac3 fix revert of duplicated flows 2017-11-06 15:24:54 +01:00
Maximilian Hils
4cb96dedd0
Merge pull request #2619 from mhils/issue-2617 
Fix #2617
 2017-11-06 11:23:16 +01:00
Maximilian Hils
7e5eea1929 fix re-use of serverconnection source address 
this previously made it impossible to redirect requests from example.com to localhost,
as we still tried to bind to the external interface.
 2017-11-03 17:32:47 +01:00
Maximilian Hils
c7d8b7d6a7 fix #2617 2017-11-03 16:45:36 +01:00
Thomas Kriechbaumer
1d55d241f8
Merge pull request #2615 from Kriechi/bump-flake 
bump flake8
 2017-10-31 11:16:42 +01:00
Thomas Kriechbaumer
80a8eaa708 bump flake8 
closes #2601
 2017-10-31 10:58:38 +01:00
Maximilian Hils
731b40ce0f
Merge pull request #2608 from mhils/web 
[web] minor improvements, move options editor
 2017-10-29 15:01:50 +01:00
Maximilian Hils
b32dff7520 Merge pull request #2610 from mhils/log-threadsafe 
Make master.add_log threadsafe
 2017-10-26 21:55:06 +02:00
Maximilian Hils
7314081b82 make safecall threadsafe. 2017-10-26 21:43:59 +02:00
Maximilian Hils
9d514330ca [web] adjust tests 2017-10-26 16:34:24 +02:00
Maximilian Hils
c2401e35f4 [web] move options editor from file menu to options menu 
ultimately we probably want to open the options editor immediately if someone presses "Options".
This still requires us to

  1. have a nicer editors for common settings.
  2. Add a "view event log" button somewhere else,
     for example in the footer.

For now, the options editor is marked as beta, as there are some options you
clearly do not want to edit (e.g. wfile).
 2017-10-25 15:57:21 +02:00
Maximilian Hils
42895f4fec [web] minor fixes and cleanup 2017-10-25 15:25:41 +02:00
Maximilian Hils
f870ccd949 [web] remove prompt 2017-10-25 14:00:33 +02:00
Maximilian Hils
51d3fb8ea1 [web] minor fixes 2017-10-25 13:35:22 +02:00
Maximilian Hils
01f28bbccb [web] update to react 16.0 2017-10-25 13:35:15 +02:00
Maximilian Hils
671b012e38 re-add discourse link in issue template 2017-10-25 10:59:51 +02:00
Maximilian Hils
fdd6bd8277 Merge pull request #2606 from mhils/issue-2563 
Fix #2563
 2017-10-25 10:20:09 +02:00
Maximilian Hils
4a6d838ecc fix #2563 2017-10-24 23:27:16 +02:00
Maximilian Hils
1f3fec2a3e remove old dntree implementation 2017-10-24 23:13:42 +02:00
Maximilian Hils
45145ed08b Merge pull request #2602 from mhils/simplify-version 
Simplify version output
 2017-10-24 15:21:37 +02:00
Maximilian Hils
964eadeacf Merge pull request #2603 from mhils/wsl 
Fix urwid display on WSL
 2017-10-24 14:36:46 +02:00
Maximilian Hils
a5d74356dd simplify version output 2017-10-24 14:33:56 +02:00
Maximilian Hils
c7d14ef4e5 Fix AppVeyor builds (#2604) 2017-10-24 00:20:05 +02:00
Maximilian Hils
3d66ebd526 fix urwid display on WSL 2017-10-23 22:49:50 +02:00
Thomas Kriechbaumer
569d275d76 [requires.io] dependency update on master branch (#2586) 2017-10-22 18:06:44 +02:00
Maximilian Hils
f31d5dc3eb Merge pull request #2591 from ddworken/master 
Added scanning for CSS injection and iframe injection to XSS scanner
 2017-10-22 18:02:28 +02:00