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

Replace use of pickle in update URL

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-15 14:04:54 +05:30
parent 1e6d9e9583
commit 74e316e20b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/update.py
View File

@ -1,7 +1,7 @@
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import re, binascii, cPickle, ssl, json import re, binascii, ssl, json
from polyglot.builtins import map, unicode_type from polyglot.builtins import map, unicode_type
from threading import Thread, Event from threading import Thread, Event
@ -16,6 +16,7 @@ from calibre.utils.localization import localize_website_link
from calibre.utils.https import get_https_resource_securely from calibre.utils.https import get_https_resource_securely
from calibre.gui2 import config, dynamic, open_url from calibre.gui2 import config, dynamic, open_url
from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available
from calibre.utils.serialize import msgpack_dumps, msgpack_loads
URL = 'https://code.calibre-ebook.com/latest' URL = 'https://code.calibre-ebook.com/latest'
# URL = 'http://localhost:8000/latest' # URL = 'http://localhost:8000/latest'
@ -194,7 +195,7 @@ class UpdateMixin(object):
has_calibre_update = calibre_version != NO_CALIBRE_UPDATE has_calibre_update = calibre_version != NO_CALIBRE_UPDATE
has_plugin_updates = number_of_plugin_updates > 0 has_plugin_updates = number_of_plugin_updates > 0
self.plugin_update_found(number_of_plugin_updates) self.plugin_update_found(number_of_plugin_updates)
version_url = binascii.hexlify(cPickle.dumps((calibre_version, number_of_plugin_updates), -1)) version_url = binascii.hexlify(msgpack_dumps((calibre_version, number_of_plugin_updates)))
calibre_version = u'.'.join(map(unicode_type, calibre_version)) calibre_version = u'.'.join(map(unicode_type, calibre_version))
if not has_calibre_update and not has_plugin_updates: if not has_calibre_update and not has_plugin_updates:
@ -248,7 +249,7 @@ class UpdateMixin(object):
def update_link_clicked(self, url): def update_link_clicked(self, url):
url = unicode_type(url) url = unicode_type(url)
if url.startswith('update:'): if url.startswith('update:'):
calibre_version, number_of_plugin_updates = cPickle.loads(binascii.unhexlify(url[len('update:'):])) calibre_version, number_of_plugin_updates = msgpack_loads(binascii.unhexlify(url[len('update:'):]))
self.update_found(calibre_version, number_of_plugin_updates, force=True) self.update_found(calibre_version, number_of_plugin_updates, force=True)