Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix tests | Maximilian Hils | 2017-08-21 | 1 | -1/+1 |
| | |||||
* | move tests... | Maximilian Hils | 2017-08-21 | 1 | -0/+0 |
| | |||||
* | Merge pull request #2510 from MatthewShao/static-viewer | Maximilian Hils | 2017-08-21 | 2 | -5/+68 |
|\ | | | | | [WIP][web]Static viewer converter for mitmweb | ||||
| * | [web] Static_viewer coverage ++. | Matthew Shao | 2017-08-17 | 1 | -2/+5 |
| | | |||||
| * | [web] Add tests for StaticViewer and minor fixes. | Matthew Shao | 2017-08-17 | 1 | -0/+60 |
| | | |||||
| * | [web] Update tests. | Matthew Shao | 2017-08-16 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #2489 from MatthewShao/options-into-own-addon | Maximilian Hils | 2017-08-16 | 3 | -8/+12 |
|\ \ | | | | | | | Move console-related options into their own addon | ||||
| * | | Add test for AddonManager.__contains__ | Matthew Shao | 2017-08-08 | 1 | -0/+2 |
| | | | |||||
| * | | Fix lint. | Matthew Shao | 2017-08-05 | 2 | -3/+1 |
| | | | |||||
| * | | Update taddon and tests. | Matthew Shao | 2017-08-03 | 2 | -7/+2 |
| | | | |||||
| * | | Update tests. | Matthew Shao | 2017-08-01 | 2 | -14/+21 |
| | | | |||||
| * | | Update tests. | Matthew Shao | 2017-08-01 | 2 | -6/+8 |
| | | | |||||
* | | | improve ClientHello.alpn_protocols API | Maximilian Hils | 2017-08-16 | 1 | -2/+1 |
| |/ |/| | |||||
* | | Merge pull request #2502 from mhils/optmanager | Maximilian Hils | 2017-08-07 | 1 | -0/+6 |
|\ \ | | | | | | | Fix optmanager equality check and deepcopy | ||||
| * | | fix optmanager equality check and deepcopy | Maximilian Hils | 2017-08-05 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #2503 from ujjwal96/options | Maximilian Hils | 2017-08-07 | 1 | -0/+36 |
|\ \ \ | | | | | | | | | Improve options UX | ||||
| * | | | Improve options UX | Ujjwal Verma | 2017-08-07 | 1 | -0/+36 |
| | | | | |||||
* | | | | Merge pull request #2492 from mhils/addon-contains | Maximilian Hils | 2017-08-05 | 2 | -6/+23 |
|\ \ \ \ | |_|/ / |/| | | | Gracefully handle errors during script load | ||||
| * | | | gracefully handle errors during script load | Maximilian Hils | 2017-08-05 | 2 | -6/+23 |
| |/ / | |||||
* / / | improve proxyauth tests | Thomas Kriechbaumer | 2017-08-02 | 1 | -188/+233 |
|/ / | |||||
* | | add LogEntry.__eq__ | Maximilian Hils | 2017-08-01 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #2487 from mhils/no-option-processing | Maximilian Hils | 2017-08-01 | 3 | -4/+1 |
|\ \ | |/ |/| | Remove OptManager._processed | ||||
| * | remove OptManager._processed | Maximilian Hils | 2017-07-31 | 3 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of having the core addon do postprocessing on body_size_limit, we add a cache to the parsing function. First, this avoids any potential issues with options and _processed getting out of sync. As anecdotal evidence, the previous implementation did not clear _processed when body_size_limit was reset to None. Second, it achieves the same end result without introducing a new concept of a "_processed" scratch space. Third, it works even if addons aren't present, and does not require workarounds as previously present in test_http2.py. refs https://github.com/mitmproxy/mitmproxy/pull/2484#pullrequestreview-53101507 | ||||
* | | Merge pull request #2484 from mhils/options-into-own-addon | Maximilian Hils | 2017-07-31 | 16 | -85/+64 |
|\| | | | | | Enable tool-specific options | ||||
| * | fix tflow.js creation on Windows. | Maximilian Hils | 2017-07-30 | 1 | -1/+1 |
| | | | | | | | | | | Keep lineendings consistent so that running the tests does not produce a different file on Windows. | ||||
| * | fix tool-specific cmdline | Maximilian Hils | 2017-07-30 | 2 | -11/+6 |
| | | | | | | | | | | | | | | before this commit, all tools only exposed mitmdump cmdline arguments, as run() contained a simple `cmdline.mitmdump()` invocation. This fixes this, and also makes it possible to have cmdline arguments for tool-specific options. | ||||
| * | disentangle ProxyServer and Master classes. | Maximilian Hils | 2017-07-30 | 14 | -73/+57 |
| | | | | | | | | | | | | The proxy server should ultimately be an addon itself and not be passed to the Master constructor. This commit already removes the server in the majority of instances, and also replaces a large number of ProxyConfig usages with the Options class.. | ||||
* | | Merge pull request #2485 from mhils/silent-option-redeclaration | Maximilian Hils | 2017-07-30 | 1 | -0/+8 |
|\ \ | | | | | | | Make option redeclaration silent if signature is the same | ||||
| * | | make option redeclaration silent if signature is the same | Maximilian Hils | 2017-07-30 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #2482 from mhils/pure-script-load | Maximilian Hils | 2017-07-30 | 2 | -34/+28 |
|\ \ \ | |/ / |/| | | Make load_script pure | ||||
| * | | make load_script pure | Maximilian Hils | 2017-07-30 | 2 | -34/+28 |
| |/ | |||||
* | | Merge pull request #2483 from mhils/ignore-imports-with-hook-names | Maximilian Hils | 2017-07-30 | 1 | -0/+5 |
|\ \ | | | | | | | Gracefully ignore imports with hook names | ||||
| * | | gracefully ignore imports with hook names | Maximilian Hils | 2017-07-29 | 1 | -0/+5 |
| |/ | |||||
* | | add option type hints | Maximilian Hils | 2017-07-29 | 1 | -0/+34 |
| | | |||||
* | | add OptManager.items | Maximilian Hils | 2017-07-29 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #2452 from mattweidner/add_intercept_toggle | Maximilian Hils | 2017-07-29 | 1 | -0/+12 |
|\ | | | | | Add intercept toggle feature. | ||||
| * | Extended intercept tests to include toggle feature | Matt Weidner | 2017-07-27 | 1 | -0/+12 |
| | | |||||
* | | Merge pull request #2480 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-29 | 4 | -4/+4 |
|\ \ | | | | | | | Fix #2448: Improve flow_detail and verbosity options | ||||
| * | | Update tests for the improved verbosity options. | Matthew Shao | 2017-07-28 | 4 | -4/+4 |
| |/ | |||||
* | | Merge pull request #2471 from ujjwal96/traceback-fix | Maximilian Hils | 2017-07-29 | 4 | -11/+15 |
|\ \ | |/ |/| | Fixed addon error in test suite | ||||
| * | fixed addon error | Ujjwal Verma | 2017-07-26 | 4 | -11/+15 |
| | | |||||
* | | add console statusbar test | Maximilian Hils | 2017-07-27 | 3 | -11/+46 |
| | | |||||
* | | Merge pull request #2460 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-27 | 1 | -1/+3 |
|\ \ | | | | | | | Add default value suggester in mitmweb options | ||||
| * | | [web] Minor Fix for backend. | Matthew Shao | 2017-07-27 | 1 | -2/+2 |
| | | | |||||
| * | | [web] Fix tests. | Matthew Shao | 2017-07-26 | 2 | -5/+1 |
| | | | |||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-26 | 2 | -11/+2 |
| | | | |||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-24 | 2 | -1/+16 |
| |/ | |||||
* | | Merge pull request #2469 from Kriechi/nuke-old-openssl | Maximilian Hils | 2017-07-25 | 9 | -145/+90 |
|\ \ | | | | | | | nuke old openssl | ||||
| * | | nuke old openssl | Thomas Kriechbaumer | 2017-07-25 | 8 | -129/+10 |
| | | | |||||
| * | | update cert with too small key | Thomas Kriechbaumer | 2017-07-25 | 1 | -16/+80 |
| |/ | | | | | | | | | | | $ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes (keep everything default, do not enter a Common Name or FQDN) $ cat key.pem cert.pem > test/mitmproxy/data/no_common_name.pem |