docker IO files are now in bytes

Author: frankcorneliusmartin

vantage/node/docker_manager.py

@@ -133,7 +133,7 @@ def is_docker_image_allowed(self, docker_image_name: str):
         return False
 
     def run(self, result_id: int,  image: str, database_uri: str, 
-        docker_input: str, tmp_vol_name: int, token: str) -> bool:
+        docker_input: bytes, tmp_vol_name: int, token: str) -> bool:
         """ Runs the docker-image in detached mode.
 
             It will will attach all mounts (input, output and datafile)
@@ -158,8 +158,8 @@ def run(self, result_id: int,  image: str, database_uri: str,
         self.log.debug("prepare IO files in docker volume")
         io_files = [
             ('input', docker_input), 
-            ('output', ''), 
-            ('token', token), 
+            ('output', b''), 
+            ('token', token.encode("ascii")), 
         ]
 
         # the data-volume is shared amongst all algorithm containers,
@@ -174,8 +174,8 @@ def run(self, result_id: int,  image: str, database_uri: str,
         io_path = pathlib.Path("/mnt/data-volume") / folder_name
         os.makedirs(io_path, exist_ok=True)
         for (filename, contents) in io_files:
-            path = io_path / f"{filename}.txt"
-            with open(path, 'w') as fp:
+            path = io_path / f"{filename}"
+            with open(path, 'wb') as fp:
                 fp.write(contents)
 
         # attempt to pull the latest image
@@ -190,9 +190,9 @@ def run(self, result_id: int,  image: str, database_uri: str,
         # facilitate indirect communication with the central server
         tmp_folder = "/mnt/tmp" # docker env
         environment_variables = {
-            "INPUT_FILE": str(io_path / "input.txt"),
-            "OUTPUT_FILE": str(io_path / "output.txt"),
-            "TOKEN_FILE": str(io_path / "token.txt"),
+            "INPUT_FILE": str(io_path / "input"),
+            "OUTPUT_FILE": str(io_path / "output"),
+            "TOKEN_FILE": str(io_path / "token"),
             "TEMPORARY_FOLDER": tmp_folder,
             "DATABASE_URI": "/mnt/data-volume/database.csv",
             "HOST": f"http://{cs.NODE_PROXY_SERVER_HOSTNAME}",
@@ -228,7 +228,7 @@ def run(self, result_id: int,  image: str, database_uri: str,
         self.active_tasks.append({
             "result_id": result_id,
             "container": container,
-            "output_file": io_path / "output.txt"
+            "output_file": io_path / "output"
         })
 
         return True

vantage/node/encryption.py

@@ -247,21 +247,10 @@ def __init__(self, private_key_file=None):
         self.log.warning(
                 "Encrpytion disabled! Use this only for debugging")
 
-        
-    def encrypt_obj_to_base64(
-        self, msg: dict, public_key_base64: str) -> str:
-        """ Encrypt dictonairy `msg` using `public_key_base64`.
-        """
-        msg_ = prepare_bytes_for_transport(msg)
-        return pickle.dumps(msg_)
-
-    def encrypt_str_to_base64(
-        self, msg: str, public_key_base64: str) -> str:
-        return msg
-
+    
     def encrypt_bytes_to_base64(
         self, msg: bytes, public_key_base64: str) -> str:
-        return msg.decode(cs.STRING_ENCODING)
+        return prepare_bytes_for_transport(msg)
 
     def encrypt_bytes(self, msg: bytes, public_key_bytes: bytes) -> bytes:
         return msg
@@ -270,14 +259,4 @@ def decrypt_bytes(self, msg: bytes) -> bytes:
         return msg
 
     def decrypt_bytes_from_base64(self, msg: str) -> bytes:
-        return msg.encode(cs.STRING_ENCODING)
-
-    def decrypt_str_from_base64(self, msg: str) -> str:
-        return msg
-
-    def decrypt_obj_from_base64(self, msg: str) -> dict:
-        if msg:
-            msg_ = unpack_bytes_from_transport(msg)
-            return pickle.loads(msg_)
-        else: 
-            return b""
+        return unpack_bytes_from_transport(msg)

vantage/node/proxy_server.py

@@ -139,7 +139,7 @@ def proxy_task_result(id):
         ).json()
         unencrypted = []
         for result in results:
-            result["result"] = server_io.cryptor.decrypt_obj_from_base64(
+            result["result"] = server_io.cryptor.decrypt_bytes_from_base64(
                 result["result"]
             )
             unencrypted.append(result)
@@ -172,7 +172,7 @@ def proxy_results(id):
             headers={'Authorization': auth}
         )
         encrypted_input = response["result"]
-        response["result"] = server_io.cryptor.decrypt_obj_from_base64(
+        response["result"] = server_io.cryptor.decrypt_bytes_from_base64(
             response["result"]
         )
         log.error(response)

vantage/node/server_io.py

@@ -351,11 +351,11 @@ def get_results(self, id=None, state=None, include_task=False,
         if not id:
             for result in results:
                 try:
-                    result["input"] = self.cryptor.decrypt_obj_from_base64(
+                    result["input"] = self.cryptor.decrypt_bytes_from_base64(
                         result["input"]
                     )
                     if result["result"]:
-                        result["result"] = self.cryptor.decrypt_obj_from_base64(
+                        result["result"] = self.cryptor.decrypt_bytes_from_base64(
                             result["result"]
                         )
 
@@ -370,10 +370,10 @@ def get_results(self, id=None, state=None, include_task=False,
             return results_unencrypted
         else:
             try:
-                results["input"] = self.cryptor.decrypt_obj_from_base64(
+                results["input"] = self.cryptor.decrypt_bytes_from_base64(
                     results["input"]
                 )
-                results["result"] = self.cryptor.decrypt_obj_from_base64(
+                results["result"] = self.cryptor.decrypt_bytes_from_base64(
                     results["result"]
                 )
             except ValueError as e: