mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-25 16:50:47 +02:00
[cookies] Defer extraction of v11 key from keyring
Closes #6082 Authored by: Grub4K
This commit is contained in:
parent
01ddec7e66
commit
9b7a48abd1
@ -20,6 +20,7 @@
|
|||||||
aes_gcm_decrypt_and_verify_bytes,
|
aes_gcm_decrypt_and_verify_bytes,
|
||||||
unpad_pkcs7,
|
unpad_pkcs7,
|
||||||
)
|
)
|
||||||
|
from .compat import functools
|
||||||
from .dependencies import (
|
from .dependencies import (
|
||||||
_SECRETSTORAGE_UNAVAILABLE_REASON,
|
_SECRETSTORAGE_UNAVAILABLE_REASON,
|
||||||
secretstorage,
|
secretstorage,
|
||||||
@ -383,9 +384,14 @@ class LinuxChromeCookieDecryptor(ChromeCookieDecryptor):
|
|||||||
def __init__(self, browser_keyring_name, logger, *, keyring=None):
|
def __init__(self, browser_keyring_name, logger, *, keyring=None):
|
||||||
self._logger = logger
|
self._logger = logger
|
||||||
self._v10_key = self.derive_key(b'peanuts')
|
self._v10_key = self.derive_key(b'peanuts')
|
||||||
password = _get_linux_keyring_password(browser_keyring_name, keyring, logger)
|
|
||||||
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._browser_keyring_name = browser_keyring_name
|
||||||
|
self._keyring = keyring
|
||||||
|
|
||||||
|
@functools.cached_property
|
||||||
|
def _v11_key(self):
|
||||||
|
password = _get_linux_keyring_password(self._browser_keyring_name, self._keyring, self._logger)
|
||||||
|
return None if password is None else self.derive_key(password)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def derive_key(password):
|
def derive_key(password):
|
||||||
|
Loading…
Reference in New Issue
Block a user