aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #2504 from MatthewShao/static-viewerMaximilian Hils2017-08-0815-31/+90
|\ \ \ | |/ / |/| | [WIP] [web] Static viewer for mitmweb
| * | [web] Minor fixes.Matthew Shao2017-08-082-5/+0
| | |
| * | [web] Remove activeFetches and onMessage in StaticBackend.Matthew Shao2017-08-081-19/+1
| | |
| * | [web] Remove MITMWEB_STATIC var in tests, and update them.Matthew Shao2017-08-084-29/+13
| | |
| * | [web] update HideInStatic and some components.Matthew Shao2017-08-085-8/+20
| | |
| * | [web] Update react,react-dom,react-test-renderer to 16-beta.3Matthew Shao2017-08-082-15/+15
| | |
| * | [web] Update tests to ensure they won't be disturbed by static modeMatthew Shao2017-08-073-13/+19
| | |
| * | [web] Add HideInStatic ComponentMatthew Shao2017-08-076-13/+32
| | | | | | | | | | | | | | | HideInStaic compoent will check the MITMWEB_STATIC var, and hide the responsive components in static mode.
| * | [web] Add static backend.Matthew Shao2017-08-072-1/+60
| | |
| * | [web] Add static.js to index.html, containing MITMWEB_STATIC var.Matthew Shao2017-08-072-0/+2
| | |
* | | Merge pull request #2502 from mhils/optmanagerMaximilian Hils2017-08-072-3/+13
|\ \ \ | | | | | | | | Fix optmanager equality check and deepcopy
| * | | fix optmanager equality check and deepcopyMaximilian Hils2017-08-052-3/+13
| | | |
* | | | Merge pull request #2503 from ujjwal96/optionsMaximilian Hils2017-08-073-2/+196
|\ \ \ \ | | | | | | | | | | Improve options UX
| * | | | Improve options UXUjjwal Verma2017-08-073-2/+196
| | | | |
* | | | | Merge pull request #2492 from mhils/addon-containsMaximilian Hils2017-08-053-8/+26
|\ \ \ \ \ | | | | | | | | | | | | Gracefully handle errors during script load
| * | | | | gracefully handle errors during script loadMaximilian Hils2017-08-053-8/+26
| |/ / / /
* | | | | Merge pull request #2501 from mhils/toxxMaximilian Hils2017-08-051-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Use Python 3.6 where possible
| * | | | use py36 where possibleMaximilian Hils2017-08-051-2/+2
|/ / / /
* | | | Merge pull request #2500 from mitmproxy/add-http2-switchMaximilian Hils2017-08-051-0/+1
|\ \ \ \ | | | | | | | | | | re-add --http2 switch
| * | | | re-add --http2 switchMaximilian Hils2017-08-051-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-toggleThomas Kriechbaumer2017-08-042-3/+5
|\ \ \ \ | | | | | | | | | | Improve intercept toggle
| * | | | Improve intercept toggleUjjwal Verma2017-08-022-3/+5
| |/ / /
* | | | Merge pull request #2499 from mhils/rawtcpMaximilian Hils2017-08-042-4/+14
|\ \ \ \ | | | | | | | | | | Re-add rawtcp mode.
| * | | | Revert "Remove promotion to raw TCP based on heuristics"Maximilian Hils2017-08-031-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 rawtcpMaximilian Hils2017-08-031-3/+4
|/ / / /
* | | | Merge pull request #2475 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-08-021-2/+2
|\ \ \ \ | | | | | | | | | | [requires.io] dependency update on master branch
| * | | | [requires.io] dependency updaterequires.io2017-08-021-2/+2
|/ / / /
* | | | Merge pull request #2496 from Kriechi/bump-pyasnThomas Kriechbaumer2017-08-022-6/+4
|\ \ \ \ | | | | | | | | | | bump pyasn
| * | | | bump dependencyThomas Kriechbaumer2017-08-021-1/+1
| | | | |
| * | | | update for pyasn1 0.3Ujjwal Verma2017-08-021-5/+3
|/ / / /
* | | | Merge pull request #2493 from Kriechi/improve-testsMaximilian Hils2017-08-021-188/+233
|\ \ \ \ | | | | | | | | | | improve proxyauth tests
| * | | | improve proxyauth testsThomas Kriechbaumer2017-08-021-188/+233
|/ / / /
* | | | Merge pull request #2490 from mitmproxy/issue-2334Maximilian Hils2017-08-011-1/+1
|\ \ \ \ | |/ / / |/| | | fix #2334
| * | | Update proxyauth.pyMaximilian Hils2017-08-011-1/+1
| | | | | | | | | | | | fix #2334
* | | | fix mitmproxy invocationMaximilian Hils2017-08-011-1/+1
|/ / /
* | | add LogEntry.__eq__Maximilian Hils2017-08-012-0/+10
| | |
* | | Merge pull request #2487 from mhils/no-option-processingMaximilian Hils2017-08-019-14/+20
|\ \ \ | |_|/ |/| | Remove OptManager._processed
| * | remove OptManager._processedMaximilian Hils2017-07-319-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-addonMaximilian Hils2017-07-311-1/+1
|\ \ \ | | | | | | | | Fix minor typing mistake in mitmproxy/tools/main.py
| * | | Fix minor typing mistake.Matthew Shao2017-07-311-1/+1
|/ / /
* | / Merge pull request #2484 from mhils/options-into-own-addonMaximilian Hils2017-07-3127-170/+183
|\| | | |/ |/| Enable tool-specific options
| * minor fixesMaximilian Hils2017-07-302-5/+5
| |
| * move isatty check to a better placeMaximilian Hils2017-07-302-6/+5
| |
| * fix tflow.js creation on Windows.Maximilian Hils2017-07-301-1/+1
| | | | | | | | | | Keep lineendings consistent so that running the tests does not produce a different file on Windows.
| * fix tool-specific cmdlineMaximilian Hils2017-07-304-30/+34
| | | | | | | | | | | | | | 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 Hils2017-07-3023-121/+130
| | | | | | | | | | | | 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..
| * move web options into their own addonMaximilian Hils2017-07-293-19/+20
| |
* | Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-302-1/+20
|\ \ | | | | | | Make option redeclaration silent if signature is the same
| * | make option redeclaration silent if signature is the sameMaximilian Hils2017-07-302-1/+20
| | |
* | | Merge pull request #2482 from mhils/pure-script-loadMaximilian Hils2017-07-303-51/+43
|\ \ \ | |/ / |/| | Make load_script pure
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 18:42:50 +0000