Aldo Cortesi
9e7438fb18
console: fix master invocation order
2016-10-19 23:16:18 +13:00
Aldo Cortesi
e73c7fe77e
mitmproxy.protocol -> mitmproxy.proxy.protocol
...
The protocols here are compltely proxy-specific, are only used from within the
proxy module, and are not exposed to users.
2016-10-19 23:11:56 +13:00
Thomas Kriechbaumer
e9f7cf68e9
Merge pull request #1634 from cortesi/pathoc
...
pathoc: handle error when selecting on read file
2016-10-19 11:27:39 +02:00
Aldo Cortesi
f4da81f749
pathoc: handle error when selecting on read file
2016-10-19 22:05:25 +13:00
Aldo Cortesi
25e866b669
debug: add missing print output file paramater
2016-10-19 21:53:58 +13:00
Aldo Cortesi
b1cf9dd5e3
Merge pull request #1633 from cortesi/refactor2
...
Continue module structure cleanup
2016-10-19 21:26:54 +13:00
Aldo Cortesi
24cf8da27e
Move all tools into mitmproxy.tools, move models/* to top level
...
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.
2016-10-19 20:26:05 +13:00
Aldo Cortesi
5a68d21e8c
Remove flow module entirely, move contents to top level
...
mitmproxy.flow.io -> mitmproxy.io
mitmproxy.flow.export -> mitmproxy.export
2016-10-19 15:08:35 +13:00
Aldo Cortesi
49346c5248
Merge pull request #1632 from cortesi/refactor
...
Start rationalising our module structure bit by bit
2016-10-19 15:03:50 +13:00
Aldo Cortesi
7c32d4ea2a
flow.state -> addons.state
2016-10-19 14:48:42 +13:00
Aldo Cortesi
22eebfd574
addons.Addons -> addonmanager, builtins -> addons
2016-10-19 14:39:39 +13:00
Aldo Cortesi
966418725b
controller.Log -> log.Log
2016-10-19 14:14:59 +13:00
Aldo Cortesi
83dbefb224
Merge pull request #1631 from cortesi/nomaster
...
Kill flow.master - create master.Master
2016-10-19 13:45:19 +13:00
Aldo Cortesi
bce387a5a0
Kill flow.master - create master.Master
...
Also extract events into .events
2016-10-19 13:22:50 +13:00
Aldo Cortesi
12cdc1577a
Merge pull request #1630 from cortesi/multiserv
...
Let's dispense with this fiction that we support multiple servers
2016-10-19 13:15:44 +13:00
Aldo Cortesi
8b5fb4b613
Merge pull request #1629 from cortesi/addonhalt
...
addons: add AddonHalt exception
2016-10-19 12:38:43 +13:00
Aldo Cortesi
264a09e778
Let's dispense with this fiction that we support multiple servers
...
It's simple enough to re-add if needed, and until then is just cruft.
2016-10-19 12:37:32 +13:00
Aldo Cortesi
8c888a58b9
Merge pull request #1628 from cortesi/webapp
...
Web apps to addons
2016-10-19 12:08:05 +13:00
Aldo Cortesi
da8dec9823
addons: add AddonHalt exception
...
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.
2016-10-19 12:01:08 +13:00
Aldo Cortesi
87629586ae
web app cleanups: tests and examples
2016-10-19 11:48:51 +13:00
Aldo Cortesi
85015fe561
pathoc: Guess the Host header from the path if possible
2016-10-19 11:41:42 +13:00
Aldo Cortesi
ceb8caee98
Web apps to addons
...
This commit removes the app registry, adds a wsgiapp addon base, and ports the
onboarding app to it.
2016-10-19 11:40:51 +13:00
Aldo Cortesi
8b51af1676
Merge pull request #1627 from cortesi/stateclean
...
No need for all builtins to be loaded for server tests
2016-10-18 22:46:44 +13:00
Aldo Cortesi
03cb5bb325
No need for all builtins to be loaded for server tests
2016-10-18 22:30:21 +13:00
Aldo Cortesi
a1859da390
Merge pull request #1626 from cortesi/state
...
Convert flow.state to an addon
2016-10-18 22:05:05 +13:00
Aldo Cortesi
466f5e56a1
Convert flow.state to an addon
...
A first step, and already many things are much nicer.
2016-10-18 21:51:36 +13:00
Aldo Cortesi
faa26a5d6b
Merge pull request #1625 from cortesi/dupflow
...
master.duplicate_flow -> state.duplicate_flow
2016-10-18 12:28:47 +13:00
Aldo Cortesi
d5056c5627
accept_addon -> resume, intercept/resume events
2016-10-18 12:02:35 +13:00
Aldo Cortesi
825b02d495
master.duplicate_flow -> state.duplicate_flow
...
This is a pure operation on state, and doesn't belong on master.
Part of prep to move state to an addon.
2016-10-18 11:29:51 +13:00
Aldo Cortesi
323f04fbe1
Merge pull request #1624 from cortesi/streambodies
...
Response body streaming to addon
2016-10-18 11:14:44 +13:00
Aldo Cortesi
b25d94a6ac
Response body streaming to addon
2016-10-18 10:42:05 +13:00
Aldo Cortesi
381ad898ac
Remove mention of pathod.net from README
...
I'm just about to redirect this to mitmproxy.org
2016-10-18 09:06:32 +13:00
Maximilian Hils
c6d485bc77
dumper: limit url length
2016-10-17 12:56:11 +02:00
Maximilian Hils
beed406058
fix tests
2016-10-17 03:37:42 -07:00
Thomas Kriechbaumer
94c9dd66e6
remove empty lines at beginning of file
2016-10-17 10:32:12 +02:00
Thomas Kriechbaumer
e59a3be09d
removed unused import
2016-10-17 09:55:49 +02:00
Maximilian Hils
7047531a3c
Merge pull request #1619 from mhils/fix-socks-tls
...
Fix SOCKS5 mode with TLS
2016-10-16 23:50:25 -07:00
Maximilian Hils
02d3d61820
fix redirect_requests.py example
2016-10-16 23:49:54 -07:00
Maximilian Hils
758860531a
fix socks5 mode with tls
2016-10-16 23:05:51 -07:00
Aldo Cortesi
43a83c89e7
python3: update README and setup.py trove classifiers
2016-10-17 18:42:48 +13:00
Maximilian Hils
209c73336c
update protobuf, reenable for py3 ( #1618 )
2016-10-16 22:22:12 -07:00
Aldo Cortesi
00071238d2
Merge pull request #1617 from cortesi/object
...
python3
2016-10-17 18:21:23 +13:00
Aldo Cortesi
c774a9fec9
python3: clean up super and __future__
2016-10-17 18:03:07 +13:00
Aldo Cortesi
a647b30365
python3: clean up class brackets
2016-10-17 17:37:08 +13:00
Aldo Cortesi
fb22f2ff4f
Zap object base class
2016-10-17 17:37:08 +13:00
Maximilian Hils
666c59cbfb
actually fix merge 🙈
2016-10-16 21:33:24 -07:00
Maximilian Hils
bdaa13d498
fix merge
2016-10-16 21:23:04 -07:00
Maximilian Hils
9389601025
Merge branch 'such-types'
2016-10-16 21:17:39 -07:00
Aldo Cortesi
ae3ff8ee1e
Merge pull request #1615 from cortesi/python3a
...
exterminate six
2016-10-17 17:03:02 +13:00
Maximilian Hils
5a07892bfc
py2--: inline type info
2016-10-16 20:56:46 -07:00
