aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | fix lintMaximilian Hils2019-11-161-1/+1
| | | |
* | | | minor type fixesMaximilian Hils2019-11-161-4/+6
| | | |
* | | | Merge branch 'master' into masterMaximilian Hils2019-11-1612-153/+237
|\ \ \ \
| * \ \ \ Merge pull request #3705 from mhils/issue-3469Maximilian Hils2019-11-162-29/+45
| |\ \ \ \ | | | | | | | | | | | | Fix #3469
| | * | | | tests++Maximilian Hils2019-11-151-1/+0
| | | | | |
| | * | | | 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-161-32/+49
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix command injection vulnerability when exporting to curl or httpie
| | * | | | test coverage++Maximilian Hils2019-11-151-0/+1
| | | | | |
| | * | | | improve curl/httpie exportMaximilian Hils2019-11-151-33/+40
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into pr-3448Maximilian Hils2019-11-1571-520/+1060
| | |\ \ \ \
| | * | | | | 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-1311-17/+18
| | |\ \ \ \ \
| | * | | | | | 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-131-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-155-17/+73
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | multipart-fix
| | * | | | | | | separate editorsrjt-gupta2019-02-063-11/+23
| | | | | | | | |
| | * | | | | | | multipart encoder and testsrjt-gupta2019-02-062-11/+46
| | | | | | | | |
| | * | | | | | | multipart-fixrjt-gupta2019-02-062-3/+12
| | | | | | | | |
| * | | | | | | | 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-1567-457/+973
| | |\ \ \ \ \ \ \
| | * | | | | | | | 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
| | | | | | | | |
| * | | | | | | | 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).
| * | | | | | | | improve flowfilterMaximilian Hils2019-11-151-64/+48
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Adding raw_request and raw_response to exportMichael McKeirnan2019-11-161-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-2/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | simplify option file loadingMaximilian Hils2019-11-141-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - no need for a constant that is only used once - if load_paths allows us to specify multiple paths, let's just do that.
| * | | | | | | adding config.yml as an allowed config filenameYoann L2019-11-141-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf. title as suggested in #3639
* | | | | | | | Fixes #3694Yoann L2019-11-141-6/+12
|/ / / / / / /
* | | | | | | Merge pull request #3691 from mhils/sans-io-adjustmentsMaximilian Hils2019-11-1236-161/+169
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Update mypy, sans-io adjustments
| * | | | | | update mypyMaximilian Hils2019-11-1236-142/+148
| | | | | | |
| * | | | | | minor improvements and sans-io adjustmentsMaximilian Hils2019-11-114-31/+33
| | | | | | |
* | | | | | | Merge pull request #3679 from tomlabaude/pf_ipv6Maximilian Hils2019-11-071-2/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added support for IPv6 in pf.py for macOS
| * | | | | | | Fixed lintTom2019-11-051-4/+4
| | | | | | | |
| * | | | | | | Added support for IPv6 in pf.py for macOSTom2019-11-051-2/+15
| |/ / / / / /
* / / / / / / make duration formatting more forgivingMaximilian Hils2019-11-071-1/+3
|/ / / / / /
* | | | | | Merge pull request #3675 from ylmrx/crash_on_replay-3559Maximilian Hils2019-11-041-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixes #3559
| * | | | | | take no action if on `Host` if `:authority` isn't foundYoann L2019-11-041-2/+3
| | | | | | |
| * | | | | | fixes #3559Yoann L2019-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the `:authority` header is not found, we can try to guess it from variable `flow.request.pretty_host` as .pop() accepts a fallback parameter