Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | FileStreamer -> StreamFile | Aldo Cortesi | 2016-11-03 | 8 | -38/+37 |
| | | | | options.wfile -> options.streamfile | ||||
* | addons: filestreamer test cov to 100% | Aldo Cortesi | 2016-11-03 | 4 | -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 bugfixes | Aldo Cortesi | 2016-11-03 | 3 | -42/+31 |
| | | | | | - Move tests to taddons - Fix a bug where options updates caused streaming to halt | ||||
* | Change antiquated test cipher suites | Aldo Cortesi | 2016-11-03 | 1 | -4/+4 |
| | | | | This breaks Travis, possibly due to OpenSSL version. | ||||
* | tests: add mitmdump --sysinfo to tests runs for platform info | Aldo Cortesi | 2016-11-03 | 1 | -0/+2 |
| | |||||
* | addons: dumper spit and polish | Aldo Cortesi | 2016-11-02 | 4 | -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 taddons | Aldo Cortesi | 2016-11-02 | 3 | -30/+29 |
| | |||||
* | Merge pull request #1701 from cortesi/addontest2 | Aldo Cortesi | 2016-11-02 | 45 | -273/+294 |
|\ | | | | | Test suite cleanups | ||||
| * | tests: client_playback coverage | Aldo Cortesi | 2016-11-02 | 5 | -45/+80 |
| | | |||||
| * | test coverage: complete branch coverage is NOT a goal | Aldo Cortesi | 2016-11-02 | 1 | -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.py | Aldo Cortesi | 2016-11-02 | 13 | -46/+41 |
| | | | | | | | | And remove all aliases for mitmproxy.test.tutils | ||||
| * | tests: clean up test/mitmproxy/tutils.py | Aldo Cortesi | 2016-11-02 | 28 | -168/+163 |
| | | | | | | | | Remove aliases, use mitmproxy/test/tutils instead. | ||||
| * | tests: minor cleanup for tests/mitmproxy/tutils.py | Aldo Cortesi | 2016-11-02 | 2 | -17/+13 |
|/ | |||||
* | Merge pull request #1700 from cortesi/addontests | Aldo Cortesi | 2016-11-01 | 3 | -27/+26 |
|\ | | | | | addons anticom, anticache: expand tests, new truss | ||||
| * | addons anticom, anticache: expand tests, new truss | Aldo Cortesi | 2016-11-01 | 3 | -27/+26 |
|/ | |||||
* | Merge pull request #1698 from vhaupert/master | Aldo Cortesi | 2016-11-01 | 1 | -1/+1 |
|\ | | | | | Wsgiapp: Only raise exception if an error occurred. | ||||
| * | Only raise exception if an error occurred. | Vincent Haupert | 2016-10-31 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1697 from xorrbit/patch-1 | Aldo Cortesi | 2016-11-01 | 1 | -4/+16 |
|\ \ | |/ |/| | Update for Ubuntu 16.04 | ||||
| * | Update for Ubuntu 16.04 | Andrew Orr | 2016-10-31 | 1 | -4/+16 |
| | | |||||
* | | Merge pull request #1696 from cortesi/rmstate | Aldo Cortesi | 2016-11-01 | 10 | -542/+109 |
|\ \ | |/ |/| | Remove addons.State entirely | ||||
| * | Extend mypy checks to mitmproxy/addons | Aldo Cortesi | 2016-11-01 | 3 | -18/+17 |
| | | | | | | | | Fix a number of issues to do this. | ||||
| * | Remove addons.State | Aldo Cortesi | 2016-11-01 | 6 | -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 suite | Aldo Cortesi | 2016-11-01 | 2 | -14/+30 |
| | | | | | | | | Use a super-simple flow recorder instead. | ||||
* | | Merge pull request #1695 from cortesi/term | Aldo Cortesi | 2016-11-01 | 1 | -11/+3 |
|\| | | | | | console: Minor cleanups | ||||
| * | console: Minor cleanups | Aldo Cortesi | 2016-11-01 | 1 | -11/+3 |
|/ | |||||
* | Merge pull request #1694 from cortesi/cachekey | Aldo Cortesi | 2016-10-30 | 8 | -93/+171 |
|\ | | | | | console: add caching sort keys | ||||
| * | console: add caching sort keys | Aldo Cortesi | 2016-10-30 | 3 | -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 focus | Aldo Cortesi | 2016-10-30 | 7 | -26/+40 |
| | | |||||
* | | Merge pull request #1693 from cortesi/statusbar | Aldo Cortesi | 2016-10-30 | 2 | -5/+20 |
|\| | | | | | console: status bar improvements | ||||
| * | console: show order option in status bar | Aldo Cortesi | 2016-10-30 | 1 | -0/+4 |
| | | |||||
| * | console: status bar improvements | Aldo Cortesi | 2016-10-30 | 2 | -5/+16 |
| | | | | | | | | | | - Arrow to show flow order - Hook statusbar up to focus change to fix some update issues | ||||
* | | Merge pull request #1692 from cortesi/floworder | Aldo Cortesi | 2016-10-30 | 8 | -10/+88 |
|\| | | | | | console: o for flow order | ||||
| * | console: "v" to reverse flow order | Aldo Cortesi | 2016-10-30 | 4 | -6/+23 |
| | | |||||
| * | console: o for flow order | Aldo Cortesi | 2016-10-30 | 8 | -5/+66 |
| | | | | | | | | | | | | "o" shortcut and --order cmdline option to change flow order. Options is now bound to "O". | ||||
* | | Merge pull request #1691 from cortesi/consoleclean1 | Aldo Cortesi | 2016-10-30 | 5 | -43/+34 |
|\| | | | | | console: various cleanups | ||||
| * | addons.view: fix tests | Aldo Cortesi | 2016-10-30 | 1 | -2/+1 |
| | | |||||
| * | docs: examples/logging -> examples/context_logging | Aldo Cortesi | 2016-10-30 | 1 | -3/+3 |
| | | |||||
| * | console: various cleanups | Aldo Cortesi | 2016-10-30 | 4 | -40/+32 |
|/ | |||||
* | Merge pull request #1690 from cortesi/consoleview | Aldo Cortesi | 2016-10-30 | 9 | -470/+179 |
|\ | | | | | console: Port from state to view | ||||
| * | mitmproxy.console: Complete port to view. | Aldo Cortesi | 2016-10-30 | 3 | -47/+29 |
| | | |||||
| * | addons.view: Add first-class support for marking | Aldo Cortesi | 2016-10-30 | 4 | -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 view | Aldo Cortesi | 2016-10-30 | 6 | -327/+129 |
| | | | | | | | | | | First phase of the port - basic flow list and flow view functionality working. More to come. | ||||
* | | Merge pull request #1689 from cortesi/contentoption | Aldo Cortesi | 2016-10-30 | 8 | -37/+36 |
|\| | | | | | Add options.default_contentview | ||||
| * | Add options.default_contentview | Aldo Cortesi | 2016-10-30 | 8 | -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/intercept | Aldo Cortesi | 2016-10-30 | 36 | -356/+448 |
|\| | | | | | Intercept addon & nicer addon testing truss | ||||
| * | Cleanups: remove intercept from addons.state, unused imports | Aldo Cortesi | 2016-10-30 | 13 | -36/+9 |
| | | |||||
| * | Replace interception in mitmproxy and mitmweb with addon | Aldo Cortesi | 2016-10-30 | 7 | -51/+14 |
| | | | | | | | | Fixes #1674 | ||||
| * | test.taddon: Add cycle() method, use it to test addons.intercept | Aldo Cortesi | 2016-10-30 | 4 | -7/+31 |
| | | |||||
| * | Move test flow creators to mitmproxy.test.tflow | Aldo Cortesi | 2016-10-30 | 27 | -264/+302 |
| | | |||||
| * | Add addons.intercept | Aldo Cortesi | 2016-10-29 | 4 | -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 |