pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-07-22 19:34:14 +09:00
Code Issues Projects Releases Wiki Activity

renamed password to key to keep naming consistent

Browse Source
This commit is contained in:
Matthew Broadway 2021-06-05 11:09:13 +01:00
parent 2ccfd900f1
commit a1aa3e6957
No known key found for this signature in database
GPG Key ID: DDC0B82B6896B381
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_cookies.py
View File

@ -45,7 +45,7 @@ class TestCookies(unittest.TestCase):
assert decryptor.decrypt(encrypted_value) == value
def test_chrome_cookie_decryptor_windows_v10(self):
with MonkeyPatch(cookies, '_get_windows_v10_password',
with MonkeyPatch(cookies, '_get_windows_v10_key',
lambda *args, **kwargs: b'Y\xef\xad\xad\xeerp\xf0Y\xe6\x9b\x12\xc2<z\x16]\n\xbb\xb8\xcb\xd7\x9bA\xc3\x14e\x99{\xd6\xf4&'):
encrypted_value = b'v10T\xb8\xf3\xb8\x01\xa7TtcV\xfc\x88\xb8\xb8\xef\x05\xb5\xfd\x18\xc90\x009\xab\xb1\x893\x85)\x87\xe1\xa9-\xa3\xad='
value = '32101439'

12
youtube_dl/cookies.py
View File

@ -322,7 +322,7 @@ class MacChromeCookieDecryptor(ChromeCookieDecryptor):
class WindowsChromeCookieDecryptor(ChromeCookieDecryptor):
def __init__(self, browser_root, logger):
self._logger = logger
self._v10_key = _get_windows_v10_password(browser_root, logger)
self._v10_key = _get_windows_v10_key(browser_root, logger)
def decrypt(self, encrypted_value):
version = encrypted_value[:3]
@ -389,7 +389,7 @@ def _get_mac_keyring_password(browser_keyring_name):
return None
def _get_windows_v10_password(browser_root, logger):
def _get_windows_v10_key(browser_root, logger):
path = _find_most_recently_used_file(browser_root, 'Local State')
if path is None:
logger.error('could not find local state file')
@ -397,16 +397,16 @@ def _get_windows_v10_password(browser_root, logger):
with open(path, 'r') as f:
data = json.load(f)
try:
base64_password = data['os_crypt']['encrypted_key']
base64_key = data['os_crypt']['encrypted_key']
except KeyError:
logger.error('no encrypted key in Local State')
return None
encrypted_password = compat_b64decode(base64_password)
encrypted_key = compat_b64decode(base64_key)
prefix = b'DPAPI'
if not encrypted_password.startswith(prefix):
if not encrypted_key.startswith(prefix):
logger.error('invalid key')
return None
return _decrypt_windows_dpapi(encrypted_password[len(prefix):], logger)
return _decrypt_windows_dpapi(encrypted_key[len(prefix):], logger)
def _decrypt_aes_cbc(ciphertext, key, initialization_vector=b' ' * 16):