pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-07-25 12:54:15 +09:00
Code Issues Projects Releases Wiki Activity

more selective about stripping only a single newline from the end of the MacOS keyring password

Browse Source
This commit is contained in:
Matthew Broadway 2021-09-25 14:08:15 +01:00
parent 8f4536edee
commit 0aa4970c90
No known key found for this signature in database
GPG Key ID: DDC0B82B6896B381
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/cookies.py
View File

@ -365,7 +365,7 @@ class MacChromeCookieDecryptor(ChromeCookieDecryptor):
def __init__(self, browser_keyring_name, logger): def __init__(self, browser_keyring_name, logger):
self._logger = logger self._logger = logger
if browser_keyring_name is not None: if browser_keyring_name is not None:
password = _get_mac_keyring_password(browser_keyring_name) password = _get_mac_keyring_password(browser_keyring_name, logger)
self._v10_key = None if password is None else self.derive_key(password) self._v10_key = None if password is None else self.derive_key(password)
else: else:
self._v10_key = None self._v10_key = None
@ -610,11 +610,13 @@ def _get_linux_keyring_password(browser_keyring_name):
return password.encode('utf-8') return password.encode('utf-8')
def _get_mac_keyring_password(browser_keyring_name): def _get_mac_keyring_password(browser_keyring_name, logger):
if KEYRING_AVAILABLE: if KEYRING_AVAILABLE:
logger.debug('using keyring to obtain password')
password = keyring.get_password('{} Safe Storage'.format(browser_keyring_name), browser_keyring_name) password = keyring.get_password('{} Safe Storage'.format(browser_keyring_name), browser_keyring_name)
return password.encode('utf-8') return password.encode('utf-8')
else: else:
logger.debug('using find-generic-password to obtain password')
proc = subprocess.Popen(['security', 'find-generic-password', proc = subprocess.Popen(['security', 'find-generic-password',
'-w', # write password to stdout '-w', # write password to stdout
'-a', browser_keyring_name, # match 'account' '-a', browser_keyring_name, # match 'account'
@ -623,7 +625,10 @@ def _get_mac_keyring_password(browser_keyring_name):
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
proc.wait() proc.wait()
if proc.returncode == 0: if proc.returncode == 0:
return proc.stdout.read().strip() stdout = proc.stdout.read()
if stdout[-1:] == b'\n':
stdout = stdout[:-1]
return stdout
else: else:
return None return None