Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | AntiCache to addon | Aldo Cortesi | 2016-07-14 | 8 | -21/+43 | |
| | |/ / / / | ||||||
| | * | | | | Disable OSX tests on Travis for now | Aldo Cortesi | 2016-07-14 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll re-enable as soon as this is sorted out: https://github.com/travis-ci/travis-ci/issues/6303 | |||||
| | * | | | | Add a .setter helper to Options | Aldo Cortesi | 2016-07-14 | 6 | -12/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns a function that sets a named attribute, and is handy for event-driven code like mitmproxy console. | |||||
| | * | | | | Handle OptionsError for command-line args. | Aldo Cortesi | 2016-07-14 | 1 | -3/+11 | |
| |/ / / / | ||||||
| * | | | | Move StickyAuth into addon | Aldo Cortesi | 2016-07-14 | 11 | -82/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the first addon that handles an OptionsError, so this commit also demos how this works in console. Handling of command-line erorrs is on its way. | |||||
| * | | | | func.__name__ works in both 2.7 and 3.5 | Aldo Cortesi | 2016-07-14 | 1 | -3/+1 | |
|/ / / / | | | | | | | | | | | | | Thanks to @resam and @dwfreed for pointing this out | |||||
* | | | | Merge pull request #1348 from cortesi/addons | Aldo Cortesi | 2016-07-14 | 18 | -51/+194 | |
|\ \ \ \ | | | | | | | | | | | Addons | |||||
| * | | | | Satisfy our ruthless linting overlords | Aldo Cortesi | 2016-07-13 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Add the addons mechanism | Aldo Cortesi | 2016-07-13 | 13 | -10/+60 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Demonstrate how it works and interacts with Options by adding our first new builtin: anticomp. | |||||
| * | | | | Merge branch 'options' into addons | Aldo Cortesi | 2016-07-13 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
| * | | | | | Basic outline of addons | Aldo Cortesi | 2016-07-13 | 12 | -43/+138 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add addons.py, integrate with our event mechanism, and change the Master API so options is the first init argument. | |||||
* | | | | | | Merge pull request #1347 from cortesi/options | Aldo Cortesi | 2016-07-13 | 8 | -24/+156 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Options | |||||
| * | | | | | Raise AttributeError from Options.__getattr__ | Aldo Cortesi | 2016-07-13 | 1 | -1/+4 | |
| |/ / / / | ||||||
| * | | | | Show how options integrates with console | Aldo Cortesi | 2016-07-13 | 4 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is not functional at the moment, because all mutable options are still on master. | |||||
| * | | | | More powerful Options scheme | Aldo Cortesi | 2016-07-13 | 6 | -25/+143 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares us for the addon configuration mechanism and gives us a more flexible way to handle options changes. This changeset should spell the end of the current anti-pattern in our codebase where we duplicate data out of options onto the master when mutability is needed. From now on, Options can be the one source of thruth. - Change notifications - Rollback on error | |||||
* | | | | fixed bug (#1342) | Clemens Brunner | 2016-07-12 | 2 | -4/+4 | |
| | | | | | | | | | | | | fix minor mitmweb issues | |||||
* | | | | http2: fix race-condition in tests | Thomas Kriechbaumer | 2016-07-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #1345 from strohu/patch-2 | Thomas Kriechbaumer | 2016-07-12 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Make sudo pfctl error check Python 3 compatible | |||||
| * | | | | Make sudo pfctl error check Python 3 compatible | strohu | 2016-07-12 | 1 | -2/+2 | |
|/ / / / | | | | | | | | | In Python 3, subprocess.check_output() returns a sequence of bytes. This change ensures that it will be converted to a string, so the substring test for the sudo error message does not raise a TypeError. This fixes the code in Python 3 while remaining compatible with Python 2. | |||||
* | | | | Merge pull request #1344 from strohu/patch-1 | Thomas Kriechbaumer | 2016-07-12 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix is_ascii check when determining next layer | |||||
| * | | | | Fix is_ascii check when determining next layer | strohu | 2016-07-12 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1338 from Kriechi/http2-tests | Thomas Kriechbaumer | 2016-07-10 | 2 | -96/+241 | |
|\ \ \ \ | | | | | | | | | | | Improve HTTP/2 test coverage | |||||
| * | | | | http2: more coverage | Thomas Kriechbaumer | 2016-07-10 | 2 | -43/+231 | |
| | | | | | ||||||
| * | | | | http2: simplify test class | Thomas Kriechbaumer | 2016-07-10 | 1 | -65/+22 | |
|/ / / / | ||||||
* | | | | update dependency and loosen restrictions on good citizens | Thomas Kriechbaumer | 2016-07-10 | 1 | -7/+7 | |
| | | | | ||||||
* | | | | Merge pull request #1335 from mitmproxy/travis | Thomas Kriechbaumer | 2016-07-10 | 1 | -13/+20 | |
|\ \ \ \ | | | | | | | | | | | move OSX Travis job to py3 for snapshots | |||||
| * | | | | move OSX Travis job to py3 for snapshots | Thomas Kriechbaumer | 2016-07-10 | 1 | -13/+20 | |
| | | | | | ||||||
* | | | | | fix sysinfo for py3 | Thomas Kriechbaumer | 2016-07-10 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1336 from dufferzafar/rtool-hotfix | Thomas Kriechbaumer | 2016-07-10 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | rtool hotfix | |||||
| * | | | | Decode commit value in rtool | Shadab Zafar | 2016-07-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | revert travis osx changes | Thomas Kriechbaumer | 2016-07-09 | 2 | -11/+12 | |
|/ / / / | ||||||
* | | | | Merge pull request #1324 from dufferzafar/sticky-cookies | Maximilian Hils | 2016-07-09 | 4 | -7/+77 | |
|\ \ \ \ | | | | | | | | | | | Delete stickycookies when told by the server | |||||
| * | | | | Remove redundant tests | Shadab Zafar | 2016-07-10 | 1 | -12/+0 | |
| | | | | | ||||||
| * | | | | Test cookies.is_expired separately | Shadab Zafar | 2016-07-10 | 2 | -4/+30 | |
| | | | | | ||||||
| * | | | | Move cookie expiry detection to separate function | Shadab Zafar | 2016-07-09 | 2 | -17/+24 | |
| | | | | | ||||||
| * | | | | Add tests for deletion of stickycookies | Shadab Zafar | 2016-07-09 | 1 | -2/+26 | |
| | | | | | ||||||
| * | | | | Delete stickycookies when told by the server | Shadab Zafar | 2016-07-09 | 1 | -4/+29 | |
| | | | | | | | | | | | | | | | | | | | | Fixes #1096 | |||||
* | | | | | add whitespace to improve url parsing | Thomas Kriechbaumer | 2016-07-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | fix pip install on osx travis | Thomas Kriechbaumer | 2016-07-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | upgrade pip on osx travis | Thomas Kriechbaumer | 2016-07-09 | 2 | -1/+3 | |
| | | | | | ||||||
* | | | | | try to fix weird install behaviour | Thomas Kriechbaumer | 2016-07-09 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | update osx travis | Thomas Kriechbaumer | 2016-07-09 | 1 | -10/+7 | |
| | | | | | ||||||
* | | | | | cleanup tox | Thomas Kriechbaumer | 2016-07-09 | 1 | -5/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #1334 from mhils/cleanup | Thomas Kriechbaumer | 2016-07-09 | 3 | -7/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unused files | |||||
| * | | | | | remove unused files | Maximilian Hils | 2016-07-09 | 3 | -7/+0 | |
|/ / / / / | ||||||
* | | | | | Update README.rst | Maximilian Hils | 2016-07-09 | 1 | -3/+2 | |
| | | | | | ||||||
* | | | | | Add Python 3.5 markers to setup.py | Maximilian Hils | 2016-07-09 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | remove pathod doc leftovers | Maximilian Hils | 2016-07-09 | 3 | -384/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #1299 from dufferzafar/py3-dump | Thomas Kriechbaumer | 2016-07-09 | 6 | -33/+47 | |
|\ \ \ \ | | | | | | | | | | | Python 3 - test_dump | |||||
| * | | | | Make escape_control_characters handle strings on Py2 | Shadab Zafar | 2016-07-09 | 2 | -4/+5 | |
| | | | | |