aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / /
* | | 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
* | | | Merge pull request #3698 from ylmrx/crash_on_empty_focus_nextMaximilian Hils2019-11-141-6/+12
|\ \ \ \ | |/ / / |/| | | Fixes crash upon view.focus.[next|prev] - #3694
| * | | Fixes #3694Yoann L2019-11-141-6/+12
|/ / /
* | | Merge pull request #3691 from mhils/sans-io-adjustmentsMaximilian Hils2019-11-1240-167/+175
|\ \ \ | | | | | | | | Update mypy, sans-io adjustments
| * | | update mypyMaximilian Hils2019-11-1240-148/+154
| | | |
| * | | minor improvements and sans-io adjustmentsMaximilian Hils2019-11-116-33/+35
| | | |
* | | | Merge pull request #3669 from jannst/add_howto_install_android_system_caThomas Kriechbaumer2019-11-111-0/+86
|\ \ \ \ | | | | | | | | | | Add howto insert mitmproxy CA cert into the android system certificate store
| * | | | Adding tutorial on how to insert mitmproxy CA cert into the android system ↵jannst2019-10-131-0/+86
| | | | | | | | | | | | | | | | | | | | certificate store
* | | | | Merge pull request #3686 from mitmproxy/github-issue-templatesThomas Kriechbaumer2019-11-072-0/+39
|\ \ \ \ \ | | | | | | | | | | | | Update issue templates
| * | | | | Update issue templatesMaximilian Hils2019-11-042-0/+39
| | | | | |
* | | | | | Merge pull request #3679 from tomlabaude/pf_ipv6Maximilian Hils2019-11-073-2/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added support for IPv6 in pf.py for macOS
| * | | | | | pfctl state output always have 2 lines for each socket. Adding outgoing ↵Tom2019-11-052-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | lines in data which matches lines before incoming ones. Also adding IPv6 data and tests
| * | | | | | Fixed lintTom2019-11-051-4/+4
| | | | | | |
| * | | | | | Added support for IPv6 in pf.py for macOSTom2019-11-051-2/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3688 from mitmproxy/sans-io-adjustmentsMaximilian Hils2019-11-072-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | make duration formatting more forgiving
| * | | | | make duration formatting more forgivingMaximilian Hils2019-11-072-1/+4
|/ / / / /
* | | | | squash remaining forum referenceMaximilian Hils2019-11-041-4/+3
| | | | |
* | | | | update badgesMaximilian Hils2019-11-041-11/+9
| | | | |
* | | | | Update issue_template.mdMaximilian Hils2019-11-041-1/+1
|/ / / /
* | | | 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
* | | | | Merge pull request #3676 from ylmrx/fix_curl_exportMaximilian Hils2019-10-302-26/+22
|\ \ \ \ \ | |/ / / / |/| | | | curl command export has several problems:
| * | | | simplify conditionMaximilian Hils2019-10-291-3/+1
| | | | |
| * | | | missed a type ignore, for mypy complianceYoann L2019-10-291-1/+1
| | | | |
| * | | | several fixes on command exports has several problems: #3676Yoann L2019-10-291-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 * factorize it into raise_if_missing_request (and rename it)
| * | | | several fixes on command exports has several problems: #3676Yoann L2019-10-282-15/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | Merge pull request #3671 from mhils/add-typesMaximilian Hils2019-10-163-10/+18
|\ \ \ \ | | | | | | | | | | Add HTTP Message Type Hints
| * | | | add http message type hintsMaximilian Hils2019-10-163-10/+18
|/ / / /
* | | | grammer correction (#3670)Will2019-10-151-1/+1
| | | |
* | | | Merge pull request #3667 from jannst/fix_docs_readmeMaximilian Hils2019-10-131-1/+2
|\ \ \ \ | | | | | | | | | | hugo server -D fails if html file in docs/src/generated are not present
| * | | | improve wordingMaximilian Hils2019-10-131-4/+2
| |/ / /
| * / / hugo server -D fails if html file in docs/src/generated are not presentjannst2019-10-131-0/+3
|/ / /
* | | Move onboardingapp from tornado to flask (#3661)Maximilian Hils2019-10-0614-141/+67
| | |
* | | update dependenciesMaximilian Hils2019-10-061-2/+2
| | |
* | | Merge pull request #3659 from vin01/masterMaximilian Hils2019-10-041-0/+7
|\ \ \ | | | | | | | | Add EKU extension for dummy certificates
| * | | Add EKU extension for dummy certificatesvin012019-10-031-0/+7
|/ / /