mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-10-31 07:50:11 +01:00
[core/windows] Improve shell quoting and tests (#9802)
Authored by: Grub4K
This commit is contained in:
parent
89f535e265
commit
64766459e3
@ -2059,7 +2059,22 @@ def test_extract_basic_auth(self):
|
|||||||
assert extract_basic_auth('http://user:pass@foo.bar') == ('http://foo.bar', 'Basic dXNlcjpwYXNz')
|
assert extract_basic_auth('http://user:pass@foo.bar') == ('http://foo.bar', 'Basic dXNlcjpwYXNz')
|
||||||
|
|
||||||
@unittest.skipUnless(compat_os_name == 'nt', 'Only relevant on Windows')
|
@unittest.skipUnless(compat_os_name == 'nt', 'Only relevant on Windows')
|
||||||
def test_Popen_windows_escaping(self):
|
def test_windows_escaping(self):
|
||||||
|
tests = [
|
||||||
|
'test"&',
|
||||||
|
'%CMDCMDLINE:~-1%&',
|
||||||
|
'a\nb',
|
||||||
|
'"',
|
||||||
|
'\\',
|
||||||
|
'!',
|
||||||
|
'^!',
|
||||||
|
'a \\ b',
|
||||||
|
'a \\" b',
|
||||||
|
'a \\ b\\',
|
||||||
|
# We replace \r with \n
|
||||||
|
('a\r\ra', 'a\n\na'),
|
||||||
|
]
|
||||||
|
|
||||||
def run_shell(args):
|
def run_shell(args):
|
||||||
stdout, stderr, error = Popen.run(
|
stdout, stderr, error = Popen.run(
|
||||||
args, text=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
args, text=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
@ -2067,15 +2082,18 @@ def run_shell(args):
|
|||||||
assert not error
|
assert not error
|
||||||
return stdout
|
return stdout
|
||||||
|
|
||||||
# Test escaping
|
for argument in tests:
|
||||||
assert run_shell(['echo', 'test"&']) == '"test""&"\n'
|
if isinstance(argument, str):
|
||||||
assert run_shell(['echo', '%CMDCMDLINE:~-1%&']) == '"%CMDCMDLINE:~-1%&"\n'
|
expected = argument
|
||||||
assert run_shell(['echo', 'a\nb']) == '"a"\n"b"\n'
|
else:
|
||||||
assert run_shell(['echo', '"']) == '""""\n'
|
argument, expected = argument
|
||||||
assert run_shell(['echo', '\\']) == '\\\n'
|
|
||||||
# Test if delayed expansion is disabled
|
args = [sys.executable, '-c', 'import sys; print(end=sys.argv[1])', argument, 'end']
|
||||||
assert run_shell(['echo', '^!']) == '"^!"\n'
|
assert run_shell(args) == expected
|
||||||
assert run_shell('echo "^!"') == '"^!"\n'
|
|
||||||
|
escaped = shell_quote(argument, shell=True)
|
||||||
|
args = f'{sys.executable} -c "import sys; print(end=sys.argv[1])" {escaped} end'
|
||||||
|
assert run_shell(args) == expected
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@ -1638,16 +1638,14 @@ def get_filesystem_encoding():
|
|||||||
return encoding if encoding is not None else 'utf-8'
|
return encoding if encoding is not None else 'utf-8'
|
||||||
|
|
||||||
|
|
||||||
_WINDOWS_QUOTE_TRANS = str.maketrans({'"': '\\"', '\\': '\\\\'})
|
_WINDOWS_QUOTE_TRANS = str.maketrans({'"': R'\"'})
|
||||||
_CMD_QUOTE_TRANS = str.maketrans({
|
_CMD_QUOTE_TRANS = str.maketrans({
|
||||||
# Keep quotes balanced by replacing them with `""` instead of `\\"`
|
# Keep quotes balanced by replacing them with `""` instead of `\\"`
|
||||||
'"': '""',
|
'"': '""',
|
||||||
# Requires a variable `=` containing `"^\n\n"` (set in `utils.Popen`)
|
# These require an env-variable `=` containing `"^\n\n"` (set in `utils.Popen`)
|
||||||
# `=` should be unique since variables containing `=` cannot be set using cmd
|
# `=` should be unique since variables containing `=` cannot be set using cmd
|
||||||
'\n': '%=%',
|
'\n': '%=%',
|
||||||
# While we are only required to escape backslashes immediately before quotes,
|
'\r': '%=%',
|
||||||
# we instead escape all of 'em anyways to be consistent
|
|
||||||
'\\': '\\\\',
|
|
||||||
# Use zero length variable replacement so `%` doesn't get expanded
|
# Use zero length variable replacement so `%` doesn't get expanded
|
||||||
# `cd` is always set as long as extensions are enabled (`/E:ON` in `utils.Popen`)
|
# `cd` is always set as long as extensions are enabled (`/E:ON` in `utils.Popen`)
|
||||||
'%': '%%cd:~,%',
|
'%': '%%cd:~,%',
|
||||||
@ -1656,19 +1654,14 @@ def get_filesystem_encoding():
|
|||||||
|
|
||||||
def shell_quote(args, *, shell=False):
|
def shell_quote(args, *, shell=False):
|
||||||
args = list(variadic(args))
|
args = list(variadic(args))
|
||||||
if any(isinstance(item, bytes) for item in args):
|
|
||||||
deprecation_warning('Passing bytes to utils.shell_quote is deprecated')
|
|
||||||
encoding = get_filesystem_encoding()
|
|
||||||
for index, item in enumerate(args):
|
|
||||||
if isinstance(item, bytes):
|
|
||||||
args[index] = item.decode(encoding)
|
|
||||||
|
|
||||||
if compat_os_name != 'nt':
|
if compat_os_name != 'nt':
|
||||||
return shlex.join(args)
|
return shlex.join(args)
|
||||||
|
|
||||||
trans = _CMD_QUOTE_TRANS if shell else _WINDOWS_QUOTE_TRANS
|
trans = _CMD_QUOTE_TRANS if shell else _WINDOWS_QUOTE_TRANS
|
||||||
return ' '.join(
|
return ' '.join(
|
||||||
s if re.fullmatch(r'[\w#$*\-+./:?@\\]+', s, re.ASCII) else s.translate(trans).join('""')
|
s if re.fullmatch(r'[\w#$*\-+./:?@\\]+', s, re.ASCII)
|
||||||
|
else re.sub(r'(\\+)("|$)', r'\1\1\2', s).translate(trans).join('""')
|
||||||
for s in args)
|
for s in args)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user