aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Delete issue_template.mdMaximilian Hils2019-11-191-17/+0
| | | this is in .github/ now.
* update badgesMaximilian Hils2019-11-191-8/+4
|
* Merge pull request #3714 from sethb157/ipv6_onlyMaximilian Hils2019-11-191-3/+15
|\ | | | | Add support for IPv6-only environments
| * Add support for IPv6-only environmentsSeth Barrios2019-11-181-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Previously, the proxy would attempt to bind to an IPv6 + IPv4 enabled socket. On failure, it would try to bind to an IPv4 only socket. If that failed, the proxy would fail to start. This update makes it so that the proxy also tries to bind to an IPv6-only socket, which is necessary in environments where IPv4 is disabled. In short, the proxy will try binding in the following order, only moving to the next step when binding fails: IPv6 + IPv4 -> IPv4 only -> IPv6 only -> proxy fails to start.
* | Use Github Actions for CI (#3713)Maximilian Hils2019-11-1920-235/+388
| | | | | | switch to github actions for CI
* | pin pyopenssl to fix builds, refs #3692Maximilian Hils2019-11-181-1/+1
| |
* | cleanup mypy usageMaximilian Hils2019-11-168-25/+17
| |
* | make mypy happyMaximilian Hils2019-11-161-2/+2
| |
* | Merge pull request #3702 from mckeimic/masterMaximilian Hils2019-11-162-10/+103
|\ \ | | | | | | Adding export raw http response
| * | fix lintMaximilian Hils2019-11-161-1/+1
| | |
| * | minor type fixesMaximilian Hils2019-11-161-4/+6
| | |
| * | Merge branch 'master' into masterMaximilian Hils2019-11-1617-173/+362
| |\ \ | |/ / |/| |
* | | Merge pull request #3705 from mhils/issue-3469Maximilian Hils2019-11-163-35/+73
|\ \ \ | | | | | | | | Fix #3469
| * | | tests++Maximilian Hils2019-11-152-7/+28
| | | |
| * | | fix #3469Maximilian Hils2019-11-152-29/+46
| | | |
* | | | Merge pull request #3700 from Jessonsotoventura/confirm_quitMaximilian Hils2019-11-161-1/+1
|\ \ \ \ | | | | | | | | | | Ctrl-C should prompt the user before exiting
| * | | | used getattr to select exitJesson Soto Ventura2019-11-151-5/+1
| | | | |
| * | | | ctrl-c should prompt for an exitJesson Soto Ventura2019-11-141-1/+5
| | |_|/ | |/| |
* | | | Merge pull request #3448 from cript0nauta/masterMaximilian Hils2019-11-162-42/+104
|\ \ \ \ | | | | | | | | | | Fix command injection vulnerability when exporting to curl or httpie
| * | | | test coverage++Maximilian Hils2019-11-152-0/+9
| | | | |
| * | | | improve curl/httpie exportMaximilian Hils2019-11-152-40/+49
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into pr-3448Maximilian Hils2019-11-15117-674/+1478
| |\ \ \ \
| * | | | | Fix flake8 warning in curl_commandMatías Lang2019-01-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an unused variable (I redefined its value below). It didn't affect the behavior of the function
| * | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMatías Lang2019-01-1319-29/+32
| |\ \ \ \ \
| * | | | | | Refactor curl_command and httpie_commandMatías Lang2019-01-131-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid calling to shlex.quote many times
| * | | | | | Fix command injection when exporting to httpieMatías Lang2019-01-132-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command generated by `export.clip httpie @focus` or `export.file httpie @focus /path/to/file` wasn't being properly escaped so it could contain a malicious command instead of just a simple httpie call.
| * | | | | | Fix command injection when exporting to curlMatías Lang2019-01-132-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command generated by `export.clip curl @focus` or `export.file curl @focus /path/to/file` wasn't being properly escaped so it could contain a malicious command instead of just a simple curl.
* | | | | | | Merge pull request #3420 from rjt-gupta/multipart-fixMaximilian Hils2019-11-157-20/+114
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | multipart-fix
| * | | | | | | test coverage improvedrjt-gupta2019-02-061-0/+19
| | | | | | | |
| * | | | | | | separate editorsrjt-gupta2019-02-063-11/+23
| | | | | | | |
| * | | | | | | multipart encoder and testsrjt-gupta2019-02-064-15/+68
| | | | | | | |
| * | | | | | | multipart-fixrjt-gupta2019-02-063-5/+15
| | | | | | | |
* | | | | | | | Merge pull request #3522 from peter-way/masterMaximilian Hils2019-11-151-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Use 'host_header' instead of 'host', to calculate 'HTTPRequest' hash in transparent mode.
| * | | | | | | Merge branch 'master' into masterMaximilian Hils2019-11-15108-602/+1380
| |\ \ \ \ \ \ \
| * | | | | | | | Update serverplayback.pyMaximilian Hils2019-07-171-4/+1
| | | | | | | | |
| * | | | | | | | Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in ↵peter-way2019-04-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transparent mode.
* | | | | | | | | Merge pull request #3612 from ccssrryy/fix-dup-respMaximilian Hils2019-11-151-5/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | fix duplicate error response
| * | | | | | | | fix duplicate error responsecs2019-08-091-5/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #3425 from rjt-gupta/external-viewerMaximilian Hils2019-11-151-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | external-viewer-fix
| * | | | | | | | remove superfluous optionMaximilian Hils2019-11-151-5/+0
| | | | | | | | |
| * | | | | | | | option addedrjt-gupta2019-01-071-0/+5
| | | | | | | | |
| * | | | | | | | external-viewer-fixrjt-gupta2018-12-171-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #3703 from mhils/replay-ignore-portMaximilian Hils2019-11-151-1/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | allow server replay functionality to run on a different port
| * | | | | | | | allow server replay functionality to run on a different portJurriaan Bremer2019-11-151-1/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By providing the "server_replay_ignore_port" configuration value we're able to run mitmproxy in server replay mode on a different port than the web server in the flows was originally running. This is also useful in case multiple ports are present in a flow (I suspect).
* | | | | | | | Merge pull request #3699 from mhils/flowfilter2019Maximilian Hils2019-11-152-65/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Improve flowfilter
| * | | | | | | disable overly strict indentation checksMaximilian Hils2019-11-151-1/+1
| | | | | | | |
| * | | | | | | improve flowfilterMaximilian Hils2019-11-151-64/+48
|/ / / / / / /
| | | | | | * Adding raw_request and raw_response to exportMichael McKeirnan2019-11-162-5/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a proposed change for https://github.com/mitmproxy/mitmproxy/issues/3701 which alters the behavior of a raw http export to include both the request and the response. Additionally, this introduces two new export options "raw_request" and "raw_response" which allow for exporting the raw HTTP request or response individually.
| | | | | | * Adding export raw http responseMichael McKeirnan2019-11-152-10/+44
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Adding a new export type for raw http response, and changing export raw to export raw_request to distinguish between the two. This is a proposed change for https://github.com/mitmproxy/mitmproxy/issues/3701
* | | | | | Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowedMaximilian Hils2019-11-151-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding config.yml as an allowed config filename
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-12 09:29:08 +0000