| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | pin pyopenssl to fix builds, refs #3692 | Maximilian Hils | 2019-11-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | cleanup mypy usage | Maximilian Hils | 2019-11-16 | 8 | -25/+17 | |
| | | | | | ||||||
| * | | | | make mypy happy | Maximilian Hils | 2019-11-16 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #3702 from mckeimic/master | Maximilian Hils | 2019-11-16 | 2 | -10/+103 | |
| |\ \ \ \ | | | | | | | | | | | Adding export raw http response | |||||
| | * | | | | fix lint | Maximilian Hils | 2019-11-16 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | minor type fixes | Maximilian Hils | 2019-11-16 | 1 | -4/+6 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into master | Maximilian Hils | 2019-11-16 | 17 | -173/+362 | |
| | |\ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | | Merge pull request #3705 from mhils/issue-3469 | Maximilian Hils | 2019-11-16 | 3 | -35/+73 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix #3469 | |||||
| | * | | | | | tests++ | Maximilian Hils | 2019-11-15 | 2 | -7/+28 | |
| | | | | | | | ||||||
| | * | | | | | fix #3469 | Maximilian Hils | 2019-11-15 | 2 | -29/+46 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #3700 from Jessonsotoventura/confirm_quit | Maximilian Hils | 2019-11-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Ctrl-C should prompt the user before exiting | |||||
| | * | | | | | | used getattr to select exit | Jesson Soto Ventura | 2019-11-15 | 1 | -5/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | ctrl-c should prompt for an exit | Jesson Soto Ventura | 2019-11-14 | 1 | -1/+5 | |
| | | |_|/ / / | |/| | | | | ||||||
| * | | | | | | Merge pull request #3448 from cript0nauta/master | Maximilian Hils | 2019-11-16 | 2 | -42/+104 | |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Fix command injection vulnerability when exporting to curl or httpie | |||||
| | * | | | | | test coverage++ | Maximilian Hils | 2019-11-15 | 2 | -0/+9 | |
| | | | | | | | ||||||
| | * | | | | | improve curl/httpie export | Maximilian Hils | 2019-11-15 | 2 | -40/+49 | |
| | | | | | | | ||||||
| | * | | | | | Merge remote-tracking branch 'origin/master' into pr-3448 | Maximilian Hils | 2019-11-15 | 117 | -674/+1478 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Fix flake8 warning in curl_command | Matías Lang | 2019-01-14 | 1 | -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/mitmproxy | Matías Lang | 2019-01-13 | 19 | -29/+32 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Refactor curl_command and httpie_command | Matías Lang | 2019-01-13 | 1 | -11/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid calling to shlex.quote many times | |||||
| | * | | | | | | | Fix command injection when exporting to httpie | Matías Lang | 2019-01-13 | 2 | -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 curl | Matías Lang | 2019-01-13 | 2 | -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-fix | Maximilian Hils | 2019-11-15 | 7 | -20/+114 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | multipart-fix | |||||
| | * | | | | | | | | test coverage improved | rjt-gupta | 2019-02-06 | 1 | -0/+19 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | separate editors | rjt-gupta | 2019-02-06 | 3 | -11/+23 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | multipart encoder and tests | rjt-gupta | 2019-02-06 | 4 | -15/+68 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | multipart-fix | rjt-gupta | 2019-02-06 | 3 | -5/+15 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #3522 from peter-way/master | Maximilian Hils | 2019-11-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | Use 'host_header' instead of 'host', to calculate 'HTTPRequest' hash in transparent mode. | |||||
| | * | | | | | | | | Merge branch 'master' into master | Maximilian Hils | 2019-11-15 | 108 | -602/+1380 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Update serverplayback.py | Maximilian Hils | 2019-07-17 | 1 | -4/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in ↵ | peter-way | 2019-04-15 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transparent mode. | |||||
| * | | | | | | | | | | Merge pull request #3612 from ccssrryy/fix-dup-resp | Maximilian Hils | 2019-11-15 | 1 | -5/+8 | |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | fix duplicate error response | |||||
| | * | | | | | | | | | fix duplicate error response | cs | 2019-08-09 | 1 | -5/+8 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #3425 from rjt-gupta/external-viewer | Maximilian Hils | 2019-11-15 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | external-viewer-fix | |||||
| | * | | | | | | | | | remove superfluous option | Maximilian Hils | 2019-11-15 | 1 | -5/+0 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | option added | rjt-gupta | 2019-01-07 | 1 | -0/+5 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | external-viewer-fix | rjt-gupta | 2018-12-17 | 1 | -2/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3703 from mhils/replay-ignore-port | Maximilian Hils | 2019-11-15 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | allow server replay functionality to run on a different port | |||||
| | * | | | | | | | | | allow server replay functionality to run on a different port | Jurriaan Bremer | 2019-11-15 | 1 | -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/flowfilter2019 | Maximilian Hils | 2019-11-15 | 2 | -65/+49 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | Improve flowfilter | |||||
| | * | | | | | | | | disable overly strict indentation checks | Maximilian Hils | 2019-11-15 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | improve flowfilter | Maximilian Hils | 2019-11-15 | 1 | -64/+48 | |
| |/ / / / / / / / | ||||||
| | | | | | | * | | Adding raw_request and raw_response to export | Michael McKeirnan | 2019-11-16 | 2 | -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 response | Michael McKeirnan | 2019-11-15 | 2 | -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_allowed | Maximilian Hils | 2019-11-15 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | adding config.yml as an allowed config filename | |||||
| | * | | | | | | | simplify option file loading | Maximilian Hils | 2019-11-14 | 1 | -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 filename | Yoann L | 2019-11-14 | 1 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf. title as suggested in #3639 | |||||
| * | | | | | | | | Merge pull request #3698 from ylmrx/crash_on_empty_focus_next | Maximilian Hils | 2019-11-14 | 1 | -6/+12 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fixes crash upon view.focus.[next|prev] - #3694 | |||||
| | * | | | | | | | Fixes #3694 | Yoann L | 2019-11-14 | 1 | -6/+12 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3691 from mhils/sans-io-adjustments | Maximilian Hils | 2019-11-12 | 40 | -167/+175 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update mypy, sans-io adjustments | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |