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

Refactor curl_command and httpie_command

Browse Source 
To avoid calling to shlex.quote many times
This commit is contained in:
Matías Lang 2019-01-13 23:53:51 -03:00
parent eab4174b87
commit 674f92a7c1
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mitmproxy/addons/export.py
View File

@ -23,10 +23,10 @@ def curl_command(f: flow.Flow) -> str:
request = f.request.copy() # type: ignore request = f.request.copy() # type: ignore
request.decode(strict=False) request.decode(strict=False)
for k, v in request.headers.items(multi=True): for k, v in request.headers.items(multi=True):
args += ["-H", shlex.quote("%s:%s" % (k, v))] args += ["-H", "%s:%s" % (k, v)]
if request.method != "GET": if request.method != "GET":
args += ["-X", shlex.quote(request.method)] args += ["-X", request.method]
args.append(shlex.quote(request.url)) args.append(request.url)
if request.content: if request.content:
try: try:
content = strutils.always_str(request.content) content = strutils.always_str(request.content)
@ -36,20 +36,19 @@ def curl_command(f: flow.Flow) -> str:
raise exceptions.CommandError("Request content must be valid unicode") raise exceptions.CommandError("Request content must be valid unicode")
args += [ args += [
"--data-binary", "--data-binary",
shlex.quote(strutils.always_str(request.content)) strutils.always_str(request.content)
] ]
return ' '.join(args) return ' '.join(shlex.quote(arg) for arg in args)
def httpie_command(f: flow.Flow) -> str: def httpie_command(f: flow.Flow) -> str:
raise_if_missing_request(f) raise_if_missing_request(f)
request = f.request.copy() # type: ignore request = f.request.copy() # type: ignore
args = ["http"]
args.append(shlex.quote(request.method))
request.decode(strict=False) request.decode(strict=False)
args.append(shlex.quote(request.url)) args = ["http", request.method, request.url]
for k, v in request.headers.items(multi=True): for k, v in request.headers.items(multi=True):
args.append(shlex.quote("%s:%s" % (k, v))) args.append("%s:%s" % (k, v))
cmd = ' '.join(shlex.quote(arg) for arg in args)
if request.content: if request.content:
try: try:
content = strutils.always_str(request.content) content = strutils.always_str(request.content)
@ -57,8 +56,8 @@ def httpie_command(f: flow.Flow) -> str:
# shlex.quote doesn't support a bytes object # shlex.quote doesn't support a bytes object
# see https://github.com/python/cpython/pull/10871 # see https://github.com/python/cpython/pull/10871
raise exceptions.CommandError("Request content must be valid unicode") raise exceptions.CommandError("Request content must be valid unicode")
args += ["<<<", shlex.quote(content)] cmd += " <<< " + shlex.quote(content)
return ' '.join(args) return cmd
def raw(f: flow.Flow) -> bytes: def raw(f: flow.Flow) -> bytes: