Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | fix revert of duplicated flows | Maximilian Hils | 2017-11-06 | 1 | -0/+11 | |
| | ||||||
* | make safecall threadsafe. | Maximilian Hils | 2017-10-26 | 1 | -2/+3 | |
| | ||||||
* | fix #2563 | Maximilian Hils | 2017-10-24 | 3 | -4/+4 | |
| | ||||||
* | simplify version output | Maximilian Hils | 2017-10-24 | 1 | -2/+8 | |
| | ||||||
* | Merge pull request #2591 from ddworken/master | Maximilian Hils | 2017-10-22 | 1 | -1/+7 | |
|\ | | | | | Added scanning for CSS injection and iframe injection to XSS scanner | |||||
| * | Added scanning for CSS injection and iframe injection | David Dworken | 2017-10-17 | 1 | -1/+7 | |
| | | ||||||
* | | skip ipv6 tests on sudo-enabled travis builds | Maximilian Hils | 2017-10-20 | 2 | -0/+18 | |
|/ | ||||||
* | remove html outline contentview, fix #2572 | Maximilian Hils | 2017-09-14 | 1 | -9/+0 | |
| | ||||||
* | Merge pull request #2537 from ujjwal96/content-view | Maximilian Hils | 2017-09-04 | 4 | -5/+103 | |
|\ | | | | | JS beautifier | |||||
| * | make split_special_areas more flexible, refs #2537 | Maximilian Hils | 2017-09-03 | 1 | -4/+4 | |
| | | | | | | | | (cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386) | |||||
| * | Added test | Ujjwal Verma | 2017-09-03 | 3 | -70/+92 | |
| | | ||||||
| * | JS beautifier | Ujjwal Verma | 2017-09-03 | 2 | -0/+76 | |
| | | ||||||
* | | Merge pull request #2560 from mhils/mitmproxy-net-tls | Maximilian Hils | 2017-09-04 | 3 | -67/+74 | |
|\ \ | | | | | | | Split TLS parts from net.tcp into net.tls | |||||
| * | | move hostname validation into mitmproxy.net.tls | Maximilian Hils | 2017-09-04 | 3 | -34/+37 | |
| | | | ||||||
| * | | split TLS parts from net.tcp into net.tls | Maximilian Hils | 2017-09-03 | 2 | -34/+38 | |
| |/ | ||||||
* / | suppress tornado logging in tests | Maximilian Hils | 2017-09-03 | 1 | -0/+14 | |
|/ | ||||||
* | [web] Update test for static viewer. | Matthew Shao | 2017-08-30 | 1 | -0/+6 | |
| | ||||||
* | fix strutils.split_special_areas | Maximilian Hils | 2017-08-26 | 1 | -0/+8 | |
| | ||||||
* | add new, faster css prettifier :tada: | Maximilian Hils | 2017-08-24 | 21 | -24/+253 | |
| | ||||||
* | add strutils.escape_special_areas | Maximilian Hils | 2017-08-24 | 1 | -0/+22 | |
| | ||||||
* | Merge pull request #2540 from mhils/relatively-static | Maximilian Hils | 2017-08-22 | 2 | -7/+7 | |
|\ | | | | | Make it possible to run static viewer in subdirectories | |||||
| * | [web] make it possible to run static viewer in subdirectories | Maximilian Hils | 2017-08-21 | 2 | -7/+7 | |
| | | ||||||
* | | fix mitmweb master shutdown, tests++ | Maximilian Hils | 2017-08-21 | 2 | -0/+24 | |
|/ | ||||||
* | 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.. |