9049 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Martin Plattner	d305c973f5	merge CliDirector and MitmCliDirector	2020-09-04 15:22:04 +02:00
Martin Plattner	129c03e51a	integrate feedback	2020-09-04 15:02:58 +02:00
Martin Plattner	2f434f91ff	add recorded casts and instructions	2020-09-03 17:56:08 +02:00
Martin Plattner	cf9b001ccb	add tutorials to docs	2020-09-03 17:47:52 +02:00
Martin Plattner	b6d52fc8ab	add cli recording scripts	2020-09-03 17:44:00 +02:00
mirosyn	99dc31a73d	Merge branch 'master' into issue-4178-passphrase	2020-08-31 09:10:38 +03:00
Miro Karvonen	abbdc31ad3	Review comment fixes, passphrase is now always required to be bytes in add_cert_file and from_store.	2020-08-31 09:01:45 +03:00
Simon Legner	0ac7833032	Update concepts-certificates.md ... Add `keytool -importcert` for Java	2020-08-29 14:52:10 +02:00
Maximilian Hils	b6e8c83a08	Merge pull request #4185 from wchasekelley/master ... Add small delay before unlinking file in external viewer fixes #4152	2020-08-29 01:40:15 +02:00
Maximilian Hils	8df5e31a19	explain why we wait before deletion in spawn_external_viewer	2020-08-29 01:31:49 +02:00
chase	b74a2f4e45	Add small delay before unlinking file in external viewer fixes #4152 ... In some cases, such as with firefox, the file is removed before the viewer is finished loading.	2020-08-28 12:10:43 -04:00
mirosyn	3ef1f966d2	Merge branch 'master' into issue-4178-passphrase	2020-08-28 17:16:12 +03:00
Miro Karvonen	770811b121	Updating the CHANGELOG, adding --cert-passphrase command line argument	2020-08-28 17:12:08 +03:00
Miro Karvonen	adc2e8d2b6	new commandline argument --cert-passphrase added. For decrypting the private key that is provided with the --certs command	2020-08-28 16:58:20 +03:00
Chase Kelley	2aacf94a63	update raw export to not remove headers (#4181)	2020-08-28 12:41:22 +02:00
Maximilian Hils	f1287012b4	Merge pull request #4183 from javabrett/options_tcp_hosts ... Replaced reference to deprecated --ignore option with --ignore-hosts.	2020-08-28 12:40:28 +02:00
Brett Randall	6b1a0986c4	Replaced reference to deprecated --ignore option with --ignore-hosts.	2020-08-28 15:10:21 +10:00
Maximilian Hils	cf0a1b0ce2	add py39 trove classifier	2020-08-27 16:49:44 +02:00
Maximilian Hils	901a8dd7d4	docs: add favicon	2020-08-27 15:18:03 +02:00
Maximilian Hils	adc4192883	Merge pull request #4180 from mhils/no-tracking ... Disable Google Analytics for docs	2020-08-27 15:14:25 +02:00
Maximilian Hils	968f9bf05f	disable google analytics for docs	2020-08-27 15:07:53 +02:00
Maximilian Hils	baf76d00f9	add Python 3.9 to CI	2020-08-27 15:04:34 +02:00
Maximilian Hils	8e5e43de24	fix #4021 (#4179)	2020-08-27 13:02:59 +00:00
Maximilian Hils	72dd567994	Merge pull request #4177 from mhils/intercept-taken ... Intercept: don't fail on requests taken by other addons	2020-08-27 12:09:50 +02:00
Maximilian Hils	327e933faf	intercept: tests++	2020-08-27 11:37:35 +02:00
Maximilian Hils	28f04c93fd	intercept: don't fail on requests taken by other addons	2020-08-27 11:24:15 +02:00
Maximilian Hils	0203202b89	Merge pull request #4176 from mhils/pyinstaller ... Update PyInstaller	2020-08-27 11:08:01 +02:00
Maximilian Hils	54276f0eea	update dependencies	2020-08-27 11:00:31 +02:00
Maximilian Hils	385cddf2b4	update pyinstaller	2020-08-27 10:50:53 +02:00
Maximilian Hils	3b7f5fca41	Merge pull request #4173 from mhils/update-dependencies ... Update Dependencies	2020-08-27 00:37:57 +02:00
Maximilian Hils	e31f69ff4a	fix windows tests failing due to tornado bug	2020-08-27 00:25:08 +02:00
Maximilian Hils	83dac0e999	make mypy happy	2020-08-27 00:25:08 +02:00
Maximilian Hils	cd44256521	update various dependencies	2020-08-27 00:25:08 +02:00
Maximilian Hils	997b496a68	update flake8 and mypy	2020-08-26 23:33:15 +02:00
Maximilian Hils	bf9159937c	Merge pull request #4153 from sanlengjingvv/master ... update compiled mitmweb assets, about #4142	2020-08-26 23:09:11 +02:00
Maximilian Hils	870eda41af	Merge pull request #4171 from mhils/bump-ldap3 ... bump ldap3 dependency	2020-08-26 23:05:49 +02:00
Maximilian Hils	9156873cf1	bump ldap3 dependency ... apparently older versions cause issues, see mitmproxy/mitmproxy#4168	2020-08-26 22:58:10 +02:00
sanlengjingvv	ab3a017e0a	update compiled mitmweb assets, about #4142	2020-08-14 14:38:27 +08:00
capt8bit	c48a2fcc4f	Add option to control stripping newlines from edited bodies (#4125)	2020-08-14 08:06:12 +02:00
Maximilian Hils	5cb403002f	Merge pull request #4147 from mhils/asgi ... add ASGI support for embedded apps	2020-08-13 17:40:48 +02:00
Maximilian Hils	fc94bbdabc	fix Python 3.6 compatibility	2020-08-13 17:22:32 +02:00
Maximilian Hils	67885320c0	add ASGI support for embedded apps ... This commit replaces our WSGI implementation with a new ASGI one, which then uses `asgiref`'s compatibility mode to still support WSGI applications. The ASGI implementation is a bit bare-bone, but good enough for our purposes. The major changes are: - We now support ASGI apps. - Instead of taking connections out of mitmproxy's normal processing, we now just set flow.response and let things continue as usual. This allows users to see responses in mitmproxy, use the response hook to modify app responses, etc. Also important for us, this makes the new implementation work for shenanigans like sans-io.	2020-08-13 17:22:31 +02:00
Maximilian Hils	e895c00ff8	Merge pull request #4146 from mhils/onboardingapp ... Revamp onboarding app	2020-08-13 08:13:25 +02:00
Maximilian Hils	20f6f823ac	revamp onboarding app ... - improve and simplify layout - revise install instructions - ditch fontawesome to reduce file size	2020-08-13 08:12:49 +02:00
Maximilian Hils	da327a14da	Merge pull request #4148 from mhils/codecov-again ... Try to fix failing codecov checks	2020-08-12 17:53:18 +02:00
sanlengjingvv	5d0e1906e6	Show http trailers in web-ui (#4142)	2020-08-12 17:21:31 +02:00
Maximilian Hils	99774ad35b	try to fix failing codecov checks	2020-08-12 17:04:50 +02:00
Alexander Prinzhorn	5ebc338fde	Prevent transparent mode from connecting to itself in the basic cases, references #4128 (#4135)	2020-08-11 13:13:09 +02:00
Maximilian Hils	218e69ddb2	Merge pull request #4137 from mhils/killed ... Standardize killed error message	2020-08-08 00:19:43 +02:00
Maximilian Hils	9d5e59bdfa	standardize killed error message ... this is mostly a preparation for sans-io, where we detect kills using the presence of the error.	2020-08-08 00:16:29 +02:00