Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed docs | Ujjwal Verma | 2017-03-11 | 1 | -4/+4 |
| | |||||
* | Fixed Replacement test | Ujjwal Verma | 2017-03-09 | 3 | -6/+6 |
| | |||||
* | Removed replace-from-file option.Made requested changes | Ujjwal Verma | 2017-03-09 | 5 | -22/+15 |
| | |||||
* | Merge pull request #2100 from cortesi/options | Aldo Cortesi | 2017-03-09 | 52 | -1459/+1334 |
|\ | | | | | Options revamp | ||||
| * | Send change event when options are reset | Aldo Cortesi | 2017-03-09 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' into options | Aldo Cortesi | 2017-03-09 | 4 | -3/+29 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2124 from mitmproxy/opensuse-docs | Maximilian Hils | 2017-03-08 | 1 | -0/+14 |
|\ \ | | | | | | | Add install docs for openSUSE | ||||
| * | | add install docs for openSUSE | Maximilian Hils | 2017-03-08 | 1 | -0/+14 |
| | | | |||||
* | | | Merge pull request #2121 from mitmproxy/address-leftovers | Maximilian Hils | 2017-03-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix tcp.Address leftovers | ||||
| * | | | fix tcp.Address leftovers | Maximilian Hils | 2017-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292 | ||||
* | | | | Merge pull request #2090 from mitmproxy/fix-pathod-header-doc | Thomas Kriechbaumer | 2017-03-08 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | pathoc: fix documentation for headers | ||||
| * | | | pathoc: fix documentation for headers | Maximilian Hils | 2017-03-02 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #2117 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-08 | 1 | -0/+12 |
|\ \ \ \ | |_|/ / |/| | | | Add Javascript tests to Travis CI. (#2093) | ||||
| * | | | Update .travis.yml | Matthew Shao | 2017-03-08 | 1 | -9/+6 |
| | | | | |||||
| * | | | Add javascript tests to Travis CI. (#2093) | Matthew Shao | 2017-03-08 | 1 | -0/+15 |
|/ / / | |||||
| | * | typing.Type -> type | Maximilian Hils | 2017-03-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | `typing.Type` should have been `typing.Type[Any]`, which in turn is equivalent to `type` | ||||
| | * | core -> core_option_validation | Maximilian Hils | 2017-03-08 | 3 | -7/+7 |
| | | | | | | | | | | | | longer, but much clearer for devs who are unfamiliar with the codebase. | ||||
| | * | change add_option parameter order | Maximilian Hils | 2017-03-08 | 4 | -110/+111 |
| | | | | | | | | | | | | | | | 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 | ||||
| | * | unify server spec parsing | Maximilian Hils | 2017-03-08 | 7 | -54/+118 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into options | Aldo Cortesi | 2017-03-08 | 18 | -102/+142 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #2108 from ayamamori/patch-1 | Maximilian Hils | 2017-03-07 | 9 | -11/+11 |
|\ \ \ | | | | | | | | | Update tcpproxy.rst | ||||
| * | | | fix other occurences of options shortcut | Maximilian Hils | 2017-03-07 | 8 | -10/+10 |
| | | | | |||||
| * | | | Update tcpproxy.rst | Yamamori Akihiro | 2017-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Correction in key short cut for TCP Proxy | ||||
* | | | | Revert "clearly indentify git-checkout as dev version" | Maximilian Hils | 2017-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This temporarily reverts commit 3b4d8d6ecae3ee1f57dd71af990bb480e6c82d6c, which broke the snapshot builds. | ||||
* | | | | Merge pull request #2106 from davidpshaw/python_3_to_master | Maximilian Hils | 2017-03-07 | 3 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | Updated for python 3 | ||||
| * | | | Updated for python 3 | David Shaw | 2017-03-06 | 3 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #2101 from s4chin/add-websocket-filter-to-web | Maximilian Hils | 2017-03-06 | 2 | -84/+111 |
|\ \ \ \ | | | | | | | | | | | web: Add websocket filter | ||||
| * | | | | web: Add websocket filter | Sachin Kelkar | 2017-03-06 | 2 | -84/+111 |
| |/ / / | |||||
* | | | | Merge pull request #2104 from lymanZerga11/patch-2 | Maximilian Hils | 2017-03-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixes #2102 | ||||
| * | | | | Update flowlist.py | lymanZerga11 | 2017-03-06 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2105 from Kriechi/dev-version | Maximilian Hils | 2017-03-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | clearly indentify git-checkout as dev version | ||||
| * | | | clearly indentify git-checkout as dev version | Thomas Kriechbaumer | 2017-03-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2085 from MatthewShao/dev | Maximilian Hils | 2017-03-05 | 3 | -2/+15 |
|\ \ \ \ | | | | | | | | | | | [web] Add mouse support for FilterInput popover. | ||||
| * | | | | [web] Retain focus on input field after selecting. (#2085) | Matthew Shao | 2017-03-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | [web] Simplify the code. (#2085) | Matthew Shao | 2017-03-03 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | [web] Add mouse support for FilterInput popover. | Matthew Shao | 2017-03-02 | 3 | -3/+19 |
| |/ / / | |||||
| | | * | Carefully re-add a small number of short flags | Aldo Cortesi | 2017-03-07 | 6 | -39/+48 |
| | | | | | | | | | | | | | | | | | | | | The mechanism for booleans attaches the short flag to whatever the opposite of the default is. | ||||
| | | * | Change the way proxy authetication is specified | Aldo Cortesi | 2017-03-07 | 5 | -58/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | * | Add type and choices to options dump commets. | Aldo Cortesi | 2017-03-07 | 2 | -21/+34 |
| | | | | |||||
| | | * | Options tweaks | Aldo Cortesi | 2017-03-07 | 4 | -111/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| | | * | Remove less commonly used command-line options | Aldo Cortesi | 2017-03-07 | 3 | -74/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | * | Add the --set option to set options directly | Aldo Cortesi | 2017-03-07 | 4 | -6/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Option spacing and coverage | Aldo Cortesi | 2017-03-07 | 3 | -15/+37 |
| | | | | |||||
| | | * | Add --options that dumps annotated option defaults | Aldo Cortesi | 2017-03-07 | 4 | -5/+39 |
| | | | | |||||
| | | * | Fix lint | Aldo Cortesi | 2017-03-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Flatten commandline arg structure, extract common run func for tools | Aldo Cortesi | 2017-03-07 | 2 | -100/+51 |
| | | | | |||||
| | | * | Cleanups and test coverage | Aldo Cortesi | 2017-03-07 | 10 | -26/+45 |
| | | | | |||||
| | | * | Automate slurping up command-line options | Aldo Cortesi | 2017-03-07 | 6 | -124/+23 |
| | | | | | | | | | | | | | | | | | | | | Now that options are completely regular, we can automate reading them out of arguments, rather than listing them out by hand like savages. | ||||
| | | * | Replacements and setheaders are always strings | Aldo Cortesi | 2017-03-06 | 4 | -44/+38 |
| | | | | | | | | | | | | | | | | | | | | Instead of having two representations we have one canonical specification. Fixing the editor in console is left ot a further patch. | ||||
| | | * | Unify mode specification | Aldo Cortesi | 2017-03-06 | 14 | -129/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have: --mode regular (the default) --mode transparent --mode socks5 --mode reverse:SPEC --mode upstream:SPEC Where SPEC is a host specification. |