aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [web] Reach 100% coverage for ducks/eventLog.jsMatthew Shao2017-03-221-0/+40
|
* Fix#2184, mitmweb -n dispalys incorrect message. (#2187)Matthew Shao2017-03-223-10/+9
| | | | | | | | * Fixes #2184, python code. * Fixes #2184, JavaScript code. * [web] Update Footer.jsx (#2184)
* Merge pull request #2190 from cortesi/mypyAldo Cortesi2017-03-2223-84/+104
|\ | | | | mypy for all of ./mitmproxy
| * tox: mypy checking for entire codebaseAldo Cortesi2017-03-225-17/+8
| | | | | | | | Also fix a few linting errors.
| * Make tnetstrings pass mypyAldo Cortesi2017-03-201-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 moduleAldo Cortesi2017-03-209-6/+13
| | | | | | | | | | Include tnetstring - we've made enough changes that this no longer belongs in contrib.
| * mypy all of the codebase bar tnetstringAldo Cortesi2017-03-2014-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 Hils2017-03-211-1/+1
| |
* | Merge pull request #2186 from cortesi/tightenAldo Cortesi2017-03-2018-75/+103
|\| | | | | Tighten some options-related functionality
| * Fix sliding window type specsAldo Cortesi2017-03-201-2/+2
| |
| * addons.view: we no longer have a None order stateAldo Cortesi2017-03-201-9/+6
| | | | | | | | This bumps coverage back to 100% for addons
| * options: default_contentview uses lowercaseAldo Cortesi2017-03-191-1/+1
| |
| * options: reraise when there's an error with a partial updateAldo Cortesi2017-03-194-6/+12
| | | | | | | | Fixes #2174
| * console: use overlay chooser to pick flow view modeAldo Cortesi2017-03-191-15/+13
| | | | | | | | More consistent, and fixes status prompt overflow issue.
| * console options: "d" to reset this option to defaultAldo Cortesi2017-03-191-1/+9
| |
| * options: choices for content views and tighten console order specAldo Cortesi2017-03-195-13/+13
| | | | | | | | Also clean up some leftovers from filter option name change.
| * dumper, mitmdump: kill filtstrAldo Cortesi2017-03-196-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 filtstrAldo Cortesi2017-03-193-7/+13
| |
| * console options: fix bug that caused keys to be handled by wrong componentAldo Cortesi2017-03-191-0/+1
| |
| * options: filter -> view_filterAldo Cortesi2017-03-193-6/+6
| |
* | Merge pull request #2182 from syahn/fix-#2134Maximilian Hils2017-03-193-3/+8
|\ \ | |/ |/| Fix #2134
| * Fix #2134Frank Ahn2017-03-183-3/+8
| |
* | Merge pull request #2173 from cortesi/coptionsAldo Cortesi2017-03-1912-326/+553
|\ \ | | | | | | Console options editor
| * | console options: help for overlays, improved layout for overlay grid editorAldo Cortesi2017-03-194-16/+40
| | |
| * | optmanager: test coverageAldo Cortesi2017-03-191-1/+8
| | |
| * | console options: add an overlay grid editor for sequence optionsAldo Cortesi2017-03-197-18/+84
| | |
| * | optmanager: cope with bound methods in .subscribeAldo Cortesi2017-03-193-6/+30
| | | | | | | | | | | | Fixes #2122
| * | console options: handle choices settingsAldo Cortesi2017-03-193-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 intsAldo Cortesi2017-03-193-77/+131
| | |
| * | console options: better defaults display, g/G/D keyboard shortcutsAldo Cortesi2017-03-192-13/+24
| | |
| * | console: options/help pane switching, toggle bools with enterAldo Cortesi2017-03-192-31/+77
| | |
| * | options cleanupsAldo Cortesi2017-03-194-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 editorAldo Cortesi2017-03-192-240/+109
| | |
| * | Make mypy succeed with imports on master.pyAldo Cortesi2017-03-191-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-devMaximilian Hils2017-03-171-10/+95
|\ \ | |/ |/| [web] Reach 100% coverage for ducks/utils/store.js
| * [web] Reach 100% coverage for ducks/utils/store.jsMatthew Shao2017-03-171-10/+95
|/
* Merge pull request #2169 from cortesi/mypyAldo Cortesi2017-03-1719-106/+116
|\ | | | | mypy without skipping imports
| * Make mypy succeed with imports on master.pyAldo Cortesi2017-03-1718-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 mechanismAldo Cortesi2017-03-171-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-popupMaximilian Hils2017-03-161-0/+8
|\ | | | | [web] Adjust pop-up docs position
| * Adjust pop-up docs positionFrank Ahn2017-03-151-0/+8
| | | | | | | | - Shift pop-up docs to the right position according to responsiveness
* | Merge pull request #2168 from cortesi/handlersMaximilian Hils2017-03-1627-444/+251
|\ \ | | | | | | Rip out old handlers mechanism - all events are now handled in addons
| * | Rip out master handler mechanismAldo Cortesi2017-03-1617-246/+116
| | | | | | | | | | | | | | | All events are now handled by addons, and we no longer support any events on master.
| * | Remove last handlers in test suiteAldo Cortesi2017-03-161-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.RecordingMasterAldo Cortesi2017-03-1613-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 addonAldo Cortesi2017-03-161-32/+30
| | |
| * | Move dump handlers to addonAldo Cortesi2017-03-163-13/+21
| | |
* | | Merge pull request #2153 from MatthewShao/jest-devMaximilian Hils2017-03-161-1/+34
|\ \ \ | | | | | | | | [web] Reach 100% coverage for ducks/ui/flow.js
| * | | [web] Reach 100% coverage for ducks/ui/flow.jsMatthew Shao2017-03-151-1/+34
| | |/ | |/|
* | | Merge pull request #2170 from felixonmars/patch-1Maximilian Hils2017-03-161-1/+1
|\ \ \ | | | | | | | | Fix test_format_xml with dot in path