Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master | Maximilian Hils | 2019-11-16 | 4 | -19/+124 |
|\ | |||||
| * | Merge pull request #3705 from mhils/issue-3469 | Maximilian Hils | 2019-11-16 | 1 | -6/+28 |
| |\ | | | | | | | Fix #3469 | ||||
| | * | tests++ | Maximilian Hils | 2019-11-15 | 1 | -6/+28 |
| | | | |||||
| * | | Merge pull request #3448 from cript0nauta/master | Maximilian Hils | 2019-11-16 | 1 | -10/+55 |
| |\ \ | | | | | | | | | Fix command injection vulnerability when exporting to curl or httpie | ||||
| | * | | test coverage++ | Maximilian Hils | 2019-11-15 | 1 | -0/+8 |
| | | | | |||||
| | * | | improve curl/httpie export | Maximilian Hils | 2019-11-15 | 1 | -7/+9 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into pr-3448 | Maximilian Hils | 2019-11-15 | 19 | -60/+165 |
| | |\| | |||||
| | * | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Matías Lang | 2019-01-13 | 5 | -6/+8 |
| | |\ \ | |||||
| | * | | | Fix command injection when exporting to httpie | Matías Lang | 2019-01-13 | 1 | -5/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+41 |
| |\ \ \ \ | | |_|_|/ | |/| | | | multipart-fix | ||||
| | * | | | test coverage improved | rjt-gupta | 2019-02-06 | 1 | -0/+19 |
| | | | | | |||||
| | * | | | multipart encoder and tests | rjt-gupta | 2019-02-06 | 2 | -4/+22 |
| | | | | | |||||
| | * | | | multipart-fix | rjt-gupta | 2019-02-06 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | Adding raw_request and raw_response to export | Michael McKeirnan | 2019-11-16 | 1 | -1/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -8/+30 |
|/ / / / | | | | | | | | | | | | | | | | | 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 #3691 from mhils/sans-io-adjustments | Maximilian Hils | 2019-11-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Update mypy, sans-io adjustments | ||||
| * | | | | update mypy | Maximilian Hils | 2019-11-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | minor improvements and sans-io adjustments | Maximilian Hils | 2019-11-11 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3679 from tomlabaude/pf_ipv6 | Maximilian Hils | 2019-11-07 | 2 | -0/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Added support for IPv6 in pf.py for macOS | ||||
| * | | | | | pfctl state output always have 2 lines for each socket. Adding outgoing ↵ | Tom | 2019-11-05 | 2 | -0/+11 |
| |/ / / / | | | | | | | | | | | | | | | | lines in data which matches lines before incoming ones. Also adding IPv6 data and tests | ||||
* / / / / | make duration formatting more forgiving | Maximilian Hils | 2019-11-07 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | several fixes on command exports has several problems: #3676 | Yoann L | 2019-10-28 | 1 | -15/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * authority can usually rely on actual URL. as `:authority` headers will break curl command. (advise if it's better to change them to Host, or if it should be reported on curl side) * `content-length`: 0 is added for each request. if it's found in the curl argument list, it'll try to fetch an empty body (and crash). also trying to guess on accept-encoding header to add the `--compress` option when fetching potentially compressed content. * ditto for httpie | ||||
* | | | | Move onboardingapp from tornado to flask (#3661) | Maximilian Hils | 2019-10-06 | 2 | -1/+0 |
| | | | | |||||
* | | | | Add key_size option to define rsa key size (#3657) | vin01 | 2019-09-30 | 1 | -10/+10 |
| | | | | |||||
* | | | | bump more deps | Thomas Kriechbaumer | 2019-09-28 | 2 | -8/+8 |
| | | | | |||||
* | | | | bump deps | Thomas Kriechbaumer | 2019-09-28 | 2 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #3464 from rjt-gupta/url-fix | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+16 |
|\ \ \ \ | | | | | | | | | | | Non ascii characters in url | ||||
| * | | | | non ascii fix and tests | rjt-gupta | 2019-02-03 | 1 | -0/+16 |
| |/ / / | |||||
* | | | | Merge pull request #3486 from rjt-gupta/unicode-filter | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+23 |
|\ \ \ \ | | | | | | | | | | | filter unicode fix | ||||
| * | | | | filter unicode fix | rjt-gupta | 2019-02-24 | 1 | -0/+23 |
| |/ / / | |||||
* | | | | Merge pull request #3526 from pierlon/feature/allow-hosts | Thomas Kriechbaumer | 2019-09-28 | 2 | -2/+58 |
|\ \ \ \ | | | | | | | | | | | Add --allow_hosts option | ||||
| * | | | | Verify ignore_hosts & allow_hosts are mutually exclusive | Pierre Gordon | 2019-04-19 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | Add --allow_hosts option | Pierre Gordon | 2019-04-19 | 1 | -2/+49 |
| |/ / / | | | | | | | | | | | | | Closes #3295 | ||||
* | | | | Merge pull request #3631 from mhils/lint | Maximilian Hils | 2019-09-05 | 2 | -14/+14 |
|\ \ \ \ | | | | | | | | | | | Fix CI | ||||
| * | | | | lint | Maximilian Hils | 2019-09-05 | 2 | -14/+14 |
| | | | | | |||||
* | | | | | encoding: add support for zstd (zstandard) | Tero Saaristo | 2019-09-05 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | Handles zstandard-compressed bodies labeled as zstd. | ||||
* / / / | update formatdate for cookies and tests to use GMT formatting | Anthony Biondo | 2019-04-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3437 from yan12125/fix-tests-on-mojave | Thomas Kriechbaumer | 2019-01-26 | 1 | -1/+5 |
|\ \ \ | |_|/ |/| | | Fix a failing test on macOS Mojave | ||||
| * | | Fix a failing test on macOS Mojave | Chih-Hsuan Yen | 2018-12-29 | 1 | -1/+5 |
| |/ | |||||
* | | Merge pull request #3444 from BoboTiG/fix-resource-leaks | Maximilian Hils | 2019-01-06 | 2 | -2/+4 |
|\ \ | | | | | | | Fix ResourceWarning: unclosed file, prevent resource leaks | ||||
| * | | Fix ResourceWarning: unclosed file, prevent resource leaks | Mickaël Schoentgen | 2019-01-06 | 2 | -2/+4 |
| |/ | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | ||||
* / | Fix several DeprecationWarning: invalid escape sequence | Mickaël Schoentgen | 2019-01-05 | 3 | -4/+4 |
|/ | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | ||||
* | charset in meta tags (#3411) | Rajat Gupta | 2018-12-13 | 1 | -0/+10 |
| | | | original contribution from @0xHJK in https://github.com/mitmproxy/mitmproxy/pull/3150 | ||||
* | fix query array | Rajat Gupta | 2018-12-03 | 2 | -2/+17 |
| | | | | fixes #3072 closes #3254 | ||||
* | bump dependencies | Thomas Kriechbaumer | 2018-12-02 | 3 | -5/+5 |
| | |||||
* | Change variable o to organization for generated certficates. | Abhigyan Khaund | 2018-11-11 | 1 | -3/+3 |
| | |||||
* | Add Organization field for the generated certificate (#3376) | Abcdefghijklmnopqrstuvwxyzxyz | 2018-11-09 | 1 | -2/+7 |
| | | | add organization field for the generated certificate | ||||
* | test_dumper.py - Add sio_err everywhere + adjust test_simple | Jessica Favin | 2018-11-04 | 1 | -4/+26 |
| | |||||
* | Fix test_dumper.py - Dumper constructor | Jessica Favin | 2018-11-04 | 1 | -2/+2 |
| |