From db4976186cf4fa8a90ba1341b26811930d710394 Mon Sep 17 00:00:00 2001 From: SpeakerEnder Date: Sun, 31 Mar 2019 00:01:17 -0400 Subject: [PATCH 1/4] Update Authentication for Directv Now --- youtube_dl/extractor/adobepass.py | 41 ++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index 1cf2dcbf3..f41c63388 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', @@ -1491,31 +1491,64 @@ class AdobePassIE(InfoExtractor): }), headers={ 'Content-Type': 'application/x-www-form-urlencoded' }) + elif mso_id == 'ATTOTT': + provider_login_page, urlTest = 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(urlTest.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 = post_form(mvpd_confirm_page_res,'Authenticate') + post_form(mvpd_auth_page,'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 ' Date: Sun, 31 Mar 2019 15:06:40 -0400 Subject: [PATCH 2/4] Clean up variable names --- youtube_dl/extractor/adobepass.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py index f41c63388..a14ffd42c 100644 --- a/youtube_dl/extractor/adobepass.py +++ b/youtube_dl/extractor/adobepass.py @@ -1492,7 +1492,7 @@ class AdobePassIE(InfoExtractor): 'Content-Type': 'application/x-www-form-urlencoded' }) elif mso_id == 'ATTOTT': - provider_login_page, urlTest = post_form(provider_redirect_page_res,'Pressing Continuing', {'submit': 'Continue'}) + 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, @@ -1505,7 +1505,7 @@ class AdobePassIE(InfoExtractor): post_url = login_widget_data['TGuardAuthPostUrl'] if not re.match(r'https?://', post_url): - post_url = compat_urlparse.urljoin(urlTest.geturl(), 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, @@ -1517,8 +1517,8 @@ class AdobePassIE(InfoExtractor): post_url, video_id, 'Submit User/Password', data=urlencode_postdata(form_data), headers={ 'Content-Type': 'application/x-www-form-urlencoded', }) - mvpd_auth_page = post_form(mvpd_confirm_page_res,'Authenticate') - post_form(mvpd_auth_page,'Call SAMLAssert') + mvpd_auth_page_res = post_form(mvpd_confirm_page_res,'Authenticate') + post_form(mvpd_auth_page_res,'Call SAMLAssert') else: # Some providers have another meta refresh # based redirect that should be followed. From e4e393b983bfe151fc09b13d96e7b946fab68142 Mon Sep 17 00:00:00 2001 From: SpeakerEnder Date: Mon, 23 Sep 2019 22:32:35 -0400 Subject: [PATCH 3/4] Update go to select brand. --- youtube_dl/extractor/go.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/go.py b/youtube_dl/extractor/go.py index 5916f9a8f..2a032178d 100644 --- a/youtube_dl/extractor/go.py +++ b/youtube_dl/extractor/go.py @@ -78,13 +78,17 @@ class GoIE(AdobePassIE): def _extract_videos(self, brand, video_id='-1', show_id='-1'): display_id = video_id if video_id != '-1' else show_id + foo = 'http://api.contents.watchabc.go.com/vp2/ws/contents/3000/videos/%s/001/-1/%s/-1/%s/-1/-1.json' % (brand, show_id, video_id) + print("Foo is:", foo) return self._download_json( 'http://api.contents.watchabc.go.com/vp2/ws/contents/3000/videos/%s/001/-1/%s/-1/%s/-1/-1.json' % (brand, show_id, video_id), display_id)['video'] def _real_extract(self, url): sub_domain, video_id, display_id = re.match(self._VALID_URL, url).groups() + print("sub_domain:",sub_domain) site_info = self._SITE_INFO.get(sub_domain, {}) + print("site_info:", site_info) brand = site_info.get('brand') if not video_id or not site_info: webpage = self._download_webpage(url, display_id or video_id) @@ -97,7 +101,8 @@ class GoIE(AdobePassIE): brand = self._search_regex( (r'data-brand=\s*["\']\s*(\d+)', r'data-page-brand=\s*["\']\s*(\d+)'), webpage, 'brand', - default='004') + default='008') + print("Brand 100:", brand) site_info = next( si for _, si in self._SITE_INFO.items() if si.get('brand') == brand) From 6a413ba6125dcaa66253ed82f135562888dfe12b Mon Sep 17 00:00:00 2001 From: SpeakerEnder Date: Wed, 27 May 2020 21:11:07 -0400 Subject: [PATCH 4/4] Undo go changes --- youtube_dl/extractor/go.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/youtube_dl/extractor/go.py b/youtube_dl/extractor/go.py index 37fe017e2..03cfba91f 100644 --- a/youtube_dl/extractor/go.py +++ b/youtube_dl/extractor/go.py @@ -120,7 +120,6 @@ class GoIE(AdobePassIE): def _extract_videos(self, brand, video_id='-1', show_id='-1'): display_id = video_id if video_id != '-1' else show_id - return self._download_json( 'http://api.contents.watchabc.go.com/vp2/ws/contents/3000/videos/%s/001/-1/%s/-1/%s/-1/-1.json' % (brand, show_id, video_id), display_id)['video'] @@ -145,7 +144,7 @@ class GoIE(AdobePassIE): brand = self._search_regex( (r'data-brand=\s*["\']\s*(\d+)', r'data-page-brand=\s*["\']\s*(\d+)'), webpage, 'brand', - default='004') #was 8 premerge + default='004') site_info = next( si for _, si in self._SITE_INFO.items() if si.get('brand') == brand)