Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #2668 from cortesi/commandopts | Aldo Cortesi | 2017-12-13 | 2 | -6/+22 |
|\ \ \ | | |/ | |/| | Command improvements | ||||
| * | | commands: formalise a Choice type | Aldo Cortesi | 2017-12-13 | 2 | -6/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves as a string during MyPy checks, but at runtime has an additional attribute that is a command that returns valid options. This is very ugly and clumsy, basically because MyPy is super restrictive about what it accepts as a type. Almost any attempt to construct these types in a more sophisticated way fails in one way or another. I'm open to suggestions. | ||||
* | | | Merge pull request #2643 from Ga-ryo/master | Maximilian Hils | 2017-12-12 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Fix #2594 | ||||
| * | | minor improvements, add tests for ipv4-mapped addresses | Maximilian Hils | 2017-12-12 | 1 | -0/+1 |
| | | | |||||
* | | | fix #2529 | Maximilian Hils | 2017-12-12 | 1 | -0/+9 |
| | | | |||||
* | | | Merge branch 'master' into browser-win | Aldo Cortesi | 2017-12-12 | 1 | -0/+7 |
|\ \ \ | | |/ | |/| | |||||
| * | | commands: verify command function signatures before call (#2659) | Aldo Cortesi | 2017-12-11 | 1 | -0/+7 |
| | | | | | | | | | Fixes #2652, and many other possible crashes on user input. | ||||
* | | | fix browser addon on Windows | Maximilian Hils | 2017-12-11 | 1 | -1/+12 |
|/ / | |||||
* / | browser addon: start an isolated browser attached to the proxy | Aldo Cortesi | 2017-12-10 | 1 | -0/+20 |
|/ | | | | | | | | | | | | A simple addon that starts an instance of Chrome attached to the current proxy. The instance is isolated in its own user data directory, and addons are turned off. Future work: - I wasn't able to test the Windows executable path - a Windows dev should confirm this for us. - In future it would be nice to support other browsers like Firefox. | ||||
* | Bug in expected_http_body_size fix (#2642) | Suraj Tripathi | 2017-11-27 | 1 | -0/+11 |
| | | | fixes #2618 | ||||
* | improve clientreplay addon | Maximilian Hils | 2017-11-07 | 1 | -2/+5 |
| | | | | | | | | - always refresh UI after flow is finished (refs #2616) - count currently active replay - make replay thread daemonic so that users can exit mitmproxy if replay hangs. This is not perfect yet, but vastly better than how it has been. | ||||
* | fix revert of duplicated flows | Maximilian Hils | 2017-11-06 | 1 | -0/+11 |
| | |||||
* | make safecall threadsafe. | Maximilian Hils | 2017-10-26 | 1 | -2/+3 |
| | |||||
* | fix #2563 | Maximilian Hils | 2017-10-24 | 3 | -4/+4 |
| | |||||
* | simplify version output | Maximilian Hils | 2017-10-24 | 1 | -2/+8 |
| | |||||
* | Merge pull request #2591 from ddworken/master | Maximilian Hils | 2017-10-22 | 1 | -1/+7 |
|\ | | | | | Added scanning for CSS injection and iframe injection to XSS scanner | ||||
| * | Added scanning for CSS injection and iframe injection | David Dworken | 2017-10-17 | 1 | -1/+7 |
| | | |||||
* | | skip ipv6 tests on sudo-enabled travis builds | Maximilian Hils | 2017-10-20 | 2 | -0/+18 |
|/ |