$!navbar!$

diff --git a/doc-src/dev/architecture.html b/doc-src/dev/architecture.html index 8ab8821f..a184fe4f 100644 --- a/doc-src/dev/architecture.html +++ b/doc-src/dev/architecture.html @@ -1,8 +1,8 @@ To give you a better understanding of how mitmproxy works, mitmproxy's high-level architecture is detailed in the following graphic: -

(architecture.pdf)

Please don't refrain from asking any further -questions on the mailing list, the IRC channel or the GitHub issue tracker.

\ No newline at end of file +questions on the mailing list, the IRC channel or the GitHub issue tracker.

diff --git a/doc-src/howmitmproxy.html b/doc-src/howmitmproxy.html index 832a61a8..f114e145 100644 --- a/doc-src/howmitmproxy.html +++ b/doc-src/howmitmproxy.html @@ -26,7 +26,7 @@ This is a proxy GET request - an extended form of the vanilla HTTP GET request that includes a schema and host specification, and it includes all the information mitmproxy needs to proceed. -

@@ -158,7 +158,7 @@ handshake. Luckily, this is almost never an issue in practice. Lets put all of this together into the complete explicitly proxied HTTPS flow. -

@@ -250,7 +250,7 @@ mitmproxy, this takes the form of a built-in set of that know how to talk to each platform's redirection mechanism. Once we have this information, the process is fairly straight-forward. -

@@ -296,7 +296,7 @@ transparently proxying HTTP, and explicitly proxying HTTPS. We use the routing mechanism to establish the upstream server address, and then proceed as for explicit HTTPS connections to establish the CN and SANs, and cope with SNI. -

diff --git a/doc-src/mitmproxy.html b/doc-src/mitmproxy.html index d41c1b21..7261c238 100644 --- a/doc-src/mitmproxy.html +++ b/doc-src/mitmproxy.html @@ -7,13 +7,13 @@ documentation from any __mitmproxy__ screen. ## Flow list -The flow list shows an index of captured flows in chronological order. +The flow list shows an index of captured flows in chronological order. -

- __1__: A GET request, returning a 302 Redirect response. - __2__: A GET request, returning 16.75kb of text/html data. -- __3__: A replayed request. +- __3__: A replayed request. - __4__: Intercepted flows are indicated with orange text. The user may edit these flows, and then accept them (using the _a_ key) to continue. In this case, the request has been intercepted on the way to the server. @@ -32,7 +32,7 @@ interfaces. The __Flow View__ lets you inspect and manipulate a single flow: -

- __1__: Flow summary. - __2__: The Request/Response tabs, showing you which part of the flow you are @@ -53,11 +53,11 @@ using the _m_ key. Much of the data that we'd like to interact with in mitmproxy is structured. For instance, headers, queries and form data can all be thought of as a list of key/value pairs. Mitmproxy has a built-in editor that lays this type of data -out in a grid for easy manipulation. +out in a grid for easy manipulation. At the moment, the Grid Editor is used in four parts of mitmproxy: -- Editing request or response headers (_e_ for edit, then _h_ for headers in flow view) +- Editing request or response headers (_e_ for edit, then _h_ for headers in flow view) - Editing a query string (_e_ for edit, then _q_ for query in flow view) - Editing a URL-encoded form (_e_ for edit, then _f_ for form in flow view) - Editing replacement patterns (_R_ globally) @@ -65,13 +65,13 @@ At the moment, the Grid Editor is used in four parts of mitmproxy: If there is is no data, an empty editor will be started to let you add some. Here is the editor showing the headers from a request: -

To edit, navigate to the key or value you want to modify using the arrow or vi navigation keys, and press enter. The background color will change to show that you are in edit mode for the specified field: -

Modify the field as desired, then press escape to exit edit mode when you're done. You can also add a row (_a_ key), delete a row (_d_ key), spawn an @@ -83,12 +83,12 @@ help (_?_ key) for more. __mitmproxy__'s interception functionality lets you pause an HTTP request or response, inspect and modify it, and then accept it to send it on to the server -or client. +or client. ### 1: Set an interception pattern -

We press _i_ to set an interception pattern. In this case, the __~q__ filter pattern tells __mitmproxy__ to intercept all requests. For complete filter @@ -97,19 +97,19 @@ document, or the built-in help function in __mitmproxy__. ### 2: Intercepted connections are indicated with orange text: -

### 3: You can now view and modify the request: -

In this case, we viewed the request by selecting it, pressed _e_ for "edit" and _m_ for "method" to change the HTTP request method. ### 4: Accept the intercept to continue: -

Finally, we press _a_ to accept the modified request, which is then sent on to the server. In this case, we changed the request from an HTTP GET to -OPTIONS, and Google's server has responded with a 405 "Method not allowed". +OPTIONS, and Google's server has responded with a 405 "Method not allowed". diff --git a/doc-src/modes.html b/doc-src/modes.html index 8870009d..b5a38696 100644 --- a/doc-src/modes.html +++ b/doc-src/modes.html @@ -9,7 +9,7 @@ variety of scenarios: Now, which one should you pick? Use this flow chart: -

Regular Proxy

@@ -31,7 +31,7 @@ these cases, you need to use mitmproxy's transparent mode. If you are proxying an external device, your network will probably look like this: -

The square brackets signify the source and destination IP addresses. Your client explicitly connects to mitmproxy and mitmproxy explicitly connects @@ -48,7 +48,7 @@ below, a machine running mitmproxy has been inserted between the router and the internet: -

The square brackets signify the source and destination IP addresses. Round @@ -60,7 +60,7 @@ remove the target information, leaving mitmproxy unable to determine the real destination. -

Common Configurations

@@ -79,7 +79,7 @@ intact, is to simply configure the client with the mitmproxy box as the default gateway. -

In this scenario, we would: @@ -98,7 +98,7 @@ for your device. Setting the custom gateway on clients can be automated by serving the settings out to clients over DHCP. This lets set up an interception network where all -clients are proxied automatically, which can save time and effort. +clients are proxied automatically, which can save time and effort.

@@ -141,7 +141,7 @@ packet filter you're using. In most cases, the configuration will look like this: -

@@ -154,7 +154,7 @@ Internet. Using reverse proxy mode, you can use mitmproxy to act like a normal HTTP server: -

There are various use-cases: @@ -215,8 +215,8 @@ appliance, you can use mitmproxy's upstream mode. In upstream mode, all requests are unconditionally transferred to an upstream proxy of your choice. -

mitmproxy supports both explicit HTTP and explicit HTTPS in upstream proxy mode. You could in theory chain multiple mitmproxy instances in a row, but -that doesn't make any sense in practice (i.e. outside of our tests). +that doesn't make any sense in practice (i.e. outside of our tests). diff --git a/doc-src/tutorials/gamecenter.html b/doc-src/tutorials/gamecenter.html index 15380c20..af11b5bb 100644 --- a/doc-src/tutorials/gamecenter.html +++ b/doc-src/tutorials/gamecenter.html @@ -15,14 +15,14 @@ Worm](http://itunes.apple.com/us/app/super-mega-worm/id388541990?mt=8) - a great little retro-apocalyptic sidescroller for the iPhone: -

After finishing a game (take your time), watch the traffic flowing through mitmproxy: -

We see a bunch of things we might expect - initialisation, the retrieval of @@ -97,7 +97,7 @@ replay. ## The glorious result and some intrigue -

And that's it - according to the records, I am the greatest Super Mega Worm diff --git a/doc-src/tutorials/transparent-dhcp.html b/doc-src/tutorials/transparent-dhcp.html index c34dd700..6c648c0d 100644 --- a/doc-src/tutorials/transparent-dhcp.html +++ b/doc-src/tutorials/transparent-dhcp.html @@ -4,10 +4,10 @@ This walkthrough illustrates how to set up transparent proxying with mitmproxy. The network setup is simple: `internet <--> proxy vm <--> (virtual) internal network`. For the proxy machine, *eth0* represents the outgoing network. *eth1* is connected to the internal network that will be proxified, using a static ip (192.168.3.1).

VirtualBox configuration: -

Proxy VM: -

2. **Configure DHCP and DNS** We use dnsmasq to provide DHCP and DNS in our internal network. @@ -34,7 +34,7 @@ This walkthrough illustrates how to set up transparent proxying with mitmproxy. `sudo service dnsmasq restart`

Your proxied machine's network settings should now look similar to this: -

3. **Set up traffic redirection to mitmproxy** -- cgit v1.2.3

@!this.title!@

Regular Proxy

Common Configurations