aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Disable implicit JS test asset generationAldo Cortesi2017-12-171-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 presentationAldo Cortesi2017-12-171-1/+1
| | | | Fixes #2681
* command cuts: add completionAldo Cortesi2017-12-173-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 APIAldo Cortesi2017-12-172-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 Cortesi2017-12-151-6/+48
|
* command: path completionAldo Cortesi2017-12-152-72/+13
|
* command: recursive command parsingAldo Cortesi2017-12-151-0/+19
| | | | This lets us complete commands passed to commands correctly.
* Merge pull request #2678 from mhils/console-startup-eventsAldo Cortesi2017-12-151-0/+15
|\ | | | | Fix console logging during startup
| * improve eventstore truncationMaximilian Hils2017-12-151-0/+15
| |
* | commands: emit types from partial parser, implement choice completionAldo Cortesi2017-12-151-2/+22
| |
* | commander: tab completion for command namesAldo Cortesi2017-12-151-0/+25
| |
* | WIP: autocompletionAldo Cortesi2017-12-152-15/+38
| |
* | commands: add a parser for partial commandsAldo Cortesi2017-12-151-0/+10
| | | | | | | | We only return Cmd and str types for the moment.
* | commands: add a Cmd argument typeAldo Cortesi2017-12-152-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 editingAldo Cortesi2017-12-151-0/+37
|/ | | | | The builtin urwid.Edit widget is not sufficiently flexible for what we want to do.
* Merge pull request #2545 from mitmproxy/wsprotoAldo Cortesi2017-12-151-28/+114
|\ | | | | Replace our WebSocket stack with wsproto
| * Use wsproto for websocketsUjjwal Verma2017-12-121-18/+104
| |
| * prepare WebSocket stack to move to wsprotoThomas Kriechbaumer2017-12-121-13/+13
| |
* | adjust testsMaximilian Hils2017-12-141-8/+16
| |
* | Merge pull request #2669 from cortesi/pathAldo Cortesi2017-12-141-0/+8
|\ \ | | | | | | commands: add a Path argument type
| * | commands: add a Path argument typeAldo Cortesi2017-12-131-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-2664Maximilian Hils2017-12-131-1/+8
|\ \ \ | | | | | | | | fix #2664
| * | | fix #2664Thomas Kriechbaumer2017-12-131-1/+8
| | |/ | |/|
* | | Merge pull request #2668 from cortesi/commandoptsAldo Cortesi2017-12-132-6/+22
|\ \ \ | | |/ | |/| Command improvements
| * | commands: formalise a Choice typeAldo Cortesi2017-12-132-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/masterMaximilian Hils2017-12-121-0/+1
|\ \ \ | |_|/ |/| | Fix #2594
| * | minor improvements, add tests for ipv4-mapped addressesMaximilian Hils2017-12-121-0/+1
| | |
* | | fix #2529Maximilian Hils2017-12-121-0/+9
| | |
* | | Merge branch 'master' into browser-winAldo Cortesi2017-12-121-0/+7
|\ \ \ | | |/ | |/|
| * | commands: verify command function signatures before call (#2659)Aldo Cortesi2017-12-111-0/+7
| | | | | | | | | Fixes #2652, and many other possible crashes on user input.
* | | fix browser addon on WindowsMaximilian Hils2017-12-111-1/+12
|/ /
* / browser addon: start an isolated browser attached to the proxyAldo Cortesi2017-12-101-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 Tripathi2017-11-271-0/+11
| | | fixes #2618
* improve clientreplay addonMaximilian Hils2017-11-071-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 flowsMaximilian Hils2017-11-061-0/+11
|
* make safecall threadsafe.Maximilian Hils2017-10-261-2/+3
|
* fix #2563Maximilian Hils2017-10-243-4/+4
|
* simplify version outputMaximilian Hils2017-10-241-2/+8
|
* Merge pull request #2591 from ddworken/masterMaximilian Hils2017-10-221-1/+7
|\ | | | | Added scanning for CSS injection and iframe injection to XSS scanner
| * Added scanning for CSS injection and iframe injectionDavid Dworken2017-10-171-1/+7
| |
* | skip ipv6 tests on sudo-enabled travis buildsMaximilian Hils2017-10-202-0/+18
|/
* remove html outline contentview, fix #2572Maximilian Hils2017-09-141-9/+0
|
* Merge pull request #2537 from ujjwal96/content-viewMaximilian Hils2017-09-044-5/+103
|\ | | | | JS beautifier
| * make split_special_areas more flexible, refs #2537Maximilian Hils2017-09-031-4/+4
| | | | | | | | (cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386)
| * Added testUjjwal Verma2017-09-033-70/+92
| |
| * JS beautifierUjjwal Verma2017-09-032-0/+76
| |
* | Merge pull request #2560 from mhils/mitmproxy-net-tlsMaximilian Hils2017-09-043-67/+74
|\ \ | | | | | | Split TLS parts from net.tcp into net.tls
| * | move hostname validation into mitmproxy.net.tlsMaximilian Hils2017-09-043-34/+37
| | |
| * | split TLS parts from net.tcp into net.tlsMaximilian Hils2017-09-032-34/+38
| |/
* / suppress tornado logging in testsMaximilian Hils2017-09-031-0/+14
|/