aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [web] style flow menuMaximilian Hils2016-12-115-86/+158
|
* [web] style start menuMaximilian Hils2016-12-113-4/+18
|
* [web] style options menuMaximilian Hils2016-12-1110-133/+203
| | | | The other menus are WIP.
* [web] show proxy address, add websocket toggleMaximilian Hils2016-12-118-492/+58387
|
* Merge pull request #1836 from Kriechi/wipeout-lxmlMaximilian Hils2016-12-111-49/+37
|\ | | | | docs: update installation
| * docs: update installationThomas Kriechbaumer2016-12-111-49/+37
| |
* | Merge pull request #1835 from Kriechi/bumpMaximilian Hils2016-12-111-5/+5
|\ \ | |/ |/| bump dependencies
| * bump dependenciesThomas Kriechbaumer2016-12-101-5/+5
|/
* Merge pull request #1831 from mhils/contentviewsAldo Cortesi2016-12-1154-1011/+1257
|\ | | | | Split contentviews.py into mitmproxy.contentviews
| * minor fixesMaximilian Hils2016-12-104-4/+4
| |
| * add new xml/html pretty-printer :tada:Maximilian Hils2016-12-1012-2/+338
| |
| * remove lxml-dependent codeMaximilian Hils2016-12-1011-130/+30
| |
| * update tests, increase coverage, add type infoMaximilian Hils2016-12-0932-379/+435
| |
| * split contentviews.py into mitmproxy.contentviewsMaximilian Hils2016-12-0917-672/+626
| |
* | minor fixesMaximilian Hils2016-12-101-1/+2
| |
* | Merge pull request #1834 from Kriechi/remove_ssl_match_hostnameMaximilian Hils2016-12-102-5/+4
|\ \ | |/ |/| remove backport.ssl_match_hostname
| * remove backport.ssl_match_hostnameThomas Kriechbaumer2016-12-102-5/+4
| | | | | | | | This is already included in Python 3.5+
* | Merge pull request #1827 from mhils/issue-1803Maximilian Hils2016-12-091-0/+1
|\ \ | | | | | | Fix #1803
| * | fix #1803Maximilian Hils2016-12-091-0/+1
|/ /
* | Merge pull request #1823 from cortesi/options2Aldo Cortesi2016-12-087-29/+54
|\ \ | | | | | | options: add a merge method to assimilate options
| * | options: add a merge method to assimilate optionsAldo Cortesi2016-12-087-29/+54
|/ / | | | | | | Fixes #953
* | Merge pull request #1822 from cortesi/clogAldo Cortesi2016-12-081-4/+6
|\ \ | | | | | | console: use an addon to capture logs
| * | console: use an addon to capture logsAldo Cortesi2016-12-081-4/+6
| | | | | | | | | | | | Fix #1780
* | | Merge pull request #1806 from cortesi/optionsAldo Cortesi2016-12-0824-463/+561
|\| | | |/ |/| Options
| * Minor tweaksAldo Cortesi2016-12-084-19/+21
| |
| * Amalgamate all the Options objectsAldo Cortesi2016-12-087-61/+61
| |
| * Replace configargparse with argparse, enable new options loadingAldo Cortesi2016-12-087-122/+126
| | | | | | | | | | | | This commit ditches configargparse and enables the new config file format. The default location is ~/.mitmproxy/config.yaml. Unifying all of the various Options objects will follow in the next patch.
| * Add YAML serialization of optionsAldo Cortesi2016-12-081-4/+0
| | | | | | | | | | This uses ruamel.yaml. The library seems well-supported, and can do in-place modification of config files that retains user comments and file structure.
| * options: defaults are a class attributeAldo Cortesi2016-12-082-9/+9
| |
| * Options - avoid mutation, API cleanup, has_changedAldo Cortesi2016-12-081-0/+1
| | | | | | | | | | | | | | | | | | - Always return a deepcopy of options to avoid accidental mutation of options state. - Remove .get(opt, default). This is an inappropriate API for Options - trying to retrieve an option that doesn't exist should always be an error. - Add the has_changed method that checks if an option differs from the default, use it in mitmproxy console.
| * options: save defaults, add .reset() to restore defaultsAldo Cortesi2016-12-082-10/+14
| | | | | | | | Use .reset() in console app to clear options.
| * Add YAML serialization of optionsAldo Cortesi2016-12-083-1/+125
| | | | | | | | | | This uses ruamel.yaml. The library seems well-supported, and can do in-place modification of config files that retains user comments and file structure.
| * options: defaults are a class attributeAldo Cortesi2016-12-082-10/+23
| |
| * Correct refresh_server_playback option defaultAldo Cortesi2016-12-081-1/+1
| |
| * Add OptManager.subscribe, use it to clean up palettes in consoleAldo Cortesi2016-12-084-22/+61
| | | | | | | | .subscribe lets you subscribe a function to a specified set of options.
| * Options - avoid mutation, API cleanup, has_changedAldo Cortesi2016-12-086-37/+53
| | | | | | | | | | | | | | | | | | - Always return a deepcopy of options to avoid accidental mutation of options state. - Remove .get(opt, default). This is an inappropriate API for Options - trying to retrieve an option that doesn't exist should always be an error. - Add the has_changed method that checks if an option differs from the default, use it in mitmproxy console.
| * Get rid of tfile testing optionAldo Cortesi2016-12-086-38/+31
| | | | | | | | | | It's weird, it's ugly, it's getting in the way of my options refactoring, and it must therefore die.
| * Clean up dump testsAldo Cortesi2016-12-083-174/+38
| | | | | | | | | | | | - Remove tests that redundantly test addon funtionality that we've already tested more comprehensively elsewhere. - Extend to 100% coverage for tools/dump.py
| * options: save defaults, add .reset() to restore defaultsAldo Cortesi2016-12-083-16/+58
|/ | | | Use .reset() in console app to clear options.
* Merge pull request #1817 from Kriechi/fix-1816Thomas Kriechbaumer2016-12-065-21/+90
|\ | | | | tls_parser: allow optional extensions
| * tls_parser: allow optional extensionsThomas Kriechbaumer2016-12-065-21/+90
|/ | | | fixes #1816
* Merge pull request #1810 from Kriechi/constructMaximilian Hils2016-12-044-154/+123
|\ | | | | upgrade to construct 2.8 and new API
| * upgrade to construct 2.8 and new APIThomas Kriechbaumer2016-12-044-154/+123
| |
* | Merge pull request #1813 from dwfreed/patch-1Maximilian Hils2016-12-041-1/+1
|\ \ | | | | | | release: fix dropping _main suffix
| * | release: fix dropping _main suffixDoug Freed2016-12-041-1/+1
|/ /
* | Merge pull request #1801 from Kriechi/simplify-alpn-opensslThomas Kriechbaumer2016-12-0410-116/+151
|\ \ | |/ |/| simplify ALPN and OpenSSL on macOS
| * simplify ALPN and OpenSSL on macOSThomas Kriechbaumer2016-12-0410-116/+151
|/
* fix whitespaceThomas Kriechbaumer2016-12-031-0/+1
|
* fix indentationThomas Kriechbaumer2016-12-031-2/+2
|
* fix ALPN usageThomas Kriechbaumer2016-12-021-2/+2
|