diff options
author | Sergey M․ <[email protected]> | 2019-01-20 18:21:31 +0700 |
---|---|---|
committer | Sergey M․ <[email protected]> | 2019-01-20 18:21:31 +0700 |
commit | a1a460759815414c6194bc921ac77a5533b6e02e (patch) | |
tree | 4637c6f89f463743f67c563f2e7437216449b78a | |
parent | 73c19aaa9f74e9383a7aaf0dfb3c608727d5b6b2 (diff) | |
download | youtube-dl-a1a460759815414c6194bc921ac77a5533b6e02e.tar.gz youtube-dl-a1a460759815414c6194bc921ac77a5533b6e02e.zip |
[vimeo] Fix video password verification for videos protected by Referer HTTP header
-rw-r--r-- | youtube_dl/extractor/vimeo.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index fd37f919b..6215b3258 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -435,6 +435,8 @@ class VimeoIE(VimeoBaseInfoExtractor): 'url': 'https://vimeo.com/160743502/abd0e13fb4', 'only_matching': True, } + # https://gettingthingsdone.com/workflowmap/ + # vimeo embed with check-password page protected by Referer header ] @staticmethod @@ -465,20 +467,22 @@ class VimeoIE(VimeoBaseInfoExtractor): urls = VimeoIE._extract_urls(url, webpage) return urls[0] if urls else None - def _verify_player_video_password(self, url, video_id): + def _verify_player_video_password(self, url, video_id, headers): password = self._downloader.params.get('videopassword') if password is None: raise ExtractorError('This video is protected by a password, use the --video-password option') data = urlencode_postdata({ 'password': base64.b64encode(password.encode()), }) - pass_url = url + '/check-password' - password_request = sanitized_Request(pass_url, data) - password_request.add_header('Content-Type', 'application/x-www-form-urlencoded') - password_request.add_header('Referer', url) - return self._download_json( - password_request, video_id, - 'Verifying the password', 'Wrong password') + headers = merge_dicts(headers, { + 'Content-Type': 'application/x-www-form-urlencoded', + }) + checked = self._download_json( + url + '/check-password', video_id, + 'Verifying the password', data=data, headers=headers) + if checked is False: + raise ExtractorError('Wrong video password', expected=True) + return checked def _real_initialize(self): self._login() @@ -591,7 +595,7 @@ class VimeoIE(VimeoBaseInfoExtractor): cause=e) else: if config.get('view') == 4: - config = self._verify_player_video_password(redirect_url, video_id) + config = self._verify_player_video_password(redirect_url, video_id, headers) vod = config.get('video', {}).get('vod', {}) |