Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |||||
| * | upgrade to construct 2.8 and new API | Thomas Kriechbaumer | 2016-12-04 | 4 | -154/+123 | |
| | | ||||||
* | | Merge pull request #1813 from dwfreed/patch-1 | Maximilian Hils | 2016-12-04 | 1 | -1/+1 | |
|\ \ | | | | | | | release: fix dropping _main suffix | |||||
| * | | release: fix dropping _main suffix | Doug Freed | 2016-12-04 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1801 from Kriechi/simplify-alpn-openssl | Thomas Kriechbaumer | 2016-12-04 | 10 | -116/+151 | |
|\ \ | |/ |/| | simplify ALPN and OpenSSL on macOS | |||||
| * | simplify ALPN and OpenSSL on macOS | Thomas Kriechbaumer | 2016-12-04 | 10 | -116/+151 | |
|/ | ||||||
* | fix whitespace | Thomas Kriechbaumer | 2016-12-03 | 1 | -0/+1 | |
| | ||||||
* | fix indentation | Thomas Kriechbaumer | 2016-12-03 | 1 | -2/+2 | |
| | ||||||
* | fix ALPN usage | Thomas Kriechbaumer | 2016-12-02 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #1797 from Kriechi/websocket++ | Maximilian Hils | 2016-12-01 | 3 | -22/+67 | |
|\ | | | | | Pass Autobahn WebSocket Test Suite | |||||
| * | websocket: update close handshake tests | Thomas Kriechbaumer | 2016-11-29 | 1 | -0/+4 | |
| | | ||||||
| * | websocket: make flowfilter work | Thomas Kriechbaumer | 2016-11-29 | 1 | -6/+15 | |
| | | ||||||
| * | websocket: carry over per-message compression bit | Thomas Kriechbaumer | 2016-11-29 | 1 | -0/+2 | |
| | | ||||||
| * | websocket: reduce connection timeout | Thomas Kriechbaumer | 2016-11-29 | 1 | -1/+1 | |
| | | ||||||
| * | websocket: fix message type on chunking | Thomas Kriechbaumer | 2016-11-29 | 1 | -2/+5 | |
| | | ||||||
| * | websocket: fix close handshake and re-chunking | Thomas Kriechbaumer | 2016-11-29 | 1 | -14/+33 | |
| | | ||||||
| * | websocket: fix empty frame with fin=1 | Thomas Kriechbaumer | 2016-11-29 | 1 | -1/+9 | |
|/ | ||||||
* | fix #1783 (#1794) | Maximilian Hils | 2016-11-28 | 2 | -1/+20 | |
| | ||||||
* | Merge pull request #1792 from Kriechi/mitmdump-filter-help | Maximilian Hils | 2016-11-28 | 2 | -2/+9 | |
|\ | | | | | improve mitmdump filter help | |||||
| * | improve mitmdump filter help | Thomas Kriechbaumer | 2016-11-25 | 2 | -2/+9 | |
| | | ||||||
* | | fix pyinstaller | Maximilian Hils | 2016-11-28 | 16 | -118/+141 | |
|/ | | | amongst other things, fix #1746 | |||||
* | Fix transparent mode initialisation, refactor mitmproxy.platform (#1787) | Maximilian Hils | 2016-11-25 | 10 | -68/+74 | |
| | ||||||
* | mitmweb: include console logging | Maximilian Hils | 2016-11-25 | 1 | -10/+30 | |
| | ||||||
* | mitmweb: add --no-browser | Maximilian Hils | 2016-11-25 | 3 | -3/+13 | |
| | ||||||
* | fix pyinstaller (#1788) | Maximilian Hils | 2016-11-25 | 9 | -122/+27 | |
| | ||||||
* | update dependencies (#1789) | Maximilian Hils | 2016-11-25 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'mitmweb-eventlog' | Maximilian Hils | 2016-11-23 | 22 | -275/+505 | |
|\ | ||||||
| * | mitmweb: 100% app test coverage, numerous fixes | Maximilian Hils | 2016-11-23 | 14 | -126/+377 | |
| | | ||||||
| * | minor fixes | Maximilian Hils | 2016-11-23 | 4 | -11/+9 | |
| | | ||||||
| * | add eventstore tests | Maximilian Hils | 2016-11-23 | 1 | -0/+32 | |
| | |