Skip to content

Fix SSL and token issues #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jussihi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix SSL and token issues #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f291a70
Add SSL support
Oct 4, 2019
9cd376d
Rename token to account_playback_token
Oct 4, 2019
9e6fc07
Force youtube downloader to use https links instead of http
Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pytomo/lib_general_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import urllib2
import tempfile
import os
import ssl
from urlparse import urlsplit
#import cookielib

Expand Down Expand Up @@ -484,8 +485,7 @@ def establish_connection(url, ip_address=None):
while count <= retries:
# Establish connection
try:
data = urllib2.urlopen(request,
timeout=config_pytomo.URL_TIMEOUT)
data = urllib2.urlopen(request, context=ssl._create_unverified_context())
#data = opener.open(request)
break
except (urllib2.HTTPError, ), err:
Expand All @@ -497,8 +497,7 @@ def establish_connection(url, ip_address=None):
config_pytomo.LOG.exception(err)
try:
# Open the connection again without the range header
data = urllib2.urlopen(basic_request,
timeout=config_pytomo.URL_TIMEOUT)
data = urllib2.urlopen(request, context=ssl._create_unverified_context())
#data = opener.open(basic_request)
except (urllib2.HTTPError, ), err:
if err.code < 500 or err.code >= 600:
Expand Down
18 changes: 9 additions & 9 deletions pytomo/lib_youtube_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def get_video_info(self, video_id):
self.report_video_webpage_download(video_id)
video_info = None
for el_type in ['&el=embedded', '&el=detailpage', '&el=vevo', '']:
video_info_url = ('http://www.youtube.com/get_video_info?\
video_info_url = ('https://www.youtube.com/get_video_info?\
&video_id=%s%s&ps=default&eurl=&gl=US&hl=en' % (video_id, el_type))
request = urllib2.Request(video_info_url, None,
config_pytomo.STD_HEADERS)
Expand All @@ -138,31 +138,31 @@ def get_video_info(self, video_id):
video_info_webpage = urllib2.urlopen(request,
timeout=config_pytomo.URL_TIMEOUT).read()
video_info = parse_qs(video_info_webpage)
if 'token' in video_info:
if 'account_playback_token' in video_info:
break
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self._downloader.trouble(
u'ERROR: unable to download video info webpage: %s'
% str(err))
return
if 'token' not in video_info:
if 'account_playback_token' not in video_info:
if 'reason' in video_info:
self._downloader.trouble(u'ERROR: YouTube said: %s'
% video_info['reason'][0].decode(
'utf-8'))
else:
self._downloader.trouble(u'ERROR: "token" parameter not in'
self._downloader.trouble(u'ERROR: "account_playback_token" parameter not in'
'video info for unknown reason')
return None
# JLS => add text more readable for the the file LOG
config_pytomo.LOG.debug('%d keys of video_info are : %s' % (video_info.__len__(), video_info.keys()))
config_pytomo.LOG.debug("video_info['token'] : %s" % video_info['token'])
config_pytomo.LOG.debug("video_info['account_playback_token'] : %s" % video_info['account_playback_token'])
return video_info

@staticmethod
def get_swf(video_webpage, mobj):
"Attempt to extract SWF player URL"
mobj = re.search(r'swfConfig.*?"(http:\\/\\/.*?watch.*?-.*?\.swf)"',
mobj = re.search(r'swfConfig.*?"(https:\\/\\/.*?watch.*?-.*?\.swf)"',
video_webpage)
if mobj is not None:
player_url = re.sub(r'\\(.)', r'\1', mobj.group(1))
Expand All @@ -178,7 +178,7 @@ def get_video_url_list(self, video_id, video_token, video_info,
"""
video_url_list = None
#req_format = self._downloader.params.get('format', None)
get_video_template = ('http://www.youtube.com/get_video?'
get_video_template = ('https://www.youtube.com/get_video?'
Copy link
Copy Markdown

@jacksgt jacksgt Oct 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the line I still needed :-)

+ 'video_id=%s&t=%s&eurl=&el=&ps=&asv=&fmt=%%s'
% (video_id, video_token))
if 'fmt_url_map' in video_info:
Expand Down Expand Up @@ -258,7 +258,7 @@ def _real_extract(self, url):
return
# Start extracting information
self.report_information_extraction(video_id)
video_token = urllib.unquote_plus(video_info['token'][0])
video_token = urllib.unquote_plus(video_info['account_playback_token'][0])
video_url_list = self.get_video_url_list(video_id, video_token,
video_info)
for format_param, video_real_url in video_url_list:
Expand Down Expand Up @@ -321,7 +321,7 @@ def get_cache_url(url, redirect=False, hd_first=False):
except Exception, mes:
config_pytomo.LOG.exception('Uncaught exception: %s' % mes)
return None
video_token = urllib.unquote_plus(video_info['token'][0])
video_token = urllib.unquote_plus(video_info['account_playback_token'][0])
# req_format='-1' for all available formats
# req_format=None for best available format
try:
Expand Down