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

several fixes on command exports has several problems: #3676

Browse Source 
* authority can usually rely on actual URL. as `:authority` headers will
break curl command. (advise if it's better to change them to Host, or if
it should be reported on curl side)
* `content-length`: 0 is added for each request. if it's found in the
curl argument list, it'll try to fetch an empty body (and crash).
also trying to guess on accept-encoding header to add the
`--compress` option when fetching potentially compressed content.
* ditto for httpie
* factorize it into raise_if_missing_request (and rename it)
This commit is contained in:
Yoann L 2019-10-29 12:24:07 +01:00
parent 3370740361
commit 4383122b7b
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mitmproxy/addons/export.py
View File

@ -11,7 +11,12 @@ import mitmproxy.types
import pyperclip import pyperclip
def cleanup_for_commands(request): def cleanup_request(f: flow.Flow):
if not hasattr(f, "request"):
raise exceptions.CommandError("Can't export flow with no request.")
request = f.request.copy()
request.decode(strict=False)
# a bit of clean-up
if ('content-length' in request.headers.keys() and if ('content-length' in request.headers.keys() and
request.headers['content-length'] == '0' and request.headers['content-length'] == '0' and
request.method == 'GET'): request.method == 'GET'):
@ -20,25 +25,14 @@ def cleanup_for_commands(request):
return request return request
def raise_if_missing_request(f: flow.Flow) -> None:
if not hasattr(f, "request"):
raise exceptions.CommandError("Can't export flow with no request.")
def curl_command(f: flow.Flow) -> str: def curl_command(f: flow.Flow) -> str:
raise_if_missing_request(f)
data = "curl " data = "curl "
request = f.request.copy() # type: ignore request = cleanup_request(f)
request.decode(strict=False)
request = cleanup_for_commands(request)
for k, v in request.headers.items(multi=True): for k, v in request.headers.items(multi=True):
data += "--compressed " if k == 'accept-encoding' else ""
data += "-H '%s:%s' " % (k, v) data += "-H '%s:%s' " % (k, v)
if request.method != "GET": if request.method != "GET":
data += "-X %s " % request.method data += "-X %s " % request.method
for header in request.headers.keys():
if ('accept-encoding' == header.lower() and
any(comp in request.headers[header] for comp in ['gzip', 'deflate'])):
data += "--compressed "
data += "'%s'" % request.url data += "'%s'" % request.url
if request.content: if request.content:
data += " --data-binary '%s'" % strutils.bytes_to_escaped_str( data += " --data-binary '%s'" % strutils.bytes_to_escaped_str(
@ -49,12 +43,8 @@ def curl_command(f: flow.Flow) -> str:
def httpie_command(f: flow.Flow) -> str: def httpie_command(f: flow.Flow) -> str:
raise_if_missing_request(f) request = cleanup_request(f)
request = f.request.copy() # type: ignore data = "http %s %s" % (request.method, request.url)
data = "http %s " % request.method
request.decode(strict=False)
request = cleanup_for_commands(request)
data += "%s" % request.url
for k, v in request.headers.items(multi=True): for k, v in request.headers.items(multi=True):
data += " '%s:%s'" % (k, v) data += " '%s:%s'" % (k, v)
if request.content: if request.content:
@ -66,8 +56,7 @@ def httpie_command(f: flow.Flow) -> str:
def raw(f: flow.Flow) -> bytes: def raw(f: flow.Flow) -> bytes:
raise_if_missing_request(f) return assemble.assemble_request(cleanup_request(f)) # type: ignore
return assemble.assemble_request(f.request) # type: ignore
formats = dict( formats = dict(