aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-02-25 18:32:15 +0100
committerGitHub <noreply@github.com>2018-02-25 18:32:15 +0100
commit7eadd0c6bac4ef7d673005ef0914e3e575924d58 (patch)
tree05a256137391c80ee88322a00a5eb683a06ebf54 /docs
parent2d1d1418b433d4356ab849543ecec12be196c7be (diff)
parent302bf9875b44595756f3197794d88210f0743473 (diff)
downloadmitmproxy-7eadd0c6bac4ef7d673005ef0914e3e575924d58.tar.gz
mitmproxy-7eadd0c6bac4ef7d673005ef0914e3e575924d58.tar.bz2
mitmproxy-7eadd0c6bac4ef7d673005ef0914e3e575924d58.zip
Merge pull request #2920 from kira0204/docs-2913
Docs updates
Diffstat (limited to 'docs')
-rwxr-xr-x[-rw-r--r--]docs/raw/proxy-modes.vsdxbin191464 -> 192086 bytes
-rw-r--r--docs/src/content/howto-transparent-vms.md2
-rw-r--r--docs/src/content/howto-transparent.md14
-rwxr-xr-x[-rw-r--r--]docs/src/static/schematics/proxy-modes-reverse.pngbin16719 -> 12480 bytes
-rwxr-xr-x[-rw-r--r--]docs/src/static/schematics/proxy-modes-transparent-1.pngbin14558 -> 10489 bytes
-rwxr-xr-x[-rw-r--r--]docs/src/static/schematics/proxy-modes-transparent-2.pngbin23375 -> 16951 bytes
-rwxr-xr-x[-rw-r--r--]docs/src/static/schematics/proxy-modes-transparent-3.pngbin23855 -> 17192 bytes
-rwxr-xr-x[-rw-r--r--]docs/src/static/schematics/proxy-modes-transparent-wrong.pngbin14719 -> 11333 bytes
-rwxr-xr-x[-rw-r--r--]docs/src/static/schematics/proxy-modes-upstream.pngbin14781 -> 11537 bytes
9 files changed, 8 insertions, 8 deletions
diff --git a/docs/raw/proxy-modes.vsdx b/docs/raw/proxy-modes.vsdx
index 0128a142..d115ea9e 100644..100755
--- a/docs/raw/proxy-modes.vsdx
+++ b/docs/raw/proxy-modes.vsdx
Binary files differ
diff --git a/docs/src/content/howto-transparent-vms.md b/docs/src/content/howto-transparent-vms.md
index b186fd39..1446ede7 100644
--- a/docs/src/content/howto-transparent-vms.md
+++ b/docs/src/content/howto-transparent-vms.md
@@ -106,7 +106,7 @@ sudo iptables -t nat -A PREROUTING -i eth1 -p tcp --dport 443 -j REDIRECT --to-p
Finally, we can run mitmproxy in transparent mode with
{{< highlight bash >}}
-mitmproxy -T
+mitmproxy --mode transparent
{{< / highlight >}}
The proxied machine cannot to leak any data outside of HTTP or DNS requests. If
diff --git a/docs/src/content/howto-transparent.md b/docs/src/content/howto-transparent.md
index 224cb5ee..3d99e9dc 100644
--- a/docs/src/content/howto-transparent.md
+++ b/docs/src/content/howto-transparent.md
@@ -58,7 +58,7 @@ dropped privileges. It can be used as follows:
gcc examples/complex/full_transparency_shim.c -o mitmproxy_shim -lcap
sudo chown root:root mitmproxy_shim
sudo chmod u+s mitmproxy_shim
-./mitmproxy_shim $(which mitmproxy) -T --spoof-source-address
+./mitmproxy_shim $(which mitmproxy) --mode transparent --set spoof-source-address
{{< / highlight >}}
@@ -112,10 +112,10 @@ something like this:
You probably want a command like this:
{{< highlight bash >}}
-mitmproxy -T --host
+mitmproxy --mode transparent --showhost
{{< / highlight >}}
-The `-T` flag turns on transparent mode, and the `--host` argument tells
+The `--mode transparent` option turns on transparent mode, and the `--showhost` argument tells
mitmproxy to use the value of the Host header for URL display.
### 6. Finally, configure your test device
@@ -163,10 +163,10 @@ doas pfctl -e
You probably want a command like this:
{{< highlight bash >}}
-mitmproxy -T --host
+mitmproxy --mode transparent --showhost
{{< / highlight >}}
-The `-T` flag turns on transparent mode, and the `--host` argument tells
+The `--mode transparent` option turns on transparent mode, and the `--showhost` argument tells
mitmproxy to use the value of the Host header for URL display.
### 6. Finally, configure your test device
@@ -245,10 +245,10 @@ tighten the restriction up to the user running mitmproxy.
You probably want a command like this:
{{< highlight bash >}}
-mitmproxy -T --host
+mitmproxy --mode transparent --showhost
{{< / highlight >}}
-The `-T` flag turns on transparent mode, and the `--host` argument tells
+The `--mode transparent` flag turns on transparent mode, and the `--showhost` argument tells
mitmproxy to use the value of the Host header for URL display.
### 6. Finally, configure your test device
diff --git a/docs/src/static/schematics/proxy-modes-reverse.png b/docs/src/static/schematics/proxy-modes-reverse.png
index 071d3fc8..87372688 100644..100755
--- a/docs/src/static/schematics/proxy-modes-reverse.png
+++ b/docs/src/static/schematics/proxy-modes-reverse.png
Binary files differ
diff --git a/docs/src/static/schematics/proxy-modes-transparent-1.png b/docs/src/static/schematics/proxy-modes-transparent-1.png
index 002e0e76..557406f8 100644..100755
--- a/docs/src/static/schematics/proxy-modes-transparent-1.png
+++ b/docs/src/static/schematics/proxy-modes-transparent-1.png
Binary files differ
diff --git a/docs/src/static/schematics/proxy-modes-transparent-2.png b/docs/src/static/schematics/proxy-modes-transparent-2.png
index 41997b05..ecc09f5a 100644..100755
--- a/docs/src/static/schematics/proxy-modes-transparent-2.png
+++ b/docs/src/static/schematics/proxy-modes-transparent-2.png
Binary files differ
diff --git a/docs/src/static/schematics/proxy-modes-transparent-3.png b/docs/src/static/schematics/proxy-modes-transparent-3.png
index ee26cb4f..177aaaef 100644..100755
--- a/docs/src/static/schematics/proxy-modes-transparent-3.png
+++ b/docs/src/static/schematics/proxy-modes-transparent-3.png
Binary files differ
diff --git a/docs/src/static/schematics/proxy-modes-transparent-wrong.png b/docs/src/static/schematics/proxy-modes-transparent-wrong.png
index ca501e93..c69c6b70 100644..100755
--- a/docs/src/static/schematics/proxy-modes-transparent-wrong.png
+++ b/docs/src/static/schematics/proxy-modes-transparent-wrong.png
Binary files differ
diff --git a/docs/src/static/schematics/proxy-modes-upstream.png b/docs/src/static/schematics/proxy-modes-upstream.png
index d40a6494..daa2b9af 100644..100755
--- a/docs/src/static/schematics/proxy-modes-upstream.png
+++ b/docs/src/static/schematics/proxy-modes-upstream.png
Binary files differ