aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* commander: palette entries, highlight errorsAldo Cortesi2017-12-206-6/+56
| | | | | | | - Add palette entries specific to commander - Highlight errors - Introduce an Unknown type to keep track of extra unknown arguments to commands
* commander: highlight commandsAldo Cortesi2017-12-205-29/+55
| | | | Step 1 of the fancification of commander.
* commands: partial parser now returns help for remaining argumentsAldo Cortesi2017-12-195-61/+55
|
* types: add validation to partial parserAldo Cortesi2017-12-193-18/+39
|
* types: use new type validation mechanism in commandsAldo Cortesi2017-12-196-99/+33
|
* types: add validation functionsAldo Cortesi2017-12-192-6/+129
|
* types: cleanups and minor refactoringsAldo Cortesi2017-12-195-76/+80
|
* Merge pull request #2702 from Kriechi/fix-2640Thomas Kriechbaumer2017-12-1814-19/+128
|\ | | | | improve websocket dumps
| * add doc stringThomas Kriechbaumer2017-12-181-0/+5
| |
| * add testsThomas Kriechbaumer2017-12-185-3/+33
| |
| * ignore contrib type errorsThomas Kriechbaumer2017-12-183-0/+7
| |
| * fix #2640Thomas Kriechbaumer2017-12-188-13/+63
| |
| * websocket: support domain and url filtersThomas Kriechbaumer2017-12-183-5/+22
| |
* | Merge pull request #2707 from cortesi/addtypesAldo Cortesi2017-12-1917-313/+591
|\ \ | |/ |/| commands: refactor types
| * commands: refactor typesAldo Cortesi2017-12-1817-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-2697Aldo Cortesi2017-12-181-7/+25
|\ | | | | Fix #2697
| * fix #2697Maximilian Hils2017-12-171-7/+25
| |
* | Merge pull request #2698 from mhils/issue-2658Aldo Cortesi2017-12-182-2/+3
|\ \ | | | | | | Don't display contentview errors too prominently.
| * | update evenlog when verbosity changesMaximilian Hils2017-12-171-1/+2
| | |
| * | log contentview errors in the debug log onlyMaximilian Hils2017-12-171-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/typesAldo Cortesi2017-12-1834-29/+29
|\ \ | |/ |/| mitmproxy.types -> mitmproxy.coretypes
| * mitmproxy.types -> mitmproxy.coretypesAldo Cortesi2017-12-1734-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-cryptographyThomas Kriechbaumer2017-12-171-1/+1
|\ \ | | | | | | bump cryptography
| * | bump cryptographyThomas Kriechbaumer2017-12-171-1/+1
|/ / | | | | | | This includes important security fixes.
* | Merge pull request #2689 from cortesi/grideditor.saveAldo Cortesi2017-12-172-0/+21
|\ \ | | | | | | console.grideditor.save
| * | console: add console.grideditor.saveAldo Cortesi2017-12-172-0/+21
| | | | | | | | | | | | This will tide us over until we have a proper data viewer.
* | | Merge pull request #2687 from cortesi/minor1Aldo Cortesi2017-12-174-22/+21
|\| | | |/ |/| commands: minor refactoring and command renaming
| * commands: minor refactoring and command renamingAldo Cortesi2017-12-174-22/+21
| |
* | Merge pull request #2686 from cortesi/flowspecoptsAldo Cortesi2017-12-172-1/+35
|\| | | | | commander: add completion for flowspecs
| * commander: add completion for flowspecsAldo Cortesi2017-12-172-1/+35
| |
* | Merge pull request #2685 from cortesi/longoutAldo Cortesi2017-12-1718-183/+311
|\| | | | | Add a data viewer for command output
| * Disable implicit JS test asset generationAldo Cortesi2017-12-172-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 outputAldo Cortesi2017-12-177-8/+123
| | | | | | | | Fixes #2654
| * minor: commandeditor.py -> commandexecutor.pyAldo Cortesi2017-12-173-4/+4
| |
| * minor: fix key bindings, adjust flow command presentationAldo Cortesi2017-12-173-3/+3
| | | | | | | | Fixes #2681
| * command cuts: add completionAldo Cortesi2017-12-1710-92/+145
| | | | | | | | | | | | - Remove shortcuts for request, response, etc. - we don't need them if we have completion - Restrict cuts specification to a set of prefixes - Extend cuts to add a few more items
| * commands: Reassess the cuts APIAldo Cortesi2017-12-175-118/+78
|/ | | | | Make the cuts API more transparent. Cut specifications are no longer a centrally resolved core type, and flows are now passed explicitly.
* Merge pull request #2682 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-12-161-1/+1
|\ | | | | [requires.io] dependency update on master branch
| * [requires.io] dependency updaterequires.io2017-12-151-1/+1
|/
* Merge pull request #2679 from cortesi/commander2Aldo Cortesi2017-12-168-151/+124
|\ | | | | commands - further progress
| * commander: test++Aldo Cortesi2017-12-152-9/+51
| |
| * commander: sort options for completionAldo Cortesi2017-12-151-0/+1
| |
| * command: path completionAldo Cortesi2017-12-154-145/+51
| |
| * console: fix variable clash exposed by recent key binding workAldo Cortesi2017-12-152-2/+2
| |
| * command: recursive command parsingAldo Cortesi2017-12-152-2/+26
|/ | | | This lets us complete commands passed to commands correctly.
* Merge pull request #2678 from mhils/console-startup-eventsAldo Cortesi2017-12-157-72/+85
|\ | | | | Fix console logging during startup
| * improve eventstore truncationMaximilian Hils2017-12-153-23/+38
| |
| * limit eventstore sizeMaximilian Hils2017-12-142-4/+11
| |
| * console: display errors that happened during startupMaximilian Hils2017-12-141-3/+16
| |
| * streamline console logging, fix #2667Maximilian Hils2017-12-146-60/+38
| |