243 Commits

Author	SHA1	Message	Date
Maximilian Hils	6ad7b575bb	simplify install instructions	2019-11-20 18:45:36 +01:00
Maximilian Hils	e92b957e3a	Use Github Actions for CI (#3713) ... switch to github actions for CI	2019-11-19 18:15:08 +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
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	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
Nirusu	7ef91f46a3	Update howto-transparent-vms.md for newer versions (#3597) ... Update howto-transparent-vms.md for newer versions	2019-09-30 11:41:49 +02:00
Thomas Kriechbaumer	f6405abda2	Merge pull request #3329 from Kriechi/readme-slogan ... update readme slogan	2019-09-28 16:45:00 +02:00
Thomas Kriechbaumer	16bc62bd77	Merge pull request #3603 from tomsaleeba/patch-1 ... Transparent proxy on Linux for local originating traffic	2019-09-28 11:38:30 +02:00
Thomas Kriechbaumer	079374dec8	Merge pull request #3600 from king6cong/master ... fix pf.conf on macOS	2019-09-28 11:33:32 +02:00
Adam Hopkins	6ba39ede08	Update concepts-certificates.md ... Update to direct people to using Safari instead of another browser on iOS.	2019-09-24 14:59:26 +03:00
Tom Saleeba	f47608c85e	docs: correct command to install mitmproxy	2019-08-01 22:04:58 +09:30
Tom Saleeba	ba848e2040	docs: add instructions for transparent proxy on Linux for traffic originating from the mitmproxy host itself	2019-08-01 15:37:25 +09:30
king6cong	586f8d2044	fix pf.conf on macOS	2019-07-30 20:26:51 +08:00
Maximilian Hils	d64ec3072d	Merge pull request #3542 from ZHRhodes/patch-1 ... Typo in howto-wireshark-tls.md	2019-07-17 22:49:37 +02:00
Lucio Paiva	a4f8457dd3	Minor fix re. macOS steps	2019-06-26 18:39:23 +01:00
ZHRhodes	1410bdd9ca	Update howto-wireshark-tls.md ... Fixed a typo in describing the master keys	2019-05-16 23:21:47 -07:00
Rob Wills	fad326a85f	Fix markdown typo on addons-scripting.md	2019-03-29 15:11:17 -07:00
Maximilian Hils	139a385900	Merge pull request #3441 from petersmythe/patch-1 ... Fix spelling issues	2019-01-23 13:08:51 +01:00
Jihyun Yu	c331ba91fc	openbsd: divert-to requires exact listen address ... divert-to does not work with '0.0.0.0' or similar listen address, so we need to specify listen address that we provided to `pf`.	2019-01-18 15:59:58 +09:00
Peter Smythe	2223520403	Fix space	2019-01-03 08:48:09 +02:00
Peter Smythe	d6445fa5ba	Fix spelling	2019-01-03 07:54:57 +02:00
Maximilian Hils	08f2459cbd	docs: don't make links extra bold	2018-11-09 08:56:48 +01:00
Abhigyan Khaund	80f5cf5437	docs: Add mitm.it link in the certificates docs.	2018-11-05 02:15:48 +05:30
Tey	1752fac0d8	Fixed doc about domain whitelisting	2018-10-05 04:05:18 +02:00
Thomas Kriechbaumer	f95784ba9d	update readme slogan	2018-09-21 10:38:25 +02:00
Aldo Cortesi	9829fe150e	Merge pull request #3186 from andersonvom/master ... Add scripting example to intercept & change requests	2018-07-11 10:24:52 +12:00
bunnyhero	e5121ee977	Update howto-transparent.md ... i got a syntax error on macOS high sierra with the existing example pf.conf line. based on sample pf rules i found online, i believe it was missing the `pass` keyword, which i added. also, the surrounding text refers to "two lines," when there is only one, so i've updated that too.	2018-07-05 12:35:55 -04:00
Anderson Mesquita	ba02a0b8b9	Add example to intercept/change specific requests ... This example captures requests to a specific URL and returns an arbitrary response instead. It's common enough that is useful to have in the docs. It also adds links to the Request and Response classes to help developers writing scripts.	2018-06-16 09:16:38 +02:00
Anderson Mesquita	4fdc3d9e15	Rename scripting file ... In order to add the more scripting examples, it makes sense to rename this file and avoid confusion.	2018-06-08 08:04:53 +02:00
Maximilian Hils	0f981bff25	docs: fix minimum page height	2018-05-25 15:29:25 +02:00
Maximilian Hils	615d606da9	docs: minor improvements to Windows installation	2018-05-16 15:35:37 +02:00
Aldo Cortesi	dc2ac88871	docs: complete, informative documentation on our SOCKS5 mode	2018-05-16 10:15:54 +12:00
Aldo Cortesi	17dd7e2bd6	docs: installation, WSL	2018-05-16 10:07:03 +12:00
Aldo Cortesi	56010ebcb7	docs: clarify binary packaage admonition	2018-05-15 10:46:30 +12:00
Aldo Cortesi	2db223decb	docs: console key binding docs and example	2018-05-15 10:34:55 +12:00
Aldo Cortesi	fe4c371001	docs: split out tool documentation	2018-05-15 10:07:09 +12:00
Aldo Cortesi	9830e5b597	cadir -> confdir ... We store a lot more than just the CAs in our configuration directory. Clarify the option name.	2018-05-10 11:40:33 +12:00
Thomas Kriechbaumer	44d788ff96	Merge pull request #2986 from miheerdew/patch-1 ... Workaround for MacOS transparent proxy	2018-05-06 12:24:24 +02:00
Simon Elvery	48ba4eb737	Fix typo in addons-overview.md	2018-05-05 20:24:49 +10:00
p1uymi	93a59acaeb	Changed syntax from v2 to v3 ... --client-certs = v2 syntax --> --set client_certs=value = v3 syntax --cadir = v2 syntax --> --set cadir=value = v3 syntax	2018-04-26 16:14:27 +02:00
Maximilian Hils	660aa87a24	fix GA id	2018-04-11 16:58:09 -06:00
Aldo Cortesi	53827a36ae	Merge pull request #3025 from Kriechi/py36 ... Python 3.5 is dead -- long live Python 3.6!	2018-04-01 08:59:47 +12:00
ghillu	673b58c79f	Update addons-overview.md ... Fixed a typo	2018-04-01 00:09:45 +05:30
Thomas Kriechbaumer	46f8901b8c	Python 3.5 is dead -- long live Python 3.6! ... fixes #2266	2018-03-31 18:46:32 +02:00
Aldo Cortesi	3c52ed6ee1	Merge pull request #3012 from Kriechi/docs-options ... docs: add auto-generated options reference	2018-03-30 09:38:17 +13:00
Michael Shi	f6b616aa89	Fixed Typo in Transparent Proxy Setup for Mac ... Fixed typo referencing `en2` when it should mention `en0`	2018-03-26 21:30:14 -07:00
Thomas Kriechbaumer	f6699792da	docs: add auto-generated options reference	2018-03-25 13:42:55 +02:00
Maximilian Hils	0e62e386c0	docs: add skeleton for options script	2018-03-24 23:14:58 +01:00