aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* addon loader: add boot_into, which replaces returning from start()Aldo Cortesi2017-03-2523-48/+158
| | | | | While we're here, expand test coverage for addonmanager to 100%, and promote to individual coverage.
* addons: an addonmanager.Loader is now passed to the load() eventAldo Cortesi2017-03-252-3/+32
|
* addons: start -> load throughoutAldo Cortesi2017-03-2525-49/+49
|
* Merge pull request #2208 from Kriechi/bump-h2Maximilian Hils2017-03-243-8/+16
|\ | | | | bump h2
| * bump h2Thomas Kriechbaumer2017-03-243-8/+16
|/
* Merge pull request #2207 from nikofil/scripts-redirect-stdoutAldo Cortesi2017-03-243-7/+38
|\ | | | | scripts: redirect stdout to ctx.log.warn
| * scripts: redirect stdout to ctx.log.warnNikos Filippakis2017-03-243-7/+38
| | | | | | | | | | | | | | Redirect messages written to stdout in scripts to ctx.log.warn. (closes #1530) Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
* | Merge pull request #2204 from cortesi/consoleoptsAldo Cortesi2017-03-243-11/+64
|\ \ | | | | | | console options: load and save options to and from file
| * | optmanager: make serialization and loading more robustAldo Cortesi2017-03-243-13/+47
| | | | | | | | | | | | Also handle errors in console options manager.
| * | console: read and write options to and from fileAldo Cortesi2017-03-231-1/+20
| |/
* | Merge pull request #2203 from cortesi/malformedreqAldo Cortesi2017-03-241-5/+10
|\ \ | |/ |/| Don't pass malformed request objects to our error handler
| * Don't pass malformed request objects to our error handlerAldo Cortesi2017-03-231-5/+10
|/
* Merge pull request #2200 from MatthewShao/jest-devMaximilian Hils2017-03-222-1/+41
|\ | | | | Add coverage for eventLog.js and update Jest config.
| * [web] Update configuration of jest to avoid deprecation warningMatthew Shao2017-03-221-1/+1
| |
| * [web] Reach 100% coverage for ducks/eventLog.jsMatthew Shao2017-03-221-0/+40
| |
* | move examples tests (#2199)Thomas Kriechbaumer2017-03-224-85/+115
|/
* 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