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

7759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
9979be6487 fix py36/37 escaping issues 
closes #3122

https://bugs.python.org/issue16285
https://bugs.python.org/issue12910
21024f0662
 2018-05-14 10:41:46 +02:00
Thomas Kriechbaumer
6478523913 test on Python 3.7-dev 2018-05-13 09:56:32 +02:00
Aldo Cortesi
7fde02ac90
Merge pull request #3117 from cortesi/morefixes 
More misc fixes
 2018-05-12 14:41:23 +12:00
Aldo Cortesi
58ff51da10 command: handle string without terminal escaped char 
Fixes #2810
 2018-05-12 14:02:20 +12:00
Aldo Cortesi
449b8b383d controller: add mysteriously missing comment portion 
Thanks to @tran-tien-dat
 2018-05-12 13:52:15 +12:00
Aldo Cortesi
4b4d97412b clientreplay: don't restrict outbound replay address to listen host 
Fixes #2647
 2018-05-12 13:38:15 +12:00
Aldo Cortesi
2db0245233
Merge pull request #3116 from cortesi/fixes 
Misc fixes
 2018-05-12 13:32:57 +12:00
Aldo Cortesi
94428b2ffd script: tweak explicit command invocation 2018-05-12 13:14:26 +12:00
Aldo Cortesi
33eba29d1e tcp: handle EINVAL from closed connections 
Fixes #2771
 2018-05-12 12:36:31 +12:00
Aldo Cortesi
88fe26997c script: revamp ephemeral script running 
Fixes 2838
 2018-05-12 12:35:24 +12:00
Aldo Cortesi
45c435592f
Merge pull request #3115 from cortesi/cmds 
commands fixes and improvements
 2018-05-12 11:46:28 +12:00
Aldo Cortesi
260f729092 Commit taken messages on kill 
Fixes 2879
 2018-05-12 11:39:44 +12:00
Aldo Cortesi
ac7880132e
Merge pull request #3028 from madt1m/Fix#3011 
Fix buggy keybindings in Data Viewer overlays
 2018-05-12 11:24:32 +12:00
Aldo Cortesi
9f83b6b944 script: invoke addons as script with exception handler 
Fixes #2837
 2018-05-12 11:16:19 +12:00
Aldo Cortesi
a70b50fe3a console: implement positions for flow list walker 
This papers over an urwid bug until they fix it.

fixes #2973
 2018-05-12 11:10:33 +12:00
Aldo Cortesi
482043cdcf commands: handle type errors on startup 
fixes #3088
fixes #2787
 2018-05-12 11:10:14 +12:00
Aldo Cortesi
ce6029b435
Merge pull request #3114 from Kriechi/fix-tcp-example 
fix tcp example
 2018-05-12 10:44:26 +12:00
Aldo Cortesi
30d11a5674
Merge pull request #3110 from cortesi/misc 
Changelog, change meaning of --conf flag
 2018-05-12 10:43:48 +12:00
Aldo Cortesi
6dff8c58ad commands: if no explicit return type is specified, assume None 
This is going to be a super common error for addon authors, so we might as well
handle it.
 2018-05-12 10:15:08 +12:00
Thomas Kriechbaumer
e305a320a2 fix tcp example 2018-05-11 11:58:01 +02:00
Aldo Cortesi
75d30212c2 console: fix bug that caused addon commands not to appear in command list 2018-05-11 15:00:32 +12:00
Aldo Cortesi
9a53525b83 Remove MANIFEST.in 
We don't use sdist.
 2018-05-10 17:47:30 +12:00
Aldo Cortesi
be27bde4d4 cmdline: --conf -> --confdir, which specifies the config directory, not the yaml options file 
This is a much more sensible behaviour for the flag.
 2018-05-10 17:35:37 +12:00
Aldo Cortesi
ab89079c65
Merge pull request #3109 from cortesi/kmap 
console keybindings: define a yaml format, load CONFDIR/keys.yaml on startup
 2018-05-10 17:30:49 +12:00
Aldo Cortesi
1f02354196 Initial changelog for 4.0 2018-05-10 17:23:29 +12:00
Aldo Cortesi
8c63a8818d keymap: read keys from CONFDIR/keys.yaml by default 2018-05-10 16:06:52 +12:00
Aldo Cortesi
9830e5b597 cadir -> confdir 
We store a lot more than just the CAs in our configuration directory. Clarify
the option name.
 2018-05-10 11:40:33 +12:00
Aldo Cortesi
3438912236 console keybindings: define YAML-based format for console key binding persistence 2018-05-10 11:30:51 +12:00
Maximilian Hils
0c101a4bcc
Merge pull request #3106 from cortesi/noprint 
Ditch the addon stdout wrapper
 2018-05-08 15:24:02 +02:00
Thomas Kriechbaumer
ad74c18f74
Merge pull request #3107 from 0xHJK/master 
add har_dump example cmdline invocation
 2018-05-08 11:07:05 +02:00
0xHJK
a46a317dca har_dump example cmdline invocation 2018-05-08 16:27:56 +08:00
Aldo Cortesi
7d9b626d2e clientplayback: try to fix flaky replay test 2018-05-08 16:33:41 +12:00
Aldo Cortesi
8a682d3532
Merge pull request #3105 from cortesi/opts 
Add deferred options, tweak benchmarks, document done event
 2018-05-08 14:53:56 +12:00
Aldo Cortesi
af1a4ffdcd Ditch the addon stdout wrapper 
This results in a 30% improvement in our core request throughput.

Fixes #3102
 2018-05-08 14:26:41 +12:00
Aldo Cortesi
717fbaa990 optmanager: refactor for coverage and clarity 2018-05-08 14:24:41 +12:00
Aldo Cortesi
76a7883c8b events: document behaviour of done() more fully 2018-05-08 11:09:10 +12:00
Aldo Cortesi
1b0eed19d1 benchmarks: quick-run scripts for mitmproxy and mitmdump 2018-05-08 11:08:37 +12:00
Aldo Cortesi
9b51393b6d benchmark: keep track of requests/responses seen by proxy 2018-05-08 11:00:20 +12:00
Aldo Cortesi
f7d7e31f06 options: add the concept of deferred settings 
We've had a perpetual sequencing problem with addon startup. Users need to be
able to specify options to addons on the command-line, before addons are
actually loaded. This is only exacerbated with the new async core, where load
order can't be relied on.

This patch introduces deferred options. Options passed with "--set" on the
command line are deferred if they are unknown, and are automatically applied by
the addon manager once matching addons are registered and their options are defined.
 2018-05-08 10:56:00 +12:00
Aldo Cortesi
7ec9c5524f
Merge pull request #3104 from cortesi/cmdcall 
Zap some commands.call invocations that were missed in the rename
 2018-05-07 19:19:51 +12:00
Aldo Cortesi
39e5f94cf1 Zap some commands.call invocations that were missed in the rename 2018-05-07 18:46:17 +12:00
Thomas Kriechbaumer
2a0da34a0c
Merge pull request #3103 from mhils/fix-processing 
Remove leftover processing_complete
 2018-05-06 18:37:24 +02:00
Maximilian Hils
752a367436 remove leftover processing_complete 2018-05-06 15:47:12 +02:00
Thomas Kriechbaumer
44d788ff96
Merge pull request #2986 from miheerdew/patch-1 
Workaround for MacOS transparent proxy
 2018-05-06 12:24:24 +02:00
Thomas Kriechbaumer
eecb576aff
Merge pull request #3100 from cortesi/block 
Remove allowremote addon, add an improved take called block
 2018-05-06 11:40:46 +02:00
Aldo Cortesi
60acbd79b9 Remove allowremote addon, add an improved take called block 
We now have two options: block_global blocks global networks, block_private
blocks private networks. The block_global option is true by default, and
block_private is false by default. The addon name is "block" so the options are
correctly prefixed.

Also make option documentation precise, reduce verbosity of logs.
 2018-05-06 12:43:25 +12:00
Aldo Cortesi
c53bc39c95
Merge pull request #3099 from Kriechi/fix-3024 
fix #3024
 2018-05-06 11:27:14 +12:00
Thomas Kriechbaumer
54e2daa21e fix #3024 2018-05-05 14:38:02 +02:00
Thomas Kriechbaumer
b4f618e801
Merge pull request #3098 from drzax/patch-1 
Fix typo in addons-overview.md
 2018-05-05 12:34:22 +02:00
Simon Elvery
48ba4eb737
Fix typo in addons-overview.md 2018-05-05 20:24:49 +10:00