Cool_Tools/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-28 01:21:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ie/dropbox] Fix password-protected video extraction (#11636)

Browse Source 
Closes #11634
Authored by: bashonly
This commit is contained in:
bashonly 2024-11-27 01:47:28 +00:00 committed by GitHub
parent 910ecc4229
commit 00dcde7286
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
yt_dlp/extractor/dropbox.py
View File

@ -48,32 +48,30 @@ def _real_extract(self, url):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
fn = urllib.parse.unquote(url_basename(url)) fn = urllib.parse.unquote(url_basename(url))
title = os.path.splitext(fn)[0] title = os.path.splitext(fn)[0]
password = self.get_param('videopassword') content_id = None
for part in self._yield_decoded_parts(webpage): for part in self._yield_decoded_parts(webpage):
if '/sm/password' in part: if '/sm/password' in part:
webpage = self._download_webpage( content_id = self._search_regex(r'content_id=([\w.+=/-]+)', part, 'content ID')
update_url('https://www.dropbox.com/sm/password', query=part.partition('?')[2]), video_id)
break break
if (self._og_search_title(webpage, default=None) == 'Dropbox - Password Required' if content_id:
or 'Enter the password for this link' in webpage): password = self.get_param('videopassword')
if password: if not password:
raise ExtractorError('Password protected video, use --video-password <password>', expected=True)
response = self._download_json( response = self._download_json(
'https://www.dropbox.com/sm/auth', video_id, 'POSTing video password', 'https://www.dropbox.com/sm/auth', video_id, 'POSTing video password',
headers={'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'},
data=urlencode_postdata({ data=urlencode_postdata({
'is_xhr': 'true', 'is_xhr': 'true',
't': self._get_cookies('https://www.dropbox.com')['t'].value, 't': self._get_cookies('https://www.dropbox.com')['t'].value,
'content_id': self._search_regex(r'content_id=([\w.+=/-]+)["\']', webpage, 'content id'), 'content_id': content_id,
'password': password, 'password': password,
'url': url, 'url': update_url(url, scheme='', netloc=''),
})) }))
if response.get('status') != 'authed': if response.get('status') != 'authed':
raise ExtractorError('Invalid password', expected=True) raise ExtractorError('Invalid password', expected=True)
elif not self._get_cookies('https://dropbox.com').get('sm_auth'):
raise ExtractorError('Password protected video, use --video-password <password>', expected=True)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
formats, subtitles = [], {} formats, subtitles = [], {}