From 9a9bd71634556442f08670b91b844cdcebc7b66d Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 19 Jun 2017 16:07:36 +0200 Subject: [PATCH] Catch file verification errors on update request --- src/File/FileRequest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py index c4f42350..ea114a1c 100644 --- a/src/File/FileRequest.py +++ b/src/File/FileRequest.py @@ -127,7 +127,11 @@ class FileRequest(object): if self.server.files_parsing.get(file_uri): # Check if we already working on it valid = None # Same file else: - valid = site.content_manager.verifyFile(params["inner_path"], content) + try: + valid = site.content_manager.verifyFile(inner_path, content) + except Exception, err: + self.log.debug("Update for %s is invalid" % (inner_path, err)) + valid = False if valid is True: # Valid and changed site.log.info("Update for %s looks valid, saving..." % inner_path) @@ -179,8 +183,7 @@ class FileRequest(object): self.connection.badAction() else: # Invalid sign or sha hash - self.log.debug("Update for %s is invalid" % params["inner_path"]) - self.response({"error": "File invalid"}) + self.response({"error": "File invalid: %s" % err}) self.connection.badAction(5) # Send file content request