aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| |
* | Merge pull request #2677 from cortesi/commanderAldo Cortesi2017-12-1510-19/+355
|\ \ | |/ |/| Commander
| * command: add command.Arg typeAldo Cortesi2017-12-153-10/+19
| | | | | | | | | | | | This type represents an argument to a command passed to another command. This improves help text, and will be used in the partial parser to expand subcommand types.
| * commands: emit types from partial parser, implement choice completionAldo Cortesi2017-12-153-20/+66
| |
| * commander: tab completion for command namesAldo Cortesi2017-12-153-10/+77
| |
| * WIP: autocompletionAldo Cortesi2017-12-155-23/+72
| |
| * commands: add a parser for partial commandsAldo Cortesi2017-12-152-0/+35
| | | | | | | | We only return Cmd and str types for the moment.
| * commands: add a Cmd argument typeAldo Cortesi2017-12-158-20/+35
| | | | | | | | | | | | This represents a command passed as an argument. Also split arguments from command values themselves, making the command help for meta-commands much clearer.
| * Introduce a custom widget for command editingAldo Cortesi2017-12-155-11/+126
|/ | | | | The builtin urwid.Edit widget is not sufficiently flexible for what we want to do.
* Merge pull request #2674 from mhils/issue-2620Aldo Cortesi2017-12-151-9/+10
|\ | | | | Fix #2620
| * fix #2620Maximilian Hils2017-12-141-9/+10
| | | | | | | | | | | | | | | | We previously had the problem that overriding keypress() skipped the proper calculation of the top widget's size, leading to broken scrolling behavior in the flowlist. We now always use urwid.Frame's keypress method, but we make sure that urwid.Pile and urwid.Columns delegate to the currently focused component.
* | Merge pull request #2545 from mitmproxy/wsprotoAldo Cortesi2017-12-1518-119/+1708
|\ \ | | | | | | Replace our WebSocket stack with wsproto
| * | vendoring of wsprotoThomas Kriechbaumer2017-12-127-4/+1419
| | | | | | | | | | | | | | | https://github.com/python-hyper/wsproto.git commit 5ea2da61266796666f5de6461aaae22e6b00deba
| * | docs++: add websocket PING/PONGThomas Kriechbaumer2017-12-121-0/+5
| | |
| * | docs++: add individual protocol pagesThomas Kriechbaumer2017-12-127-7/+63
| | |
| * | Use wsproto for websocketsUjjwal Verma2017-12-125-109/+185
| | |
| * | prepare WebSocket stack to move to wsprotoThomas Kriechbaumer2017-12-122-117/+154
| | |
* | | Merge pull request #2675 from mhils/issue-2673Aldo Cortesi2017-12-152-8/+12
|\ \ \ | | | | | | | | Fix #2673
| * | | fix #2673Maximilian Hils2017-12-142-8/+12
|/ / /
* | | Merge pull request #2671 from mhils/command-argtypesMaximilian Hils2017-12-145-58/+59
|\ \ \ | | | | | | | | Introduce @command.argument
| * | | simplify path typeMaximilian Hils2017-12-141-6/+3
| | | | | | | | | | | | | | | | | | | | the previous implementation crashed the typechecker, as typing.NewType does not return a proper type that can be used for isinstance() checks.
| * | | adjust testsMaximilian Hils2017-12-141-8/+16
| | | |