Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #2525 from mhils/nicer-install | Thomas Kriechbaumer | 2017-08-15 | 1 | -5/+5 | |
|\ \ \ \ | | | | | | | | | | | docs: simplify install instructions | |||||
| * | | | | docs: simplify install instructions | Maximilian Hils | 2017-08-15 | 1 | -5/+5 | |
|/ / / / | | | | | | | | | | | | | | | | | We only need pip3 now on all OSes as cryptography now ships wheels on Linux :tada:. Also remove `pip3 install --user` recommendation because that won't end up on $PATH. | |||||
* | | | | Merge pull request #2519 from titeuf87/no_ipv6_fallback_fix | Maximilian Hils | 2017-08-13 | 1 | -0/+2 | |
|\ \ \ \ | |_|/ / |/| | | | Fallback correctly to ipv4 when ipv6 is not supported | |||||
| * | | | Fallback correctly to ipv4 when ipv6 is not supported | Simon Vermeersch | 2017-08-13 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge pull request #2511 from ujjwal96/master | Maximilian Hils | 2017-08-10 | 1 | -0/+1 | |
|\ \ \ | |_|/ |/| | | Fix version conflict | |||||
| * | | Fix version conflict | Ujjwal Verma | 2017-08-10 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #2509 from ujjwal96/compat | Maximilian Hils | 2017-08-09 | 1 | -1/+1 | |
|\ \ | | | | | | | Fixes #2495 | |||||
| * | | Fixes #2495 | Ujjwal Verma | 2017-08-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2504 from MatthewShao/static-viewer | Maximilian Hils | 2017-08-08 | 15 | -31/+90 | |
|\ \ \ | |/ / |/| | | [WIP] [web] Static viewer for mitmweb | |||||
| * | | [web] Minor fixes. | Matthew Shao | 2017-08-08 | 2 | -5/+0 | |
| | | | ||||||
| * | | [web] Remove activeFetches and onMessage in StaticBackend. | Matthew Shao | 2017-08-08 | 1 | -19/+1 | |
| | | | ||||||
| * | | [web] Remove MITMWEB_STATIC var in tests, and update them. | Matthew Shao | 2017-08-08 | 4 | -29/+13 | |
| | | | ||||||
| * | | [web] update HideInStatic and some components. | Matthew Shao | 2017-08-08 | 5 | -8/+20 | |
| | | | ||||||
| * | | [web] Update react,react-dom,react-test-renderer to 16-beta.3 | Matthew Shao | 2017-08-08 | 2 | -15/+15 | |
| | | | ||||||
| * | | [web] Update tests to ensure they won't be disturbed by static mode | Matthew Shao | 2017-08-07 | 3 | -13/+19 | |
| | | | ||||||
| * | | [web] Add HideInStatic Component | Matthew Shao | 2017-08-07 | 6 | -13/+32 | |
| | | | | | | | | | | | | | | | HideInStaic compoent will check the MITMWEB_STATIC var, and hide the responsive components in static mode. | |||||
| * | | [web] Add static backend. | Matthew Shao | 2017-08-07 | 2 | -1/+60 | |
| | | | ||||||
| * | | [web] Add static.js to index.html, containing MITMWEB_STATIC var. | Matthew Shao | 2017-08-07 | 2 | -0/+2 | |
| | | | ||||||
* | | | Merge pull request #2502 from mhils/optmanager | Maximilian Hils | 2017-08-07 | 2 | -3/+13 | |
|\ \ \ | | | | | | | | | Fix optmanager equality check and deepcopy | |||||
| * | | | fix optmanager equality check and deepcopy | Maximilian Hils | 2017-08-05 | 2 | -3/+13 | |
| | | | | ||||||
* | | | | Merge pull request #2503 from ujjwal96/options | Maximilian Hils | 2017-08-07 | 3 | -2/+196 | |
|\ \ \ \ | | | | | | | | | | | Improve options UX | |||||
| * | | | | Improve options UX | Ujjwal Verma | 2017-08-07 | 3 | -2/+196 | |
| | | | | | ||||||
* | | | | | Merge pull request #2492 from mhils/addon-contains | Maximilian Hils | 2017-08-05 | 3 | -8/+26 | |
|\ \ \ \ \ | | | | | | | | | | | | | Gracefully handle errors during script load | |||||
| * | | | | | gracefully handle errors during script load | Maximilian Hils | 2017-08-05 | 3 | -8/+26 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2501 from mhils/toxx | Maximilian Hils | 2017-08-05 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Use Python 3.6 where possible | |||||
| * | | | | use py36 where possible | Maximilian Hils | 2017-08-05 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #2500 from mitmproxy/add-http2-switch | Maximilian Hils | 2017-08-05 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | re-add --http2 switch | |||||
| * | | | | re-add --http2 switch | Maximilian Hils | 2017-08-05 | 1 | -0/+1 | |
|/ / / / | | | | | | | | | | | | | I think this is one of the more important ones we should not omit, e.g. as `--no-http2` is still needed for scripted redirection. | |||||
* | | | | Merge pull request #2494 from ujjwal96/intercept-toggle | Thomas Kriechbaumer | 2017-08-04 | 2 | -3/+5 | |
|\ \ \ \ | | | | | | | | | | | Improve intercept toggle | |||||
| * | | | | Improve intercept toggle | Ujjwal Verma | 2017-08-02 | 2 | -3/+5 | |
| |/ / / | ||||||
* | | | | Merge pull request #2499 from mhils/rawtcp | Maximilian Hils | 2017-08-04 | 2 | -4/+14 | |
|\ \ \ \ | | | | | | | | | | | Re-add rawtcp mode. | |||||
| * | | | | Revert "Remove promotion to raw TCP based on heuristics" | Maximilian Hils | 2017-08-03 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fbaade429845546d751110caa0f886f7b1a62717 for the following reasons: - The commit only removed the proxy logic, while keeping the corresponding command line options etc. intact. That is quite confusing. - The switch is (and has been) off-by-default and the option help now clearly states that this needs to be used with caution. I'd argue that constrains the potential danger. - I have a specific use case that needs this, and implementing it as an addon is rather difficult at the moment. That being said, this revert is a rather pragmatic temporary decision, the functionality should clearly be made more explicit and protocol switching should be moved to an addon. | |||||
| * | | | | improve docstring for rawtcp | Maximilian Hils | 2017-08-03 | 1 | -3/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #2475 from mitmproxy/requires-io-master | Thomas Kriechbaumer | 2017-08-02 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | [requires.io] dependency update on master branch | |||||
| * | | | | [requires.io] dependency update | requires.io | 2017-08-02 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #2496 from Kriechi/bump-pyasn | Thomas Kriechbaumer | 2017-08-02 | 2 | -6/+4 | |
|\ \ \ \ | | | | | | | | | | | bump pyasn | |||||
| * | | | | bump dependency | Thomas Kriechbaumer | 2017-08-02 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | update for pyasn1 0.3 | Ujjwal Verma | 2017-08-02 | 1 | -5/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #2493 from Kriechi/improve-tests | Maximilian Hils | 2017-08-02 | 1 | -188/+233 | |
|\ \ \ \ | | | | | | | | | | | improve proxyauth tests | |||||
| * | | | | improve proxyauth tests | Thomas Kriechbaumer | 2017-08-02 | 1 | -188/+233 | |
|/ / / / | ||||||
* | | | | Merge pull request #2490 from mitmproxy/issue-2334 | Maximilian Hils | 2017-08-01 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | fix #2334 | |||||
| * | | | Update proxyauth.py | Maximilian Hils | 2017-08-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | fix #2334 | |||||
* | | | | fix mitmproxy invocation | Maximilian Hils | 2017-08-01 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | add LogEntry.__eq__ | Maximilian Hils | 2017-08-01 | 2 | -0/+10 | |
| | | | ||||||
* | | | Merge pull request #2487 from mhils/no-option-processing | Maximilian Hils | 2017-08-01 | 9 | -14/+20 | |
|\ \ \ | |_|/ |/| | | Remove OptManager._processed | |||||
| * | | remove OptManager._processed | Maximilian Hils | 2017-07-31 | 9 | -14/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #2488 from MatthewShao/options-into-own-addon | Maximilian Hils | 2017-07-31 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix minor typing mistake in mitmproxy/tools/main.py | |||||
| * | | | Fix minor typing mistake. | Matthew Shao | 2017-07-31 | 1 | -1/+1 | |
|/ / / | ||||||
* | / | Merge pull request #2484 from mhils/options-into-own-addon | Maximilian Hils | 2017-07-31 | 27 | -170/+183 | |
|\| | | |/ |/| | Enable tool-specific options | |||||
| * | minor fixes | Maximilian Hils | 2017-07-30 | 2 | -5/+5 | |
| | |