mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-30 03:33:02 +00:00
ff07792676
The shell escape function now properly escapes `%`, `\\` and `\n`. `utils.Popen` as well as `%q` output template expansion have been patched accordingly. Prior to this fix using `--exec` together with `%q` when on Windows could cause remote code to execute. See https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-hjq6-52gw-2g7p for more details. Authored by: Grub4K
76 lines
2.4 KiB
Python
76 lines
2.4 KiB
Python
import os
|
|
import sys
|
|
import xml.etree.ElementTree as etree
|
|
|
|
from .compat_utils import passthrough_module
|
|
|
|
passthrough_module(__name__, '._deprecated')
|
|
del passthrough_module
|
|
|
|
|
|
# HTMLParseError has been deprecated in Python 3.3 and removed in
|
|
# Python 3.5. Introducing dummy exception for Python >3.5 for compatible
|
|
# and uniform cross-version exception handling
|
|
class compat_HTMLParseError(ValueError):
|
|
pass
|
|
|
|
|
|
class _TreeBuilder(etree.TreeBuilder):
|
|
def doctype(self, name, pubid, system):
|
|
pass
|
|
|
|
|
|
def compat_etree_fromstring(text):
|
|
return etree.XML(text, parser=etree.XMLParser(target=_TreeBuilder()))
|
|
|
|
|
|
compat_os_name = os._name if os.name == 'java' else os.name
|
|
|
|
|
|
def compat_shlex_quote(s):
|
|
from ..utils import shell_quote
|
|
return shell_quote(s)
|
|
|
|
|
|
def compat_ord(c):
|
|
return c if isinstance(c, int) else ord(c)
|
|
|
|
|
|
if compat_os_name == 'nt' and sys.version_info < (3, 8):
|
|
# os.path.realpath on Windows does not follow symbolic links
|
|
# prior to Python 3.8 (see https://bugs.python.org/issue9949)
|
|
def compat_realpath(path):
|
|
while os.path.islink(path):
|
|
path = os.path.abspath(os.readlink(path))
|
|
return os.path.realpath(path)
|
|
else:
|
|
compat_realpath = os.path.realpath
|
|
|
|
|
|
# Python 3.8+ does not honor %HOME% on windows, but this breaks compatibility with youtube-dl
|
|
# See https://github.com/yt-dlp/yt-dlp/issues/792
|
|
# https://docs.python.org/3/library/os.path.html#os.path.expanduser
|
|
if compat_os_name in ('nt', 'ce'):
|
|
def compat_expanduser(path):
|
|
HOME = os.environ.get('HOME')
|
|
if not HOME:
|
|
return os.path.expanduser(path)
|
|
elif not path.startswith('~'):
|
|
return path
|
|
i = path.replace('\\', '/', 1).find('/') # ~user
|
|
if i < 0:
|
|
i = len(path)
|
|
userhome = os.path.join(os.path.dirname(HOME), path[1:i]) if i > 1 else HOME
|
|
return userhome + path[i:]
|
|
else:
|
|
compat_expanduser = os.path.expanduser
|
|
|
|
|
|
def urllib_req_to_req(urllib_request):
|
|
"""Convert urllib Request to a networking Request"""
|
|
from ..networking import Request
|
|
from ..utils.networking import HTTPHeaderDict
|
|
return Request(
|
|
urllib_request.get_full_url(), data=urllib_request.data, method=urllib_request.get_method(),
|
|
headers=HTTPHeaderDict(urllib_request.headers, urllib_request.unredirected_hdrs),
|
|
extensions={'timeout': urllib_request.timeout} if hasattr(urllib_request, 'timeout') else None)
|