mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-02 06:27:21 +00:00
[ie/Zoom] gh-7784 fix password handling logic
This commit is contained in:
parent
367ec929f4
commit
2eaf303b63
|
@ -7,6 +7,7 @@
|
||||||
parse_resolution,
|
parse_resolution,
|
||||||
str_or_none,
|
str_or_none,
|
||||||
traverse_obj,
|
traverse_obj,
|
||||||
|
update_url,
|
||||||
url_basename,
|
url_basename,
|
||||||
urlencode_postdata,
|
urlencode_postdata,
|
||||||
urljoin,
|
urljoin,
|
||||||
|
@ -62,39 +63,59 @@ def _get_page_data(self, webpage, video_id):
|
||||||
return self._search_json(
|
return self._search_json(
|
||||||
r'window\.__data__\s*=', webpage, 'data', video_id, transform_source=js_to_json)
|
r'window\.__data__\s*=', webpage, 'data', video_id, transform_source=js_to_json)
|
||||||
|
|
||||||
def _get_real_webpage(self, url, base_url, video_id, url_type):
|
def _try_login(self, url, base_url, video_id, form):
|
||||||
webpage = self._download_webpage(url, video_id, note=f'Downloading {url_type} webpage')
|
# This will most likely only work for password-protected meetings
|
||||||
try:
|
|
||||||
form = self._form_hidden_inputs('password_form', webpage)
|
|
||||||
except ExtractorError:
|
|
||||||
return webpage
|
|
||||||
|
|
||||||
password = self.get_param('videopassword')
|
password = self.get_param('videopassword')
|
||||||
if not password:
|
if not password:
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
'This video is protected by a passcode, use the --video-password option', expected=True)
|
'This video is protected by a passcode, use the --video-password option', expected=True)
|
||||||
|
|
||||||
is_meeting = form.get('useWhichPasswd') == 'meeting'
|
is_meeting = form.get('useWhichPasswd') == 'meeting'
|
||||||
validation = self._download_json(
|
validation = self._download_json(
|
||||||
base_url + 'rec/validate%s_passwd' % ('_meet' if is_meeting else ''),
|
base_url + 'nws/recording/1.0/validate%s-passwd' % ('-meeting' if is_meeting else ''),
|
||||||
video_id, 'Validating passcode', 'Wrong passcode', data=urlencode_postdata({
|
video_id, 'Validating passcode', 'Wrong passcode', data=urlencode_postdata({
|
||||||
'id': form[('meet' if is_meeting else 'file') + 'Id'],
|
'id': form[('meeting' if is_meeting else 'file') + '_id'],
|
||||||
'passwd': password,
|
'passwd': password,
|
||||||
'action': form.get('action'),
|
'action': form.get('action'),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
if not validation.get('status'):
|
if not validation.get('status'):
|
||||||
raise ExtractorError(validation['errorMessage'], expected=True)
|
raise ExtractorError(validation['errorMessage'], expected=True)
|
||||||
return self._download_webpage(url, video_id, note=f'Re-downloading {url_type} webpage')
|
|
||||||
|
def _get_real_webpage(self, url, base_url, video_id, url_type):
|
||||||
|
webpage = self._download_webpage(url, video_id, note=f'Downloading {url_type} webpage')
|
||||||
|
|
||||||
|
data = self._get_page_data(webpage, video_id)
|
||||||
|
if data.get('componentName') != 'need-password': # not password protected
|
||||||
|
return webpage
|
||||||
|
|
||||||
|
# Password-protected:
|
||||||
|
self._try_login(url, base_url, video_id, form=data)
|
||||||
|
# Return the new HTML document
|
||||||
|
new_url = f"{base_url}rec/share/{data['meeting_id']}"
|
||||||
|
return self._download_webpage(new_url, video_id, note=f'Re-downloading {url_type} webpage')
|
||||||
|
|
||||||
|
def _get_share_redirect_url(self, url, base_url, video_id):
|
||||||
|
"""Converts a `/rec/share` url to the corresponding `/rec/play` url, performs login if necessary"""
|
||||||
|
webpage = self._get_real_webpage(url, base_url, video_id, 'share')
|
||||||
|
meeting_id = self._get_page_data(webpage, video_id)['meetingId']
|
||||||
|
redirect_dict = self._download_json(
|
||||||
|
f'{base_url}nws/recording/1.0/play/share-info/{meeting_id}',
|
||||||
|
video_id, note='Downloading share info JSON')['result']
|
||||||
|
redirect_path = redirect_dict.pop('redirectUrl')
|
||||||
|
url = update_url(urljoin(base_url, redirect_path), query_update=redirect_dict)
|
||||||
|
|
||||||
|
if redirect_dict.get('componentName') == 'need-password':
|
||||||
|
# First login, then return redirection URL
|
||||||
|
return self._get_share_redirect_url(url, base_url, video_id)
|
||||||
|
|
||||||
|
return url
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
base_url, url_type, video_id = self._match_valid_url(url).group('base_url', 'type', 'id')
|
base_url, url_type, video_id = self._match_valid_url(url).group('base_url', 'type', 'id')
|
||||||
|
|
||||||
if url_type == 'share':
|
if url_type == 'share':
|
||||||
webpage = self._get_real_webpage(url, base_url, video_id, 'share')
|
url = self._get_share_redirect_url(url, base_url, video_id)
|
||||||
meeting_id = self._get_page_data(webpage, video_id)['meetingId']
|
|
||||||
redirect_path = self._download_json(
|
|
||||||
f'{base_url}nws/recording/1.0/play/share-info/{meeting_id}',
|
|
||||||
video_id, note='Downloading share info JSON')['result']['redirectUrl']
|
|
||||||
url = urljoin(base_url, redirect_path)
|
|
||||||
|
|
||||||
webpage = self._get_real_webpage(url, base_url, video_id, 'play')
|
webpage = self._get_real_webpage(url, base_url, video_id, 'play')
|
||||||
file_id = self._get_page_data(webpage, video_id)['fileId']
|
file_id = self._get_page_data(webpage, video_id)['fileId']
|
||||||
|
@ -107,7 +128,6 @@ def _real_extract(self, url):
|
||||||
'continueMode': 'true', # Makes this return value include interpreter audio information
|
'continueMode': 'true', # Makes this return value include interpreter audio information
|
||||||
},
|
},
|
||||||
note='Downloading play info JSON')['result']
|
note='Downloading play info JSON')['result']
|
||||||
|
|
||||||
subtitles = {}
|
subtitles = {}
|
||||||
# XXX: Would be more appropriate to parse chapters separate from subtitles
|
# XXX: Would be more appropriate to parse chapters separate from subtitles
|
||||||
for _type in ('transcript', 'cc', 'chapter'):
|
for _type in ('transcript', 'cc', 'chapter'):
|
||||||
|
|
Loading…
Reference in a new issue