Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2733 from mitmproxy/pyinstaller | Maximilian Hils | 2017-12-30 | 2 | -13/+23 |
|\ | | | | | Update PyInstaller, add dev version info to builds. | ||||
| * | single-source version processing | Maximilian Hils | 2017-12-30 | 2 | -13/+23 |
| | | |||||
* | | Merge pull request #2703 from mhils/test-defaultkeys | Maximilian Hils | 2017-12-30 | 1 | -0/+23 |
|\ \ | | | | | | | Test that default key bindings are valid commands | ||||
| * | | test that defaultkeys are valid commands | Maximilian Hils | 2017-12-29 | 1 | -0/+23 |
| |/ | |||||
* | | fix Flow.kill behaviour | Maximilian Hils | 2017-12-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | This now just sets a kill reply instead of committing directly. First, this seems like the more sane thing to do. Second, we have an iffy race condition where we call Reply.commit() before the addonmanager finishes its invocation, the proxy thread then progresses and sets a new flow.reply attribute, and the addonmanager then gets confused when finishing. This commit doesn't fix that, but mitigates it for Flow.kill which is now committed by the addonmanager. | ||||
* | | websocket: add flow kill test | Thomas Kriechbaumer | 2017-12-29 | 1 | -0/+19 |
| | | |||||
* | | websocket: test killable | Thomas Kriechbaumer | 2017-12-28 | 1 | -0/+15 |
| | | |||||
* | | websocket: docs++ and kill messages | Thomas Kriechbaumer | 2017-12-27 | 1 | -0/+6 |
| | | | | | | | | fixes #2724 | ||||
* | | Display "*" when listening on all interfaces | Maximilian Hils | 2017-12-26 | 1 | -0/+2 |
|/ | | | | | | | | | | The set of people who understand "0.0.0.0" (and/or "::") is a subset of the set of people who understand "*", so we can make things easier to understand by using the less technical notation. Empirical Evidence: - https://discourse.mitmproxy.org/t/unable-to-use-mitmproxy-on-windows/735 - https://discourse.mitmproxy.org/t/how-to-view-the-proxy-servers-url/23 | ||||
* | @concurrent decorator works for class methods. (#2708) | fate0 | 2017-12-26 | 1 | -1/+1 |
| | | | | | * @concurrent decorator should works for class methods * modify test for @concurrent decorator in class. * add docs | ||||
* | cuts: don't crash when retrieving header of a non-existent response | Aldo Cortesi | 2017-12-20 | 1 | -0/+5 |
| | |||||
* | commander: command argument underlay | Aldo Cortesi | 2017-12-20 | 1 | -0/+71 |
| | | | | Display context-sensitive argument types as an "underlay" in commander. | ||||
* | commander: palette entries, highlight errors | Aldo Cortesi | 2017-12-20 | 2 | -2/+15 |
| | | | | | | | - Add palette entries specific to commander - Highlight errors - Introduce an Unknown type to keep track of extra unknown arguments to commands | ||||
* | commander: highlight commands | Aldo Cortesi | 2017-12-20 | 2 | -12/+23 |
| | | | | Step 1 of the fancification of commander. | ||||
* | commands: partial parser now returns help for remaining arguments | Aldo Cortesi | 2017-12-19 | 2 | -57/+37 |
| | |||||
* | types: add validation to partial parser | Aldo Cortesi | 2017-12-19 | 2 | -15/+16 |
| | |||||
* | types: use new type validation mechanism in commands | Aldo Cortesi | 2017-12-19 | 3 | -35/+4 |
| | |||||
* | types: add validation functions | Aldo Cortesi | 2017-12-19 | 1 | -0/+42 |
| | |||||
* | types: cleanups and minor refactorings | Aldo Cortesi | 2017-12-19 | 1 | -12/+12 |
| | |||||
* | Merge pull request #2702 from Kriechi/fix-2640 | Thomas Kriechbaumer | 2017-12-18 | 3 | -1/+42 |
|\ | | | | | improve websocket dumps | ||||
| * | add tests | Thomas Kriechbaumer | 2017-12-18 | 2 | -1/+16 |
| | | |||||
| * | fix #2640 | Thomas Kriechbaumer | 2017-12-18 | 1 | -0/+12 |
| | | |||||
| * | websocket: support domain and url filters | Thomas Kriechbaumer | 2017-12-18 | 1 | -0/+14 |
| | | |||||
* | | commands: refactor types | Aldo Cortesi | 2017-12-18 | 5 | -62/+200 |
|/ | | | | | | | 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 #2690 from cortesi/types | Aldo Cortesi | 2017-12-18 | 7 | -6/+6 |
|\ | | | | | mitmproxy.types -> mitmproxy.coretypes | ||||
| * | mitmproxy.types -> mitmproxy.coretypes | Aldo Cortesi | 2017-12-17 | 7 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | commands: minor refactoring and command renaming | Aldo Cortesi | 2017-12-17 | 1 | -10/+9 |
|/ | |||||
* | Disable implicit JS test asset generation | Aldo Cortesi | 2017-12-17 | 1 | -1/+1 |
| | | | | | | | | | | 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. | ||||
* | minor: fix key bindings, adjust flow command presentation | Aldo Cortesi | 2017-12-17 | 1 | -1/+1 |
| | | | | Fixes #2681 | ||||
* | command cuts: add completion | Aldo Cortesi | 2017-12-17 | 3 | -59/+64 |
| | | | | | | - 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 API | Aldo Cortesi | 2017-12-17 | 2 | -73/+32 |
| | | | | | Make the cuts API more transparent. Cut specifications are no longer a centrally resolved core type, and flows are now passed explicitly. | ||||
* | commander: test++ | Aldo Cortesi | 2017-12-15 | 1 | -6/+48 |
| | |||||
* | command: path completion | Aldo Cortesi | 2017-12-15 | 2 | -72/+13 |
| | |||||
* | command: recursive command parsing | Aldo Cortesi | 2017-12-15 | 1 | -0/+19 |
| | | | | This lets us complete commands passed to commands correctly. | ||||
* | Merge pull request #2678 from mhils/console-startup-events | Aldo Cortesi | 2017-12-15 | 1 | -0/+15 |
|\ | | | | | Fix console logging during startup | ||||
| * | improve eventstore truncation | Maximilian Hils | 2017-12-15 | 1 | -0/+15 |
| | | |||||
* | | commands: emit types from partial parser, implement choice completion | Aldo Cortesi | 2017-12-15 | 1 | -2/+22 |
| | | |||||
* | | commander: tab completion for command names | Aldo Cortesi | 2017-12-15 | 1 | -0/+25 |
| | | |||||
* | | WIP: autocompletion | Aldo Cortesi | 2017-12-15 | 2 | -15/+38 |
| | | |||||
* | | commands: add a parser for partial commands | Aldo Cortesi | 2017-12-15 | 1 | -0/+10 |
| | | | | | | | | We only return Cmd and str types for the moment. | ||||
* | | commands: add a Cmd argument type | Aldo Cortesi | 2017-12-15 | 2 | -3/+4 |
| | | | | | | | | | | | | 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 editing | Aldo Cortesi | 2017-12-15 | 1 | -0/+37 |
|/ | | | | | The builtin urwid.Edit widget is not sufficiently flexible for what we want to do. | ||||
* | Merge pull request #2545 from mitmproxy/wsproto | Aldo Cortesi | 2017-12-15 | 1 | -28/+114 |
|\ | | | | | Replace our WebSocket stack with wsproto | ||||
| * | Use wsproto for websockets | Ujjwal Verma | 2017-12-12 | 1 | -18/+104 |
| | | |||||
| * | prepare WebSocket stack to move to wsproto | Thomas Kriechbaumer | 2017-12-12 | 1 | -13/+13 |
| | | |||||
* | | adjust tests | Maximilian Hils | 2017-12-14 | 1 | -8/+16 |
| | | |||||
* | | Merge pull request #2669 from cortesi/path | Aldo Cortesi | 2017-12-14 | 1 | -0/+8 |
|\ \ | | | | | | | commands: add a Path argument type | ||||
| * | | commands: add a Path argument type | Aldo Cortesi | 2017-12-13 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | This is just an alias for str, and in this patch is used mostly to give an appropriate type in help strings. More to come. Fixes #2198 | ||||
* | | | Merge pull request #2670 from Kriechi/fix-2664 | Maximilian Hils | 2017-12-13 | 1 | -1/+8 |
|\ \ \ | | | | | | | | | fix #2664 | ||||
| * | | | fix #2664 | Thomas Kriechbaumer | 2017-12-13 | 1 | -1/+8 |
| | |/ | |/| |