Merge pull request #1947 from radfish/PR-py3--cryptmsg-base64-type

CryptMessage: base64 arg type byte-array; File: set error message before use

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)

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):