aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Web apps to addonsAldo Cortesi2016-10-1934-143/+259
| | | | | This commit removes the app registry, adds a wsgiapp addon base, and ports the onboarding app to it.
* No need for all builtins to be loaded for server testsAldo Cortesi2016-10-183-16/+21
|
* Convert flow.state to an addonAldo Cortesi2016-10-1825-158/+101
| | | | A first step, and already many things are much nicer.
* accept_addon -> resume, intercept/resume eventsAldo Cortesi2016-10-188-18/+23
|
* master.duplicate_flow -> state.duplicate_flowAldo Cortesi2016-10-188-24/+28
| | | | | | This is a pure operation on state, and doesn't belong on master. Part of prep to move state to an addon.
* Response body streaming to addonAldo Cortesi2016-10-1811-53/+76
|
* Remove mention of pathod.net from READMEAldo Cortesi2016-10-181-6/+1
| | | | I'm just about to redirect this to mitmproxy.org
* dumper: limit url lengthMaximilian Hils2016-10-171-0/+2
|
* fix testsMaximilian Hils2016-10-171-2/+4
|
* remove empty lines at beginning of fileThomas Kriechbaumer2016-10-1788-91/+0
|
* removed unused importThomas Kriechbaumer2016-10-171-2/+0
|
* Merge pull request #1619 from mhils/fix-socks-tlsMaximilian Hils2016-10-162-3/+13
|\ | | | | Fix SOCKS5 mode with TLS
| * fix socks5 mode with tlsMaximilian Hils2016-10-162-3/+13
| |
* | fix redirect_requests.py exampleMaximilian Hils2016-10-161-2/+1
|/
* python3: update README and setup.py trove classifiersAldo Cortesi2016-10-172-5/+3
|
* update protobuf, reenable for py3 (#1618)Maximilian Hils2016-10-161-2/+2
|
* Merge pull request #1617 from cortesi/objectAldo Cortesi2016-10-17167-391/+261
|\ | | | | python3
| * python3: clean up super and __future__Aldo Cortesi2016-10-17140-267/+136
| |
| * python3: clean up class bracketsAldo Cortesi2016-10-1769-122/+122
| |
| * Zap object base classAldo Cortesi2016-10-1765-114/+115
|/
* actually fix merge :see_no_evil:Maximilian Hils2016-10-162-16/+15
|
* fix mergeMaximilian Hils2016-10-161-7/+1
|
* Merge branch 'such-types'Maximilian Hils2016-10-1627-230/+202
|\
| * py2--: inline type infoMaximilian Hils2016-10-1627-239/+206
| |
* | Merge pull request #1615 from cortesi/python3aAldo Cortesi2016-10-1760-336/+208
|\ \ | |/ |/| exterminate six
| * test & examples: zap sixAldo Cortesi2016-10-1730-133/+107
| |
| * mitmproxy: zap sixAldo Cortesi2016-10-1724-191/+97
| |
| * pathod: remove sixAldo Cortesi2016-10-177-19/+11
| |
* | update pydivert dependency (#1614)Maximilian Hils2016-10-161-1/+1
| |
* | Merge pull request #1613 from cortesi/python3Aldo Cortesi2016-10-1731-203/+90
|\| | | | | First-order conversion to Python3-only
| * First-order conversion to Python3-onlyAldo Cortesi2016-10-1731-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 formatAldo Cortesi2016-10-171-0/+6
|
* Bump version post releaseAldo Cortesi2016-10-171-1/+1
|
* Bump to 0.18.1 to fix pypi obstreperousnessAldo Cortesi2016-10-163-106/+67
| | | | Also include contriburors update.
* Merge pull request #1602 from cortesi/scriptdocsAldo Cortesi2016-10-1630-466/+624
|\ | | | | docs: stub out new script documentation
| * docs: concurrency, developing scriptsAldo Cortesi2016-10-163-32/+20
| |
| * scripts: keep scripts just after the ScriptLoader in addon chainAldo Cortesi2016-10-164-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 flowsAldo Cortesi2016-10-161-7/+23
| |
| * mitmdump: fix addon order - dumper must be lastAldo Cortesi2016-10-161-1/+1
| | | | | | | | This is so we can see the effects of script rewriting using -dd.
| * docs: link to correct tagMaximilian Hils2016-10-161-5/+16
| |
| * docs: logging and the contextAldo Cortesi2016-10-166-27/+68
| |
| * scripts: handle SystemExit from scripts explicitlyAldo Cortesi2016-10-161-0/+2
| |
| * mitmdump: show script errors on startupAldo Cortesi2016-10-161-1/+1
| | | | | | | | | | Add the terminal logger before any other addons, so we see script errors on startup.
| * docs: overview, classes, argumentsAldo Cortesi2016-10-167-47/+86
| |
| * docs: improve external source links, tweak code docsAldo Cortesi2016-10-163-38/+53
| |
| * Clean up models.http a bitAldo Cortesi2016-10-161-31/+17
| | | | | | | | | | - We don't need a deprecation warning here - Bring imports inline with policy
| * docs: cleanups improvements and fighting sphinxAldo Cortesi2016-10-1618-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 #1611Maximilian Hils2016-10-151-4/+2
|
* update CHANGELOGMaximilian Hils2016-10-151-0/+48
|
* Merge pull request #1610 from mhils/issue-1605Maximilian Hils2016-10-142-12/+19
|\ | | | | Fix #1605