Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

used get_decoded_content and removed decode call from headers as max suggested

Browse Source
This commit is contained in:
Marcelo Glezer 2015-01-14 14:45:19 -03:00
parent 1a06f15ee0
commit d9f562b5c0
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmproxy/console/flowlist.py
View File

@ -143,12 +143,12 @@ class ConnectionItem(common.WWrap):
def server_copy_response(self, k): def server_copy_response(self, k):
if k == "c": if k == "c":
try: try:
pyperclip.copy(self.flow.response_content()) pyperclip.copy(self.flow.response.get_decoded_content())
except TypeError: except TypeError:
self.master.statusbar.message("Content is binary or can be converted to text") self.master.statusbar.message("Content is binary or can be converted to text")
elif k == "h": elif k == "h":
try: try:
pyperclip.copy(self.flow.response_headers()) pyperclip.copy(str(self.flow.response.headers))
except TypeError: except TypeError:
self.master.statusbar.message("Error converting headers to text") self.master.statusbar.message("Error converting headers to text")

4
libmproxy/console/flowview.py
View File

@ -652,12 +652,12 @@ class FlowView(common.WWrap):
def server_copy_response(self, k): def server_copy_response(self, k):
if k == "c": if k == "c":
try: try:
pyperclip.copy(self.flow.response_content()) pyperclip.copy(self.flow.response.get_decoded_content())
except TypeError: except TypeError:
self.master.statusbar.message("Content is binary or can be converted to text") self.master.statusbar.message("Content is binary or can be converted to text")
elif k == "h": elif k == "h":
try: try:
pyperclip.copy(self.flow.response_headers()) pyperclip.copy(str(self.flow.response.headers))
except TypeError: except TypeError:
self.master.statusbar.message("Error converting headers to text") self.master.statusbar.message("Error converting headers to text")

10
libmproxy/protocol/http.py
View File

@ -953,16 +953,6 @@ class HTTPFlow(Flow):
c += self.response.replace(pattern, repl, *args, **kwargs) c += self.response.replace(pattern, repl, *args, **kwargs)
return c 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): class HttpAuthenticationError(Exception):
def __init__(self, auth_headers=None): def __init__(self, auth_headers=None):
super(HttpAuthenticationError, self).__init__( super(HttpAuthenticationError, self).__init__(