Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3099 from Kriechi/fix-3024 | Aldo Cortesi | 2018-05-06 | 2 | -15/+39 |
|\ | | | | | fix #3024 | ||||
| * | fix #3024 | Thomas Kriechbaumer | 2018-05-05 | 2 | -15/+39 |
| | | |||||
* | | Merge pull request #3098 from drzax/patch-1 | Thomas Kriechbaumer | 2018-05-05 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in addons-overview.md | ||||
| * | | Fix typo in addons-overview.md | Simon Elvery | 2018-05-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3093 from cortesi/diecustom | Aldo Cortesi | 2018-05-05 | 2 | -16/+21 |
|\ \ | | | | | | | Remove custom events | ||||
| * | | Remove custom events | Aldo Cortesi | 2018-05-03 | 2 | -16/+21 |
| | | | | | | | | | | | | | | | These were always weird, and were added to support exit when processing completed to mitmdump. We now have better ways to do this. | ||||
* | | | Merge pull request #3097 from cortesi/examp | Aldo Cortesi | 2018-05-05 | 2 | -4/+11 |
|\ \ \ | | | | | | | | | Revamp dup_and_replay example | ||||
| * | | | Revamp dup_and_replay example | Aldo Cortesi | 2018-05-05 | 2 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Exposes view.add as a command - Copes with cases where a view addon isn't present - Avoids infinite loop caused by replaying replays Fixes #3096 | ||||
* | | | | Merge pull request #3091 from cortesi/dietick | Aldo Cortesi | 2018-05-03 | 8 | -48/+16 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Remove the tick event | ||||
| * | | Remove the tick event | Aldo Cortesi | 2018-05-02 | 8 | -48/+16 |
| | | | | | | | | | | | | Mitmproxy: the tickless wonder. | ||||
* | | | Merge pull request #3090 from cortesi/iflight | Aldo Cortesi | 2018-05-02 | 16 | -62/+99 |
|\| | | | | | | | | Redesign keepserving | ||||
| * | | Catch some stray command.call invocations | Aldo Cortesi | 2018-05-02 | 2 | -4/+4 |
| | | | |||||
| * | | taddons: remove has_event | Aldo Cortesi | 2018-05-02 | 2 | -12/+0 |
| | | | | | | | | | | | | We no longer use this anywhere, so ditch it. | ||||
| * | | Redesign keepserving | Aldo Cortesi | 2018-05-02 | 9 | -40/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Instead of listening for a pseudo-event, we periodically check whether client replay, server replay or file reading is active. - Adjust server replay not to use tick. - Adjust readfile to expose a command to check whether reading is in progress. | ||||
| * | | console: use replay count commands in statusbar | Aldo Cortesi | 2018-05-02 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | Also add a periodic refresh every 0.5 seconds for the statusbar. This is in addition to refreshes upon event update notifications, and picks up replay status changes not linked to flow events. | ||||
| * | | server replay: expose the replay.server.count command | Aldo Cortesi | 2018-05-02 | 1 | -0/+1 |
| | | | |||||
| * | | client replay: replaying flows in-flight should be added to count() | Aldo Cortesi | 2018-05-02 | 2 | -2/+7 |
| | | | |||||
* | | | Merge pull request #3089 from cortesi/creplay | Aldo Cortesi | 2018-05-02 | 22 | -411/+386 |
|\| | | | | | | | | Revamp client replay | ||||
| * | | commands: clarify command call interface, fix web app replay | Aldo Cortesi | 2018-05-02 | 8 | -35/+40 |
| | | | |||||
| * | | client replay: use count command for console statusbar | Aldo Cortesi | 2018-05-01 | 1 | -3/+4 |
| | | | |||||
| * | | client replay: expad and consolidate tests | Aldo Cortesi | 2018-05-01 | 4 | -97/+128 |
| | | | |||||
| * | | client replay: revert our changes if replay is aborted | Aldo Cortesi | 2018-04-30 | 1 | -0/+2 |
| | | | |||||
| * | | client replay: re-design | Aldo Cortesi | 2018-04-30 | 8 | -209/+154 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-design the way client replay works. Before, we would fire up a thread, replay, wait for the thread to complete, get the next flow, and repeat the procedure. Now, we have one replay thread that starts when the addon starts, which pops flows off a thread-safe queue. This is much cleaner, removes the need for busy tick, and sets the scene for optimisations like server connection reuse down the track. | ||||
| * | | client replay: move all client replay-related code into addon | Aldo Cortesi | 2018-04-27 | 9 | -269/+260 |
|/ / | |||||
* | | Merge pull request #3082 from p1uymi/patch-2 | Aldo Cortesi | 2018-04-27 | 1 | -3/+3 |
|\ \ | | | | | | | Changed syntax of two options (from v2 to v3) | ||||
| * | | Changed syntax from v2 to v3 | p1uymi | 2018-04-26 | 1 | -3/+3 |
| | | | | | | | | | | | | --client-certs = v2 syntax --> --set client_certs=value = v3 syntax --cadir = v2 syntax --> --set cadir=value = v3 syntax | ||||
* | | | Merge pull request #3083 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-04-27 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | [requires.io] dependency update on master branch | ||||
| * | | [requires.io] dependency update | requires.io | 2018-04-27 | 0 | -0/+0 |
| | | | |||||
| * | | [requires.io] dependency update | requires.io | 2018-04-26 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3078 from kajojify/expanduser | Aldo Cortesi | 2018-04-26 | 4 | -5/+10 |
|\ \ | | | | | | | Fix #3002. Auto-expanding for tilda. | ||||
| * | | Incompatible types | Miroslav | 2018-04-26 | 1 | -2/+2 |
| | | | |||||
| * | | Lint | Miroslav | 2018-04-26 | 1 | -1/+0 |
| | | | |||||
| * | | Fix #3002. Auto-expanding | Miroslav | 2018-04-26 | 4 | -4/+10 |
| | | | |||||
* | | | Merge pull request #3076 from clyfish/keepalive | Aldo Cortesi | 2018-04-26 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | add SO_KEEPALIVE | ||||
| * | | | add SO_KEEPALIVE | Cheng Liangyu | 2018-04-25 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #3071 from cortesi/tickless | Aldo Cortesi | 2018-04-26 | 43 | -327/+348 |
|\ \ \ \ | |_|/ / |/| | | | asyncio: shift script reloading out of the tick event | ||||
| * | | | test: shift test_data out of our public API | Aldo Cortesi | 2018-04-23 | 33 | -229/+216 |
| | | | | |||||
| * | | | addons/script: improve relability of reload test | Aldo Cortesi | 2018-04-23 | 4 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | The granularity of mtime is surprisingly bad. Make the tests more robust against this, and promote has_log back to a public method, now that we have a few legitimate examples. | ||||
| * | | | asyncio: shift script reloading out of the tick event | Aldo Cortesi | 2018-04-23 | 13 | -105/+133 |
| |/ / | | | | | | | | | | | | | | | | | | | The tick event is a nasty compromise, left over from when we didn't have an event loop. This is the first patch in a series that explores moving our built-in addons to managing coroutines on the eventloop directly for periodic tasks. | ||||
* | | | Merge pull request #3077 from mhils/pytest-fix | Maximilian Hils | 2018-04-25 | 3 | -3/+3 |
|\ \ \ | |/ / |/| | | Fix pytest invocation errors | ||||
| * | | fix pytest invocation errors | Maximilian Hils | 2018-04-25 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #3070 from CorTal/Fix#3066 | Thomas Kriechbaumer | 2018-04-18 | 1 | -1/+1 |
|\ \ | | | | | | | Fix asyncio.call_soon -> asyncio.ensure_future | ||||
| * | | call_soon->ensure_future | CorTal | 2018-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3069 from cortesi/mweb | Aldo Cortesi | 2018-04-18 | 3 | -29/+8 |
|\ \ | | | | | | | A grab-bag of mitmweb-related fixes | ||||
| * | | mitmweb: don't blort all over my config file | Aldo Cortesi | 2018-04-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Temporarily disable config saving until we can look at this more closely. Config saving should: - Only happen when explicitly requested by the user - Only save changed values | ||||
| * | | tcp: As of Python 3.5, EINTR is retried automatically by select | Aldo Cortesi | 2018-04-18 | 1 | -10/+1 |
| | | | | | | | | | | | | See https://www.python.org/dev/peps/pep-0475/ | ||||
| * | | mitmweb: shift to use new run_loop wrapper on master | Aldo Cortesi | 2018-04-18 | 1 | -14/+2 |
|/ / | | | | | | | Fixes #3067 | ||||
* | | Merge pull request #3064 from cortesi/mexit | Aldo Cortesi | 2018-04-18 | 2 | -24/+29 |
|\ \ | | | | | | | asyncio: fix exit behaviour for console | ||||
| * | | asyncio: fix exit behavior for console | Aldo Cortesi | 2018-04-17 | 2 | -24/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a master.run_loop function. This encapsulates our run behaviour so that it can be used by implementations that need to manage their own run loop (like urwid). - Shift crash exit message to the common core. I'm not convinced we really need this, but if we want it it should be centralised. - Clean up an extra exception that can be thrown by asyncio itself on "dirty" termination after a mitmproxy crash. | ||||
* | | | Merge pull request #3063 from cortesi/sigs | Aldo Cortesi | 2018-04-17 | 2 | -17/+22 |
|\| | | | | | | | | Ignore signal errors on windows + various fixes |