diff --git a/plugins/CryptMessage/CryptMessagePlugin.py b/plugins/CryptMessage/CryptMessagePlugin.py index 50b69003..fb895975 100644 --- a/plugins/CryptMessage/CryptMessagePlugin.py +++ b/plugins/CryptMessage/CryptMessagePlugin.py @@ -75,7 +75,7 @@ class UiWebsocketPlugin(object): if text: encrypted = pyelliptic.Cipher(key, iv, 1, ciphername='aes-256-cbc').ciphering(text.encode("utf8")) else: - encrypted = "" + encrypted = b"" res = [base64.b64encode(item).decode("utf8") for item in [key, iv, encrypted]] self.response(to, res) diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py index f316c5f2..98bda0ca 100644 --- a/src/File/FileRequest.py +++ b/src/File/FileRequest.py @@ -133,6 +133,7 @@ class FileRequest(object): valid = site.content_manager.verifyFile(inner_path, content) except Exception as err: self.log.debug("Update for %s is invalid: %s" % (inner_path, err)) + error = err valid = False if valid is True: # Valid and changed @@ -182,7 +183,7 @@ class FileRequest(object): self.connection.badAction() else: # Invalid sign or sha hash - self.response({"error": "File invalid: %s" % err}) + self.response({"error": "File %s invalid: %s" % (inner_path, error)}) self.connection.badAction(5) def isReadable(self, site, inner_path, file, pos):