mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-02 03:47:27 +00:00
[discovery] extract Affiliate/Anonymous Auth Token from cookies(closes #14954)
This commit is contained in:
parent
ea1f5e5dbd
commit
3cc0d0b829
1 changed files with 26 additions and 11 deletions
|
@ -5,7 +5,10 @@
|
||||||
import string
|
import string
|
||||||
|
|
||||||
from .discoverygo import DiscoveryGoBaseIE
|
from .discoverygo import DiscoveryGoBaseIE
|
||||||
from ..compat import compat_str
|
from ..compat import (
|
||||||
|
compat_str,
|
||||||
|
compat_urllib_parse_unquote,
|
||||||
|
)
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
try_get,
|
try_get,
|
||||||
|
@ -55,6 +58,18 @@ def _real_extract(self, url):
|
||||||
video = next(cb for cb in content_blocks if cb.get('type') == 'video')['content']['items'][0]
|
video = next(cb for cb in content_blocks if cb.get('type') == 'video')['content']['items'][0]
|
||||||
video_id = video['id']
|
video_id = video['id']
|
||||||
|
|
||||||
|
access_token = None
|
||||||
|
cookies = self._get_cookies(url)
|
||||||
|
|
||||||
|
# prefer Affiliate Auth Token over Anonymous Auth Token
|
||||||
|
auth_storage_cookie = cookies.get('eosAf') or cookies.get('eosAn')
|
||||||
|
if auth_storage_cookie and auth_storage_cookie.value:
|
||||||
|
auth_storage = self._parse_json(compat_urllib_parse_unquote(
|
||||||
|
compat_urllib_parse_unquote(auth_storage_cookie.value)),
|
||||||
|
video_id, fatal=False) or {}
|
||||||
|
access_token = auth_storage.get('a') or auth_storage.get('access_token')
|
||||||
|
|
||||||
|
if not access_token:
|
||||||
access_token = self._download_json(
|
access_token = self._download_json(
|
||||||
'https://www.%s.com/anonymous' % site, display_id, query={
|
'https://www.%s.com/anonymous' % site, display_id, query={
|
||||||
'authRel': 'authorization',
|
'authRel': 'authorization',
|
||||||
|
@ -72,7 +87,7 @@ def _real_extract(self, url):
|
||||||
'Authorization': 'Bearer ' + access_token,
|
'Authorization': 'Bearer ' + access_token,
|
||||||
})
|
})
|
||||||
except ExtractorError as e:
|
except ExtractorError as e:
|
||||||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
|
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (401, 403):
|
||||||
e_description = self._parse_json(
|
e_description = self._parse_json(
|
||||||
e.cause.read().decode(), display_id)['description']
|
e.cause.read().decode(), display_id)['description']
|
||||||
if 'resource not available for country' in e_description:
|
if 'resource not available for country' in e_description:
|
||||||
|
|
Loading…
Reference in a new issue