aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FileStreamer -> StreamFileAldo Cortesi2016-11-038-38/+37
| | | | options.wfile -> options.streamfile
* addons: filestreamer test cov to 100%Aldo Cortesi2016-11-034-22/+69
| | | | | Also address a bug in taddons that caused options changes that raised errors to be retained rather than rolled back.
* addons filstreamer: tests and bugfixesAldo Cortesi2016-11-033-42/+31
| | | | | - Move tests to taddons - Fix a bug where options updates caused streaming to halt
* Change antiquated test cipher suitesAldo Cortesi2016-11-031-4/+4
| | | | This breaks Travis, possibly due to OpenSSL version.
* tests: add mitmdump --sysinfo to tests runs for platform infoAldo Cortesi2016-11-031-0/+2
|
* addons: dumper spit and polishAldo Cortesi2016-11-024-92/+223
| | | | | | | - 100% test coverage - Cleanups - Add test/mitmproxy/addons/dumperview.py, a small utility for viewing dumper output variations
* tests: convert test_dumper to use taddonsAldo Cortesi2016-11-023-30/+29
|
* Merge pull request #1701 from cortesi/addontest2Aldo Cortesi2016-11-0245-273/+294
|\ | | | | Test suite cleanups
| * tests: client_playback coverageAldo Cortesi2016-11-025-45/+80
| |
| * test coverage: complete branch coverage is NOT a goalAldo Cortesi2016-11-021-1/+1
| | | | | | | | | | Branch coverage means lots of duplication in tests to hit all cases, and I'm not sure it's worth it. At any rate, let's aim for statement coverage first.
| * tests: pathod/tutils.py -> pathod/tservers.pyAldo Cortesi2016-11-0213-46/+41
| | | | | | | | And remove all aliases for mitmproxy.test.tutils
| * tests: clean up test/mitmproxy/tutils.pyAldo Cortesi2016-11-0228-168/+163
| | | | | | | | Remove aliases, use mitmproxy/test/tutils instead.
| * tests: minor cleanup for tests/mitmproxy/tutils.pyAldo Cortesi2016-11-022-17/+13
|/
* Merge pull request #1700 from cortesi/addontestsAldo Cortesi2016-11-013-27/+26
|\ | | | | addons anticom, anticache: expand tests, new truss
| * addons anticom, anticache: expand tests, new trussAldo Cortesi2016-11-013-27/+26
|/
* Merge pull request #1698 from vhaupert/masterAldo Cortesi2016-11-011-1/+1
|\ | | | | Wsgiapp: Only raise exception if an error occurred.
| * Only raise exception if an error occurred.Vincent Haupert2016-10-311-1/+1
| |
* | Merge pull request #1697 from xorrbit/patch-1Aldo Cortesi2016-11-011-4/+16
|\ \ | |/ |/| Update for Ubuntu 16.04
| * Update for Ubuntu 16.04Andrew Orr2016-10-311-4/+16
| |
* | Merge pull request #1696 from cortesi/rmstateAldo Cortesi2016-11-0110-542/+109
|\ \ | |/ |/| Remove addons.State entirely
| * Extend mypy checks to mitmproxy/addonsAldo Cortesi2016-11-013-18/+17
| | | | | | | | Fix a number of issues to do this.
| * Remove addons.StateAldo Cortesi2016-11-016-510/+62
| | | | | | | | | | - Do a first-pass port of mitmweb. Some stuff still broken. - Remove more all State tests from the test suite
| * Replace addons.state in test suiteAldo Cortesi2016-11-012-14/+30
| | | | | | | | Use a super-simple flow recorder instead.
* | Merge pull request #1695 from cortesi/termAldo Cortesi2016-11-011-11/+3
|\| | | | | console: Minor cleanups
| * console: Minor cleanupsAldo Cortesi2016-11-011-11/+3
|/
* Merge pull request #1694 from cortesi/cachekeyAldo Cortesi2016-10-308-93/+171
|\ | | | | console: add caching sort keys
| * console: add caching sort keysAldo Cortesi2016-10-303-70/+134
| | | | | | | | | | | | | | | | | | | | | | This is a tad complicated. The underlying sorted list implementation expects the sort key to be stable for the lifetime of the object. However, if we sort by size, for instance, the sort order changes as the flow progresses through its lifecycle. We address this through two means: - Let order keys cache the sort value by flow ID. - Add a facility to refresh items in the list by removing and re-adding them when they are updated.
| * console: re-add follow focusAldo Cortesi2016-10-307-26/+40
| |
* | Merge pull request #1693 from cortesi/statusbarAldo Cortesi2016-10-302-5/+20
|\| | | | | console: status bar improvements
| * console: show order option in status barAldo Cortesi2016-10-301-0/+4
| |
| * console: status bar improvementsAldo Cortesi2016-10-302-5/+16
| | | | | | | | | | - Arrow to show flow order - Hook statusbar up to focus change to fix some update issues
* | Merge pull request #1692 from cortesi/floworderAldo Cortesi2016-10-308-10/+88
|\| | | | | console: o for flow order
| * console: "v" to reverse flow orderAldo Cortesi2016-10-304-6/+23
| |
| * console: o for flow orderAldo Cortesi2016-10-308-5/+66
| | | | | | | | | | | | "o" shortcut and --order cmdline option to change flow order. Options is now bound to "O".
* | Merge pull request #1691 from cortesi/consoleclean1Aldo Cortesi2016-10-305-43/+34
|\| | | | | console: various cleanups
| * addons.view: fix testsAldo Cortesi2016-10-301-2/+1
| |
| * docs: examples/logging -> examples/context_loggingAldo Cortesi2016-10-301-3/+3
| |
| * console: various cleanupsAldo Cortesi2016-10-304-40/+32
|/
* Merge pull request #1690 from cortesi/consoleviewAldo Cortesi2016-10-309-470/+179
|\ | | | | console: Port from state to view
| * mitmproxy.console: Complete port to view.Aldo Cortesi2016-10-303-47/+29
| |
| * addons.view: Add first-class support for markingAldo Cortesi2016-10-304-103/+28
| | | | | | | | | | | | | | | | | | Marking now works differently - it's no longer just another filter, it's applied in addition to the filter. This means you can apply a filter, mark some flows, and then toggle between marked and unmarked flows matching the filter. I'm leaving the filter for marked flows intact - it will come in handy in other situations.
| * console: Port from state to viewAldo Cortesi2016-10-306-327/+129
| | | | | | | | | | First phase of the port - basic flow list and flow view functionality working. More to come.
* | Merge pull request #1689 from cortesi/contentoptionAldo Cortesi2016-10-308-37/+36
|\| | | | | Add options.default_contentview
| * Add options.default_contentviewAldo Cortesi2016-10-308-37/+36
| | | | | | | | | | This is the first step in a longer process of revamping content views. For the moment, the option is not exposed on the command line.
* | Merge pull request #1688 from cortesi/interceptAldo Cortesi2016-10-3036-356/+448
|\| | | | | Intercept addon & nicer addon testing truss
| * Cleanups: remove intercept from addons.state, unused importsAldo Cortesi2016-10-3013-36/+9
| |
| * Replace interception in mitmproxy and mitmweb with addonAldo Cortesi2016-10-307-51/+14
| | | | | | | | Fixes #1674
| * test.taddon: Add cycle() method, use it to test addons.interceptAldo Cortesi2016-10-304-7/+31
| |
| * Move test flow creators to mitmproxy.test.tflowAldo Cortesi2016-10-3027-264/+302
| |
| * Add addons.interceptAldo Cortesi2016-10-294-7/+65
| | | | | | | | | | - Add an addon to handle intercept based on a filter pattern - Start sketching out a nicer testing truss for addons in mitmproxy.test.taddon