Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity
7,208 Commits 1 Branch 67 Tags 50 MiB
ea891b43f8
Commit Graph

7208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
92ab90bb89 Merge pull request #2527 from mitmproxy/revert-2511-master 
Revert "Fix version conflict"
 2017-08-15 16:53:59 +02:00
Thomas Kriechbaumer
68839077b6 Revert "Fix version conflict" 2017-08-15 16:32:18 +02:00
Matthew Shao
6560b0dcdb [web] Change the api routing and minor fix. 2017-08-15 22:21:08 +08:00
Thomas Kriechbaumer
38237f8a0f Merge pull request #2525 from mhils/nicer-install 
docs: simplify install instructions
 2017-08-15 14:24:05 +02:00
Maximilian Hils
ad42e9ce96 docs: simplify install instructions 
We only need pip3 now on all OSes as cryptography now ships wheels on Linux 🎉.
Also remove `pip3 install --user` recommendation because that won't end up on $PATH.
 2017-08-15 14:19:51 +02:00
Matthew Shao
cbdddefcc8 [web] change the path name like _flows to flows.json. 2017-08-14 12:21:11 +08:00
Maximilian Hils
96c8c75ce6 Merge pull request #2519 from titeuf87/no_ipv6_fallback_fix 
Fallback correctly to ipv4 when ipv6 is not supported
 2017-08-13 23:14:20 +02:00
Simon Vermeersch
38fe2f244a Fallback correctly to ipv4 when ipv6 is not supported 2017-08-13 14:00:42 +02:00
Matthew Shao
7d92cdf3bb [web] Hide ContentViewOptions in static mode 2017-08-12 19:38:52 +08:00
Matthew Shao
e925015d10 [web] Update fetch api to suite the static mode. 2017-08-12 19:36:43 +08:00
Matthew Shao
1b129b5099 [web] Update static_viewer addon. 
When the addon is triggered, we first copy the static resource files to
the output dir, then load the `flows` file and dump json files.
 2017-08-12 19:25:56 +08:00
Maximilian Hils
b7c02b9eb5 Merge pull request #2511 from ujjwal96/master 
Fix version conflict
 2017-08-10 14:42:08 +02:00
Ujjwal Verma
35c267b9bf Fix version conflict 2017-08-10 16:50:20 +05:30
Matthew Shao
bf0834051d [web] Attempt of static viewer addon. 2017-08-10 14:39:19 +08:00
Matthew Shao
3976ea0158 [web] Import static.js in index.html 
This is necessary after we introducing the static mode, or it will raise
an "undefined" exception.
 2017-08-10 14:37:19 +08:00
Maximilian Hils
bb0ab45348 Merge pull request #2509 from ujjwal96/compat 
Fixes #2495
 2017-08-09 23:25:10 +02:00
Ujjwal Verma
a4048c8871 Fixes #2495 2017-08-10 02:34:03 +05:30
Maximilian Hils
802e8cb341 Merge pull request #2504 from MatthewShao/static-viewer 
[WIP] [web] Static viewer for mitmweb
 2017-08-08 16:59:07 +02:00
Matthew Shao
0ad552ead4 [web] Minor fixes. 2017-08-08 22:46:47 +08:00
Matthew Shao
32957976f5 [web] Remove activeFetches and onMessage in StaticBackend. 2017-08-08 22:33:41 +08:00
Matthew Shao
dd43722c18 [web] Remove MITMWEB_STATIC var in tests, and update them. 2017-08-08 21:59:07 +08:00
Matthew Shao
756b734ae2 [web] update HideInStatic and some components. 2017-08-08 21:57:42 +08:00
Matthew Shao
07b3900ac5 [web] Update react,react-dom,react-test-renderer to 16-beta.3 2017-08-08 21:55:57 +08:00
Matthew Shao
56781a0b08 Add test for AddonManager.__contains__ 2017-08-08 19:43:51 +08:00
Maximilian Hils
6d9b5b0c06 Merge pull request #2502 from mhils/optmanager 
Fix optmanager equality check and deepcopy
 2017-08-07 16:22:33 +02:00
Maximilian Hils
cf135eab44 Merge pull request #2503 from ujjwal96/options 
Improve options UX
 2017-08-07 16:22:17 +02:00
Matthew Shao
c6385e81c8 [web] Update tests to ensure they won't be disturbed by static mode 2017-08-07 11:08:19 +08:00
Matthew Shao
f7b494ccf2 [web] Add HideInStatic Component 
HideInStaic compoent will check the MITMWEB_STATIC var, and hide the
responsive components in static mode.
 2017-08-07 11:05:02 +08:00
Matthew Shao
94a0b82cee [web] Add static backend. 2017-08-07 10:57:12 +08:00
Matthew Shao
27f4c6d394 [web] Add static.js to index.html, containing MITMWEB_STATIC var. 2017-08-07 10:53:13 +08:00
Ujjwal Verma
3d79ea4358 Improve options UX 2017-08-07 00:11:44 +05:30
Maximilian Hils
aa8969b240 Merge pull request #2492 from mhils/addon-contains 
Gracefully handle errors during script load
 2017-08-05 20:04:23 +02:00
Matthew Shao
43e5647cef Add console_focus_follow in view and eventlog addons. 2017-08-05 11:30:12 +08:00
Matthew Shao
cd222ff4f9 Fix lint. 2017-08-05 09:17:38 +08:00
Maximilian Hils
304016f137 Merge pull request #2501 from mhils/toxx 
Use Python 3.6 where possible
 2017-08-05 02:34:51 +02:00
Maximilian Hils
e30750bf9e fix optmanager equality check and deepcopy 2017-08-05 02:34:00 +02:00
Maximilian Hils
7b1378f373 use py36 where possible 2017-08-05 01:44:11 +02:00
Maximilian Hils
a9f169ca86 gracefully handle errors during script load 2017-08-05 01:40:04 +02:00
Maximilian Hils
819a85df74 Merge pull request #2500 from mitmproxy/add-http2-switch 
re-add --http2 switch
 2017-08-05 01:39:30 +02:00
Maximilian Hils
47f5ca41c5 re-add --http2 switch 
I think this is one of the more important ones we should not omit, e.g. as `--no-http2` is still needed for scripted redirection.
 2017-08-05 00:40:49 +02:00
Thomas Kriechbaumer
cfd8f8b519 Merge pull request #2494 from ujjwal96/intercept-toggle 
Improve intercept toggle
 2017-08-04 16:38:30 +02:00
Matthew Shao
ca2126b385 Add consoleaddons.common_options to suggest dependency. 2017-08-04 10:59:42 +08:00
Maximilian Hils
e0ca9c3a98 Merge pull request #2499 from mhils/rawtcp 
Re-add rawtcp mode.
 2017-08-04 04:02:12 +02:00
Maximilian Hils
9ca6785d40 Revert "Remove promotion to raw TCP based on heuristics" 
This reverts commit fbaade4298 for the following reasons:

 - The commit only removed the proxy logic, while keeping the corresponding command line
   options etc. intact. That is quite confusing.
 - The switch is (and has been) off-by-default and the option help now clearly states
   that this needs to be used with caution. I'd argue that constrains the potential danger.
 - I have a specific use case that needs this, and implementing it as an addon is rather
   difficult at the moment.

That being said, this revert is a rather pragmatic temporary decision,
the functionality should clearly be made more explicit and protocol switching should
be moved to an addon.
 2017-08-03 16:46:53 +02:00
Maximilian Hils
1f98c7be4f improve docstring for rawtcp 2017-08-03 16:44:17 +02:00
Matthew Shao
b42f5bcb9d Update taddon and tests. 2017-08-03 18:57:54 +08:00
Thomas Kriechbaumer
79354235a6 Merge pull request #2475 from mitmproxy/requires-io-master 
[requires.io] dependency update on master branch
 2017-08-02 21:27:19 +02:00
requires.io
da38e36ea0 [requires.io] dependency update 2017-08-02 20:40:40 +02:00
Thomas Kriechbaumer
70a501e917 Merge pull request #2496 from Kriechi/bump-pyasn 
bump pyasn
 2017-08-02 20:35:50 +02:00
Thomas Kriechbaumer
8b0a570f4c bump dependency 2017-08-02 19:53:32 +02:00