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

Merge remote-tracking branch 'tunz/crash1'

Browse Source
This commit is contained in:
Maximilian Hils 2015-04-26 18:44:40 +02:00
commit 417190daa7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libmproxy/console/common.py
View File

@ -236,6 +236,9 @@ def copy_flow_format_data(part, scope, flow):
else: else:
data = "" data = ""
if scope in ("q", "a"): if scope in ("q", "a"):
if flow.request.content == None:
signals.status_message.send(message="Please retry, after finishing loading.")
return "", True
with decoded(flow.request): with decoded(flow.request):
if part == "h": if part == "h":
data += flow.request.assemble() data += flow.request.assemble()
@ -247,6 +250,9 @@ def copy_flow_format_data(part, scope, flow):
# Add padding between request and response # Add padding between request and response
data += "\r\n" * 2 data += "\r\n" * 2
if scope in ("s", "a") and flow.response: if scope in ("s", "a") and flow.response:
if flow.response.content == None:
signals.status_message.send(message="Please retry, after finishing loading.")
return "", True
with decoded(flow.response): with decoded(flow.response):
if part == "h": if part == "h":
data += flow.response.assemble() data += flow.response.assemble()
@ -254,17 +260,18 @@ def copy_flow_format_data(part, scope, flow):
data += flow.response.content data += flow.response.content
else: else:
raise ValueError("Unknown part: {}".format(part)) raise ValueError("Unknown part: {}".format(part))
return data return data, False
def copy_flow(part, scope, flow, master, state): def copy_flow(part, scope, flow, master, state):
""" """
part: _c_ontent, _a_ll, _u_rl part: _c_ontent, _a_ll, _u_rl
scope: _a_ll, re_q_uest, re_s_ponse scope: _a_ll, re_q_uest, re_s_ponse
""" """
data = copy_flow_format_data(part, scope, flow) data, err = copy_flow_format_data(part, scope, flow)
if not data: if err:
return
elif not data:
if scope == "q": if scope == "q":
signals.status_message.send(message="No request content to copy.") signals.status_message.send(message="No request content to copy.")
elif scope == "s": elif scope == "s":