Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move examples tests (#2199) | Thomas Kriechbaumer | 2017-03-22 | 4 | -85/+115 |
| | |||||
* | Fix#2184, mitmweb -n dispalys incorrect message. (#2187) | Matthew Shao | 2017-03-22 | 3 | -10/+9 |
| | | | | | | | | * Fixes #2184, python code. * Fixes #2184, JavaScript code. * [web] Update Footer.jsx (#2184) | ||||
* | Merge pull request #2190 from cortesi/mypy | Aldo Cortesi | 2017-03-22 | 23 | -84/+104 |
|\ | | | | | mypy for all of ./mitmproxy | ||||
| * | tox: mypy checking for entire codebase | Aldo Cortesi | 2017-03-22 | 5 | -17/+8 |
| | | | | | | | | Also fix a few linting errors. | ||||
| * | Make tnetstrings pass mypy | Aldo Cortesi | 2017-03-20 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | Mypy doesn't support recursive types yet, so we can't properly express TSerializable nested structures. For now, we just disable type checking in the appropriate locations. https://github.com/python/mypy/issues/731 | ||||
| * | Factor out an io module | Aldo Cortesi | 2017-03-20 | 9 | -6/+13 |
| | | | | | | | | | | Include tnetstring - we've made enough changes that this no longer belongs in contrib. | ||||
| * | mypy all of the codebase bar tnetstring | Aldo Cortesi | 2017-03-20 | 14 | -55/+77 |
| | | | | | | | | | | | | In some places, this involved removing type declarations where our types were terminally confused. The grideditor specifically needs a cleanup and restructure. | ||||
* | | [requires.io] dependency update on master branch (#2193) | Maximilian Hils | 2017-03-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2186 from cortesi/tighten | Aldo Cortesi | 2017-03-20 | 18 | -75/+103 |
|\| | | | | | Tighten some options-related functionality | ||||
| * | Fix sliding window type specs | Aldo Cortesi | 2017-03-20 | 1 | -2/+2 |
| | | |||||
| * | addons.view: we no longer have a None order state | Aldo Cortesi | 2017-03-20 | 1 | -9/+6 |
| | | | | | | | | This bumps coverage back to 100% for addons | ||||
| * | options: default_contentview uses lowercase | Aldo Cortesi | 2017-03-19 | 1 | -1/+1 |
| | | |||||
| * | options: reraise when there's an error with a partial update | Aldo Cortesi | 2017-03-19 | 4 | -6/+12 |
| | | | | | | | | Fixes #2174 | ||||
| * | console: use overlay chooser to pick flow view mode | Aldo Cortesi | 2017-03-19 | 1 | -15/+13 |
| | | | | | | | | More consistent, and fixes status prompt overflow issue. | ||||
| * | console options: "d" to reset this option to default | Aldo Cortesi | 2017-03-19 | 1 | -1/+9 |
| | | |||||
| * | options: choices for content views and tighten console order spec | Aldo Cortesi | 2017-03-19 | 5 | -13/+13 |
| | | | | | | | | Also clean up some leftovers from filter option name change. | ||||
| * | dumper, mitmdump: kill filtstr | Aldo Cortesi | 2017-03-19 | 6 | -16/+28 |
| | | | | | | | | | | Dumper now also uses view_filter. Passing arguments to mitmdump is now precisely equivalent to setting both filestream_filter and view_filter. | ||||
| * | streamfile: add streamfile_filter and use it instead of filtstr | Aldo Cortesi | 2017-03-19 | 3 | -7/+13 |
| | | |||||
| * | console options: fix bug that caused keys to be handled by wrong component | Aldo Cortesi | 2017-03-19 | 1 | -0/+1 |
| | | |||||
| * | options: filter -> view_filter | Aldo Cortesi | 2017-03-19 | 3 | -6/+6 |
| | | |||||
* | | Merge pull request #2182 from syahn/fix-#2134 | Maximilian Hils | 2017-03-19 | 3 | -3/+8 |
|\ \ | |/ |/| | Fix #2134 | ||||
| * | Fix #2134 | Frank Ahn | 2017-03-18 | 3 | -3/+8 |
| | | |||||
* | | Merge pull request #2173 from cortesi/coptions | Aldo Cortesi | 2017-03-19 | 12 | -326/+553 |
|\ \ | | | | | | | Console options editor | ||||
| * | | console options: help for overlays, improved layout for overlay grid editor | Aldo Cortesi | 2017-03-19 | 4 | -16/+40 |
| | | | |||||
| * | | optmanager: test coverage | Aldo Cortesi | 2017-03-19 | 1 | -1/+8 |
| | | | |||||
| * | | console options: add an overlay grid editor for sequence options | Aldo Cortesi | 2017-03-19 | 7 | -18/+84 |
| | | | |||||
| * | | optmanager: cope with bound methods in .subscribe | Aldo Cortesi | 2017-03-19 | 3 | -6/+30 |
| | | | | | | | | | | | | Fixes #2122 | ||||
| * | | console options: handle choices settings | Aldo Cortesi | 2017-03-19 | 3 | -1/+122 |
| | | | | | | | | | | | | | | | This implements a generic chooser overlay, and uses it to handle setting options that have fixed choices. We'll use this overlay elsewhere too. | ||||
| * | | console options: in-place editor for simple strings and ints | Aldo Cortesi | 2017-03-19 | 3 | -77/+131 |
| | | | |||||
| * | | console options: better defaults display, g/G/D keyboard shortcuts | Aldo Cortesi | 2017-03-19 | 2 | -13/+24 |
| | | | |||||
| * | | console: options/help pane switching, toggle bools with enter | Aldo Cortesi | 2017-03-19 | 2 | -31/+77 |
| | | | |||||
| * | | options cleanups | Aldo Cortesi | 2017-03-19 | 4 | -27/+32 |
| | | | | | | | | | | | | | | | | | | - Move default client ciphers - no need to have a 10-line string default. - Add some style guidance on options help - Be consistent about reflowing options help | ||||
| * | | console: sketch out look and feel of the new Options editor | Aldo Cortesi | 2017-03-19 | 2 | -240/+109 |
| | | | |||||
| * | | Make mypy succeed with imports on master.py | Aldo Cortesi | 2017-03-19 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We get little benefit from our mypy QA checks at the moment, because we skip imports. This patch is what's needed to make mypy succeed with imports on a single file: master.py It also updates mypy to the current version, and enables a QA check. Mypy bugs I encountered: dict.update with kwargs not supported: https://github.com/python/mypy/issues/1031 property setters and getters must be adjacent: https://github.com/python/mypy/issues/1465 | ||||
* | | Merge pull request #2176 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-17 | 1 | -10/+95 |
|\ \ | |/ |/| | [web] Reach 100% coverage for ducks/utils/store.js | ||||
| * | [web] Reach 100% coverage for ducks/utils/store.js | Matthew Shao | 2017-03-17 | 1 | -10/+95 |
|/ | |||||
* | Merge pull request #2169 from cortesi/mypy | Aldo Cortesi | 2017-03-17 | 19 | -106/+116 |
|\ | | | | | mypy without skipping imports | ||||
| * | Make mypy succeed with imports on master.py | Aldo Cortesi | 2017-03-17 | 18 | -105/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We get little benefit from our mypy QA checks at the moment, because we skip imports. This patch is what's needed to make mypy succeed with imports on a single file: master.py It also updates mypy to the current version, and enables a QA check. Mypy bugs I encountered: dict.update with kwargs not supported: https://github.com/python/mypy/issues/1031 property setters and getters must be adjacent: https://github.com/python/mypy/issues/1465 | ||||
| * | Rip out master handler mechanism | Aldo Cortesi | 2017-03-17 | 1 | -1/+0 |
|/ | | | | | All events are now handled by addons, and we no longer support any events on master. | ||||
* | Merge pull request #2156 from syahn/pretty-popup | Maximilian Hils | 2017-03-16 | 1 | -0/+8 |
|\ | | | | | [web] Adjust pop-up docs position | ||||
| * | Adjust pop-up docs position | Frank Ahn | 2017-03-15 | 1 | -0/+8 |
| | | | | | | | | - Shift pop-up docs to the right position according to responsiveness | ||||
* | | Merge pull request #2168 from cortesi/handlers | Maximilian Hils | 2017-03-16 | 27 | -444/+251 |
|\ \ | | | | | | | Rip out old handlers mechanism - all events are now handled in addons | ||||
| * | | Rip out master handler mechanism | Aldo Cortesi | 2017-03-16 | 17 | -246/+116 |
| | | | | | | | | | | | | | | | All events are now handled by addons, and we no longer support any events on master. | ||||
| * | | Remove last handlers in test suite | Aldo Cortesi | 2017-03-16 | 1 | -35/+21 |
| | | | | | | | | | | | | | | | | | | While we're here, make checking that there are NO logs on the proxy more efficient by setting a short timeout. This reduces total test suite running time by 15% on my system. | ||||
| * | | Remove test handlers by using taddons.RecordingMaster | Aldo Cortesi | 2017-03-16 | 13 | -120/+65 |
| | | | | | | | | | | | | | | | This also means expanding and tweaking the recording master API, which we reflect through the current test suite | ||||
| * | | Move mitmproxy console handlers to addon | Aldo Cortesi | 2017-03-16 | 1 | -32/+30 |
| | | | |||||
| * | | Move dump handlers to addon | Aldo Cortesi | 2017-03-16 | 3 | -13/+21 |
| | | | |||||
* | | | Merge pull request #2153 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-16 | 1 | -1/+34 |
|\ \ \ | | | | | | | | | [web] Reach 100% coverage for ducks/ui/flow.js | ||||
| * | | | [web] Reach 100% coverage for ducks/ui/flow.js | Matthew Shao | 2017-03-15 | 1 | -1/+34 |
| | |/ | |/| | |||||
* | | | Merge pull request #2170 from felixonmars/patch-1 | Maximilian Hils | 2017-03-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix test_format_xml with dot in path |