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
5,155 Commits 1 Branch 67 Tags 50 MiB
63f64cd660
Commit Graph

5155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldo Cortesi
9c9d28d068 Remove proxy.config.process_proxy_options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
ef380917a8 ProxyConf: adapt mitmproxy console, ditch tcp|host filter attrs on flow.master 2016-07-19 16:25:09 +12:00
Aldo Cortesi
be081a24bc ProxyConf: auth_* into Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
5cfe783b6c ProxyConfig: http2, rawtcp, no_upstream_cert -> Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
fb6e9c44c8 ProxyConfig: ciphers_client and ciphers_server -> Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
26fa88a338 ProxyConfig: Refactor to move verification mode checks into configure 2016-07-19 16:25:09 +12:00
Aldo Cortesi
77bf092bcd ProxyConfig: tcp_hosts and ignore_hosts to Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
98bf544664 Regularize naming of upstream_trusted_ca* options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
0a3839375d ProxyConfig: various SSL options to Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
f81c53f9bb Fix ca directory creation 2016-07-19 16:25:09 +12:00
Aldo Cortesi
78e8159007 config.parse_server_spec shouldn't pass byts to tcp.Address 2016-07-19 16:25:09 +12:00
Aldo Cortesi
f9622074cc ProxyConfig: mode, upstream_server and upstream_auth to Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
bd733e1232 Handle command-line argument errors properly 
At some point we stopped handling exceptions from get_common_options properly.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi
d2268ddb1e ProxyConfig: --body-size-limit to Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
f24f8ce971 ProxyConfig: --cert to options 
Also incidentally improve handling of invalid certificate formats.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi
856e1c2ba9 Move clientcers & cadir to Options 
Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change
event.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi
b1b1a1b9cf ProxyConfig: cadir to options 2016-07-19 16:25:09 +12:00
Aldo Cortesi
6908dc4d90 ProxyConfig refactor 
Step two of frog boiling: move listening address and port into options. This is
the hard bit, because it touches the test suite so deeply.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi
9bc1514aef Unify proxy config and options 
This is step 1 in a gradual "boiling frog" strategy. Decorate ProxyConfig
with an Options object.
 2016-07-19 16:25:09 +12:00
Maximilian Hils
5034a6232c web: remove SELECT_RELATIVE 2016-07-18 21:23:50 -07:00
Maximilian Hils
859bb8c99f Merge remote-tracking branch 'jason/ui' 2016-07-18 20:59:17 -07:00
Maximilian Hils
00b0d47db6 Merge pull request #1365 from Kriechi/fix-1333 
add Windows py3 builds
 2016-07-18 20:48:46 -07:00
Aldo Cortesi
9869cb617e Merge pull request #1378 from cortesi/cleanups 
Console-related cleanups
 2016-07-18 11:29:18 +12:00
Aldo Cortesi
e9865800a8 Console options cleanup 
Use setters, use togglers, move more things out of master
 2016-07-18 10:31:34 +12:00
Aldo Cortesi
ff80c7b618 file -> open throughout console 2016-07-18 10:08:05 +12:00
Aldo Cortesi
f9e4249499 Add a toggller helper to Options, start using it in mitmproxy console 2016-07-18 10:03:10 +12:00
Thomas Kriechbaumer
7b57c2948e cleanup 2016-07-17 18:17:35 +02:00
Thomas Kriechbaumer
d9021f8505 http2: coverage++ 2016-07-17 18:07:02 +02:00
Aldo Cortesi
6c86d7bd4f Merge pull request #1372 from cortesi/setheaders 
setheaders -> addon
 2016-07-17 18:49:41 +12:00
Aldo Cortesi
216e38d437 setheaders -> addon 2016-07-17 18:41:14 +12:00
Aldo Cortesi
61d6345f22 Merge pull request #1371 from cortesi/cleancode 
Remove old ReplaceHooks code
 2016-07-17 17:25:06 +12:00
Aldo Cortesi
821b97c19c Remove old ReplaceHooks code 2016-07-17 16:25:42 +12:00
Aldo Cortesi
a26cc75aab Merge pull request #1370 from cortesi/filestreamer 
Some work on stream-to-file
 2016-07-17 16:20:41 +12:00
Aldo Cortesi
9bf1d300d8 Some work on stream-to-file 
- stream -> filestreamer throughout
- move active_flows set into FileStreamer addon
 2016-07-17 16:07:29 +12:00
Aldo Cortesi
fb45d59c02 Merge pull request #1367 from Kriechi/fix-1366 
fix-1366
 2016-07-17 15:06:58 +12:00
Aldo Cortesi
15c7528faf Merge pull request #1369 from cortesi/dumper 
Extract console dump functionality into an addon
 2016-07-17 14:35:54 +12:00
Aldo Cortesi
08b3af98c2 Merge branch 'master' into dumper 2016-07-17 12:53:14 +12:00
Aldo Cortesi
b5bbeb0ff3 dumper: correctly detect request replay 
Fixes #1361
 2016-07-17 11:11:22 +12:00
Aldo Cortesi
ca7ca8ec24 The "handled" flag on responses should not persist across calls 2016-07-17 11:06:29 +12:00
Aldo Cortesi
11bd911e45 Some mild refactoring of dumper.py 2016-07-17 11:00:36 +12:00
Aldo Cortesi
4bbab72cb2 Merge pull request #1368 from DrakeCaraker/patch-1 
Update gamecenter.rst
 2016-07-17 10:27:07 +12:00
Drake Caraker
2fde1d0b53 Update gamecenter.rst 
Typo fix: changed plist score value from '0' to '55', aligning with the subsequent explanatory text.
 2016-07-16 15:24:56 -07:00
Aldo Cortesi
b0b3b19ad6 Extract console dump functionality into an addon 
This removes all the code that deals with printing flows to screen from dump.py
into a self-contained addon.

- This fixes a bug - by moving dumping into an
addon, we now dump flows AFTER addon transformation, so we can see the changes
made.
- We get dumping "for free" in other places by simply adding the addon. It's
now easy to add dumping to console to mitmweb for debugging and development.
The same goes for external projects that derive from master.
- We also get major benefits in clarity for a frankly hairy part of our
project. Mitmdump is much clearer, and all the hairyness is now isolated for
further refactoring.
 2016-07-17 10:17:02 +12:00
Thomas Kriechbaumer
a32312cecc fix-1366 2016-07-16 18:31:37 +02:00
Thomas Kriechbaumer
da99258168 add Windows py3 builds 
fixes #1333
 2016-07-16 12:08:36 +02:00
Maximilian Hils
f0c15aa09c @mhils can't merge 2016-07-16 00:36:26 -07:00
Maximilian Hils
afc3f6d854 Merge remote-tracking branch 'duffer/tcpflow-filter' 2016-07-16 00:19:01 -07:00
Maximilian Hils
b27d59095d Merge pull request #1306 from mitmproxy/message-body-encoding 
Improve Message Body Encoding
 2016-07-16 00:13:58 -07:00
Aldo Cortesi
903807292b Merge pull request #1363 from cortesi/replace 
replacehooks -> addon
 2016-07-16 18:57:41 +12:00
Maximilian Hils
e6e39ce80f preserve content-type parameter order 2016-07-15 23:46:12 -07:00