w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[twitch] Fix authentication (closes #17024)

Browse source
This commit is contained in:
Tim Broder 2018-07-31 16:49:30 -04:00 committed by Sergey M․
parent 644921b372
commit 48afc6ca3e
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
youtube_dl/extractor/twitch.py
View file

@ -4,6 +4,7 @@ from __future__ import unicode_literals
import itertools import itertools
import re import re
import random import random
import json
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
@ -26,7 +27,6 @@ from ..utils import (
try_get, try_get,
unified_timestamp, unified_timestamp,
update_url_query, update_url_query,
urlencode_postdata,
url_or_none, url_or_none,
urljoin, urljoin,
) )
@ -37,7 +37,8 @@ class TwitchBaseIE(InfoExtractor):
_API_BASE = 'https://api.twitch.tv' _API_BASE = 'https://api.twitch.tv'
_USHER_BASE = 'https://usher.ttvnw.net' _USHER_BASE = 'https://usher.ttvnw.net'
_LOGIN_URL = 'https://www.twitch.tv/login' _LOGIN_FORM_URL = 'https://www.twitch.tv/login'
_LOGIN_POST_URL = 'https://passport.twitch.tv/login'
_CLIENT_ID = 'jzkbprff40iqj646a697cyrvl0zt2m6' _CLIENT_ID = 'jzkbprff40iqj646a697cyrvl0zt2m6'
_NETRC_MACHINE = 'twitch' _NETRC_MACHINE = 'twitch'
@ -77,21 +78,25 @@ class TwitchBaseIE(InfoExtractor):
page_url = urlh.geturl() page_url = urlh.geturl()
post_url = self._search_regex( post_url = self._search_regex(
r'<form[^>]+action=(["\'])(?P<url>.+?)\1', page, r'<form[^>]+action=(["\'])(?P<url>.+?)\1', page,
'post url', default=page_url, group='url') 'post url', default=self._LOGIN_POST_URL, group='url')
post_url = urljoin(page_url, post_url) post_url = urljoin(page_url, post_url)
headers = {'Referer': page_url} headers = {
'Referer': page_url,
'Origin': page_url,
'Content-Type': 'text/plain;charset=UTF-8'
}
try: try:
response = self._download_json( response = self._download_json(
post_url, None, note, post_url, None, note,
data=urlencode_postdata(form), data=json.dumps(form).encode(),
headers=headers) headers=headers)
except ExtractorError as e: except ExtractorError as e:
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.get('message') or response['errors'][0]) fail(response.get('error_description') or response.get('error_code'))
raise raise
if 'Authenticated successfully' in response.get('message', ''): if 'Authenticated successfully' in response.get('message', ''):
@ -105,7 +110,7 @@ class TwitchBaseIE(InfoExtractor):
headers=headers) headers=headers)
login_page, handle = self._download_webpage_handle( login_page, handle = self._download_webpage_handle(
self._LOGIN_URL, None, 'Downloading login page') self._LOGIN_FORM_URL, None, 'Downloading login page')
# Some TOR nodes and public proxies are blocked completely # Some TOR nodes and public proxies are blocked completely
if 'blacklist_message' in login_page: if 'blacklist_message' in login_page:
@ -115,6 +120,7 @@ class TwitchBaseIE(InfoExtractor):
login_page, handle, 'Logging in', { login_page, handle, 'Logging in', {
'username': username, 'username': username,
'password': password, 'password': password,
'client_id': self._CLIENT_ID,
}) })
# Successful login # Successful login