From f89a5235d36db8c82ec608ba1f39809d2a355384 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <marcelo.glezer@gmail.com>
Date: Wed, 14 Jan 2015 10:52:52 -0300
Subject: wip - content copy is working, header representation is not

---
 libmproxy/console/flowlist.py | 16 ++++++++++++++++
 libmproxy/protocol/http.py    | 15 +++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'libmproxy')

diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 102fa7b9..cdb4af49 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 import urwid
+import pyperclip
 from . import common
 
 def _mkhelp():
@@ -138,6 +139,11 @@ class ConnectionItem(common.WWrap):
                 self.state.last_saveload,
                 self.master.server_playback_path
             )
+    def server_copy_response(self, k):
+        if k == "c":
+            pyperclip.copy(self.flow.response_content())
+        elif k == "t":
+            pyperclip.copy(self.flow.response_headers())
 
     def keypress(self, (maxcol,), key):
         key = common.shortcuts(key)
@@ -204,6 +210,16 @@ class ConnectionItem(common.WWrap):
                 self.master.run_script_once,
                 self.flow
             )
+        elif key == "g":
+            #copy flow part
+            self.master.prompt_onekey(
+                "Copy Response",
+                (
+                    ("content", "c"),
+                    ("headers", "h"),
+                ),
+                self.server_copy_response,
+            )
         else:
             return key
 
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index bebb4f7b..04e3fe40 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -953,6 +953,21 @@ class HTTPFlow(Flow):
             c += self.response.replace(pattern, repl, *args, **kwargs)
         return c
 
+    def response_content(self):
+        s = "[No Content]"
+        with decoded(self.response):
+            s = self.response.content
+        return s
+
+    def response_headers(self):
+        with decoded(self.response):
+            sh = ""
+            for i in self.flow.response.headers:
+                v = self.flow.response.headers[i]
+                for j in v:
+                    sh += str(i)+"="+str(v[j])+"\n"
+        return sh
+
 
 class HttpAuthenticationError(Exception):
     def __init__(self, auth_headers=None):
-- 
cgit v1.2.3


From ee75a0b9cbe5f4882453d2f1cb0d0a7df431200a Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Wed, 14 Jan 2015 12:03:40 -0300
Subject: now content and header are working and exception for binary files are
 handled correctly

---
 libmproxy/console/flowlist.py | 13 ++++++++++---
 libmproxy/protocol/http.py    | 14 ++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index cdb4af49..98b5561f 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -13,6 +13,7 @@ def _mkhelp():
         ("D", "duplicate flow"),
         ("e", "toggle eventlog"),
         ("F", "toggle follow flow list"),
+        ("g", "copy response(content/headers) to clipboard"),        
         ("l", "set limit filter pattern"),
         ("L", "load saved flows"),
         ("r", "replay request"),
@@ -141,9 +142,15 @@ class ConnectionItem(common.WWrap):
             )
     def server_copy_response(self, k):
         if k == "c":
-            pyperclip.copy(self.flow.response_content())
-        elif k == "t":
-            pyperclip.copy(self.flow.response_headers())
+            try:
+                pyperclip.copy(self.flow.response_content())
+            except TypeError:
+                self.master.statusbar.message("Content is binary or can be converted to text")
+        elif k == "h":
+            try:
+                pyperclip.copy(self.flow.response_headers())
+            except TypeError:
+                self.master.statusbar.message("Error converting headers to text")
 
     def keypress(self, (maxcol,), key):
         key = common.shortcuts(key)
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 04e3fe40..63f9e47b 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -954,20 +954,18 @@ class HTTPFlow(Flow):
         return c
 
     def response_content(self):
-        s = "[No Content]"
         with decoded(self.response):
             s = self.response.content
+        if s == None:
+            s = "[No content]"
         return s
 
     def response_headers(self):
         with decoded(self.response):
-            sh = ""
-            for i in self.flow.response.headers:
-                v = self.flow.response.headers[i]
-                for j in v:
-                    sh += str(i)+"="+str(v[j])+"\n"
-        return sh
-
+            s = str(self.response.headers) 
+        if s == None:
+            s = "[]"
+        return s
 
 class HttpAuthenticationError(Exception):
     def __init__(self, auth_headers=None):
-- 
cgit v1.2.3


From fdd012bdd80b0a1419e8967f10c92a9384a72da5 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Wed, 14 Jan 2015 12:09:14 -0300
Subject: removed invalid comment and unneeded safe text

---
 libmproxy/console/flowlist.py | 1 -
 libmproxy/protocol/http.py    | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 98b5561f..03dfe5ed 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -218,7 +218,6 @@ class ConnectionItem(common.WWrap):
                 self.flow
             )
         elif key == "g":
-            #copy flow part
             self.master.prompt_onekey(
                 "Copy Response",
                 (
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 63f9e47b..f59b76ad 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -956,15 +956,11 @@ class HTTPFlow(Flow):
     def response_content(self):
         with decoded(self.response):
             s = self.response.content
-        if s == None:
-            s = "[No content]"
         return s
 
     def response_headers(self):
         with decoded(self.response):
             s = str(self.response.headers) 
-        if s == None:
-            s = "[]"
         return s
 
 class HttpAuthenticationError(Exception):
-- 
cgit v1.2.3


From 1a06f15ee0423941e906f6fc654094b0fa9a9e3a Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Wed, 14 Jan 2015 12:36:19 -0300
Subject: added copy functionality to flowview too

---
 libmproxy/console/flowview.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 9e305b8a..25b085c3 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -4,7 +4,7 @@ import urwid
 from . import common, grideditor, contentview
 from .. import utils, flow, controller
 from ..protocol.http import HTTPResponse, CONTENT_MISSING, decoded
-
+import pyperclip
 
 class SearchError(Exception): pass
 
@@ -19,6 +19,7 @@ def _mkhelp():
         ("D", "duplicate flow"),
         ("e", "edit request/response"),
         ("f", "load full body data"),
+        ("g", "copy response(content/headers) to clipboard"),        
         ("m", "change body display mode for this entity"),
             (None,
                 common.highlight_key("automatic", "a") +
@@ -648,6 +649,18 @@ class FlowView(common.WWrap):
         )
         self.master.refresh_flow(self.flow)
 
+    def server_copy_response(self, k):
+        if k == "c":
+            try:
+                pyperclip.copy(self.flow.response_content())
+            except TypeError:
+                self.master.statusbar.message("Content is binary or can be converted to text")
+        elif k == "h":
+            try:
+                pyperclip.copy(self.flow.response_headers())
+            except TypeError:
+                self.master.statusbar.message("Error converting headers to text")
+
     def delete_body(self, t):
         if t == "m":
             val = CONTENT_MISSING
@@ -751,6 +764,15 @@ class FlowView(common.WWrap):
             )
             self.master.refresh_flow(self.flow)
             self.master.statusbar.message("")
+        elif key == "g":
+            self.master.prompt_onekey(
+                "Copy Response",
+                (
+                    ("content", "c"),
+                    ("headers", "h"),
+                ),
+                self.server_copy_response,
+            )
         elif key == "m":
             p = list(contentview.view_prompts)
             p.insert(0, ("Clear", "C"))
-- 
cgit v1.2.3


From d9f562b5c0ba0b4769455c117c1321d63ff6497c Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Wed, 14 Jan 2015 14:45:19 -0300
Subject: used get_decoded_content and removed decode call from headers as max
 suggested

---
 libmproxy/console/flowlist.py |  4 ++--
 libmproxy/console/flowview.py |  4 ++--
 libmproxy/protocol/http.py    | 10 ----------
 3 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 03dfe5ed..44b32855 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -143,12 +143,12 @@ class ConnectionItem(common.WWrap):
     def server_copy_response(self, k):
         if k == "c":
             try:
-                pyperclip.copy(self.flow.response_content())
+                pyperclip.copy(self.flow.response.get_decoded_content())
             except TypeError:
                 self.master.statusbar.message("Content is binary or can be converted to text")
         elif k == "h":
             try:
-                pyperclip.copy(self.flow.response_headers())
+                pyperclip.copy(str(self.flow.response.headers))
             except TypeError:
                 self.master.statusbar.message("Error converting headers to text")
 
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 25b085c3..08a0148f 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -652,12 +652,12 @@ class FlowView(common.WWrap):
     def server_copy_response(self, k):
         if k == "c":
             try:
-                pyperclip.copy(self.flow.response_content())
+                pyperclip.copy(self.flow.response.get_decoded_content())
             except TypeError:
                 self.master.statusbar.message("Content is binary or can be converted to text")
         elif k == "h":
             try:
-                pyperclip.copy(self.flow.response_headers())
+                pyperclip.copy(str(self.flow.response.headers))
             except TypeError:
                 self.master.statusbar.message("Error converting headers to text")
 
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index f59b76ad..284731b0 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -953,16 +953,6 @@ class HTTPFlow(Flow):
             c += self.response.replace(pattern, repl, *args, **kwargs)
         return c
 
-    def response_content(self):
-        with decoded(self.response):
-            s = self.response.content
-        return s
-
-    def response_headers(self):
-        with decoded(self.response):
-            s = str(self.response.headers) 
-        return s
-
 class HttpAuthenticationError(Exception):
     def __init__(self, auth_headers=None):
         super(HttpAuthenticationError, self).__init__(
-- 
cgit v1.2.3


From f21a44dd48a1ea7401378830fc38e5a864e927e5 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <marcelo.glezer@gmail.com>
Date: Thu, 15 Jan 2015 08:46:10 -0300
Subject: removed pyperclip hard dependencies

---
 libmproxy/console/flowlist.py | 28 +++++++++++++++++-----------
 libmproxy/console/flowview.py | 28 +++++++++++++++++-----------
 2 files changed, 34 insertions(+), 22 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 44b32855..f97a7a11 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -1,7 +1,10 @@
 from __future__ import absolute_import
 import urwid
-import pyperclip
 from . import common
+try:
+    import pyperclip
+except:
+    pyperclip = False
 
 def _mkhelp():
     text = []
@@ -141,16 +144,19 @@ class ConnectionItem(common.WWrap):
                 self.master.server_playback_path
             )
     def server_copy_response(self, k):
-        if k == "c":
-            try:
-                pyperclip.copy(self.flow.response.get_decoded_content())
-            except TypeError:
-                self.master.statusbar.message("Content is binary or can be converted to text")
-        elif k == "h":
-            try:
-                pyperclip.copy(str(self.flow.response.headers))
-            except TypeError:
-                self.master.statusbar.message("Error converting headers to text")
+        if pyperclip:
+            if k == "c":
+                try:
+                    pyperclip.copy(self.flow.response.get_decoded_content())
+                except TypeError:
+                    self.master.statusbar.message("Content is binary or can be converted to text")
+            elif k == "h":
+                try:
+                    pyperclip.copy(str(self.flow.response.headers))
+                except TypeError:
+                    self.master.statusbar.message("Error converting headers to text")
+        else:
+            self.master.statusbar.message("No clipboard support on your system, sorry.")
 
     def keypress(self, (maxcol,), key):
         key = common.shortcuts(key)
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 08a0148f..667a7407 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -4,7 +4,10 @@ import urwid
 from . import common, grideditor, contentview
 from .. import utils, flow, controller
 from ..protocol.http import HTTPResponse, CONTENT_MISSING, decoded
-import pyperclip
+try:
+    import pyperclip
+except:
+    pyperclip = False
 
 class SearchError(Exception): pass
 
@@ -650,16 +653,19 @@ class FlowView(common.WWrap):
         self.master.refresh_flow(self.flow)
 
     def server_copy_response(self, k):
-        if k == "c":
-            try:
-                pyperclip.copy(self.flow.response.get_decoded_content())
-            except TypeError:
-                self.master.statusbar.message("Content is binary or can be converted to text")
-        elif k == "h":
-            try:
-                pyperclip.copy(str(self.flow.response.headers))
-            except TypeError:
-                self.master.statusbar.message("Error converting headers to text")
+        if pyperclip:
+            if k == "c":
+                try:
+                    pyperclip.copy(self.flow.response.get_decoded_content())
+                except TypeError:
+                    self.master.statusbar.message("Content is binary or can be converted to text")
+            elif k == "h":
+                try:
+                    pyperclip.copy(str(self.flow.response.headers))
+                except TypeError:
+                    self.master.statusbar.message("Error converting headers to text")
+        else:
+            self.master.statusbar.message("No clipboard support on your system, sorry.")
 
     def delete_body(self, t):
         if t == "m":
-- 
cgit v1.2.3


From c57efffe01bdc29e08b5eaa1a9b7071336bd4bb1 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <marcelo.glezer@gmail.com>
Date: Thu, 15 Jan 2015 09:36:59 -0300
Subject: extracted server_copy_response to common

---
 libmproxy/console/common.py   | 20 +++++++++++++++++++-
 libmproxy/console/flowlist.py | 22 +++-------------------
 libmproxy/console/flowview.py | 24 ++++--------------------
 3 files changed, 26 insertions(+), 40 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 3e6e5ccc..3ba89f8e 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -3,7 +3,10 @@ import urwid
 import urwid.util
 from .. import utils
 from ..protocol.http import CONTENT_MISSING
-
+try:
+    import pyperclip
+except:
+    pyperclip = False
 
 VIEW_LIST = 0
 VIEW_FLOW = 1
@@ -161,6 +164,21 @@ def raw_format_flow(f, focus, extended, padding):
     pile.append(urwid.Columns(resp, dividechars=1))
     return urwid.Pile(pile)
 
+def server_copy_response( k, response, statusbar):
+    if pyperclip:
+        if k == "c":
+            try:
+                pyperclip.copy(response.get_decoded_content())
+            except TypeError:
+                statusbar.message("Content is binary or can be converted to text")
+        elif k == "h":
+            try:
+                pyperclip.copy(str(response.headers))
+            except TypeError:
+                statusbar.message("Error converting headers to text")
+    else:
+        statusbar.message("No clipboard support on your system, sorry.")
+
 
 class FlowCache:
     @utils.LRUCache(200)
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index f97a7a11..b2e2ba07 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -1,10 +1,6 @@
 from __future__ import absolute_import
 import urwid
 from . import common
-try:
-    import pyperclip
-except:
-    pyperclip = False
 
 def _mkhelp():
     text = []
@@ -143,20 +139,6 @@ class ConnectionItem(common.WWrap):
                 self.state.last_saveload,
                 self.master.server_playback_path
             )
-    def server_copy_response(self, k):
-        if pyperclip:
-            if k == "c":
-                try:
-                    pyperclip.copy(self.flow.response.get_decoded_content())
-                except TypeError:
-                    self.master.statusbar.message("Content is binary or can be converted to text")
-            elif k == "h":
-                try:
-                    pyperclip.copy(str(self.flow.response.headers))
-                except TypeError:
-                    self.master.statusbar.message("Error converting headers to text")
-        else:
-            self.master.statusbar.message("No clipboard support on your system, sorry.")
 
     def keypress(self, (maxcol,), key):
         key = common.shortcuts(key)
@@ -230,7 +212,9 @@ class ConnectionItem(common.WWrap):
                     ("content", "c"),
                     ("headers", "h"),
                 ),
-                self.server_copy_response,
+                common.server_copy_response,
+                self.flow.response,
+                self.master.statusbar
             )
         else:
             return key
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 667a7407..abca2ed6 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -4,10 +4,7 @@ import urwid
 from . import common, grideditor, contentview
 from .. import utils, flow, controller
 from ..protocol.http import HTTPResponse, CONTENT_MISSING, decoded
-try:
-    import pyperclip
-except:
-    pyperclip = False
+
 
 class SearchError(Exception): pass
 
@@ -652,21 +649,6 @@ class FlowView(common.WWrap):
         )
         self.master.refresh_flow(self.flow)
 
-    def server_copy_response(self, k):
-        if pyperclip:
-            if k == "c":
-                try:
-                    pyperclip.copy(self.flow.response.get_decoded_content())
-                except TypeError:
-                    self.master.statusbar.message("Content is binary or can be converted to text")
-            elif k == "h":
-                try:
-                    pyperclip.copy(str(self.flow.response.headers))
-                except TypeError:
-                    self.master.statusbar.message("Error converting headers to text")
-        else:
-            self.master.statusbar.message("No clipboard support on your system, sorry.")
-
     def delete_body(self, t):
         if t == "m":
             val = CONTENT_MISSING
@@ -777,7 +759,9 @@ class FlowView(common.WWrap):
                     ("content", "c"),
                     ("headers", "h"),
                 ),
-                self.server_copy_response,
+                common.server_copy_response,
+                self.flow.response,
+                self.master.statusbar
             )
         elif key == "m":
             p = list(contentview.view_prompts)
-- 
cgit v1.2.3


From 8f66fe1bfc16d0bb63acc267632471640939371e Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Thu, 15 Jan 2015 12:37:26 -0300
Subject: added support for saving file if content is binary. still wip

---
 libmproxy/console/common.py   | 44 +++++++++++++++++++++++++++++++++++++++----
 libmproxy/console/flowlist.py |  3 ++-
 libmproxy/console/flowview.py |  3 ++-
 3 files changed, 44 insertions(+), 6 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 3ba89f8e..84dc8aef 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 import urwid
 import urwid.util
+import os
 from .. import utils
 from ..protocol.http import CONTENT_MISSING
 try:
@@ -164,20 +165,55 @@ def raw_format_flow(f, focus, extended, padding):
     pile.append(urwid.Columns(resp, dividechars=1))
     return urwid.Pile(pile)
 
-def server_copy_response( k, response, statusbar):
+## common save body parts
+def _save_body(path, master, state, content):
+    if not path:
+        return
+    state.last_saveload = path
+    path = os.path.expanduser(path)
+    try:
+        f = file(path, "wb")
+        f.write(str(content))
+        f.close()
+    except IOError, v:
+        master.statusbar.message(v.strerror)
+
+def save_body(k, master, state, content):
+    if k == "y":
+        master.path_prompt(
+            "Save response body: ",
+            state.last_saveload,
+            _save_body,
+            master,
+            state,
+            content,
+        )
+
+## common server_copy_response parts 
+def server_copy_response( k, master, state, response):
     if pyperclip:
         if k == "c":
             try:
                 pyperclip.copy(response.get_decoded_content())
             except TypeError:
-                statusbar.message("Content is binary or can be converted to text")
+                master.prompt_onekey(
+                    "Content is binary do you want to save it to a file instead?",
+                    (
+                        ("yes", "y"),
+                        ("no", "n"),
+                    ),
+                    save_body,
+                    master,
+                    state,
+                    response.get_decoded_content(),
+                )
         elif k == "h":
             try:
                 pyperclip.copy(str(response.headers))
             except TypeError:
-                statusbar.message("Error converting headers to text")
+                master.statusbar.message("Error converting headers to text")
     else:
-        statusbar.message("No clipboard support on your system, sorry.")
+        master.statusbar.message("No clipboard support on your system, sorry.")
 
 
 class FlowCache:
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index b2e2ba07..62c031b6 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -213,8 +213,9 @@ class ConnectionItem(common.WWrap):
                     ("headers", "h"),
                 ),
                 common.server_copy_response,
+                self.master,
+                self.state,
                 self.flow.response,
-                self.master.statusbar
             )
         else:
             return key
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index abca2ed6..bc0b5f83 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -760,8 +760,9 @@ class FlowView(common.WWrap):
                     ("headers", "h"),
                 ),
                 common.server_copy_response,
+                self.master,
+                self.state,
                 self.flow.response,
-                self.master.statusbar
             )
         elif key == "m":
             p = list(contentview.view_prompts)
-- 
cgit v1.2.3


From 3bcf0cbba894ad12d4cfc438d26cdf22d640416c Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Thu, 15 Jan 2015 12:57:00 -0300
Subject: used save_body from common when b key is pressed

---
 libmproxy/console/common.py   |  8 ++++----
 libmproxy/console/flowview.py | 41 ++++++++++++++---------------------------
 2 files changed, 18 insertions(+), 31 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 84dc8aef..29e59373 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -166,7 +166,7 @@ def raw_format_flow(f, focus, extended, padding):
     return urwid.Pile(pile)
 
 ## common save body parts
-def _save_body(path, master, state, content):
+def save_body(path, master, state, content):
     if not path:
         return
     state.last_saveload = path
@@ -178,12 +178,12 @@ def _save_body(path, master, state, content):
     except IOError, v:
         master.statusbar.message(v.strerror)
 
-def save_body(k, master, state, content):
+def ask_save_body(k, master, state, content):
     if k == "y":
         master.path_prompt(
             "Save response body: ",
             state.last_saveload,
-            _save_body,
+            save_body,
             master,
             state,
             content,
@@ -202,7 +202,7 @@ def server_copy_response( k, master, state, response):
                         ("yes", "y"),
                         ("no", "n"),
                     ),
-                    save_body,
+                    ask_save_body,
                     master,
                     state,
                     response.get_decoded_content(),
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index bc0b5f83..b964b92a 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -508,22 +508,6 @@ class FlowView(common.WWrap):
                     self.flow.request.method = i[0].upper()
             self.master.refresh_flow(self.flow)
 
-    def save_body(self, path):
-        if not path:
-            return
-        self.state.last_saveload = path
-        if self.state.view_flow_mode == common.VIEW_FLOW_REQUEST:
-            c = self.flow.request
-        else:
-            c = self.flow.response
-        path = os.path.expanduser(path)
-        try:
-            f = file(path, "wb")
-            f.write(str(c.content))
-            f.close()
-        except IOError, v:
-            self.master.statusbar.message(v.strerror)
-
     def set_url(self, url):
         request = self.flow.request
         try:
@@ -691,17 +675,20 @@ class FlowView(common.WWrap):
         elif key == "b":
             if conn:
                 if self.state.view_flow_mode == common.VIEW_FLOW_REQUEST:
-                    self.master.path_prompt(
-                        "Save request body: ",
-                        self.state.last_saveload,
-                        self.save_body
-                    )
-                else:
-                    self.master.path_prompt(
-                        "Save response body: ",
-                        self.state.last_saveload,
-                        self.save_body
-                    )
+                    msg = "Save request body: "
+                    content = self.flow.request.content
+                else: 
+                    msg = "Save response body: "
+                    content = self.flow.response.content                    
+
+                self.master.path_prompt(
+                    msg,
+                    self.state.last_saveload,
+                    common.save_body,
+                    self.master,
+                    self.state,
+                    content,
+                )
         elif key == "d":
             if self.state.flow_count() == 1:
                 self.master.view_flowlist()
-- 
cgit v1.2.3


From 9fc68d320c80ad07398a234630f6b59546a444e0 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Fri, 16 Jan 2015 12:13:55 -0300
Subject: added support for copying request (content|header) to clipboard

---
 libmproxy/console/common.py   | 13 ++++++-------
 libmproxy/console/flowlist.py | 15 ++++++++++++++-
 libmproxy/console/flowview.py | 15 ++++++++++++++-
 3 files changed, 34 insertions(+), 9 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 29e59373..33738c0a 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -181,7 +181,7 @@ def save_body(path, master, state, content):
 def ask_save_body(k, master, state, content):
     if k == "y":
         master.path_prompt(
-            "Save response body: ",
+            "Save message content: ",
             state.last_saveload,
             save_body,
             master,
@@ -189,12 +189,12 @@ def ask_save_body(k, master, state, content):
             content,
         )
 
-## common server_copy_response parts 
-def server_copy_response( k, master, state, response):
+## common copy_message parts 
+def copy_message( k, master, state, message):
     if pyperclip:
         if k == "c":
             try:
-                pyperclip.copy(response.get_decoded_content())
+                pyperclip.copy(message.get_decoded_content())
             except TypeError:
                 master.prompt_onekey(
                     "Content is binary do you want to save it to a file instead?",
@@ -205,17 +205,16 @@ def server_copy_response( k, master, state, response):
                     ask_save_body,
                     master,
                     state,
-                    response.get_decoded_content(),
+                    message.get_decoded_content(),
                 )
         elif k == "h":
             try:
-                pyperclip.copy(str(response.headers))
+                pyperclip.copy(str(message.headers))
             except TypeError:
                 master.statusbar.message("Error converting headers to text")
     else:
         master.statusbar.message("No clipboard support on your system, sorry.")
 
-
 class FlowCache:
     @utils.LRUCache(200)
     def format_flow(self, *args):
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 62c031b6..6939be23 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -13,6 +13,7 @@ def _mkhelp():
         ("e", "toggle eventlog"),
         ("F", "toggle follow flow list"),
         ("g", "copy response(content/headers) to clipboard"),        
+        ("G", "copy request(content/headers) to clipboard"),                
         ("l", "set limit filter pattern"),
         ("L", "load saved flows"),
         ("r", "replay request"),
@@ -212,11 +213,23 @@ class ConnectionItem(common.WWrap):
                     ("content", "c"),
                     ("headers", "h"),
                 ),
-                common.server_copy_response,
+                common.copy_message,
                 self.master,
                 self.state,
                 self.flow.response,
             )
+        elif key == "G":
+            self.master.prompt_onekey(
+                "Copy Request",
+                (
+                    ("content", "c"),
+                    ("headers", "h"),
+                ),
+                common.copy_message,
+                self.master,
+                self.state,
+                self.flow.request,
+            )
         else:
             return key
 
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index b964b92a..a759f109 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -20,6 +20,7 @@ def _mkhelp():
         ("e", "edit request/response"),
         ("f", "load full body data"),
         ("g", "copy response(content/headers) to clipboard"),        
+        ("G", "copy request(content/headers) to clipboard"),        
         ("m", "change body display mode for this entity"),
             (None,
                 common.highlight_key("automatic", "a") +
@@ -746,11 +747,23 @@ class FlowView(common.WWrap):
                     ("content", "c"),
                     ("headers", "h"),
                 ),
-                common.server_copy_response,
+                common.copy_message,
                 self.master,
                 self.state,
                 self.flow.response,
             )
+        elif key == "G":
+            self.master.prompt_onekey(
+                "Copy Request",
+                (
+                    ("content", "c"),
+                    ("headers", "h"),
+                ),
+                common.copy_message,
+                self.master,
+                self.state,
+                self.flow.request,
+            )
         elif key == "m":
             p = list(contentview.view_prompts)
             p.insert(0, ("Clear", "C"))
-- 
cgit v1.2.3


From ae83d39eba4a5518537d799fc4bd61d083f32944 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Fri, 16 Jan 2015 13:08:25 -0300
Subject: added support for 'b' key in flowlist

---
 libmproxy/console/common.py   | 28 ++++++++++++++++++++++++++++
 libmproxy/console/flowlist.py | 13 +++++++++++++
 2 files changed, 41 insertions(+)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 33738c0a..2f6c909c 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -189,8 +189,36 @@ def ask_save_body(k, master, state, content):
             content,
         )
 
+def which_body_save(k, master, state, flow):
+    if k == "q":
+        master.path_prompt(
+            "Save request content: ",
+            state.last_saveload,
+            save_body,
+            master,
+            state,
+            flow.request.get_decoded_content(),
+        )
+    elif k == "r":
+        if flow.response:
+            master.path_prompt(
+                "Save response content: ",
+                state.last_saveload,
+                save_body,
+                master,
+                state,
+                flow.response.get_decoded_content(),
+            )
+        else:
+            master.statusbar.message("Flow has no response")
+
 ## common copy_message parts 
 def copy_message( k, master, state, message):
+    if not message:
+        # only response could be None
+        master.statusbar.message("Flow has no response")                
+        return
+
     if pyperclip:
         if k == "c":
             try:
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 6939be23..4acb17dc 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -7,6 +7,7 @@ def _mkhelp():
     keys = [
         ("A", "accept all intercepted flows"),
         ("a", "accept this intercepted flow"),
+        ("b", "save request/response body"),
         ("C", "clear flow list or eventlog"),
         ("d", "delete flow"),
         ("D", "duplicate flow"),
@@ -230,6 +231,18 @@ class ConnectionItem(common.WWrap):
                 self.state,
                 self.flow.request,
             )
+        elif key == "b":
+            self.master.prompt_onekey(
+                "Save",
+                (
+                    ("request", "q"),
+                    ("response", "r"),
+                ),
+                common.which_body_save,
+                self.master,
+                self.state,
+                self.flow,
+            )
         else:
             return key
 
-- 
cgit v1.2.3


From 75cca63b2687db5da0793c2e6d60d38531f18b59 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <mg@tekii.com.ar>
Date: Tue, 3 Feb 2015 15:41:09 -0300
Subject: added copy to clipboard support for url

---
 libmproxy/console/common.py   | 5 +++++
 libmproxy/console/flowlist.py | 3 ++-
 libmproxy/console/flowview.py | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 2f6c909c..b7c46476 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -240,6 +240,11 @@ def copy_message( k, master, state, message):
                 pyperclip.copy(str(message.headers))
             except TypeError:
                 master.statusbar.message("Error converting headers to text")
+        elif k == "u":
+            try:
+                pyperclip.copy(message.url)
+            except TypeError:
+                master.statusbar.message("Error copying url to clipboard")
     else:
         master.statusbar.message("No clipboard support on your system, sorry.")
 
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 4acb17dc..fbcf1052 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -14,7 +14,7 @@ def _mkhelp():
         ("e", "toggle eventlog"),
         ("F", "toggle follow flow list"),
         ("g", "copy response(content/headers) to clipboard"),        
-        ("G", "copy request(content/headers) to clipboard"),                
+        ("G", "copy request(content/headers/url) to clipboard"),                
         ("l", "set limit filter pattern"),
         ("L", "load saved flows"),
         ("r", "replay request"),
@@ -225,6 +225,7 @@ class ConnectionItem(common.WWrap):
                 (
                     ("content", "c"),
                     ("headers", "h"),
+                    ("url", "u"),                                        
                 ),
                 common.copy_message,
                 self.master,
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index a759f109..c01bb08f 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -20,7 +20,7 @@ def _mkhelp():
         ("e", "edit request/response"),
         ("f", "load full body data"),
         ("g", "copy response(content/headers) to clipboard"),        
-        ("G", "copy request(content/headers) to clipboard"),        
+        ("G", "copy request(content/headers/url) to clipboard"),        
         ("m", "change body display mode for this entity"),
             (None,
                 common.highlight_key("automatic", "a") +
@@ -758,6 +758,7 @@ class FlowView(common.WWrap):
                 (
                     ("content", "c"),
                     ("headers", "h"),
+                    ("url", "u"),                    
                 ),
                 common.copy_message,
                 self.master,
-- 
cgit v1.2.3


From 64c02a16c389d4fdee396f132a76a627302c7511 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <marcelo.glezer@gmail.com>
Date: Fri, 6 Feb 2015 00:44:43 -0300
Subject: save_flow now uses with, and pyperclip requirement updated to 1.5.8

---
 libmproxy/console/common.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index b7c46476..6141bc1c 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -172,9 +172,8 @@ def save_body(path, master, state, content):
     state.last_saveload = path
     path = os.path.expanduser(path)
     try:
-        f = file(path, "wb")
-        f.write(str(content))
-        f.close()
+        with file(path, "wb") as f:
+            f.write(content)
     except IOError, v:
         master.statusbar.message(v.strerror)
 
-- 
cgit v1.2.3


From f49dcb0d91031c75231b4659f141aece5a43f8d1 Mon Sep 17 00:00:00 2001
From: Marcelo Glezer <marcelo.glezer@gmail.com>
Date: Fri, 6 Feb 2015 00:59:05 -0300
Subject: removed str() cast and changed 'failed copy trying save instead'
 message

---
 libmproxy/console/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 6141bc1c..c0929d58 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -224,7 +224,7 @@ def copy_message( k, master, state, message):
                 pyperclip.copy(message.get_decoded_content())
             except TypeError:
                 master.prompt_onekey(
-                    "Content is binary do you want to save it to a file instead?",
+                    "Cannot copy binary data to clipboard. Save as file?",
                     (
                         ("yes", "y"),
                         ("no", "n"),
@@ -236,7 +236,7 @@ def copy_message( k, master, state, message):
                 )
         elif k == "h":
             try:
-                pyperclip.copy(str(message.headers))
+                pyperclip.copy(message.headers)
             except TypeError:
                 master.statusbar.message("Error converting headers to text")
         elif k == "u":
-- 
cgit v1.2.3