Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix tests | Maximilian Hils | 2016-10-17 | 1 | -2/+4 |
| | |||||
* | remove empty lines at beginning of file | Thomas Kriechbaumer | 2016-10-17 | 11 | -11/+0 |
| | |||||
* | fix socks5 mode with tls | Maximilian Hils | 2016-10-16 | 1 | -0/+12 |
| | |||||
* | python3: clean up super and __future__ | Aldo Cortesi | 2016-10-17 | 21 | -36/+20 |
| | |||||
* | python3: clean up class brackets | Aldo Cortesi | 2016-10-17 | 24 | -51/+51 |
| | |||||
* | Zap object base class | Aldo Cortesi | 2016-10-17 | 20 | -42/+42 |
| | |||||
* | test & examples: zap six | Aldo Cortesi | 2016-10-17 | 25 | -123/+98 |
| | |||||
* | scripts: keep scripts just after the ScriptLoader in addon chain | Aldo Cortesi | 2016-10-16 | 2 | -7/+3 |
| | | | | | | 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: overview, classes, arguments | Aldo Cortesi | 2016-10-16 | 1 | -5/+2 |
| | |||||
* | add regression test for #1605 | Maximilian Hils | 2016-10-14 | 1 | -0/+13 |
| | |||||
* | certutils: cap the cert store size at 100 by default | Aldo Cortesi | 2016-10-05 | 1 | -0/+25 |
| | | | | | | | | 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. | ||||
* | use flt instead of filt for flowfilter expressions | Thomas Kriechbaumer | 2016-10-04 | 1 | -2/+2 |
| | |||||
* | debug: Hard exit after debug signal | Aldo Cortesi | 2016-10-04 | 1 | -2/+2 |
| | |||||
* | Consolidate logging | Aldo Cortesi | 2016-10-04 | 5 | -16/+31 |
| | | | | | | - Make log event handler work - Move terminal event log into an addon - Clean various log related errors and duplications | ||||
* | Clarify channel interaction pattern | Aldo Cortesi | 2016-10-04 | 1 | -3/+2 |
| | | | | | | | 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. | ||||
* | Add requestheaders event | Aldo Cortesi | 2016-10-04 | 1 | -1/+1 |
| | | | | HTTP1 only for now, HTTP2 coming next. | ||||
* | fix flowfilter.match args | Thomas Kriechbaumer | 2016-10-03 | 1 | -10/+10 |
| | |||||
* | use flowfilter.match | Thomas Kriechbaumer | 2016-10-03 | 1 | -10/+10 |
| | |||||
* | rename mitmproxy.filt -> mitmproxy.flowfilter | Thomas Kriechbaumer | 2016-10-03 | 2 | -30/+30 |
| | |||||
* | Revert "Add API to programmatically create new requests (#1534)" | Maximilian Hils | 2016-10-02 | 1 | -9/+0 |
| | | | | | This reverts commit ccbdcd684b5a49c0509610a79dad3f220962a42d, which yielded a test timeout. | ||||
* | Add API to programmatically create new requests (#1534) | Tyler St. Onge | 2016-10-01 | 1 | -0/+9 |
| | |||||
* | parse_set_cookie header returns an empty list if no cookies are found | Aldo Cortesi | 2016-09-28 | 1 | -3/+3 |
| | | | | This matches parse_cookie, and is more idiomatic. | ||||
* | Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxy | Aldo Cortesi | 2016-09-28 | 2 | -93/+125 |
|\ | |||||
| * | Add tests for comma separated Set-Cookies | Shadab Zafar | 2016-09-27 | 1 | -10/+47 |
| | | |||||
| * | Can't have , in the sticky cookie test | Shadab Zafar | 2016-09-27 | 1 | -1/+0 |
| | | | | | | | | Since we support comma separated cookies now | ||||
| * | Make needed changes in tests | Shadab Zafar | 2016-09-27 | 1 | -30/+33 |
| | | |||||
| * | Update cookie tests | Shadab Zafar | 2016-09-27 | 1 | -91/+84 |
| | | | | | | | | | | This is needed since _read_pairs now returns a list of cookies each of which is a list of [name, value] tuples. | ||||
* | | In reverse proxy mode, always send SNI | Ryan Laughlin | 2016-09-27 | 1 | -1/+7 |
|/ | |||||
* | update dependencies, minor fixes (#1577) | Maximilian Hils | 2016-09-24 | 1 | -3/+1 |
| | |||||
* | remove option argument for addons.add (#1576) | Maximilian Hils | 2016-09-24 | 14 | -25/+24 |
| | |||||
* | Merge pull request #1566 from mhils/issue-1546 | Maximilian Hils | 2016-09-22 | 1 | -1/+2 |
|\ | | | | | add websocket on/off switch, improve logging (fix #1546, fix #1547) | ||||
| * | fix tests | Maximilian Hils | 2016-09-22 | 1 | -1/+2 |
| | | |||||
* | | scripts: cut traceback properly, fix #1467 | Maximilian Hils | 2016-09-22 | 1 | -3/+27 |
|/ | |||||
* | Merge pull request #1564 from mhils/issue-1554 | Maximilian Hils | 2016-09-21 | 1 | -0/+5 |
|\ | | | | | Fix Response.make content-length header | ||||
| * | fix Response.make content-length header | Maximilian Hils | 2016-09-21 | 1 | -0/+5 |
| | | |||||
* | | raise TypeError on invalid header assignment, fix #1562 | Maximilian Hils | 2016-09-21 | 2 | -0/+11 |
|/ | |||||
* | Redesign client replay | Aldo Cortesi | 2016-09-11 | 5 | -60/+54 |
| | | | | | - Move to an addon - Use a much simpler synchronisation mechanism | ||||
* | Add "run_once" support to the script addon, use it in mitmproxy | Aldo Cortesi | 2016-09-11 | 1 | -0/+25 |
| | | | | Fixes #1418 | ||||
* | options.replay_ignore* -> options.server_replay_ignore* | Aldo Cortesi | 2016-09-10 | 1 | -9/+9 |
| | |||||
* | options.nopop -> options.server_replay_nopop | Aldo Cortesi | 2016-09-10 | 1 | -2/+2 |
| | |||||
* | options.rheaders -> options.server_replay_use_headers | Aldo Cortesi | 2016-09-10 | 1 | -1/+1 |
| | |||||
* | options.kill -> options.replay_kill_extra | Aldo Cortesi | 2016-09-10 | 3 | -6/+6 |
| | |||||
* | Roll out synchronisation for mitmproxy tests | Aldo Cortesi | 2016-09-10 | 5 | -179/+228 |
| | | | | | | | | | This extends some of the work I did for pathod and netlib to the mitmproxy test suite. It also fixes what may be a leak in replays. Failing on connection leak is disabled on Windows for the moment. Fixes #1535 | ||||
* | Merge pull request #1532 from cortesi/playback | Aldo Cortesi | 2016-09-07 | 4 | -301/+292 |
|\ | | | | | Playback and fix construct breakage | ||||
| * | Move server playback in to an addon | Aldo Cortesi | 2016-09-06 | 4 | -301/+292 |
| | | | | | | | | | | | | | | | | | | | | | | - Move server playback into an addon - Implement a better sync strategy to decide when to exit if keepserving is off. We now wait for the final flow played back to no longer be live. - Leave interactive server playback in mitmproxy console broken for now - there are broader addon-related changes that need to be made for that, and this patch is already big. Fixes #1229 | ||||
* | | Make 'none' synonymous to 'identity' | Schamper | 2016-09-06 | 1 | -8/+7 |
| | | |||||
* | | Add test | Schamper | 2016-09-06 | 1 | -0/+5 |
|/ | |||||
* | change test value | Thomas Kriechbaumer | 2016-09-04 | 1 | -1/+1 |
| | |||||
* | improve netlib.encoding | Thomas Kriechbaumer | 2016-09-04 | 1 | -31/+18 |
| | |||||
* | http2: assemble connect-request from object | Thomas Kriechbaumer | 2016-09-03 | 1 | -7/+12 |
| |