logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Disable-use-of-ctypes-and-dynamic-loading.patch (9452B)

    

  1. From 1b166dc9a491440db655fa3c7b49df329683ef45 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Mon, 4 Jul 2016 16:14:18 -0700
  4. Subject: [PATCH] Disable use of ctypes and dynamic loading
  6. ---
  7.  yt_dlp/cookies.py      | 104 -----------------------------------------
  8.  yt_dlp/utils/_utils.py |  85 +--------------------------------
  9.  2 files changed, 2 insertions(+), 187 deletions(-)
  11. diff --git a/yt_dlp/cookies.py b/yt_dlp/cookies.py
  12. index fad323c90..5e5c9df81 100644
  13. --- a/yt_dlp/cookies.py
  14. +++ b/yt_dlp/cookies.py
  15. @@ -416,8 +416,6 @@ def decrypt(self, encrypted_value):
  16.  def get_cookie_decryptor(browser_root, browser_keyring_name, logger, *, keyring=None, meta_version=None):
  17.      if sys.platform == 'darwin':
  18.          return MacChromeCookieDecryptor(browser_keyring_name, logger, meta_version=meta_version)
  19. -    elif sys.platform in ('win32', 'cygwin'):
  20. -        return WindowsChromeCookieDecryptor(browser_root, logger, meta_version=meta_version)
  21.      return LinuxChromeCookieDecryptor(browser_keyring_name, logger, keyring=keyring, meta_version=meta_version)
  22.  
  23.  
  24. @@ -511,46 +509,6 @@ def decrypt(self, encrypted_value):
  25.              return encrypted_value
  26.  
  27.  
  28. -class WindowsChromeCookieDecryptor(ChromeCookieDecryptor):
  29. -    def __init__(self, browser_root, logger, meta_version=None):
  30. -        self._logger = logger
  31. -        self._v10_key = _get_windows_v10_key(browser_root, logger)
  32. -        self._cookie_counts = {'v10': 0, 'other': 0}
  33. -        self._meta_version = meta_version or 0
  34. -
  35. -    def decrypt(self, encrypted_value):
  36. -        version = encrypted_value[:3]
  37. -        ciphertext = encrypted_value[3:]
  38. -
  39. -        if version == b'v10':
  40. -            self._cookie_counts['v10'] += 1
  41. -            if self._v10_key is None:
  42. -                self._logger.warning('cannot decrypt v10 cookies: no key found', only_once=True)
  43. -                return None
  44. -
  45. -            # https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/os_crypt/sync/os_crypt_win.cc
  46. -            #   kNonceLength
  47. -            nonce_length = 96 // 8
  48. -            # boringssl
  49. -            #   EVP_AEAD_AES_GCM_TAG_LEN
  50. -            authentication_tag_length = 16
  51. -
  52. -            raw_ciphertext = ciphertext
  53. -            nonce = raw_ciphertext[:nonce_length]
  54. -            ciphertext = raw_ciphertext[nonce_length:-authentication_tag_length]
  55. -            authentication_tag = raw_ciphertext[-authentication_tag_length:]
  56. -
  57. -            return _decrypt_aes_gcm(
  58. -                ciphertext, self._v10_key, nonce, authentication_tag, self._logger,
  59. -                hash_prefix=self._meta_version >= 24)
  60. -
  61. -        else:
  62. -            self._cookie_counts['other'] += 1
  63. -            # any other prefix means the data is DPAPI encrypted
  64. -            # https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/os_crypt/sync/os_crypt_win.cc
  65. -            return _decrypt_windows_dpapi(encrypted_value, self._logger).decode()
  66. -
  67. -
  68.  def _extract_safari_cookies(profile, logger):
  69.      if sys.platform != 'darwin':
  70.          raise ValueError(f'unsupported platform: {sys.platform}')
  71. @@ -997,33 +955,6 @@ def _get_mac_keyring_password(browser_keyring_name, logger):
  72.          return None
  73.  
  74.  
  75. -def _get_windows_v10_key(browser_root, logger):
  76. -    """
  77. -    References:
  78. -        - [1] https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/os_crypt/sync/os_crypt_win.cc
  79. -    """
  80. -    path = _newest(_find_files(browser_root, 'Local State', logger))
  81. -    if path is None:
  82. -        logger.error('could not find local state file')
  83. -        return None
  84. -    logger.debug(f'Found local state file at "{path}"')
  85. -    with open(path, encoding='utf8') as f:
  86. -        data = json.load(f)
  87. -    try:
  88. -        # kOsCryptEncryptedKeyPrefName in [1]
  89. -        base64_key = data['os_crypt']['encrypted_key']
  90. -    except KeyError:
  91. -        logger.error('no encrypted key in Local State')
  92. -        return None
  93. -    encrypted_key = base64.b64decode(base64_key)
  94. -    # kDPAPIKeyPrefix in [1]
  95. -    prefix = b'DPAPI'
  96. -    if not encrypted_key.startswith(prefix):
  97. -        logger.error('invalid key')
  98. -        return None
  99. -    return _decrypt_windows_dpapi(encrypted_key[len(prefix):], logger)
  100. -
  101. -
  102.  def pbkdf2_sha1(password, salt, iterations, key_length):
  103.      return hashlib.pbkdf2_hmac('sha1', password, salt, iterations, key_length)
  104.  
  105. @@ -1057,41 +988,6 @@ def _decrypt_aes_gcm(ciphertext, key, nonce, authentication_tag, logger, hash_pr
  106.          return None
  107.  
  108.  
  109. -def _decrypt_windows_dpapi(ciphertext, logger):
  110. -    """
  111. -    References:
  112. -        - https://docs.microsoft.com/en-us/windows/win32/api/dpapi/nf-dpapi-cryptunprotectdata
  113. -    """
  114. -
  115. -    import ctypes
  116. -    import ctypes.wintypes
  117. -
  118. -    class DATA_BLOB(ctypes.Structure):
  119. -        _fields_ = [('cbData', ctypes.wintypes.DWORD),
  120. -                    ('pbData', ctypes.POINTER(ctypes.c_char))]
  121. -
  122. -    buffer = ctypes.create_string_buffer(ciphertext)
  123. -    blob_in = DATA_BLOB(ctypes.sizeof(buffer), buffer)
  124. -    blob_out = DATA_BLOB()
  125. -    ret = ctypes.windll.crypt32.CryptUnprotectData(
  126. -        ctypes.byref(blob_in),  # pDataIn
  127. -        None,  # ppszDataDescr: human readable description of pDataIn
  128. -        None,  # pOptionalEntropy: salt?
  129. -        None,  # pvReserved: must be NULL
  130. -        None,  # pPromptStruct: information about prompts to display
  131. -        0,  # dwFlags
  132. -        ctypes.byref(blob_out),  # pDataOut
  133. -    )
  134. -    if not ret:
  135. -        message = 'Failed to decrypt with DPAPI. See  https://github.com/yt-dlp/yt-dlp/issues/10927  for more info'
  136. -        logger.error(message)
  137. -        raise DownloadError(message)  # force exit
  138. -
  139. -    result = ctypes.string_at(blob_out.pbData, blob_out.cbData)
  140. -    ctypes.windll.kernel32.LocalFree(blob_out.pbData)
  141. -    return result
  142. -
  143. -
  144.  def _config_home():
  145.      return os.environ.get('XDG_CONFIG_HOME', os.path.expanduser('~/.config'))
  146.  
  147. diff --git a/yt_dlp/utils/_utils.py b/yt_dlp/utils/_utils.py
  148. index 699bf1e7f..710668036 100644
  149. --- a/yt_dlp/utils/_utils.py
  150. +++ b/yt_dlp/utils/_utils.py
  151. @@ -1506,64 +1506,7 @@ def __init__(self):
  152.          super().__init__(self.msg)
  153.  
  154.  
  155. -# Cross-platform file locking
  156. -if sys.platform == 'win32':
  157. -    import ctypes
  158. -    import ctypes.wintypes
  159. -    import msvcrt
  160. -
  161. -    class OVERLAPPED(ctypes.Structure):
  162. -        _fields_ = [
  163. -            ('Internal', ctypes.wintypes.LPVOID),
  164. -            ('InternalHigh', ctypes.wintypes.LPVOID),
  165. -            ('Offset', ctypes.wintypes.DWORD),
  166. -            ('OffsetHigh', ctypes.wintypes.DWORD),
  167. -            ('hEvent', ctypes.wintypes.HANDLE),
  168. -        ]
  169. -
  170. -    kernel32 = ctypes.WinDLL('kernel32')
  171. -    LockFileEx = kernel32.LockFileEx
  172. -    LockFileEx.argtypes = [
  173. -        ctypes.wintypes.HANDLE,     # hFile
  174. -        ctypes.wintypes.DWORD,      # dwFlags
  175. -        ctypes.wintypes.DWORD,      # dwReserved
  176. -        ctypes.wintypes.DWORD,      # nNumberOfBytesToLockLow
  177. -        ctypes.wintypes.DWORD,      # nNumberOfBytesToLockHigh
  178. -        ctypes.POINTER(OVERLAPPED),  # Overlapped
  179. -    ]
  180. -    LockFileEx.restype = ctypes.wintypes.BOOL
  181. -    UnlockFileEx = kernel32.UnlockFileEx
  182. -    UnlockFileEx.argtypes = [
  183. -        ctypes.wintypes.HANDLE,     # hFile
  184. -        ctypes.wintypes.DWORD,      # dwReserved
  185. -        ctypes.wintypes.DWORD,      # nNumberOfBytesToLockLow
  186. -        ctypes.wintypes.DWORD,      # nNumberOfBytesToLockHigh
  187. -        ctypes.POINTER(OVERLAPPED),  # Overlapped
  188. -    ]
  189. -    UnlockFileEx.restype = ctypes.wintypes.BOOL
  190. -    whole_low = 0xffffffff
  191. -    whole_high = 0x7fffffff
  192. -
  193. -    def _lock_file(f, exclusive, block):
  194. -        overlapped = OVERLAPPED()
  195. -        overlapped.Offset = 0
  196. -        overlapped.OffsetHigh = 0
  197. -        overlapped.hEvent = 0
  198. -        f._lock_file_overlapped_p = ctypes.pointer(overlapped)
  199. -
  200. -        if not LockFileEx(msvcrt.get_osfhandle(f.fileno()),
  201. -                          (0x2 if exclusive else 0x0) | (0x0 if block else 0x1),
  202. -                          0, whole_low, whole_high, f._lock_file_overlapped_p):
  203. -            # NB: No argument form of "ctypes.FormatError" does not work on PyPy
  204. -            raise BlockingIOError(f'Locking file failed: {ctypes.FormatError(ctypes.GetLastError())!r}')
  205. -
  206. -    def _unlock_file(f):
  207. -        assert f._lock_file_overlapped_p
  208. -        handle = msvcrt.get_osfhandle(f.fileno())
  209. -        if not UnlockFileEx(handle, 0, whole_low, whole_high, f._lock_file_overlapped_p):
  210. -            raise OSError(f'Unlocking file failed: {ctypes.FormatError()!r}')
  211. -
  212. -else:
  213. +if True:
  214.      try:
  215.          import fcntl
  216.  
  217. @@ -1912,31 +1855,7 @@ def fix_xml_ampersands(xml_str):
  218.  
  219.  
  220.  def setproctitle(title):
  221. -    assert isinstance(title, str)
  222. -
  223. -    # Workaround for https://github.com/yt-dlp/yt-dlp/issues/4541
  224. -    try:
  225. -        import ctypes
  226. -    except ImportError:
  227. -        return
  228. -
  229. -    try:
  230. -        libc = ctypes.cdll.LoadLibrary('libc.so.6')
  231. -    except OSError:
  232. -        return
  233. -    except TypeError:
  234. -        # LoadLibrary in Windows Python 2.7.13 only expects
  235. -        # a bytestring, but since unicode_literals turns
  236. -        # every string into a unicode string, it fails.
  237. -        return
  238. -    title_bytes = title.encode()
  239. -    buf = ctypes.create_string_buffer(len(title_bytes))
  240. -    buf.value = title_bytes
  241. -    try:
  242. -        # PR_SET_NAME = 15      Ref: /usr/include/linux/prctl.h
  243. -        libc.prctl(15, buf, 0, 0, 0)
  244. -    except AttributeError:
  245. -        return  # Strange libc, just skip this
  246. +    return
  247.  
  248.  
  249.  def remove_start(s, start):
  250. -- 
  251. 2.45.2