Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #2710 from jimhigson/update-ios-instructions | Thomas Kriechbaumer | 2017-12-21 | 1 | -5/+5 | |
|\ | | | | | Move trust instructions for ios | |||||
| * | minor docs improvements | Maximilian Hils | 2017-12-18 | 1 | -6/+3 | |
| | | | | | | | | 1. The way the certificate is installed (mitm.it or not) does not matter. 2. Instructions are a bit shorter now and match those provided by Apple at https://support.apple.com/en-us/HT204477. | |||||
| * | move extra info for ios to ios section | jimhigson | 2017-12-18 | 1 | -5/+8 | |
| | | ||||||
* | | Merge pull request #2716 from cortesi/cmdfixes | Aldo Cortesi | 2017-12-20 | 8 | -3/+49 | |
|\ \ | | | | | | | various command-related fixes | |||||
| * | | cuts: don't crash when retrieving header of a non-existent response | Aldo Cortesi | 2017-12-20 | 2 | -0/+7 | |
| | | | ||||||
| * | | console: ignore non-nav keys in chooser | Aldo Cortesi | 2017-12-20 | 2 | -2/+28 | |
| | | | | | | | | | | | | | | | | | | Awkward, but works Fixes #2417 | |||||
| * | | console options: retain focus position after edit | Aldo Cortesi | 2017-12-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | Fixes #2622 | |||||
| * | | "Commands" title -> "Command Reference" | Aldo Cortesi | 2017-12-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | commands: don't try to view flow returns as data | Aldo Cortesi | 2017-12-20 | 1 | -0/+4 | |
| | | | | | | | | | | | | Fixes #2704 | |||||
| * | | console: add console.bodyview.options | Aldo Cortesi | 2017-12-20 | 1 | -0/+8 | |
| | | | | | | | | | | | | This may be "request" or "response". | |||||
* | | | Merge pull request #2715 from cortesi/fancycommander2 | Aldo Cortesi | 2017-12-20 | 6 | -7/+144 | |
|\| | | | | | | | | commander: palette entries, highlight errors | |||||
| * | | commander: command argument underlay | Aldo Cortesi | 2017-12-20 | 3 | -3/+90 | |
| | | | | | | | | | | | | Display context-sensitive argument types as an "underlay" in commander. | |||||
| * | | commander: palette entries, highlight errors | Aldo Cortesi | 2017-12-20 | 6 | -6/+56 | |
| | | | | | | | | | | | | | | | | | | | | | - Add palette entries specific to commander - Highlight errors - Introduce an Unknown type to keep track of extra unknown arguments to commands | |||||
* | | | Merge pull request #2714 from cortesi/commander1 | Aldo Cortesi | 2017-12-20 | 6 | -85/+105 | |
|\| | | | | | | | | commander: highlight commands | |||||
| * | | commander: highlight commands | Aldo Cortesi | 2017-12-20 | 5 | -29/+55 | |
| | | | | | | | | | | | | Step 1 of the fancification of commander. | |||||
| * | | commands: partial parser now returns help for remaining arguments | Aldo Cortesi | 2017-12-19 | 5 | -61/+55 | |
| | | | ||||||
* | | | Merge pull request #2712 from cortesi/types3 | Aldo Cortesi | 2017-12-19 | 8 | -197/+279 | |
|\| | | | | | | | | types: add validation, use it in commands | |||||
| * | | types: add validation to partial parser | Aldo Cortesi | 2017-12-19 | 3 | -18/+39 | |
| | | | ||||||
| * | | types: use new type validation mechanism in commands | Aldo Cortesi | 2017-12-19 | 6 | -99/+33 | |
| | | | ||||||
| * | | types: add validation functions | Aldo Cortesi | 2017-12-19 | 2 | -6/+129 | |
| | | | ||||||
| * | | types: cleanups and minor refactorings | Aldo Cortesi | 2017-12-19 | 5 | -76/+80 | |
| | | | ||||||
* | | | Merge pull request #2705 from mhils/issue-2694 | Maximilian Hils | 2017-12-18 | 1 | -0/+22 | |
|\ \ \ | |/ / |/| | | Re-add body editing | |||||
| * | | implement body editing, fix #2694 | Maximilian Hils | 2017-12-18 | 1 | -0/+22 | |
| | | | ||||||
* | | | Merge pull request #2702 from Kriechi/fix-2640 | Thomas Kriechbaumer | 2017-12-18 | 14 | -19/+128 | |
|\ \ \ | |/ / |/| | | improve websocket dumps | |||||
| * | | add doc string | Thomas Kriechbaumer | 2017-12-18 | 1 | -0/+5 | |
| | | | ||||||
| * | | add tests | Thomas Kriechbaumer | 2017-12-18 | 5 | -3/+33 | |
| | | | ||||||
| * | | ignore contrib type errors | Thomas Kriechbaumer | 2017-12-18 | 3 | -0/+7 | |
| | | | ||||||
| * | | fix #2640 | Thomas Kriechbaumer | 2017-12-18 | 8 | -13/+63 | |
| | | | ||||||
| * | | websocket: support domain and url filters | Thomas Kriechbaumer | 2017-12-18 | 3 | -5/+22 | |
| |/ | ||||||
* | | Merge pull request #2707 from cortesi/addtypes | Aldo Cortesi | 2017-12-19 | 17 | -313/+591 | |
|\ \ | |/ |/| | commands: refactor types | |||||
| * | commands: refactor types | Aldo Cortesi | 2017-12-18 | 17 | -313/+591 | |
|/ | | | | | | | The type system was scattered over a number of places, making it hard to follow. This collects all command types in types.py, and completion, validation and parsing for each type is centralised. We should use the same mechanism for options. | |||||
* | Merge pull request #2700 from mhils/issue-2697 | Aldo Cortesi | 2017-12-18 | 1 | -7/+25 | |
|\ | | | | | Fix #2697 | |||||
| * | fix #2697 | Maximilian Hils | 2017-12-17 | 1 | -7/+25 | |
| | | ||||||
* | | Merge pull request #2698 from mhils/issue-2658 | Aldo Cortesi | 2017-12-18 | 2 | -2/+3 | |
|\ \ | | | | | | | Don't display contentview errors too prominently. | |||||
| * | | update evenlog when verbosity changes | Maximilian Hils | 2017-12-17 | 1 | -1/+2 | |
| | | | ||||||
| * | | log contentview errors in the debug log only | Maximilian Hils | 2017-12-17 | 1 | -1/+1 | |
| |/ | | | | | | | | | | | | | We already display the "couldn't parse" message, which is better than overwhelming users with a traceback. refs #2658 | |||||
* | | Merge pull request #2690 from cortesi/types | Aldo Cortesi | 2017-12-18 | 34 | -29/+29 | |
|\ \ | |/ |/| | mitmproxy.types -> mitmproxy.coretypes | |||||
| * | mitmproxy.types -> mitmproxy.coretypes | Aldo Cortesi | 2017-12-17 | 34 | -29/+29 | |
| | | | | | | | | | | | | | | | | | | | | The types name is valuable, and we have a better use for it in collecting and exposing types for options and commands. The coretypes module should probably be split up anyway - it contains a threading base class, a few container objects, and the defintion of our serialization protocol. I was tempted to rename it to "uncagegorized" for the sake of honesty. | |||||
* | | Merge pull request #2691 from Kriechi/bump-cryptography | Thomas Kriechbaumer | 2017-12-17 | 1 | -1/+1 | |
|\ \ | | | | | | | bump cryptography | |||||
| * | | bump cryptography | Thomas Kriechbaumer | 2017-12-17 | 1 | -1/+1 | |
|/ / | | | | | | | This includes important security fixes. | |||||
* | | Merge pull request #2689 from cortesi/grideditor.save | Aldo Cortesi | 2017-12-17 | 2 | -0/+21 | |
|\ \ | | | | | | | console.grideditor.save | |||||
| * | | console: add console.grideditor.save | Aldo Cortesi | 2017-12-17 | 2 | -0/+21 | |
| | | | | | | | | | | | | This will tide us over until we have a proper data viewer. | |||||
* | | | Merge pull request #2687 from cortesi/minor1 | Aldo Cortesi | 2017-12-17 | 4 | -22/+21 | |
|\| | | |/ |/| | commands: minor refactoring and command renaming | |||||
| * | commands: minor refactoring and command renaming | Aldo Cortesi | 2017-12-17 | 4 | -22/+21 | |
| | | ||||||
* | | Merge pull request #2686 from cortesi/flowspecopts | Aldo Cortesi | 2017-12-17 | 2 | -1/+35 | |
|\| | | | | | commander: add completion for flowspecs | |||||
| * | commander: add completion for flowspecs | Aldo Cortesi | 2017-12-17 | 2 | -1/+35 | |
| | | ||||||
* | | Merge pull request #2685 from cortesi/longout | Aldo Cortesi | 2017-12-17 | 18 | -183/+311 | |
|\| | | | | | Add a data viewer for command output | |||||
| * | Disable implicit JS test asset generation | Aldo Cortesi | 2017-12-17 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | The JS test assets depend in a brittle way on the details of the tflow() utility functions. We shouldn't have to fix JS tests when adjusting these. Options: - Manually generate the test assets in a script. - Define the JS assets without using tflow, so they don't unexpextedly vary. | |||||
| * | console: add a data view overlay for command output | Aldo Cortesi | 2017-12-17 | 7 | -8/+123 | |
| | | | | | | | | Fixes #2654 | |||||
| * | minor: commandeditor.py -> commandexecutor.py | Aldo Cortesi | 2017-12-17 | 3 | -4/+4 | |
| | |