aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
|/
* [web] Update test for static viewer.Matthew Shao2017-08-301-0/+6
|
* fix strutils.split_special_areasMaximilian Hils2017-08-261-0/+8
|
* add new, faster css prettifier :tada:Maximilian Hils2017-08-2421-24/+253
|
* add strutils.escape_special_areasMaximilian Hils2017-08-241-0/+22
|
* Merge pull request #2540 from mhils/relatively-staticMaximilian Hils2017-08-222-7/+7
|\ | | | | Make it possible to run static viewer in subdirectories
| * [web] make it possible to run static viewer in subdirectoriesMaximilian Hils2017-08-212-7/+7
| |
* | fix mitmweb master shutdown, tests++Maximilian Hils2017-08-212-0/+24
|/
* fix testsMaximilian Hils2017-08-211-1/+1
|
* move tests...Maximilian Hils2017-08-211-0/+0
|
* Merge pull request #2510 from MatthewShao/static-viewerMaximilian Hils2017-08-212-5/+68
|\ | | | | [WIP][web]Static viewer converter for mitmweb
| * [web] Static_viewer coverage ++.Matthew Shao2017-08-171-2/+5
| |
| * [web] Add tests for StaticViewer and minor fixes.Matthew Shao2017-08-171-0/+60
| |
| * [web] Update tests.Matthew Shao2017-08-161-5/+5
| |
* | Merge pull request #2489 from MatthewShao/options-into-own-addonMaximilian Hils2017-08-163-8/+12
|\ \ | | | | | | Move console-related options into their own addon
| * | Add test for AddonManager.__contains__Matthew Shao2017-08-081-0/+2
| | |