From c24dda1c203b5818b347787f8b2e88804c2a40a4 Mon Sep 17 00:00:00 2001 From: Niklas Date: Sat, 6 Oct 2018 02:37:33 +0200 Subject: [PATCH 1/3] ignore ttml files with .tt extension --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c4870a6ba..89f4c3b35 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ updates_key.pem *.egg-info *.srt *.ttml +*.tt *.sbv *.vtt *.flv From 8598dd3887e572a770b52a3d73abaa381f0b872f Mon Sep 17 00:00:00 2001 From: Niklas Date: Sat, 6 Oct 2018 02:38:19 +0200 Subject: [PATCH 2/3] [adobepass] fix DIRECTV NOW login (fixes #17770) --- youtube_dl/extractor/adobepass.py | 48 ++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 1cf2dcbf3..60ecfd478 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -27,8 +27,8 @@ MSO_INFO = { }, 'ATTOTT': { 'name': 'DIRECTV NOW', - 'username_field': 'email', - 'password_field': 'loginpassword', + 'username_field': 'userid', + 'password_field': 'password', }, 'Rogers': { 'name': 'Rogers', @@ -1503,12 +1503,46 @@ class AdobePassIE(InfoExtractor): '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, - }) + + # The DIRECTV NOW login is usually JavaScript-based, but the + # needed form data can be extracted from a script block. + if mso_id == 'ATTOTT': + provider_login_page, urlh = provider_login_page_res + login_widget_data_json = self._html_search_regex( + r'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(urlh.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, 'Logging in', data=urlencode_postdata(form_data), headers={ + 'Content-Type': 'application/x-www-form-urlencoded', + }) + else: + 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') + mvpd_continue_page_res = post_form(mvpd_confirm_page_res, 'Confirming Login') + + # DIRECTV NOW requires another form based redirect to be followed. + if mso_id == 'ATTOTT': + post_form(mvpd_continue_page_res, 'Continuing login') session = self._download_webpage( self._SERVICE_PROVIDER_TEMPLATE % 'session', video_id, From 8625f1c68bfa9e0468618c9444ae8d2922a486f5 Mon Sep 17 00:00:00 2001 From: Niklas Date: Sat, 6 Oct 2018 19:40:45 +0200 Subject: [PATCH 3/3] [adobepass] support both of DIRECTV NOW's login schemes at the same time --- youtube_dl/extractor/adobepass.py | 36 ++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 60ecfd478..1fcf2ed36 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -27,8 +27,8 @@ MSO_INFO = { }, 'ATTOTT': { 'name': 'DIRECTV NOW', - 'username_field': 'userid', - 'password_field': 'password', + 'username_field': 'email', + 'password_field': 'loginpassword', }, 'Rogers': { 'name': 'Rogers', @@ -1355,15 +1355,17 @@ class AdobePassIE(InfoExtractor): token_expires = unified_timestamp(re.sub(r'[_ ]GMT', '', xml_text(token, date_ele))) return token_expires and token_expires <= int(time.time()) - def post_form(form_page_res, note, data={}): + def post_form(form_page_res, note, data={}, fatal=True): form_page, urlh = form_page_res - post_url = self._html_search_regex(r']+action=(["\'])(?P.+?)\1', form_page, 'post url', group='url') + post_url = self._html_search_regex(r']+action=(["\'])(?P.+?)\1', form_page, 'post url', group='url', fatal=fatal) + if not post_url: + return None if not re.match(r'https?://', post_url): post_url = compat_urlparse.urljoin(urlh.geturl(), post_url) form_data = self._hidden_inputs(form_page) form_data.update(data) return self._download_webpage_handle( - post_url, video_id, note, data=urlencode_postdata(form_data), headers={ + post_url, video_id, note, data=urlencode_postdata(form_data), fatal=fatal, headers={ 'Content-Type': 'application/x-www-form-urlencoded', }) @@ -1504,9 +1506,13 @@ class AdobePassIE(InfoExtractor): provider_login_page_res = post_form( provider_redirect_page_res, self._DOWNLOADING_LOGIN_PAGE) - # The DIRECTV NOW login is usually JavaScript-based, but the - # needed form data can be extracted from a script block. - if mso_id == 'ATTOTT': + 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, + }, fatal=mso_id != 'ATTOTT') + + # Sometimes, DIRECTV NOW uses a JavaScript-based login. + if mso_id == 'ATTOTT' and not mvpd_confirm_page_res: provider_login_page, urlh = provider_login_page_res login_widget_data_json = self._html_search_regex( r'var LoginWidgetAdditionalAttr = (.*)//-->', @@ -1522,8 +1528,8 @@ class AdobePassIE(InfoExtractor): form_data = login_widget_data['formSubmitParams'] form_data.update({ - mso_info.get('username_field', 'username'): username, - mso_info.get('password_field', 'password'): password, + 'userid': username, + 'password': password, 'remember_me': 'Y', }) @@ -1531,17 +1537,13 @@ class AdobePassIE(InfoExtractor): post_url, video_id, 'Logging in', data=urlencode_postdata(form_data), headers={ 'Content-Type': 'application/x-www-form-urlencoded', }) - else: - 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': mvpd_continue_page_res = post_form(mvpd_confirm_page_res, 'Confirming Login') - # DIRECTV NOW requires another form based redirect to be followed. - if mso_id == 'ATTOTT': + # DIRECTV NOW requires another form-based redirect to be + # followed if the JavaScript-based login was required. + if mso_id == 'ATTOTT' and not mvpd_confirm_page_res: post_form(mvpd_continue_page_res, 'Continuing login') session = self._download_webpage(