mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-07 13:58:31 +00:00
Code Issues Projects Releases Wiki Activity

fix cache compat in CDA extractor

Browse Source
This commit is contained in:
Michaël De Boey 2025-03-17 00:40:17 +01:00
parent f6c24f54f3
commit ff1786e158
No known key found for this signature in database
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yt_dlp/extractor/cda.py
View File

@ -15,7 +15,6 @@
OnDemandPagedList, OnDemandPagedList,
float_or_none, float_or_none,
int_or_none, int_or_none,
jwt_decode_hs256,
jwt_encode_hs256, jwt_encode_hs256,
jwt_is_expired, jwt_is_expired,
merge_dicts, merge_dicts,
@ -154,8 +153,8 @@ def _perform_login(self, username, password):
self._API_HEADERS['User-Agent'] = f'pl.cda 1.0 (version {app_version}; Android {android_version}; {phone_model})' self._API_HEADERS['User-Agent'] = f'pl.cda 1.0 (version {app_version}; Android {android_version}; {phone_model})'
cached_bearer = self.cache.load(self._BEARER_CACHE, username) or {} cached_bearer = self.cache.load(self._BEARER_CACHE, username) or {}
if not jwt_is_expired(cached_bearer, 5, 'valid_until'): if not jwt_is_expired(jwt_encode_hs256(cached_bearer, 'cda.pl'), 5, 'valid_until'):
self._API_HEADERS['Authorization'] = f'Bearer {jwt_decode_hs256(cached_bearer)["token"]}' self._API_HEADERS['Authorization'] = f'Bearer {cached_bearer["token"]}'
return return
password_hash = base64.urlsafe_b64encode(hmac.new( password_hash = base64.urlsafe_b64encode(hmac.new(
@ -172,10 +171,10 @@ def _perform_login(self, username, password):
'login': username, 'login': username,
'password': password_hash, 'password': password_hash,
}) })
self.cache.store(self._BEARER_CACHE, username, jwt_encode_hs256({ self.cache.store(self._BEARER_CACHE, username, {
'token': token_res['access_token'], 'token': token_res['access_token'],
'valid_until': token_res['expires_in'] + dt.datetime.now().timestamp(), 'valid_until': token_res['expires_in'] + dt.datetime.now().timestamp(),
}, 'cda.pl')) })
self._API_HEADERS['Authorization'] = f'Bearer {token_res["access_token"]}' self._API_HEADERS['Authorization'] = f'Bearer {token_res["access_token"]}'
def _real_extract(self, url): def _real_extract(self, url):