Refactor reverse proxying

- Retain the specification from the Host header as a Request's description.
- Expand upstream proxy specifications to include the scheme. We now say https://hostname:port
- Move the "R" revert keybinding to "v" to make room for a reverse proxy
binding that matches the command-line flag.

2 files changed, 4 insertions, 6 deletions

diff --git a/libmproxy/console/connlist.py b/libmproxy/console/connlist.py
index 4e8bfebd..8fbe3609 100644
--- a/libmproxy/console/connlist.py
+++ b/libmproxy/console/connlist.py
@@ -8,11 +8,11 @@ def _mkhelp():
         ("a", "accept this intercepted connection"),
         ("C", "clear connection list or eventlog"),
         ("d", "delete flow"),
+        ("e", "toggle eventlog"),
         ("l", "set limit filter pattern"),
         ("L", "load saved flows"),
         ("r", "replay request"),
         ("R", "revert changes to request"),
-        ("v", "toggle eventlog"),
         ("w", "save all flows matching current limit"),
         ("W", "save this flow"),
         ("X", "kill and delete connection, even if it's mid-intercept"),
@@ -133,8 +133,6 @@ class ConnectionItem(common.WWrap):
             )
         elif key == "X":
             self.flow.kill(self.master)
-        elif key == "v":
-            self.master.toggle_eventlog()
         elif key == "enter":
             if self.flow.request:
                 self.master.view_flow(self.flow)
@@ -190,7 +188,7 @@ class ConnectionListBox(urwid.ListBox):
         elif key == "C":
             self.master.clear_connections()
             key = None
-        elif key == "v":
+        elif key == "e":
             self.master.toggle_eventlog()
             key = None
         return urwid.ListBox.keypress(self, size, key)
diff --git a/libmproxy/console/connview.py b/libmproxy/console/connview.py
index c9667ed2..7f0b0541 100644
--- a/libmproxy/console/connview.py
+++ b/libmproxy/console/connview.py
@@ -26,7 +26,7 @@ def _mkhelp():
             ),
         ("p", "previous flow"),
         ("r", "replay request"),
-        ("R", "revert changes to request"),
+        ("V", "revert changes to request"),
         ("v", "view body in external viewer"),
         ("w", "save all flows matching current limit"),
         ("W", "save this flow"),
@@ -513,7 +513,7 @@ class ConnectionView(common.WWrap):
             if r:
                 self.master.statusbar.message(r)
             self.master.refresh_connection(self.flow)
-        elif key == "R":
+        elif key == "V":
             self.state.revert(self.flow)
             self.master.refresh_connection(self.flow)
         elif key == "W":