diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:31 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:31 +0100 |
| commit | e3c69fd105f925009fdf31efe8598f70e2950ab4 (patch) | |
| tree | b61bb99ae8e34f73583263619730fbbe5d526161 /doc-src | |
| parent | 948d4c0445f006640d08d96dc3d6e604df78bc99 (diff) | |
| parent | 3a1d85ab18dbff82505feac3619af733a0a2b4f7 (diff) | |
| download | mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.tar.gz mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.tar.bz2 mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'doc-src')
| -rw-r--r-- | doc-src/scripting/inlinescripts.html | 2 | ||||
| -rw-r--r-- | doc-src/transparent/osx.html | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc-src/scripting/inlinescripts.html b/doc-src/scripting/inlinescripts.html index 2d53df80..c9e188fc 100644 --- a/doc-src/scripting/inlinescripts.html +++ b/doc-src/scripting/inlinescripts.html @@ -25,7 +25,7 @@ The new header will be added to all responses passing through the proxy. ## Events -### start(ScriptContext) +### start(ScriptContext, argv) Called once on startup, before any other events. diff --git a/doc-src/transparent/osx.html b/doc-src/transparent/osx.html index 77eea63b..205e4c76 100644 --- a/doc-src/transparent/osx.html +++ b/doc-src/transparent/osx.html @@ -67,3 +67,15 @@ rdr on en2 inet proto tcp to any port 443 -> 127.0.0.1 port 8080 </ol> + +Note that the **rdr** rules in the pf.conf given above only apply to inbound +traffic. This means that they will NOT redirect traffic coming from the box +running pf itself. We can't distinguish between an outbound connection from a +non-mitmproxy app, and an outbound connection from mitmproxy itself - if you +want to intercept your OSX traffic, you should use an external host to run +mitmproxy. None the less, pf is flexible to cater for a range of creative +possibilities, like intercepting traffic emanating from VMs. See the +**pf.conf** man page for more. + + + |