github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cookies] try decryption with empty password as fallback

Browse Source 
https://github.com/yt-dlp/yt-dlp/pull/6897
This commit is contained in:
Mike Fährmann
2024-11-04 22:12:16 +01:00
parent d2db7060e2
commit cf0817e17b
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gallery_dl/cookies.py
View File

@@ -493,8 +493,9 @@ class ChromiumCookieDecryptor:
class LinuxChromiumCookieDecryptor(ChromiumCookieDecryptor): class LinuxChromiumCookieDecryptor(ChromiumCookieDecryptor):
def __init__(self, browser_keyring_name, keyring=None, meta_version=0): def __init__(self, browser_keyring_name, keyring=None, meta_version=0):
self._v10_key = self.derive_key(b"peanuts")
password = _get_linux_keyring_password(browser_keyring_name, keyring) password = _get_linux_keyring_password(browser_keyring_name, keyring)
self._empty_key = self.derive_key(b"")
self._v10_key = self.derive_key(b"peanuts")
self._v11_key = None if password is None else self.derive_key(password) self._v11_key = None if password is None else self.derive_key(password)
self._cookie_counts = {"v10": 0, "v11": 0, "other": 0} self._cookie_counts = {"v10": 0, "v11": 0, "other": 0}
self._offset = (32 if meta_version >= 24 else 0) self._offset = (32 if meta_version >= 24 else 0)
@@ -517,19 +518,25 @@ class LinuxChromiumCookieDecryptor(ChromiumCookieDecryptor):
if version == b"v10": if version == b"v10":
self._cookie_counts["v10"] += 1 self._cookie_counts["v10"] += 1
return _decrypt_aes_cbc(ciphertext, self._v10_key, self._offset) value = _decrypt_aes_cbc(ciphertext, self._v10_key, self._offset)
elif version == b"v11": elif version == b"v11":
self._cookie_counts["v11"] += 1 self._cookie_counts["v11"] += 1
if self._v11_key is None: if self._v11_key is None:
_log_warning("Unable to decrypt v11 cookies: no key found") _log_warning("Unable to decrypt v11 cookies: no key found")
return None return None
return _decrypt_aes_cbc(ciphertext, self._v11_key, self._offset) value = _decrypt_aes_cbc(ciphertext, self._v11_key, self._offset)
else: else:
self._cookie_counts["other"] += 1 self._cookie_counts["other"] += 1
return None return None
if value is None:
value = _decrypt_aes_cbc(ciphertext, self._empty_key, self._offset)
if value is None:
_log_warning("Failed to decrypt cookie (AES-CBC)")
return value
class MacChromiumCookieDecryptor(ChromiumCookieDecryptor): class MacChromiumCookieDecryptor(ChromiumCookieDecryptor):
def __init__(self, browser_keyring_name, meta_version=0): def __init__(self, browser_keyring_name, meta_version=0):
@@ -559,7 +566,6 @@ class MacChromiumCookieDecryptor(ChromiumCookieDecryptor):
if self._v10_key is None: if self._v10_key is None:
_log_warning("Unable to decrypt v10 cookies: no key found") _log_warning("Unable to decrypt v10 cookies: no key found")
return None return None
return _decrypt_aes_cbc(ciphertext, self._v10_key, self._offset) return _decrypt_aes_cbc(ciphertext, self._v10_key, self._offset)
else: else:
@@ -993,17 +999,14 @@ def pbkdf2_sha1(password, salt, iterations, key_length):
def _decrypt_aes_cbc(ciphertext, key, offset=0, def _decrypt_aes_cbc(ciphertext, key, offset=0,
initialization_vector=b" " * 16): initialization_vector=b" " * 16):
plaintext = aes.unpad_pkcs7(aes.aes_cbc_decrypt_bytes(
ciphertext, key, initialization_vector))
if offset:
plaintext = plaintext[offset:]
try: try:
plaintext = aes.unpad_pkcs7(aes.aes_cbc_decrypt_bytes(
ciphertext, key, initialization_vector))
if offset:
plaintext = plaintext[offset:]
return plaintext.decode() return plaintext.decode()
except UnicodeDecodeError: except UnicodeDecodeError:
_log_warning("Failed to decrypt cookie (AES-CBC Unicode)") return None
except ValueError:
_log_warning("Failed to decrypt cookie (AES-CBC)")
return None
def _decrypt_aes_gcm(ciphertext, key, nonce, authentication_tag, offset=0): def _decrypt_aes_gcm(ciphertext, key, nonce, authentication_tag, offset=0):