diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-08 15:36:24 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-08 15:36:24 +0200 |
commit | c3ba98b68127b1a0d974e564c0c9af97b97f2a06 (patch) | |
tree | e67101dec0f3e7ea22349d9f680e4e4c54e37487 /docs | |
parent | c4286b15dc3d95f52b7ce5b5292796109fa77f3f (diff) | |
download | mitmproxy-c3ba98b68127b1a0d974e564c0c9af97b97f2a06.tar.gz mitmproxy-c3ba98b68127b1a0d974e564c0c9af97b97f2a06.tar.bz2 mitmproxy-c3ba98b68127b1a0d974e564c0c9af97b97f2a06.zip |
docs: update documentedlist, add filter table headers
Diffstat (limited to 'docs')
-rw-r--r-- | docs/features/filters.rst | 1 | ||||
-rw-r--r-- | docs/howmitmproxy.rst | 28 |
2 files changed, 15 insertions, 14 deletions
diff --git a/docs/features/filters.rst b/docs/features/filters.rst index 5b22376c..2adcfb70 100644 --- a/docs/features/filters.rst +++ b/docs/features/filters.rst @@ -7,6 +7,7 @@ Many commands in :program:`mitmproxy` and :program:`mitmdump` take a filter expr Filter expressions consist of the following operators: .. documentedlist:: + :header: "Expression" "Description" :listobject: libmproxy.filt.help - Regexes are Python-style diff --git a/docs/howmitmproxy.rst b/docs/howmitmproxy.rst index 4bdaeae5..7dcb4c30 100644 --- a/docs/howmitmproxy.rst +++ b/docs/howmitmproxy.rst @@ -210,20 +210,20 @@ explicit HTTPS connections to establish the CN and SANs, and cope with SNI. .. image:: schematics/how-mitmproxy-works-transparent-https.png :align: center - 1. The client makes a connection to the server. - 2. The router redirects the connection to mitmproxy, which is typically listening on a local port - of the same host. Mitmproxy then consults the routing mechanism to establish what the original - destination was. - 3. The client believes it's talking to the remote server, and initiates the SSL connection. - It uses SNI to indicate the hostname it is connecting to. - 4. Mitmproxy connects to the server, and establishes an SSL connection using the SNI hostname - indicated by the client. - 5. The server responds with the matching SSL certificate, which contains the CN and SAN values - needed to generate the interception certificate. - 6. Mitmproxy generates the interception cert, and continues the client SSL handshake paused in - step 3. - 7. The client sends the request over the established SSL connection. - 8. Mitmproxy passes the request on to the server over the SSL connection initiated in step 4. +1. The client makes a connection to the server. +2. The router redirects the connection to mitmproxy, which is typically listening on a local port + of the same host. Mitmproxy then consults the routing mechanism to establish what the original + destination was. +3. The client believes it's talking to the remote server, and initiates the SSL connection. + It uses SNI to indicate the hostname it is connecting to. +4. Mitmproxy connects to the server, and establishes an SSL connection using the SNI hostname + indicated by the client. +5. The server responds with the matching SSL certificate, which contains the CN and SAN values + needed to generate the interception certificate. +6. Mitmproxy generates the interception cert, and continues the client SSL handshake paused in + step 3. +7. The client sends the request over the established SSL connection. +8. Mitmproxy passes the request on to the server over the SSL connection initiated in step 4. .. rubric:: Footnotes |