Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #1615 from cortesi/python3a | Aldo Cortesi | 2016-10-17 | 60 | -336/+208 | |
|\ \ | |/ |/| | exterminate six | |||||
| * | test & examples: zap six | Aldo Cortesi | 2016-10-17 | 30 | -133/+107 | |
| | | ||||||
| * | mitmproxy: zap six | Aldo Cortesi | 2016-10-17 | 24 | -191/+97 | |
| | | ||||||
| * | pathod: remove six | Aldo Cortesi | 2016-10-17 | 7 | -19/+11 | |
| | | ||||||
* | | update pydivert dependency (#1614) | Maximilian Hils | 2016-10-16 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1613 from cortesi/python3 | Aldo Cortesi | 2016-10-17 | 31 | -203/+90 | |
|\| | | | | | First-order conversion to Python3-only | |||||
| * | First-order conversion to Python3-only | Aldo Cortesi | 2016-10-17 | 31 | -203/+90 | |
|/ | | | | | | - 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. | |||||
* | Add stub converter for 0.19 io format | Aldo Cortesi | 2016-10-17 | 1 | -0/+6 | |
| | ||||||
* | Bump version post release | Aldo Cortesi | 2016-10-17 | 1 | -1/+1 | |
| | ||||||
* | Bump to 0.18.1 to fix pypi obstreperousness | Aldo Cortesi | 2016-10-16 | 3 | -106/+67 | |
| | | | | Also include contriburors update. | |||||
* | Merge pull request #1602 from cortesi/scriptdocs | Aldo Cortesi | 2016-10-16 | 30 | -466/+624 | |
|\ | | | | | docs: stub out new script documentation | |||||
| * | docs: concurrency, developing scripts | Aldo Cortesi | 2016-10-16 | 3 | -32/+20 | |
| | | ||||||
| * | scripts: keep scripts just after the ScriptLoader in addon chain | Aldo Cortesi | 2016-10-16 | 4 | -16/+43 | |
| | | | | | | | | | | | | 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. | |||||
| * | docs: scripts on saved flows | Aldo Cortesi | 2016-10-16 | 1 | -7/+23 | |
| | | ||||||
| * | mitmdump: fix addon order - dumper must be last | Aldo Cortesi | 2016-10-16 | 1 | -1/+1 | |
| | | | | | | | | This is so we can see the effects of script rewriting using -dd. | |||||
| * | docs: link to correct tag | Maximilian Hils | 2016-10-16 | 1 | -5/+16 | |
| | | ||||||
| * | docs: logging and the context | Aldo Cortesi | 2016-10-16 | 6 | -27/+68 | |
| | | ||||||
| * | scripts: handle SystemExit from scripts explicitly | Aldo Cortesi | 2016-10-16 | 1 | -0/+2 | |
| | | ||||||
| * | mitmdump: show script errors on startup | Aldo Cortesi | 2016-10-16 | 1 | -1/+1 | |
| | | | | | | | | | | Add the terminal logger before any other addons, so we see script errors on startup. | |||||
| * | docs: overview, classes, arguments | Aldo Cortesi | 2016-10-16 | 7 | -47/+86 | |
| | | ||||||
| * | docs: improve external source links, tweak code docs | Aldo Cortesi | 2016-10-16 | 3 | -38/+53 | |
| | | ||||||
| * | Clean up models.http a bit | Aldo Cortesi | 2016-10-16 | 1 | -31/+17 | |
| | | | | | | | | | | - We don't need a deprecation warning here - Bring imports inline with policy | |||||
| * | docs: cleanups improvements and fighting sphinx | Aldo Cortesi | 2016-10-16 | 18 | -356/+389 | |
|/ | | | | | | | | - 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 | |||||
* | fix #1611 | Maximilian Hils | 2016-10-15 | 1 | -4/+2 | |
| | ||||||
* | update CHANGELOG | Maximilian Hils | 2016-10-15 | 1 | -0/+48 | |
| | ||||||
* | Merge pull request #1610 from mhils/issue-1605 | Maximilian Hils | 2016-10-14 | 2 | -12/+19 | |
|\ | | | | | Fix #1605 | |||||
| * | add regression test for #1605 | Maximilian Hils | 2016-10-14 | 1 | -0/+13 | |
| | | ||||||
| * | fix #1605 | Maximilian Hils | 2016-10-13 | 1 | -12/+6 | |
|/ | ||||||
* | Issue 1461 (#1609) | Sanchit Sokhey | 2016-10-13 | 1 | -3/+14 | |
| | | | | | | | | | | | | | | * doc changes * doc changes * doc changes * doc changes * Documentation updated * Documentation for custom certificate updated | |||||
* | Merge pull request #1603 from mhils/eof | Maximilian Hils | 2016-10-05 | 2 | -16/+5 | |
|\ | | | | | Simplify EOF detection | |||||
| * | simplify eof detection | Maximilian Hils | 2016-10-05 | 2 | -16/+5 | |
|/ | ||||||
* | Merge pull request #1601 from cortesi/certcap | Aldo Cortesi | 2016-10-05 | 3 | -1/+37 | |
|\ | | | | | certutils: cap the cert store size at 100 by default | |||||
| * | certutils: cap the cert store size at 100 by default | Aldo Cortesi | 2016-10-05 | 2 | -0/+36 | |
| | | | | | | | | | | | | | | | | This should be enough to give us reuse without growing infinitely. This is part of fixing the memory situation in mitmdump. TODO: There's an opportunity here for a better algorithm, that expires certs based on least-recently-accessed time, rather than oldest generated time. | |||||
| * | debug: use correct fp for memory object output | Aldo Cortesi | 2016-10-05 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #1598 from cortesi/dummystate | Thomas Kriechbaumer | 2016-10-04 | 3 | -10/+13 | |
|\ | | | | | mitmdump: use a dummy state object | |||||
| * | mitmdump: use a dummy state object | Aldo Cortesi | 2016-10-04 | 3 | -10/+13 | |
| | | | | | | | | | | | | Most of the mitmdump memory leak turns out to be due to our leaky handling of the state object. Since mitmdump doesn't actually use the state object, we can replace it with a shell. | |||||
* | | use flt instead of filt for flowfilter expressions | Thomas Kriechbaumer | 2016-10-04 | 4 | -11/+11 | |
| | | ||||||
* | | Merge pull request #1597 from cortesi/debug | Aldo Cortesi | 2016-10-04 | 2 | -4/+23 | |
|\| | | | | | debug: add a dump of objects in memory | |||||
| * | debug: Hard exit after debug signal | Aldo Cortesi | 2016-10-04 | 2 | -4/+9 | |
| | | ||||||
| * | debug: add a dump of objects in memory | Aldo Cortesi | 2016-10-04 | 1 | -0/+14 | |
| | | ||||||
* | | Merge pull request #1596 from cortesi/addons | Aldo Cortesi | 2016-10-04 | 12 | -46/+81 | |
|\| | | | | | Consolidate logging | |||||
| * | Consolidate logging | Aldo Cortesi | 2016-10-04 | 12 | -46/+81 | |
| | | | | | | | | | | | | - Make log event handler work - Move terminal event log into an addon - Clean various log related errors and duplications | |||||
* | | Merge pull request #1592 from cortesi/ws | Aldo Cortesi | 2016-10-04 | 11 | -53/+66 | |
|\| | | | | | docs and API-related cleanups | |||||
| * | http2: support the requestheaders event | Aldo Cortesi | 2016-10-04 | 3 | -14/+17 | |
| | | | | | | | | | | We do this by splitting read_request into read_request_headers and read_request_body. | |||||
| * | Clarify channel interaction pattern | Aldo Cortesi | 2016-10-04 | 2 | -12/+7 | |
| | | | | | | | | | | | | | | Before this patch, it wasn't clear when the arguments to an event could be modified, and when a new object should be returned. After this patch, the right thing to do is to modify the arguments in 99% of cases. The only exception to this is root_layer, for which we can find a better structure down the track. | |||||
| * | http2: frames don't have a human_readable method | Aldo Cortesi | 2016-10-04 | 1 | -4/+4 | |
| | | ||||||
| * | Add requestheaders event | Aldo Cortesi | 2016-10-04 | 5 | -17/+32 | |
| | | | | | | | | HTTP1 only for now, HTTP2 coming next. | |||||
| * | websockets_handshake -> websocket_handshake | Aldo Cortesi | 2016-10-04 | 5 | -7/+7 | |
|/ | | | | The plural feels awkward. | |||||
* | Merge pull request #1587 from Kriechi/rename-filt | Aldo Cortesi | 2016-10-04 | 19 | -166/+144 | |
|\ | | | | | rename mitmproxy.filt -> mitmproxy.flowfilter | |||||
| * | fix flowfilter.match args | Thomas Kriechbaumer | 2016-10-03 | 7 | -24/+24 | |
| | |