Madeorsk
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 6a413ba612 into d65d89183f

This commit is contained in:
speakerender 2020-09-30 04:23:47 +02:00 committed by GitHub
parent d65d89183f 6a413ba612
commit 873f9eaa3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
youtube_dl/extractor/adobepass.py
View File

@ -32,8 +32,8 @@ MSO_INFO = {
},
'ATTOTT': {
'name': 'DIRECTV NOW',
'username_field': 'email',
'password_field': 'loginpassword',
'username_field': 'userid',
'password_field': 'password',
},
'Rogers': {
'name': 'Rogers',
@ -1496,31 +1496,64 @@ class AdobePassIE(InfoExtractor):
}), headers={
'Content-Type': 'application/x-www-form-urlencoded'
})
elif mso_id == 'ATTOTT':
provider_login_page, provider_login_url = post_form(provider_redirect_page_res,'Pressing Continuing', {'submit': 'Continue'})
login_widget_data_json = self._html_search_regex(
"var LoginWidgetAdditionalAttr = (.*)//-->",
provider_login_page,
'login form data json',
flags=re.DOTALL)
login_widget_data = self._parse_json(login_widget_data_json, 'login form data')
login_widget_data = login_widget_data['LoginWidgetSetting']
post_url = login_widget_data['TGuardAuthPostUrl']
if not re.match(r'https?://', post_url):
post_url = compat_urlparse.urljoin(provider_login_url.geturl(), post_url)
form_data = login_widget_data['formSubmitParams']
form_data.update({
mso_info.get('username_field', 'username'): username,
mso_info.get('password_field', 'password'): password,
'remember_me': 'Y',
})
mvpd_confirm_page_res = self._download_webpage_handle(
post_url, video_id, 'Submit User/Password', data=urlencode_postdata(form_data), headers={
'Content-Type': 'application/x-www-form-urlencoded',
})
mvpd_auth_page_res = post_form(mvpd_confirm_page_res,'Authenticate')
post_form(mvpd_auth_page_res,'Call SAMLAssert')
else:
# Some providers (e.g. DIRECTV NOW) have another meta refresh
# Some providers have another meta refresh
# based redirect that should be followed.
provider_redirect_page, urlh = provider_redirect_page_res
provider_refresh_redirect_url = extract_redirect_url(
provider_redirect_page, url=urlh.geturl())
if provider_refresh_redirect_url:
provider_redirect_page_res = self._download_webpage_handle(
provider_refresh_redirect_url, video_id,
'Downloading Provider Redirect Page (meta refresh)')
provider_login_page_res = post_form(
provider_redirect_page_res, self._DOWNLOADING_LOGIN_PAGE)
mvpd_confirm_page_res = post_form(provider_login_page_res, 'Logging in', {
mso_info.get('username_field', 'username'): username,
mso_info.get('password_field', 'password'): password,
})
if mso_id != 'Rogers':
post_form(mvpd_confirm_page_res, 'Confirming Login')
session = self._download_webpage(
self._SERVICE_PROVIDER_TEMPLATE % 'session', video_id,
'Retrieving Session', data=urlencode_postdata({
'_method': 'GET',
'requestor_id': requestor_id,
}), headers=mvpd_headers)
if '<pendingLogout' in session:
self._downloader.cache.store(self._MVPD_CACHE, requestor_id, {})
count += 1