Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that hashes are correct when updating source plugins

Browse Source
This commit is contained in:
Kovid Goyal 2017-03-01 13:01:30 +05:30
parent 0fb0c603da
commit 9c90bd1f59
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/ebooks/metadata/sources/update.py
View File

@ -72,7 +72,7 @@ def patch_plugins():
def update_needed(): def update_needed():
needed = set() needed = {}
current_hashes = cache.get('hashes', {}) current_hashes = cache.get('hashes', {})
hashes = get_https_resource_securely( hashes = get_https_resource_securely(
'https://code.calibre-ebook.com/metadata-sources/hashes.json') 'https://code.calibre-ebook.com/metadata-sources/hashes.json')
@ -80,18 +80,22 @@ def update_needed():
hashes = json.loads(hashes) hashes = json.loads(hashes)
for k, v in hashes.iteritems(): for k, v in hashes.iteritems():
if current_hashes.get(k) != v: if current_hashes.get(k) != v:
needed.add(k) needed[k] = v
remove = set(current_hashes) - set(hashes) remove = set(current_hashes) - set(hashes)
if remove: if remove:
for k in remove: with cache:
current_hashes.pop(k, None) for k in remove:
cache['hashes'] = current_hashes current_hashes.pop(k, None)
del cache[k]
cache['hashes'] = current_hashes
return needed return needed
def update_plugin(name, updated): def update_plugin(name, updated, expected_hash):
raw = get_https_resource_securely('https://code.calibre-ebook.com/metadata-sources/' + name) raw = get_https_resource_securely('https://code.calibre-ebook.com/metadata-sources/' + name)
h = hashlib.sha1(raw).hexdigest() h = hashlib.sha1(raw).hexdigest()
if h != expected_hash:
raise ValueError('Actual hash did not match expected hash, probably an update occurred while downloading')
plugin = bz2.decompress(raw).decode('utf-8') plugin = bz2.decompress(raw).decode('utf-8')
updated[name] = plugin, h updated[name] = plugin, h
@ -111,10 +115,10 @@ def main(report_error, report_action=prints):
if not needed: if not needed:
return return
updated = {} updated = {}
for name in needed: for name, expected_hash in needed.iteritems():
report_action('Updating metadata source {}...'.format(name)) report_action('Updating metadata source {}...'.format(name))
try: try:
update_plugin(name, updated) update_plugin(name, updated, expected_hash)
except Exception as e: except Exception as e:
report_error('Failed to get plugin {} with error: {}'.format( report_error('Failed to get plugin {} with error: {}'.format(
name, as_unicode(e))) name, as_unicode(e)))