aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/flow.py
Commit message (Collapse)AuthorAgeFilesLines
* view addon: systematize different flow typesMaximilian Hils2020-04-111-0/+5
|
* fix Python 3.6 variable type annotations #3053oscure762018-04-141-6/+6
|
* stateobject: use typing, enable tuples and more complex datatypesMaximilian Hils2018-01-131-1/+1
|
* fix Flow.kill behaviourMaximilian Hils2017-12-291-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 #2529Maximilian Hils2017-12-121-2/+4
|
* fix revert of duplicated flowsMaximilian Hils2017-11-061-0/+1
|
* Rip out master handler mechanismAldo Cortesi2017-03-161-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-2Aldo Cortesi2017-03-151-0/+2
|\ | | | | Fix crash when duplicating flow
| * Fix crash when duplicating flowharsh vijay2017-03-131-2/+2
| |
| * Fix crash when duplicating flow (#2)harsh vijay2017-03-131-1/+3
| |
* | stateobject: automatically change id when copyingMaximilian Hils2017-03-141-1/+0
| |
* | decouple mitmproxy and file format versionMaximilian Hils2017-03-131-1/+1
|/
* make websocket flows serializableThomas Kriechbaumer2017-03-091-1/+1
| | | | fixes #2113
* simplify state copyMaximilian Hils2017-02-091-14/+2
|
* remove intercept events, update view manuallyMaximilian Hils2016-12-161-6/+3
|
* [web] various fixesMaximilian Hils2016-12-121-1/+3
|
* tests: client_playback coverageAldo Cortesi2016-11-021-8/+8
|
* http2: add push indicatorThomas Kriechbaumer2016-10-271-1/+4
|
* fix #1620Maximilian Hils2016-10-251-1/+2
|
* Don't call error for flow killAldo Cortesi2016-10-221-1/+0
| | | | | This is now the error handler on master, so whatever the intetion was it's now definitely wrong.
* netlib.version -> mitmproxy.versionAldo Cortesi2016-10-201-1/+1
|
* Move all tools into mitmproxy.tools, move models/* to top levelAldo Cortesi2016-10-191-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 Hils2016-05-301-1248/+0
|
* Satisfy flake8Aldo Cortesi2016-05-301-1/+5
|
* handle_* -> * leftoversMaximilian Hils2016-05-291-2/+3
|
* handle_* -> *Aldo Cortesi2016-05-291-24/+24
| | | | | Now that we have the controller.handler decorator, the _handler prefix stutters.
* Flatten ServerMaster into MasterAldo Cortesi2016-05-291-1/+1
|
* Merge branch 'master' into solidcoreAldo Cortesi2016-05-291-3/+3
|\
| * cleanup imports with flake8Thomas Kriechbaumer2016-05-281-3/+3
| |
* | Make @controller.handler inheritance-friendlyAldo Cortesi2016-05-281-1/+2
| | | | | | | | Use this to adapt mitmweb and mitproxy console
* | Mandate that all handlers must be wrapped, make tests passAldo Cortesi2016-05-281-7/+7
| | | | | | | | mitmproxy, mitmdump and mitmweb masters still to be done
* | Sketch out a more solid coreAldo Cortesi2016-05-281-7/+7
|/ | | | | - Decorator for handler methods - Stricter checking for double-acks and non-acks
* Merge pull request #1127 from mitmproxy/tcp-flowsThomas Kriechbaumer2016-05-231-10/+53
|\ | | | | mitmdump: Add Basic Support for TCP Flows
| * add FlowMaster.active_flowsMaximilian Hils2016-05-191-11/+11
| |
| * fix tests, don't double-add error'd flowsMaximilian Hils2016-05-191-2/+0
| |
| * mimtdump: add basic support for tcp flowsMaximilian Hils2016-05-191-8/+53
| |
* | Merge branch 'multidict' of https://github.com/mhils/mitmproxy into ↵Aldo Cortesi2016-05-211-18/+16
|\ \ | |/ |/| | | mhils-multidict
| * improve MultiDict, add ImmutableMultiDict, adjust response.cookiesMaximilian Hils2016-05-181-15/+13
| |
| * add MultiDictMaximilian Hils2016-05-181-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 improvementsMaximilian Hils2016-05-191-7/+12
|/
* Merge pull request #1121 from Kriechi/fix-cookiesThomas Kriechbaumer2016-05-111-14/+18
|\ | | | | improve cookie parsing
| * replace SimpleCookie with our own parser libThomas Kriechbaumer2016-05-111-14/+18
| |
* | improve script loadingMaximilian Hils2016-05-111-10/+9
| |
* | Revert "fix tests"Maximilian Hils2016-05-101-46/+4
| | | | | | | | This reverts commit f315dc1eb9f4701548fd57bbb38de1e9caa34e40.
* | fix testsMaximilian Hils2016-05-101-4/+46
|/
* actually fix #1115Maximilian Hils2016-05-061-1/+1
|
* issue-1115Maximilian Hils2016-05-061-2/+2
|
* fix bugs introduced in 317b4beMaximilian Hils2016-04-291-2/+5
|
* mitmdump: don't fail for other flowtypesMaximilian Hils2016-04-291-18/+21
|
* FlowReadError -> FlowReadExceptionMaximilian Hils2016-04-291-13/+7
|