mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-30 22:05:08 +02:00
[safari] Improve authentication detection (closes #13319)
This commit is contained in:
parent
931adf8cc1
commit
4244a13a1d
@ -16,7 +16,6 @@ from ..utils import (
|
|||||||
|
|
||||||
class SafariBaseIE(InfoExtractor):
|
class SafariBaseIE(InfoExtractor):
|
||||||
_LOGIN_URL = 'https://www.safaribooksonline.com/accounts/login/'
|
_LOGIN_URL = 'https://www.safaribooksonline.com/accounts/login/'
|
||||||
_SUCCESSFUL_LOGIN_REGEX = r'<a href="/accounts/logout/"[^>]*>Sign Out</a>'
|
|
||||||
_NETRC_MACHINE = 'safari'
|
_NETRC_MACHINE = 'safari'
|
||||||
|
|
||||||
_API_BASE = 'https://www.safaribooksonline.com/api/v1'
|
_API_BASE = 'https://www.safaribooksonline.com/api/v1'
|
||||||
@ -28,10 +27,6 @@ class SafariBaseIE(InfoExtractor):
|
|||||||
self._login()
|
self._login()
|
||||||
|
|
||||||
def _login(self):
|
def _login(self):
|
||||||
# We only need to log in once for courses or individual videos
|
|
||||||
if self.LOGGED_IN:
|
|
||||||
return
|
|
||||||
|
|
||||||
(username, password) = self._get_login_info()
|
(username, password) = self._get_login_info()
|
||||||
if username is None:
|
if username is None:
|
||||||
return
|
return
|
||||||
@ -39,11 +34,17 @@ class SafariBaseIE(InfoExtractor):
|
|||||||
headers = std_headers.copy()
|
headers = std_headers.copy()
|
||||||
if 'Referer' not in headers:
|
if 'Referer' not in headers:
|
||||||
headers['Referer'] = self._LOGIN_URL
|
headers['Referer'] = self._LOGIN_URL
|
||||||
login_page_request = sanitized_Request(self._LOGIN_URL, headers=headers)
|
|
||||||
|
|
||||||
login_page = self._download_webpage(
|
login_page = self._download_webpage(
|
||||||
login_page_request, None,
|
self._LOGIN_URL, None, 'Downloading login form', headers=headers)
|
||||||
'Downloading login form')
|
|
||||||
|
def is_logged(webpage):
|
||||||
|
return any(re.search(p, webpage) for p in (
|
||||||
|
r'href=["\']/accounts/logout/', r'>Sign Out<'))
|
||||||
|
|
||||||
|
if is_logged(login_page):
|
||||||
|
self.LOGGED_IN = True
|
||||||
|
return
|
||||||
|
|
||||||
csrf = self._html_search_regex(
|
csrf = self._html_search_regex(
|
||||||
r"name='csrfmiddlewaretoken'\s+value='([^']+)'",
|
r"name='csrfmiddlewaretoken'\s+value='([^']+)'",
|
||||||
@ -62,15 +63,13 @@ class SafariBaseIE(InfoExtractor):
|
|||||||
login_page = self._download_webpage(
|
login_page = self._download_webpage(
|
||||||
request, None, 'Logging in as %s' % username)
|
request, None, 'Logging in as %s' % username)
|
||||||
|
|
||||||
if re.search(self._SUCCESSFUL_LOGIN_REGEX, login_page) is None:
|
if not is_logged(login_page):
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
'Login failed; make sure your credentials are correct and try again.',
|
'Login failed; make sure your credentials are correct and try again.',
|
||||||
expected=True)
|
expected=True)
|
||||||
|
|
||||||
self.LOGGED_IN = True
|
self.LOGGED_IN = True
|
||||||
|
|
||||||
self.to_screen('Login successful')
|
|
||||||
|
|
||||||
|
|
||||||
class SafariIE(SafariBaseIE):
|
class SafariIE(SafariBaseIE):
|
||||||
IE_NAME = 'safari'
|
IE_NAME = 'safari'
|
||||||
|
Loading…
Reference in New Issue
Block a user