Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | fix #1809 | Maximilian Hils | 2016-12-10 | 1 | -0/+3 | |
| | | | | | ||||||
| | | * | | console: clean path prompt handling | Aldo Cortesi | 2016-12-12 | 6 | -27/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't trigger callback if no path is specified - Expand userdir centrally - Catch IO errors from callbacks and turn them into status messages | |||||
| | | * | | Replacements and SetHeaders are both defined as text in Options | Aldo Cortesi | 2016-12-12 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | Bytes don't play well with our config serialization or command-line args. | |||||
| | | * | | Extend type checker validate Sequence specs | Aldo Cortesi | 2016-12-12 | 2 | -7/+24 | |
| | | | | | ||||||
| | | * | | console: add saving of config file | Aldo Cortesi | 2016-12-12 | 2 | -1/+15 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #1841 from mitmproxy/fix-docs-tests | Maximilian Hils | 2016-12-11 | 2 | -0/+5 | |
|\ \ \ \ | | | | | | | | | | | pin docutils version to fix docs tests | |||||
| * | | | | fix install.rst | Maximilian Hils | 2016-12-11 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | pin docutils version to fix docs tests | Maximilian Hils | 2016-12-11 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1840 from mhils/1829 | Maximilian Hils | 2016-12-11 | 1 | -9/+12 | |
|\ \ \ \ | | | | | | | | | | | fix #1829 | |||||
| * | | | | fix #1829 | Maximilian Hils | 2016-12-11 | 1 | -9/+12 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #1839 from mhils/1830 | Maximilian Hils | 2016-12-11 | 2 | -5/+7 | |
|\ \ \ \ | |/ / / |/| | | | fix #1830 | |||||
| * | | | fix #1830 | Maximilian Hils | 2016-12-11 | 2 | -5/+7 | |
|/ / / | ||||||
* | | | Merge pull request #1836 from Kriechi/wipeout-lxml | Maximilian Hils | 2016-12-11 | 1 | -49/+37 | |
|\ \ \ | | | | | | | | | docs: update installation | |||||
| * | | | docs: update installation | Thomas Kriechbaumer | 2016-12-11 | 1 | -49/+37 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1835 from Kriechi/bump | Maximilian Hils | 2016-12-11 | 1 | -5/+5 | |
|\ \ \ | |/ / |/| | | bump dependencies | |||||
| * | | bump dependencies | Thomas Kriechbaumer | 2016-12-10 | 1 | -5/+5 | |
|/ / | ||||||
* | | Merge pull request #1831 from mhils/contentviews | Aldo Cortesi | 2016-12-11 | 54 | -1011/+1257 | |
|\ \ | |/ |/| | Split contentviews.py into mitmproxy.contentviews | |||||
| * | minor fixes | Maximilian Hils | 2016-12-10 | 4 | -4/+4 | |
| | | ||||||
| * | add new xml/html pretty-printer :tada: | Maximilian Hils | 2016-12-10 | 12 | -2/+338 | |
| | | ||||||
| * | remove lxml-dependent code | Maximilian Hils | 2016-12-10 | 11 | -130/+30 | |
| | | ||||||
| * | update tests, increase coverage, add type info | Maximilian Hils | 2016-12-09 | 32 | -379/+435 | |
| | | ||||||
| * | split contentviews.py into mitmproxy.contentviews | Maximilian Hils | 2016-12-09 | 17 | -672/+626 | |
| | | ||||||
* | | minor fixes | Maximilian Hils | 2016-12-10 | 1 | -1/+2 | |
| | | ||||||
* | | Merge pull request #1834 from Kriechi/remove_ssl_match_hostname | Maximilian Hils | 2016-12-10 | 2 | -5/+4 | |
|\ \ | |/ |/| | remove backport.ssl_match_hostname | |||||
| * | remove backport.ssl_match_hostname | Thomas Kriechbaumer | 2016-12-10 | 2 | -5/+4 | |
| | | | | | | | | This is already included in Python 3.5+ | |||||
* | | Merge pull request #1827 from mhils/issue-1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 | |
|\ \ | | | | | | | Fix #1803 | |||||
| * | | fix #1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #1823 from cortesi/options2 | Aldo Cortesi | 2016-12-08 | 7 | -29/+54 | |
|\ \ | | | | | | | options: add a merge method to assimilate options | |||||
| * | | options: add a merge method to assimilate options | Aldo Cortesi | 2016-12-08 | 7 | -29/+54 | |
|/ / | | | | | | | Fixes #953 | |||||
* | | Merge pull request #1822 from cortesi/clog | Aldo Cortesi | 2016-12-08 | 1 | -4/+6 | |
|\ \ | | | | | | | console: use an addon to capture logs | |||||
| * | | console: use an addon to capture logs | Aldo Cortesi | 2016-12-08 | 1 | -4/+6 | |
| | | | | | | | | | | | | Fix #1780 | |||||
* | | | Merge pull request #1806 from cortesi/options | Aldo Cortesi | 2016-12-08 | 24 | -463/+561 | |
|\| | | |/ |/| | Options | |||||
| * | Minor tweaks | Aldo Cortesi | 2016-12-08 | 4 | -19/+21 | |
| | | ||||||
| * | Amalgamate all the Options objects | Aldo Cortesi | 2016-12-08 | 7 | -61/+61 | |
| | | ||||||
| * | Replace configargparse with argparse, enable new options loading | Aldo Cortesi | 2016-12-08 | 7 | -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 options | Aldo Cortesi | 2016-12-08 | 1 | -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 attribute | Aldo Cortesi | 2016-12-08 | 2 | -9/+9 | |
| | | ||||||
| * | Options - avoid mutation, API cleanup, has_changed | Aldo Cortesi | 2016-12-08 | 1 | -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 defaults | Aldo Cortesi | 2016-12-08 | 2 | -10/+14 | |
| | | | | | | | | Use .reset() in console app to clear options. | |||||
| * | Add YAML serialization of options | Aldo Cortesi | 2016-12-08 | 3 | -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 attribute | Aldo Cortesi | 2016-12-08 | 2 | -10/+23 | |
| | | ||||||
| * | Correct refresh_server_playback option default | Aldo Cortesi | 2016-12-08 | 1 | -1/+1 | |
| | | ||||||
| * | Add OptManager.subscribe, use it to clean up palettes in console | Aldo Cortesi | 2016-12-08 | 4 | -22/+61 | |
| | | | | | | | | .subscribe lets you subscribe a function to a specified set of options. | |||||
| * | Options - avoid mutation, API cleanup, has_changed | Aldo Cortesi | 2016-12-08 | 6 | -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 option | Aldo Cortesi | 2016-12-08 | 6 | -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 tests | Aldo Cortesi | 2016-12-08 | 3 | -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 defaults | Aldo Cortesi | 2016-12-08 | 3 | -16/+58 | |
|/ | | | | Use .reset() in console app to clear options. | |||||
* | Merge pull request #1817 from Kriechi/fix-1816 | Thomas Kriechbaumer | 2016-12-06 | 5 | -21/+90 | |
|\ | | | | | tls_parser: allow optional extensions | |||||
| * | tls_parser: allow optional extensions | Thomas Kriechbaumer | 2016-12-06 | 5 | -21/+90 | |
|/ | | | | fixes #1816 | |||||
* | Merge pull request #1810 from Kriechi/construct | Maximilian Hils | 2016-12-04 | 4 | -154/+123 | |
|\ | | | | | upgrade to construct 2.8 and new API |