Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | netlib.debug -> mitmproxy.utils.debug | Aldo Cortesi | 2016-10-20 | 3 | -2/+2 |
| | |||||
* | mitmproxy.types.[basethread,multidict,serializable] | Aldo Cortesi | 2016-10-20 | 24 | -32/+32 |
| | |||||
* | netlib.strutils -> mitmproxy.utils.strutils | Aldo Cortesi | 2016-10-20 | 26 | -25/+33 |
| | |||||
* | netlib.human -> mitmproxy.utils.human | Aldo Cortesi | 2016-10-20 | 13 | -13/+15 |
| | |||||
* | Create mitmproxy.utils hierarchy | Aldo Cortesi | 2016-10-20 | 16 | -67/+69 |
| | | | | - Add mitproxy.utils.lrucache, mitproxy.utils.data | ||||
* | netlib.version -> mitmproxy.version | Aldo Cortesi | 2016-10-20 | 16 | -17/+18 |
| | |||||
* | Merge pull request #1635 from cortesi/refactor3 | Aldo Cortesi | 2016-10-19 | 21 | -27/+27 |
|\ | | | | | mitmproxy.protocol -> mitmproxy.proxy.protocol | ||||
| * | console: fix master invocation order | Aldo Cortesi | 2016-10-19 | 2 | -2/+2 |
| | | |||||
| * | mitmproxy.protocol -> mitmproxy.proxy.protocol | Aldo Cortesi | 2016-10-19 | 19 | -25/+25 |
|/ | | | | | The protocols here are compltely proxy-specific, are only used from within the proxy module, and are not exposed to users. | ||||
* | Merge pull request #1634 from cortesi/pathoc | Thomas Kriechbaumer | 2016-10-19 | 1 | -1/+4 |
|\ | | | | | pathoc: handle error when selecting on read file | ||||
| * | pathoc: handle error when selecting on read file | Aldo Cortesi | 2016-10-19 | 1 | -1/+4 |
|/ | |||||
* | debug: add missing print output file paramater | Aldo Cortesi | 2016-10-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1633 from cortesi/refactor2 | Aldo Cortesi | 2016-10-19 | 104 | -427/+428 |
|\ | | | | | Continue module structure cleanup | ||||
| * | Move all tools into mitmproxy.tools, move models/* to top level | Aldo Cortesi | 2016-10-19 | 95 | -378/+381 |
| | | | | | | | | | | | | 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. | ||||
| * | Remove flow module entirely, move contents to top level | Aldo Cortesi | 2016-10-19 | 23 | -53/+51 |
| | | | | | | | | | | mitmproxy.flow.io -> mitmproxy.io mitmproxy.flow.export -> mitmproxy.export | ||||
* | | Merge pull request #1632 from cortesi/refactor | Aldo Cortesi | 2016-10-19 | 75 | -247/+157 |
|\| | | | | | Start rationalising our module structure bit by bit | ||||
| * | flow.state -> addons.state | Aldo Cortesi | 2016-10-19 | 9 | -118/+26 |
| | | |||||
| * | addons.Addons -> addonmanager, builtins -> addons | Aldo Cortesi | 2016-10-19 | 65 | -79/+81 |
| | | |||||
| * | controller.Log -> log.Log | Aldo Cortesi | 2016-10-19 | 7 | -51/+51 |
|/ | |||||
* | Merge pull request #1631 from cortesi/nomaster | Aldo Cortesi | 2016-10-19 | 31 | -232/+241 |
|\ | | | | | Kill flow.master - create master.Master | ||||
| * | Kill flow.master - create master.Master | Aldo Cortesi | 2016-10-19 | 31 | -232/+241 |
| | | | | | | | | Also extract events into .events | ||||
* | | Merge pull request #1630 from cortesi/multiserv | Aldo Cortesi | 2016-10-19 | 28 | -79/+75 |
|\| | | | | | Let's dispense with this fiction that we support multiple servers | ||||
| * | Let's dispense with this fiction that we support multiple servers | Aldo Cortesi | 2016-10-19 | 28 | -79/+75 |
| | | | | | | | | It's simple enough to re-add if needed, and until then is just cruft. | ||||
* | | Merge pull request #1629 from cortesi/addonhalt | Aldo Cortesi | 2016-10-19 | 5 | -3/+12 |
|\| | | | | | addons: add AddonHalt exception | ||||
| * | addons: add AddonHalt exception | Aldo Cortesi | 2016-10-19 | 5 | -3/+12 |
| | | | | | | | | | | | | This can be raised from an addon handler to stop further processing of a flow. Use this to prevent further handling of web app requests. | ||||
* | | Merge pull request #1628 from cortesi/webapp | Aldo Cortesi | 2016-10-19 | 36 | -151/+262 |
|\| | | | | | Web apps to addons | ||||
| * | web app cleanups: tests and examples | Aldo Cortesi | 2016-10-19 | 3 | -26/+10 |
| | | |||||
| * | pathoc: Guess the Host header from the path if possible | Aldo Cortesi | 2016-10-19 | 1 | -3/+14 |
| | | |||||
| * | Web apps to addons | Aldo Cortesi | 2016-10-19 | 34 | -143/+259 |
| | | | | | | | | | | This commit removes the app registry, adds a wsgiapp addon base, and ports the onboarding app to it. | ||||
* | | Merge pull request #1627 from cortesi/stateclean | Aldo Cortesi | 2016-10-18 | 3 | -16/+21 |
|\| | | | | | No need for all builtins to be loaded for server tests | ||||
| * | No need for all builtins to be loaded for server tests | Aldo Cortesi | 2016-10-18 | 3 | -16/+21 |
| | | |||||
* | | Merge pull request #1626 from cortesi/state | Aldo Cortesi | 2016-10-18 | 30 | -173/+121 |
|\| | | | | | Convert flow.state to an addon | ||||
| * | Convert flow.state to an addon | Aldo Cortesi | 2016-10-18 | 25 | -158/+101 |
| | | | | | | | | A first step, and already many things are much nicer. | ||||
| * | accept_addon -> resume, intercept/resume events | Aldo Cortesi | 2016-10-18 | 8 | -18/+23 |
| | | |||||
* | | Merge pull request #1625 from cortesi/dupflow | Aldo Cortesi | 2016-10-18 | 8 | -24/+28 |
|\| | | | | | master.duplicate_flow -> state.duplicate_flow | ||||
| * | master.duplicate_flow -> state.duplicate_flow | Aldo Cortesi | 2016-10-18 | 8 | -24/+28 |
| | | | | | | | | | | | | This is a pure operation on state, and doesn't belong on master. Part of prep to move state to an addon. | ||||
* | | Merge pull request #1624 from cortesi/streambodies | Aldo Cortesi | 2016-10-18 | 11 | -53/+76 |
|\| | | | | | Response body streaming to addon | ||||
| * | Response body streaming to addon | Aldo Cortesi | 2016-10-18 | 11 | -53/+76 |
|/ | |||||
* | Remove mention of pathod.net from README | Aldo Cortesi | 2016-10-18 | 1 | -6/+1 |
| | | | | I'm just about to redirect this to mitmproxy.org | ||||
* | dumper: limit url length | Maximilian Hils | 2016-10-17 | 1 | -0/+2 |
| | |||||
* | fix tests | Maximilian Hils | 2016-10-17 | 1 | -2/+4 |
| | |||||
* | remove empty lines at beginning of file | Thomas Kriechbaumer | 2016-10-17 | 88 | -91/+0 |
| | |||||
* | removed unused import | Thomas Kriechbaumer | 2016-10-17 | 1 | -2/+0 |
| | |||||
* | Merge pull request #1619 from mhils/fix-socks-tls | Maximilian Hils | 2016-10-16 | 2 | -3/+13 |
|\ | | | | | Fix SOCKS5 mode with TLS | ||||
| * | fix socks5 mode with tls | Maximilian Hils | 2016-10-16 | 2 | -3/+13 |
| | | |||||
* | | fix redirect_requests.py example | Maximilian Hils | 2016-10-16 | 1 | -2/+1 |
|/ | |||||
* | python3: update README and setup.py trove classifiers | Aldo Cortesi | 2016-10-17 | 2 | -5/+3 |
| | |||||
* | update protobuf, reenable for py3 (#1618) | Maximilian Hils | 2016-10-16 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1617 from cortesi/object | Aldo Cortesi | 2016-10-17 | 167 | -391/+261 |
|\ | | | | | python3 | ||||
| * | python3: clean up super and __future__ | Aldo Cortesi | 2016-10-17 | 140 | -267/+136 |
| | |