ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-21 12:34:08 +00:00
Code Issues Projects Releases Wiki Activity

[twitch] Fix authentication and error capture (closes #14090, closes #15264)

Browse Source
This commit is contained in:
Sergey M․ 2018-01-16 22:34:16 +07:00
parent 1d1d60f6dd
commit 1370dba59f
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/twitch.py
View File

@ -85,10 +85,15 @@ class TwitchBaseIE(InfoExtractor):
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400: if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
response = self._parse_json( response = self._parse_json(
e.cause.read().decode('utf-8'), None) e.cause.read().decode('utf-8'), None)
fail(response['message']) fail(response.get('message') or response['errors'][0])
raise raise
redirect_url = urljoin(post_url, response['redirect']) if 'Authenticated successfully' in response.get('message', ''):
return None, None
redirect_url = urljoin(
post_url,
response.get('redirect') or response['redirect_path'])
return self._download_webpage_handle( return self._download_webpage_handle(
redirect_url, None, 'Downloading login redirect page', redirect_url, None, 'Downloading login redirect page',
headers=headers) headers=headers)
@ -106,6 +111,10 @@ class TwitchBaseIE(InfoExtractor):
'password': password, 'password': password,
}) })
# Successful login
if not redirect_page:
return
if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None: if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None:
# TODO: Add mechanism to request an SMS or phone call # TODO: Add mechanism to request an SMS or phone call
tfa_token = self._get_tfa_info('two-factor authentication token') tfa_token = self._get_tfa_info('two-factor authentication token')