Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | view addon: systematize different flow types | Maximilian Hils | 2020-04-11 | 1 | -0/+5 |
| | |||||
* | fix Python 3.6 variable type annotations #3053 | oscure76 | 2018-04-14 | 1 | -6/+6 |
| | |||||
* | stateobject: use typing, enable tuples and more complex datatypes | Maximilian Hils | 2018-01-13 | 1 | -1/+1 |
| | |||||
* | fix Flow.kill behaviour | Maximilian Hils | 2017-12-29 | 1 | -11/+8 |
| | | | | | | | | | | This now just sets a kill reply instead of committing directly. First, this seems like the more sane thing to do. Second, we have an iffy race condition where we call Reply.commit() before the addonmanager finishes its invocation, the proxy thread then progresses and sets a new flow.reply attribute, and the addonmanager then gets confused when finishing. This commit doesn't fix that, but mitigates it for Flow.kill which is now committed by the addonmanager. | ||||
* | fix #2529 | Maximilian Hils | 2017-12-12 | 1 | -2/+4 |
| | |||||
* | fix revert of duplicated flows | Maximilian Hils | 2017-11-06 | 1 | -0/+1 |
| | |||||
* | Rip out master handler mechanism | Aldo Cortesi | 2017-03-16 | 1 | -3/+4 |
| | | | | | All events are now handled by addons, and we no longer support any events on master. | ||||
* | Merge pull request #2098 from iharsh234/bug-2086-2 | Aldo Cortesi | 2017-03-15 | 1 | -0/+2 |
|\ | | | | | Fix crash when duplicating flow | ||||
| * | Fix crash when duplicating flow | harsh vijay | 2017-03-13 | 1 | -2/+2 |
| | | |||||
| * | Fix crash when duplicating flow (#2) | harsh vijay | 2017-03-13 | 1 | -1/+3 |
| | | |||||
* | | stateobject: automatically change id when copying | Maximilian Hils | 2017-03-14 | 1 | -1/+0 |
| | | |||||
* | | decouple mitmproxy and file format version | Maximilian Hils | 2017-03-13 | 1 | -1/+1 |
|/ | |||||
* | make websocket flows serializable | Thomas Kriechbaumer | 2017-03-09 | 1 | -1/+1 |
| | | | | fixes #2113 | ||||
* | simplify state copy | Maximilian Hils | 2017-02-09 | 1 | -14/+2 |
| | |||||
* | remove intercept events, update view manually | Maximilian Hils | 2016-12-16 | 1 | -6/+3 |
| | |||||
* | [web] various fixes | Maximilian Hils | 2016-12-12 | 1 | -1/+3 |
| | |||||
* | tests: client_playback coverage | Aldo Cortesi | 2016-11-02 | 1 | -8/+8 |
| | |||||
* | http2: add push indicator | Thomas Kriechbaumer | 2016-10-27 | 1 | -1/+4 |
| | |||||
* | fix #1620 | Maximilian Hils | 2016-10-25 | 1 | -1/+2 |
| | |||||
* | Don't call error for flow kill | Aldo Cortesi | 2016-10-22 | 1 | -1/+0 |
| | | | | | This is now the error handler on master, so whatever the intetion was it's now definitely wrong. | ||||
* | netlib.version -> mitmproxy.version | Aldo Cortesi | 2016-10-20 | 1 | -1/+1 |
| | |||||
* | Move all tools into mitmproxy.tools, move models/* to top level | Aldo Cortesi | 2016-10-19 | 1 | -0/+190 |
| | | | | | | The primary motivation here (and for all the other moving around) is to present a clean "front of house" to library users, and to migrate primary objects to the top of the module hierarchy. | ||||
* | split mitmproxy.flow into mitmproxy.flow.* | Maximilian Hils | 2016-05-30 | 1 | -1248/+0 |
| | |||||
* | Satisfy flake8 | Aldo Cortesi | 2016-05-30 | 1 | -1/+5 |
| | |||||
* | handle_* -> * leftovers | Maximilian Hils | 2016-05-29 | 1 | -2/+3 |
| | |||||
* | handle_* -> * | Aldo Cortesi | 2016-05-29 | 1 | -24/+24 |
| | | | | | Now that we have the controller.handler decorator, the _handler prefix stutters. | ||||
* | Flatten ServerMaster into Master | Aldo Cortesi | 2016-05-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into solidcore | Aldo Cortesi | 2016-05-29 | 1 | -3/+3 |
|\ | |||||
| * | cleanup imports with flake8 | Thomas Kriechbaumer | 2016-05-28 | 1 | -3/+3 |
| | | |||||
* | | Make @controller.handler inheritance-friendly | Aldo Cortesi | 2016-05-28 | 1 | -1/+2 |
| | | | | | | | | Use this to adapt mitmweb and mitproxy console | ||||
* | | Mandate that all handlers must be wrapped, make tests pass | Aldo Cortesi | 2016-05-28 | 1 | -7/+7 |
| | | | | | | | | mitmproxy, mitmdump and mitmweb masters still to be done | ||||
* | | Sketch out a more solid core | Aldo Cortesi | 2016-05-28 | 1 | -7/+7 |
|/ | | | | | - Decorator for handler methods - Stricter checking for double-acks and non-acks | ||||
* | Merge pull request #1127 from mitmproxy/tcp-flows | Thomas Kriechbaumer | 2016-05-23 | 1 | -10/+53 |
|\ | | | | | mitmdump: Add Basic Support for TCP Flows | ||||
| * | add FlowMaster.active_flows | Maximilian Hils | 2016-05-19 | 1 | -11/+11 |
| | | |||||
| * | fix tests, don't double-add error'd flows | Maximilian Hils | 2016-05-19 | 1 | -2/+0 |
| | | |||||
| * | mimtdump: add basic support for tcp flows | Maximilian Hils | 2016-05-19 | 1 | -8/+53 |
| | | |||||
* | | Merge branch 'multidict' of https://github.com/mhils/mitmproxy into ↵ | Aldo Cortesi | 2016-05-21 | 1 | -18/+16 |
|\ \ | |/ |/| | | | mhils-multidict | ||||
| * | improve MultiDict, add ImmutableMultiDict, adjust response.cookies | Maximilian Hils | 2016-05-18 | 1 | -15/+13 |
| | | |||||
| * | add MultiDict | Maximilian Hils | 2016-05-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | This commit introduces MultiDict, a multi-dictionary similar to ODict, but with improved semantics (as in the Headers class). MultiDict fixes a few issues that were present in the Request/Response API. In particular, `request.cookies["foo"] = "bar"` has previously been a no-op, as the cookies property returned a mutable _copy_ of the cookies. | ||||
* | | minor improvements | Maximilian Hils | 2016-05-19 | 1 | -7/+12 |
|/ | |||||
* | Merge pull request #1121 from Kriechi/fix-cookies | Thomas Kriechbaumer | 2016-05-11 | 1 | -14/+18 |
|\ | | | | | improve cookie parsing | ||||
| * | replace SimpleCookie with our own parser lib | Thomas Kriechbaumer | 2016-05-11 | 1 | -14/+18 |
| | | |||||
* | | improve script loading | Maximilian Hils | 2016-05-11 | 1 | -10/+9 |
| | | |||||
* | | Revert "fix tests" | Maximilian Hils | 2016-05-10 | 1 | -46/+4 |
| | | | | | | | | This reverts commit f315dc1eb9f4701548fd57bbb38de1e9caa34e40. | ||||
* | | fix tests | Maximilian Hils | 2016-05-10 | 1 | -4/+46 |
|/ | |||||
* | actually fix #1115 | Maximilian Hils | 2016-05-06 | 1 | -1/+1 |
| | |||||
* | issue-1115 | Maximilian Hils | 2016-05-06 | 1 | -2/+2 |
| | |||||
* | fix bugs introduced in 317b4be | Maximilian Hils | 2016-04-29 | 1 | -2/+5 |
| | |||||
* | mitmdump: don't fail for other flowtypes | Maximilian Hils | 2016-04-29 | 1 | -18/+21 |
| | |||||
* | FlowReadError -> FlowReadException | Maximilian Hils | 2016-04-29 | 1 | -13/+7 |
| |