From: Rogério Brito Date: Fri, 16 Mar 2018 16:49:03 +0000 (-0300) Subject: Merge pull request #2 from nbraud/autoupdate X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/1270059fa7cf720bc0533c2cdfe6370923ae4e20?hp=d0a866127feddafcff23f5eb8faa983b702f61c4 Merge pull request #2 from nbraud/autoupdate Disable upstream's autoupdate mechanism. In a distribution, we use our own update mechanism to avoid multiple copies of a given program. Therefore, we disable the updates performed via unsupported means. Knowledgeable users will know what to do in any case. --- diff --git a/debian/patches/remove-autoupdate-mechanism.patch b/debian/patches/remove-autoupdate-mechanism.patch new file mode 100644 index 0000000..69c67f2 --- /dev/null +++ b/debian/patches/remove-autoupdate-mechanism.patch @@ -0,0 +1,255 @@ +Subject: Remove autoupdate mechanism + +--- + youtube_dl/__init__.py | 8 ++- + youtube_dl/options.py | 2 +- + youtube_dl/update.py | 187 ------------------------------------------------- + 3 files changed, 6 insertions(+), 191 deletions(-) + delete mode 100644 youtube_dl/update.py + +diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py +index ba684a0..298ed7e 100644 +Bug: 890119 +Forwarded: no +From: Nicolas Braud-Santoni +Reviewed-by: Nicolas Braud-Santoni +Last-Update: 2018-02-24 +Applied-Upstream: no + +--- a/youtube_dl/__init__.py ++++ b/youtube_dl/__init__.py +@@ -36,7 +36,6 @@ from .utils import ( + write_string, + render_table, + ) +-from .update import update_self + from .downloader import ( + FileDownloader, + ) +@@ -432,7 +431,10 @@ def _real_main(argv=None): + with YoutubeDL(ydl_opts) as ydl: + # Update version + if opts.update_self: +- update_self(ydl.to_screen, opts.verbose, ydl._opener) ++ parser.error( ++ "youtube-dl's self-update mechanism is disabled on Debian.\n" ++ "Please update youtube-dl using apt(8)." ++ ) + + # Remove cache dir + if opts.rm_cachedir: +@@ -440,7 +442,7 @@ def _real_main(argv=None): + + # Maybe do nothing + if (len(all_urls) < 1) and (opts.load_info_filename is None): +- if opts.update_self or opts.rm_cachedir: ++ if opts.rm_cachedir: + sys.exit() + + ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv) +diff --git a/youtube_dl/options.py b/youtube_dl/options.py +index 4c04550..cca8cb6 100644 +--- a/youtube_dl/options.py ++++ b/youtube_dl/options.py +@@ -140,7 +140,7 @@ def parseOpts(overrideArguments=None): + general.add_option( + '-U', '--update', + action='store_true', dest='update_self', +- help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)') ++ help=optparse.SUPPRESS_HELP) + general.add_option( + '-i', '--ignore-errors', + action='store_true', dest='ignoreerrors', default=False, +diff --git a/youtube_dl/update.py b/youtube_dl/update.py +deleted file mode 100644 +index ebce966..0000000 +--- a/youtube_dl/update.py ++++ /dev/null +@@ -1,187 +0,0 @@ +-from __future__ import unicode_literals +- +-import io +-import json +-import traceback +-import hashlib +-import os +-import subprocess +-import sys +-from zipimport import zipimporter +- +-from .utils import encode_compat_str +- +-from .version import __version__ +- +- +-def rsa_verify(message, signature, key): +- from hashlib import sha256 +- assert isinstance(message, bytes) +- byte_size = (len(bin(key[0])) - 2 + 8 - 1) // 8 +- signature = ('%x' % pow(int(signature, 16), key[1], key[0])).encode() +- signature = (byte_size * 2 - len(signature)) * b'0' + signature +- asn1 = b'3031300d060960864801650304020105000420' +- asn1 += sha256(message).hexdigest().encode() +- if byte_size < len(asn1) // 2 + 11: +- return False +- expected = b'0001' + (byte_size - len(asn1) // 2 - 3) * b'ff' + b'00' + asn1 +- return expected == signature +- +- +-def update_self(to_screen, verbose, opener): +- """Update the program file with the latest version from the repository""" +- +- UPDATE_URL = 'https://rg3.github.io/youtube-dl/update/' +- VERSION_URL = UPDATE_URL + 'LATEST_VERSION' +- JSON_URL = UPDATE_URL + 'versions.json' +- UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) +- +- if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'): +- to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.') +- return +- +- # Check if there is a new version +- try: +- newversion = opener.open(VERSION_URL).read().decode('utf-8').strip() +- except Exception: +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: can\'t find the current version. Please try again later.') +- return +- if newversion == __version__: +- to_screen('youtube-dl is up-to-date (' + __version__ + ')') +- return +- +- # Download and check versions info +- try: +- versions_info = opener.open(JSON_URL).read().decode('utf-8') +- versions_info = json.loads(versions_info) +- except Exception: +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: can\'t obtain versions info. Please try again later.') +- return +- if 'signature' not in versions_info: +- to_screen('ERROR: the versions file is not signed or corrupted. Aborting.') +- return +- signature = versions_info['signature'] +- del versions_info['signature'] +- if not rsa_verify(json.dumps(versions_info, sort_keys=True).encode('utf-8'), signature, UPDATES_RSA_KEY): +- to_screen('ERROR: the versions file signature is invalid. Aborting.') +- return +- +- version_id = versions_info['latest'] +- +- def version_tuple(version_str): +- return tuple(map(int, version_str.split('.'))) +- if version_tuple(__version__) >= version_tuple(version_id): +- to_screen('youtube-dl is up to date (%s)' % __version__) +- return +- +- to_screen('Updating to version ' + version_id + ' ...') +- version = versions_info['versions'][version_id] +- +- print_notes(to_screen, versions_info['versions']) +- +- # sys.executable is set to the full pathname of the exe-file for py2exe +- filename = sys.executable if hasattr(sys, 'frozen') else sys.argv[0] +- +- if not os.access(filename, os.W_OK): +- to_screen('ERROR: no write permissions on %s' % filename) +- return +- +- # Py2EXE +- if hasattr(sys, 'frozen'): +- exe = filename +- directory = os.path.dirname(exe) +- if not os.access(directory, os.W_OK): +- to_screen('ERROR: no write permissions on %s' % directory) +- return +- +- try: +- urlh = opener.open(version['exe'][0]) +- newcontent = urlh.read() +- urlh.close() +- except (IOError, OSError): +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: unable to download latest version') +- return +- +- newcontent_hash = hashlib.sha256(newcontent).hexdigest() +- if newcontent_hash != version['exe'][1]: +- to_screen('ERROR: the downloaded file hash does not match. Aborting.') +- return +- +- try: +- with open(exe + '.new', 'wb') as outf: +- outf.write(newcontent) +- except (IOError, OSError): +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: unable to write the new version') +- return +- +- try: +- bat = os.path.join(directory, 'youtube-dl-updater.bat') +- with io.open(bat, 'w') as batfile: +- batfile.write(''' +-@echo off +-echo Waiting for file handle to be closed ... +-ping 127.0.0.1 -n 5 -w 1000 > NUL +-move /Y "%s.new" "%s" > NUL +-echo Updated youtube-dl to version %s. +-start /b "" cmd /c del "%%~f0"&exit /b" +- \n''' % (exe, exe, version_id)) +- +- subprocess.Popen([bat]) # Continues to run in the background +- return # Do not show premature success messages +- except (IOError, OSError): +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: unable to overwrite current version') +- return +- +- # Zip unix package +- elif isinstance(globals().get('__loader__'), zipimporter): +- try: +- urlh = opener.open(version['bin'][0]) +- newcontent = urlh.read() +- urlh.close() +- except (IOError, OSError): +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: unable to download latest version') +- return +- +- newcontent_hash = hashlib.sha256(newcontent).hexdigest() +- if newcontent_hash != version['bin'][1]: +- to_screen('ERROR: the downloaded file hash does not match. Aborting.') +- return +- +- try: +- with open(filename, 'wb') as outf: +- outf.write(newcontent) +- except (IOError, OSError): +- if verbose: +- to_screen(encode_compat_str(traceback.format_exc())) +- to_screen('ERROR: unable to overwrite current version') +- return +- +- to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.') +- +- +-def get_notes(versions, fromVersion): +- notes = [] +- for v, vdata in sorted(versions.items()): +- if v > fromVersion: +- notes.extend(vdata.get('notes', [])) +- return notes +- +- +-def print_notes(to_screen, versions, fromVersion=__version__): +- notes = get_notes(versions, fromVersion) +- if notes: +- to_screen('PLEASE NOTE:') +- for note in notes: +- to_screen(note) diff --git a/debian/patches/series b/debian/patches/series index 21895fb..1d8e12b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ skip_support_file_installation.patch fix_libav_compat_outdated.patch +remove-autoupdate-mechanism.patch