From 8110a9a3eb3280092a69d916cd135aedcdfe4120 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 4 Apr 2012 11:24:58 +1200
Subject: Start prepping docs for 0.8

Also add an interactive upstream-cert option to mitmproxy, and repair help for
R shortcut.
---
 libmproxy/console/__init__.py       | 5 +++++
 libmproxy/console/flowdetailview.py | 1 +
 libmproxy/console/help.py           | 1 +
 3 files changed, 7 insertions(+)

(limited to 'libmproxy')

diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index a6355160..6b480d57 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -168,6 +168,8 @@ class StatusBar(common.WWrap):
             opts.append("norefresh")
         if self.master.killextra:
             opts.append("killextra")
+        if self.master.server.config.upstream_cert:
+            opts.append("upstream-cert")
 
         if opts:
             r.append("[%s]"%(":".join(opts)))
@@ -842,6 +844,7 @@ class ConsoleMaster(flow.FlowMaster):
                                             ("anticomp", "c"),
                                             ("killextra", "k"),
                                             ("norefresh", "n"),
+                                            ("upstream-certs", "u"),
                                         ),
                                         self._change_options
                                 )
@@ -882,6 +885,8 @@ class ConsoleMaster(flow.FlowMaster):
             self.killextra = not self.killextra
         elif a == "n":
             self.refresh_server_playback = not self.refresh_server_playback
+        elif a == "u":
+            self.server.config.upstream_cert = not self.server.config.upstream_cert
 
     def shutdown(self):
         self.state.killall(self)
diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py
index e589d01d..ad2a4703 100644
--- a/libmproxy/console/flowdetailview.py
+++ b/libmproxy/console/flowdetailview.py
@@ -55,6 +55,7 @@ class FlowDetailsView(urwid.ListBox):
                 text.append(urwid.Text([("head", "Server Certificate:")]))
                 parts = [
                     ["Type", "%s, %s bits"%c.keyinfo],
+                    ["SHA1 digest", c.digest("sha1")],
                     ["Valid to", str(c.notafter)],
                     ["Valid from", str(c.notbefore)],
                     ["Serial", str(c.serial)],
diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py
index 9abdcd12..ba9c9f2e 100644
--- a/libmproxy/console/help.py
+++ b/libmproxy/console/help.py
@@ -117,6 +117,7 @@ class HelpView(urwid.ListBox):
             ("q", "quit / return to flow list"),
             ("Q", "quit without confirm prompt"),
             ("P", "set reverse proxy mode"),
+            ("R", "edit replacement patterns"),
             ("s", "set/unset script"),
             ("S", "server replay"),
             ("t", "set sticky cookie expression"),
-- 
cgit v1.2.3