Commit Graph

227 Commits

Author SHA1 Message Date
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
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
Miheer Dewaskar
9ee96f0227 Merge master 2018-03-24 10:49:08 -04:00
Maximilian Hils
623f9b694d fix cloudfront invalidation paths 2018-03-21 13:47:15 +01:00
Maximilian Hils
4eb6954c7d various docs improvements
- add clickable anchors for headers
- add "outdated" warning for archived docs
- add "edit on github" button
- beautify template
2018-03-21 00:42:37 +01:00
Maximilian Hils
9748487939 improve transparent mode docs 2018-03-20 16:00:23 +01:00
Maximilian Hils
252684e14e minor docs fixes 2018-03-20 16:00:02 +01:00
Maximilian Hils
885d3d5da4 add google analytics 2018-03-20 15:58:48 +01:00
Maximilian Hils
7c66c4eb16 abort doc scripts on error 2018-03-20 15:04:31 +01:00
Maximilian Hils
dc3c400b6b add README for docs install 2018-03-20 15:00:29 +01:00
Miheer Dewaskar
00d51db925
Spelling 2018-03-11 19:03:45 -04:00
Miheer Dewaskar
d866b959fe
Extrac comment and typo 2018-03-11 19:01:14 -04:00
Miheer Dewaskar
6f802274c1
Workaround for MacOS transparent proxy
This workaround (adopted from #1261) allows MacOS users to redirect their machine's outgoing traffic to mitmproxy transparently.
2018-03-11 18:55:53 -04:00
Aldo Cortesi
760882a3d1 docs: cloudfront invalidation 2018-03-07 22:45:08 +13:00
Aldo Cortesi
fc23deb9f3 release: revamped release upload process 2018-03-07 11:40:45 +13:00
Aldo Cortesi
8792e07210 docs: enable upload to docs.mitmproxy.org/master 2018-03-07 09:01:51 +13:00
Aldo Cortesi
ee6937f948 docs: add robots.txt and error.html
- robots.txt prevents crawling of everything but /stable
- error.html has a simple meta refresh to the latest stable docs. This will
also help crawlers find the right path.
2018-03-05 10:57:50 +13:00
Aldo Cortesi
a68c7ffb27 docs: add build and upload scripts
The upload scripts might be unified down the track, or might not. CloudFront is
not set up for the docs bucket yet, so CDN invalidation is commented out. This
will be added later.
2018-03-05 10:51:46 +13:00