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
Aldo Cortesi
ce98a9219e
test & examples: zap six
2016-10-17 16:45:45 +13:00
Maximilian Hils
3fbce7e981
update pydivert dependency ( #1614 )
2016-10-16 20:30:28 -07:00
Aldo Cortesi
839813a84c
mitmproxy: zap six
2016-10-17 16:22:44 +13:00
Aldo Cortesi
d60ef617e3
pathod: remove six
2016-10-17 15:43:38 +13:00
Aldo Cortesi
421679a770
Merge pull request #1613 from cortesi/python3
...
First-order conversion to Python3-only
2016-10-17 15:35:09 +13:00
Aldo Cortesi
8360f70024
First-order conversion to Python3-only
...
- Zap various occurrences of Python2 in docs and scripts
- Remove six from netlib, and some other places where obvious project-wide
search and replace works.
2016-10-17 15:18:47 +13:00
Aldo Cortesi
4918feb725
Add stub converter for 0.19 io format
2016-10-17 08:47:03 +13:00
Aldo Cortesi
dcbb968b1b
Bump version post release
2016-10-17 00:29:49 +13:00
Aldo Cortesi
5db860a334
Bump to 0.18.1 to fix pypi obstreperousness
...
Also include contriburors update.
2016-10-16 23:52:47 +13:00
Aldo Cortesi
e4a32d6844
Merge pull request #1602 from cortesi/scriptdocs
...
docs: stub out new script documentation
2016-10-16 20:50:09 +13:00
Aldo Cortesi
00603021d9
docs: concurrency, developing scripts
2016-10-16 20:39:34 +13:00
Aldo Cortesi
9a0195bf64
scripts: keep scripts just after the ScriptLoader in addon chain
...
We need scripts to run _before_ filestreamer, so we can't just add them to the
end of the chain. This patch also fixes an issue that could cause scripts to be
initialised un-necessarily if only the order of scripts in options changed.
2016-10-16 20:26:06 +13:00
Aldo Cortesi
57b8ed21a9
docs: scripts on saved flows
2016-10-16 20:26:06 +13:00
Aldo Cortesi
97b594b848
mitmdump: fix addon order - dumper must be last
...
This is so we can see the effects of script rewriting using -dd.
2016-10-16 20:26:06 +13:00
Maximilian Hils
072fff90f1
docs: link to correct tag
2016-10-16 20:26:06 +13:00
Aldo Cortesi
55cb2a8547
docs: logging and the context
2016-10-16 20:26:06 +13:00
Aldo Cortesi
a6c7a1ff91
scripts: handle SystemExit from scripts explicitly
2016-10-16 20:26:06 +13:00
Aldo Cortesi
dc19ff7a9d
mitmdump: show script errors on startup
...
Add the terminal logger before any other addons, so we see script errors on
startup.
2016-10-16 20:26:06 +13:00
Aldo Cortesi
fb69c9c345
docs: overview, classes, arguments
2016-10-16 20:26:06 +13:00
Aldo Cortesi
61040a7bcd
docs: improve external source links, tweak code docs
2016-10-16 20:26:06 +13:00
Aldo Cortesi
c8f2f1019d
Clean up models.http a bit
...
- We don't need a deprecation warning here
- Bring imports inline with policy
2016-10-16 20:26:06 +13:00
Aldo Cortesi
fdb6a44245
docs: cleanups improvements and fighting sphinx
...
- Hide links to internal code listings, and link to github instead
- Improve formatting of code/example captions
- Fix outdated documentation of command-line options
- Complete documentation of all events + improved formatting
- tcp_open -> tcp_start, tcp_close -> tcp_end to reduce confusion
2016-10-16 20:26:06 +13:00
