Commit Graph

8141 Commits

Author SHA1 Message Date
Maximilian Hils
a79e0a0868
Merge pull request #3522 from peter-way/master
Use 'host_header' instead of 'host', to calculate 'HTTPRequest' hash in transparent mode.
2019-11-15 19:04:14 +01:00
Maximilian Hils
fbbbbb678e
Merge pull request #3612 from ccssrryy/fix-dup-resp
fix duplicate error response
2019-11-15 17:45:28 +01:00
Maximilian Hils
50443df340
Merge branch 'master' into master 2019-11-15 17:24:59 +01:00
Maximilian Hils
f6f9eb2c4e
Merge pull request #3425 from rjt-gupta/external-viewer
external-viewer-fix
2019-11-15 17:23:01 +01:00
Maximilian Hils
f8926170a5
remove superfluous option 2019-11-15 17:22:41 +01:00
Maximilian Hils
4f81f1ee41
Merge pull request #3703 from mhils/replay-ignore-port
allow server replay functionality to run on a different port
2019-11-15 17:13:00 +01:00
Jurriaan Bremer
a5412ab136 allow server replay functionality to run on a different port
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).
2019-11-15 16:15:13 +01:00
Maximilian Hils
be2865cd79
Merge pull request #3699 from mhils/flowfilter2019
Improve flowfilter
2019-11-15 15:57:28 +01:00
Maximilian Hils
be46008b5e disable overly strict indentation checks 2019-11-15 15:56:55 +01:00
Maximilian Hils
2239c49e18 improve flowfilter 2019-11-15 02:28:57 +01:00
Maximilian Hils
cd660a035f
Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowed
adding config.yml as an allowed config filename
2019-11-15 00:31:19 +01:00
Maximilian Hils
c78165bd4c
simplify option file loading
- no need for a constant that is only used once
- if load_paths allows us to specify multiple paths, let's just do that.
2019-11-14 21:12:32 +01:00
Maximilian Hils
d38e20689e
Merge pull request #3698 from ylmrx/crash_on_empty_focus_next
Fixes crash upon view.focus.[next|prev] - #3694
2019-11-14 21:07:53 +01:00
Yoann L
9a1ec6b064 Fixes #3694 2019-11-14 18:59:43 +01:00
Yoann L
836e04abd6 adding config.yml as an allowed config filename
cf. title

as suggested in #3639
2019-11-14 18:39:06 +01:00
Maximilian Hils
dac0bfe786
Merge pull request #3691 from mhils/sans-io-adjustments
Update mypy, sans-io adjustments
2019-11-12 05:04:05 +01:00
Maximilian Hils
bdc15cbe0c update mypy 2019-11-12 04:38:13 +01:00
Thomas Kriechbaumer
e7c3975bfc
Merge pull request #3669 from jannst/add_howto_install_android_system_ca
Add howto insert mitmproxy CA cert into the android system certificate store
2019-11-11 19:13:15 +01:00
Maximilian Hils
f97996126f minor improvements and sans-io adjustments 2019-11-11 18:35:06 +01:00
Thomas Kriechbaumer
d9572ef4a7
Merge pull request #3686 from mitmproxy/github-issue-templates
Update issue templates
2019-11-07 20:20:38 +01:00
Maximilian Hils
8e64ac0575
Merge pull request #3679 from tomlabaude/pf_ipv6
Added support for IPv6 in pf.py for macOS
2019-11-07 18:32:26 +01:00
Maximilian Hils
6cbadf0808
Merge pull request #3688 from mitmproxy/sans-io-adjustments
make duration formatting more forgiving
2019-11-07 18:30:58 +01:00
Maximilian Hils
80963966b2 make duration formatting more forgiving 2019-11-07 18:19:50 +01:00
Tom
ff628e783e pfctl state output always have 2 lines for each socket. Adding outgoing lines in data which matches lines before incoming ones. Also adding IPv6 data and tests 2019-11-05 20:27:00 +01:00
Tom
93c103a2a2 Fixed lint 2019-11-05 20:27:00 +01:00
Tom
d35c00ee65 Added support for IPv6 in pf.py for macOS 2019-11-05 20:27:00 +01:00
Maximilian Hils
3af4647804
squash remaining forum reference 2019-11-04 16:05:43 +01:00
Maximilian Hils
0a197af6a2
update badges 2019-11-04 16:03:04 +01:00
Maximilian Hils
3fc648a6d2
Update issue_template.md 2019-11-04 15:45:18 +01:00
Maximilian Hils
9c9cfdd7ec Update issue templates 2019-11-04 15:43:39 +01:00
Maximilian Hils
37994fb12f
Merge pull request #3675 from ylmrx/crash_on_replay-3559
fixes #3559
2019-11-04 13:20:21 +01:00
Yoann L
1469678b99 take no action if on Host if :authority isn't found 2019-11-04 12:26:21 +01:00
Maximilian Hils
65edbda137
Merge pull request #3676 from ylmrx/fix_curl_export
curl command export has several problems:
2019-10-30 16:09:29 +01:00
Maximilian Hils
fcccab684d
simplify condition 2019-10-29 16:15:07 +01:00
Yoann L
6da1db750c missed a type ignore, for mypy compliance 2019-10-29 12:38:11 +01:00
Yoann L
4383122b7b several fixes on command exports has several problems: #3676
* 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)
2019-10-29 12:24:07 +01:00
Yoann L
3370740361 several fixes on command exports has several problems: #3676
* 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
2019-10-28 17:51:59 +01:00
Yoann L
ad120c380a fixes #3559
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
2019-10-25 10:38:35 +02:00
Maximilian Hils
eb7ed1dc40
Merge pull request #3671 from mhils/add-types
Add HTTP Message Type Hints
2019-10-16 21:42:37 +02:00
Maximilian Hils
063ff41858 add http message type hints 2019-10-16 20:33:09 +02:00
Will
45e3ae0f9c grammer correction (#3670) 2019-10-15 19:59:42 +02:00
jannst
a4ff65e321 Adding tutorial on how to insert mitmproxy CA cert into the android system certificate store 2019-10-13 22:03:24 +02:00
Maximilian Hils
4e0598fb5a
Merge pull request #3667 from jannst/fix_docs_readme
hugo server -D fails if html file in docs/src/generated are not present
2019-10-13 18:21:08 +02:00
Maximilian Hils
68a7d37d53
improve wording 2019-10-13 18:20:38 +02:00
jannst
f580e0ea97 hugo server -D fails if html file in docs/src/generated are not present 2019-10-13 17:48:23 +02:00
Maximilian Hils
902ef59d01
Move onboardingapp from tornado to flask (#3661) 2019-10-06 14:41:46 +02:00
Maximilian Hils
c88d3a9431
update dependencies 2019-10-06 14:00:02 +02:00
Maximilian Hils
fed3d3eb37
Merge pull request #3659 from vin01/master
Add EKU extension for dummy certificates
2019-10-04 16:24:19 +02:00
vin01
ed65476b21
Add EKU extension for dummy certificates 2019-10-03 10:23:45 +02:00
vin01
93f9e30728 Add key_size option to define rsa key size (#3657) 2019-09-30 19:19:52 +02:00