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
6,318 Commits 1 Branch 67 Tags 50 MiB
8a734a2613
Commit Graph

6318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Shao
8a734a2613 [web] Fixes the flaw in #2133 2017-03-13 19:34:25 +08:00
Thomas Kriechbaumer
7d5ab70ce3 Merge pull request #2136 from Kriechi/nuke-custom-tmpdir 
nuke tutils.tmpdir, use pytest tmpdir
 2017-03-12 23:27:27 +01:00
Thomas Kriechbaumer
1b045d24bc nuke tutils.tmpdir, use pytest tmpdir 2017-03-12 22:55:22 +01:00
Maximilian Hils
d069ba9da5 Merge pull request #2133 from MatthewShao/jest-dev 
[web] Fixes all existed tests
 2017-03-11 14:48:25 +01:00
Matthew Shao
abcfac3c19 [web] remove node tests on travis 2017-03-11 20:21:03 +08:00
Matthew Shao
523cbb02aa [web] Fixes all existed tests 2017-03-11 18:57:32 +08:00
Matthew Shao
c4e0ea27a1 [web] Fixes stopEdit action in ducks/ui/flow.js 2017-03-11 17:43:55 +08:00
Maximilian Hils
39154e628e Merge pull request #2118 from lymanZerga11/patch-3 
Update proxyauth.py to add proxyauth metadata
 2017-03-11 03:04:38 +01:00
Thomas Kriechbaumer
e9746c5182 Merge pull request #2114 from mitmproxy/fix-websocket-serialization 
make websocket flows serializable
 2017-03-10 21:15:46 +01:00
Thomas Kriechbaumer
49e0f23848 use flow.id to link websocket + handshake flows 2017-03-10 19:38:50 +01:00
Thomas Kriechbaumer
c39b65c06b Merge pull request #2128 from Kriechi/disable-more-h2c 
disable h2c prior knowledge connections
 2017-03-10 19:30:13 +01:00
Maximilian Hils
f3df4855af fix type hints 2017-03-10 19:15:44 +01:00
Maximilian Hils
db40bdca15 Merge pull request #2131 from MatthewShao/jest-dev 
[web] remove the tests for abandoned files.
 2017-03-10 18:21:55 +01:00
Thomas Kriechbaumer
45bf1ff64d disable h2c prior knowledge connections 2017-03-10 11:37:25 +01:00
Matthew Shao
da93525d2e [web] remove the tests for abandoned files. 2017-03-10 08:52:11 +08:00
Thomas Kriechbaumer
b1dd86d7ae make websocket flows serializable 
fixes #2113
 2017-03-09 19:08:59 +01:00
lymanZerga11
8e67c6f512 add tests 2017-03-09 09:01:37 +08:00
lymanZerga11
6d53d08b6c Add tests 2017-03-09 09:01:04 +08:00
Aldo Cortesi
98b5893855 Merge pull request #2100 from cortesi/options 
Options revamp
 2017-03-09 12:27:36 +13:00
Aldo Cortesi
53178f35be Send change event when options are reset 2017-03-09 08:53:36 +13:00
Aldo Cortesi
7ea171de4e Merge remote-tracking branch 'upstream/master' into options 2017-03-09 08:33:25 +13:00
Maximilian Hils
44c3c3ed86 Merge pull request #2124 from mitmproxy/opensuse-docs 
Add install docs for openSUSE
 2017-03-08 20:06:35 +01:00
Maximilian Hils
7bec0c73cf Merge pull request #2121 from mitmproxy/address-leftovers 
fix tcp.Address leftovers
 2017-03-08 20:06:11 +01:00
Thomas Kriechbaumer
69f7ad21fe Merge pull request #2090 from mitmproxy/fix-pathod-header-doc 
pathoc: fix documentation for headers
 2017-03-08 18:21:56 +01:00
Maximilian Hils
ca819fb923 add install docs for openSUSE 2017-03-08 17:42:19 +01:00
Maximilian Hils
ebedd2875f Merge pull request #2117 from MatthewShao/jest-dev 
Add Javascript tests to Travis CI. (#2093)
 2017-03-08 16:54:02 +01:00
Maximilian Hils
927b5707fe fix tcp.Address leftovers 
this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292
 2017-03-08 16:18:34 +01:00
Maximilian Hils
b345f5d432 typing.Type -> type 
`typing.Type` should have been `typing.Type[Any]`,
which in turn is equivalent to `type`
 2017-03-08 15:17:45 +01:00
Maximilian Hils
63179d9751 core -> core_option_validation 
longer, but much clearer for devs who are unfamiliar with the codebase.
 2017-03-08 15:17:07 +01:00
Maximilian Hils
618e0c6265 add type hints 2017-03-08 15:10:06 +01:00
lymanZerga11
716306538f Update proxyauth.py 2017-03-08 13:59:43 +08:00
Matthew Shao
dae7435135 Update .travis.yml 2017-03-08 13:00:09 +08:00
lymanZerga11
cf83cbf2df Update proxyauth.py 2017-03-08 11:34:59 +08:00
Matthew Shao
7ff48b8bec Add javascript tests to Travis CI. (#2093) 2017-03-08 09:57:38 +08:00
Maximilian Hils
f276c7a80d change add_option parameter order 
name, type, value matches natural language ($x is a bool with a default value of $y)
and also matches the python type annotation order of name: type = value
 2017-03-08 00:52:37 +01:00
Maximilian Hils
8707928b16 unify server spec parsing 2017-03-08 00:18:34 +01:00
Aldo Cortesi
f0d6237a96 Merge remote-tracking branch 'upstream/master' into options 2017-03-08 08:22:49 +13:00
Maximilian Hils
cb6240974d Merge pull request #2108 from ayamamori/patch-1 
Update tcpproxy.rst
 2017-03-07 14:53:27 +01:00
Maximilian Hils
88d48e38af Revert "clearly indentify git-checkout as dev version" 
This temporarily reverts commit 3b4d8d6eca,
which broke the snapshot builds.
 2017-03-07 14:49:52 +01:00
Maximilian Hils
bda39335b0 fix other occurences of options shortcut 2017-03-07 12:16:23 +01:00
Maximilian Hils
96b798615c Merge pull request #2106 from davidpshaw/python_3_to_master 
Updated for python 3
 2017-03-07 12:12:47 +01:00
Aldo Cortesi
98ec3b77fe Carefully re-add a small number of short flags 
The mechanism for booleans attaches the short flag to whatever the opposite of
the default is.
 2017-03-07 21:01:21 +13:00
Aldo Cortesi
aed780bf48 Change the way proxy authetication is specified 
We now have one option "proxyauth". If this is "any", we accept any
credentials, if it starts with an @ it's treated as a path to an htpasswd file,
if it is of the form username:password it's a single-user credential.
 2017-03-07 20:18:30 +13:00
Aldo Cortesi
b0ba765598 Add type and choices to options dump commets. 2017-03-07 19:29:08 +13:00
Yamamori Akihiro
7ca2913c1a Update tcpproxy.rst 
Correction in key short cut for TCP Proxy
 2017-03-07 14:15:29 +09:00
Aldo Cortesi
320d8848ab Options tweaks 
- Regularise presentation and wording
- Help is mandatory for all options
- Auto-generate wording to say that sequence options can be passed multiple
times on the command-line
 2017-03-07 15:23:46 +13:00
Aldo Cortesi
10db254791 Remove less commonly used command-line options 
We now have --set, so only options that really deserve it get a dedicated flag.
I'm inclined to strip this back even more. Feel free to argue that YOUR
favourite option deserves special treatment here.
 2017-03-07 14:46:28 +13:00
Aldo Cortesi
ac3b0d69cc Add the --set option to set options directly 
The --set option is a universal flag for setting options. Some examples:

Turn on a boolean:

mitmdump --set onboarding=false

Add a value to a sequence:

mitumdupm --set setheaders=/foo/bar/voing

Zero a sequence:

mitumdupm --set setheaders
 2017-03-07 14:27:50 +13:00
Aldo Cortesi
79f5883c2f Option spacing and coverage 2017-03-07 13:47:39 +13:00
Aldo Cortesi
99a6b0dbc1 Add --options that dumps annotated option defaults 2017-03-07 13:16:28 +13:00