Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 16:17:49 +00:00
Code Issues Projects Releases Wiki Activity
7,279 Commits 1 Branch 67 Tags 50 MiB
fc3edd5d8b
Commit Graph

7279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ujjwal Verma
97abb0a656 update for pyasn1 0.3 2017-08-02 19:52:49 +02:00
Ujjwal Verma
7c1d20d343 Improve intercept toggle 2017-08-02 18:01:03 +05:30
Maximilian Hils
69bc145228 Merge pull request #2493 from Kriechi/improve-tests 
improve proxyauth tests
 2017-08-02 12:47:50 +02:00
Thomas Kriechbaumer
0c5b56f7ce improve proxyauth tests 2017-08-02 10:03:41 +02:00
Maximilian Hils
f55df034e6 Merge pull request #2490 from mitmproxy/issue-2334 
fix #2334
 2017-08-01 23:39:37 +02:00
Maximilian Hils
422c6de6cc fix mitmproxy invocation 2017-08-01 23:15:57 +02:00
Maximilian Hils
daa24b77b4 Update proxyauth.py 
fix #2334
 2017-08-01 21:48:00 +02:00
Matthew Shao
ddffcf83ec Update tests. 2017-08-01 23:01:58 +08:00
Matthew Shao
7bbd89b121 Change console_order and console_order_reversed options 
Change console_order and console_order_reversed to view_order and
view_order_reversed, and move them to the view addon.
 2017-08-01 22:58:27 +08:00
Maximilian Hils
e8f836425a add LogEntry.__eq__ 2017-08-01 13:42:37 +02:00
Matthew Shao
e533d02d98 Remove redundant comment. 2017-08-01 19:32:49 +08:00
Matthew Shao
f078808fc6 Adjust --verbose options to string type. 2017-08-01 09:01:31 +08:00
Maximilian Hils
864073f700 Merge pull request #2487 from mhils/no-option-processing 
Remove OptManager._processed
 2017-08-01 02:54:33 +02:00
Matthew Shao
2ceaa5c9ef Update tests. 2017-08-01 08:42:51 +08:00
Matthew Shao
2aa97c9b75 Move console-relatived options into their own addons. 2017-08-01 08:41:57 +08:00
Maximilian Hils
d02c825427 Merge pull request #2488 from MatthewShao/options-into-own-addon 
Fix minor typing mistake in mitmproxy/tools/main.py
 2017-07-31 15:53:51 +02:00
Matthew Shao
214d87134b Fix minor typing mistake. 2017-07-31 21:44:07 +08:00
Maximilian Hils
1b09002edc remove OptManager._processed 
Instead of having the core addon do postprocessing on body_size_limit,
we add a cache to the parsing function. First, this avoids any potential issues
with options and _processed getting out of sync. As anecdotal evidence,
the previous implementation did not clear _processed when body_size_limit was
reset to None. Second, it achieves the same end result without introducing a new
concept of a "_processed" scratch space. Third, it works even if addons aren't present,
and does not require workarounds as previously present in test_http2.py.

refs https://github.com/mitmproxy/mitmproxy/pull/2484#pullrequestreview-53101507
 2017-07-31 01:58:31 +02:00
Maximilian Hils
018668618e Merge pull request #2484 from mhils/options-into-own-addon 
Enable tool-specific options
 2017-07-31 00:01:15 +02:00
Maximilian Hils
826513ef27 minor fixes 2017-07-30 23:50:34 +02:00
Maximilian Hils
f844c68e2e Merge pull request #2485 from mhils/silent-option-redeclaration 
Make option redeclaration silent if signature is the same
 2017-07-30 03:47:25 +02:00
Maximilian Hils
7594dac94b Merge pull request #2482 from mhils/pure-script-load 
Make load_script pure
 2017-07-30 02:33:00 +02:00
Maximilian Hils
3c45895cec move isatty check to a better place 2017-07-30 02:32:35 +02:00
Maximilian Hils
6a41122990 make option redeclaration silent if signature is the same 2017-07-30 02:14:44 +02:00
Maximilian Hils
ecc01b0f02 Merge pull request #2483 from mhils/ignore-imports-with-hook-names 
Gracefully ignore imports with hook names
 2017-07-30 02:04:36 +02:00
Maximilian Hils
3bd675daa4 Merge pull request #2481 from mhils/option-typehints 
Add type hints for options.
 2017-07-30 02:04:02 +02:00
Maximilian Hils
3b8e3e4aa9 make load_script pure 2017-07-30 02:03:26 +02:00
Maximilian Hils
10ef2866ca fix tflow.js creation on Windows. 
Keep lineendings consistent so that running the tests does not produce
a different file on Windows.
 2017-07-30 02:01:28 +02:00
Maximilian Hils
3612e7ca76 fix tool-specific cmdline 
before this commit, all tools only exposed mitmdump cmdline arguments,
as run() contained a simple `cmdline.mitmdump()` invocation.
This fixes this, and also makes it possible to have cmdline arguments for
tool-specific options.
 2017-07-30 01:49:56 +02:00