Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-02-18 10:07:55 +01:00
Code Issues Releases Wiki Activity

__cfduid can't be stored to long in cookieJar

Browse Source
This commit is contained in:
bato3 2019-04-02 01:02:24 +02:00
parent af778e165f
commit 9880b2da45
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/common.py
View File

@ -639,17 +639,19 @@ class InfoExtractor(object):
else: else:
self.to_screen('Solving Cloudflare challenge (~7s)') self.to_screen('Solving Cloudflare challenge (~7s)')
scraper = cfscrape.create_scraper() scraper = cfscrape.create_scraper()
cookies = dict((cookie.name, cookie.value) for cookie in self._downloader.cookiejar)
try: try:
tokens = scraper.get_tokens(err.geturl(), std_headers['User-Agent'], cookies=cookies) tokens = scraper.get_tokens(err.geturl(), std_headers['User-Agent'])
except ValueError as e: except ValueError as e:
raise ExtractorError('cfscrape error: %s' % e, expected=True) raise ExtractorError('cfscrape error: %s' % e, expected=True)
cookie = 'cf_clearance=' + tokens[0]['cf_clearance'] cookie = 'cf_clearance=' + tokens[0]['cf_clearance'] + '; __cfduid=' + tokens[0]['__cfduid']
for c in self._downloader.cookiejar: for c in self._downloader.cookiejar:
cookie += '; %s=%s' % (c.name, c.value) if c.name != '__cfduid' and c.name != 'cf_clearance':
cookie += '; %s=%s' % (c.name, c.value)
domain = '.' + compat_urlparse.urlparse(err.geturl()).netloc.replace('www.', '')
self._set_cookie(domain, 'cf_clearance', tokens[0]['cf_clearance'])
self._set_cookie(domain, '__cfduid', tokens[0]['__cfduid'])
if not isinstance(url_or_request, compat_urllib_request.Request): if not isinstance(url_or_request, compat_urllib_request.Request):
self._set_cookie(compat_urlparse.urlparse(err.geturl()).netloc, 'cf_clearance', tokens[0]['cf_clearance'])
url_or_request = sanitized_Request(url_or_request, data, {'Cookie': cookie}) url_or_request = sanitized_Request(url_or_request, data, {'Cookie': cookie})
else: else:
url_or_request = update_Request(url_or_request, headers={'Cookie': cookie}) url_or_request = update_Request(url_or_request, headers={'Cookie': cookie})