| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\ | |||||
| | * | Merge pull request #3444 from BoboTiG/fix-resource-leaks | Maximilian Hils | 2019-01-06 | 5 | -9/+12 |
| | |\ | | | | | | | Fix ResourceWarning: unclosed file, prevent resource leaks | ||||
| | | * | Fix ResourceWarning: unclosed file, prevent resource leaks | Mickaël Schoentgen | 2019-01-06 | 5 | -9/+12 |
| | | | | | | | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | ||||
| | * | | Merge pull request #3443 from BoboTiG/fix-invalid-seq-warnings | Maximilian Hils | 2019-01-06 | 14 | -20/+20 |
| | |\ \ | | |/ | |/| | Fix several DeprecationWarning: invalid escape sequence | ||||
| | | * | Fix several DeprecationWarning: invalid escape sequence | Mickaël Schoentgen | 2019-01-05 | 14 | -20/+20 |
| | |/ | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | ||||
| * | | 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. | ||||
| * | Fix Flow being part of raw_format_flow cache key | BkPHcgQL3V | 2018-12-17 | 1 | -5/+5 |
| | | | | | | | | | | | raw_format_flow is annotated with the @lru_cache decorator, which creates a cache of the function's return value based on its parameters. Thus, assuming that the first argument (f) contains all the information needed to compute the urwid control for the flow, this effectively caches results. To make most use of this, remove the second parameter representing the real Flow object to improve @lru_cache's efficiency. | ||||
| * | charset in meta tags (#3411) | Rajat Gupta | 2018-12-13 | 2 | -16/+30 |
| | | | | original contribution from @0xHJK in https://github.com/mitmproxy/mitmproxy/pull/3150 | ||||
| * | fix query array | Rajat Gupta | 2018-12-03 | 5 | -13/+47 |
| | | | | | fixes #3072 closes #3254 | ||||
| * | Merge pull request #3403 from Kriechi/bump-deps | Thomas Kriechbaumer | 2018-12-02 | 16 | -27/+30 |
| |\ | | | | | bump dependencies | ||||
| | * | bump dependencies | Thomas Kriechbaumer | 2018-12-02 | 16 | -27/+30 |
| |/ | |||||
| * | Merge pull request #3401 from rjt-gupta/fix-replay-timestamps | Thomas Kriechbaumer | 2018-12-01 | 1 | -0/+2 |
| |\ | | | | | client-replay-fix | ||||
| | * | client-replay-fix | rjt-gupta | 2018-12-01 | 1 | -0/+2 |
| |/ | |||||
| * | Merge pull request #3382 from abhigyank/org | Thomas Kriechbaumer | 2018-11-12 | 3 | -21/+21 |
| |\ | | | | | Change variable o to organization for generated certficates. | ||||
| | * | Change variable o to organization for generated certficates. | Abhigyan Khaund | 2018-11-11 | 3 | -21/+21 |
| |/ | |||||
| * | Add Organization field for the generated certificate (#3376) | Abcdefghijklmnopqrstuvwxyzxyz | 2018-11-09 | 3 | -6/+28 |
| | | | | add organization field for the generated certificate | ||||
| * | Merge pull request #3371 from JessicaFavin/proper-display-on-stderr | Maximilian Hils | 2018-11-09 | 2 | -11/+41 |
| |\ | | | | | Display errors on sys.stderr | ||||
| | * | Remove indent on echo_error | JessicaFavin | 2018-11-04 | 1 | -3/+1 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | Update test_dumper.py | Jessica Favin | 2018-11-04 | 1 | -2/+4 |
| | | | |||||
| | * | Display errors on sys.stderr | Jessica Favin | 2018-11-01 | 1 | -3/+11 |
| | | | |||||
| * | | Merge pull request #3374 from abhigyank/docs | Maximilian Hils | 2018-11-09 | 1 | -1/+1 |
| |\ \ | |/ |/| | docs: Add mitm.it link in the certificates docs. | ||||
| | * | docs: don't make links extra bold | Maximilian Hils | 2018-11-09 | 1 | -1/+1 |
| | | | |||||
| | * | docs: Add mitm.it link in the certificates docs. | Abhigyan Khaund | 2018-11-05 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3366 from alexlauerman/patch-3 | Maximilian Hils | 2018-10-26 | 1 | -1/+1 |
| |\ | | | | | Corrected keep_host_header usage option | ||||
| | * | Corrected keep_host_header usage option | Alex Lauerman | 2018-10-25 | 1 | -1/+1 |
| |/ | | | I tested this locally to verify this change is correct. | ||||
| * | Merge pull request #3356 from fghzxm/umask-keys | Samoilenko Roman | 2018-10-25 | 2 | -2/+27 |
| |\ | | | | | Make private keys readable only by the owner | ||||
| | * | use skip_windows decorator consistently | Maximilian Hils | 2018-10-23 | 1 | -4/+2 |
| | | | |||||
| | * | Skip file permission test on Windows | Fred Miller | 2018-10-23 | 1 | -0/+4 |
| | | | |||||
| | * | Make private keys readable only by the owner | Fred Miller | 2018-10-22 | 2 | -2/+25 |
| |/ | |||||
| * | Merge pull request #3351 from arun-94/master | Maximilian Hils | 2018-10-21 | 3 | -1/+29 |
| |\ | | | | | #3312 Change colors according to the HTTP status code | ||||
| | * | Update snapshot tests | Arun Swaminathan | 2018-10-20 | 2 | -0/+10 |
| | | | |||||
| | * | Check for null flow response when changing color | Arun Swaminathan | 2018-10-20 | 1 | -5/+5 |
| | | | |||||
| | * | #3312 Change colors according to HTTP status code | Arun Swaminathan | 2018-10-15 | 1 | -1/+19 |
| | | | |||||
| * | | Merge pull request #3355 from kam800/configurable-lines-cutoff | Maximilian Hils | 2018-10-20 | 4 | -5/+12 |
| |\ \ | |/ |/| | Make content view lines limit configurable | ||||
| | * | Make content view lines limit configurable | Kamil Borzym | 2018-10-19 | 4 | -5/+12 |
| |/ | |||||
| * | Added link_expander.py example to simple examples (#3348) | jbrule | 2018-10-12 | 2 | -0/+29 |
| | | |||||
| * | Merge pull request #3344 from Tey/master | Maximilian Hils | 2018-10-10 | 1 | -5/+11 |
| |\ | | | | | Fixed doc about domain whitelisting | ||||
| | * | Fixed doc about domain whitelisting | Tey | 2018-10-05 | 1 | -5/+11 |
| | | | |||||
| * | | Merge pull request #3334 from artnc/patch-1 | Thomas Kriechbaumer | 2018-10-10 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix error message for failure to start editor | ||||
| | * | | Fix error message for failure to start editor | Art Chaidarun | 2018-09-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3347 from Kriechi/ws-example | Thomas Kriechbaumer | 2018-10-09 | 1 | -0/+13 |
| |\ \ \ | |_|/ |/| | | add websocket example | ||||
| | * | | add websocket example | Thomas Kriechbaumer | 2018-10-09 | 1 | -0/+13 |
| |/ / | |||||
| * | | Merge pull request #3340 from kajojify/buttons | Samoilenko Roman | 2018-09-29 | 2 | -1/+19 |
| |\ \ | | | | | | | keys.yaml priority over defaultkeys.py | ||||
| | * | | keys.yaml priority over defaultkeys.py. Test for this. | Miroslav | 2018-09-29 | 2 | -1/+19 |
| |/ / | |||||
| * | | Merge pull request #3335 from Kriechi/bump-wsproto | Thomas Kriechbaumer | 2018-09-23 | 1 | -1/+1 |
| |\ \ | |/ |/| | bump wsproto | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |