oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch verify exceptions on manual site files verification process

Browse source
This commit is contained in:
shortcutme 2017-06-19 15:57:02 +02:00
parent 7653cba247
commit ff69b04216
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Site/SiteStorage.py
View file

@ -351,11 +351,16 @@ class SiteStorage(object):
if quick_check: if quick_check:
ok = os.path.getsize(file_path) == content["files"][file_relative_path]["size"] ok = os.path.getsize(file_path) == content["files"][file_relative_path]["size"]
if not ok:
err = "Invalid size"
else: else:
try:
ok = self.site.content_manager.verifyFile(file_inner_path, open(file_path, "rb")) ok = self.site.content_manager.verifyFile(file_inner_path, open(file_path, "rb"))
except Exception, err:
ok = False
if not ok: if not ok:
self.log.debug("[CHANGED] %s" % file_inner_path) self.log.debug("[INVALID] %s: %s" % (file_inner_path, err))
if add_changed or content.get("cert_user_id"): # If updating own site only add changed user files if add_changed or content.get("cert_user_id"): # If updating own site only add changed user files
bad_files.append(file_inner_path) bad_files.append(file_inner_path)
@ -377,7 +382,10 @@ class SiteStorage(object):
if quick_check: if quick_check:
ok = os.path.getsize(file_path) == content["files_optional"][file_relative_path]["size"] ok = os.path.getsize(file_path) == content["files_optional"][file_relative_path]["size"]
else: else:
try:
ok = self.site.content_manager.verifyFile(file_inner_path, open(file_path, "rb")) ok = self.site.content_manager.verifyFile(file_inner_path, open(file_path, "rb"))
except Exception, err:
ok = False
if ok: if ok:
if not self.site.content_manager.hashfield.hasHash(file_node["sha512"]): if not self.site.content_manager.hashfield.hasHash(file_node["sha512"]):