Fix build failures

Author: john-cado

Diff for: tests/test_import.py

@@ -8,12 +8,11 @@
 
 class TestImport(unittest.TestCase):
     system: BaseSystem
-    zip_path: str
 
     @classmethod
     def setUpClass(cls) -> None:
         cls.system = acquire_system()
-        cls.zip_path = cls.system.acquire_volatile()
+        cls.system.acquire_volatile()
 
     @classmethod
     def tearDownClass(cls) -> None:
@@ -29,5 +28,5 @@ def test_get_network(self) -> None:
 
     def test_got_files(self) -> None:
         # Check we got atleast 10 files
-        with ZipFile(self.zip_path) as z:
+        with ZipFile(self.system.output_path) as z:
             self.assertGreater(len(z.namelist()), 10)

Diff for: tests/test_linux/test_base.py

@@ -5,18 +5,13 @@
 
 class TestBaseCases(unittest.TestCase):
     system: BaseSystem
-    zip_path: str
 
     @classmethod
     def setUpClass(cls) -> None:
         cls.system = acquire_system()
-        cls.zip_path = cls.system.acquire_volatile()
+        cls.system.acquire_volatile()
 
 
-    @classmethod
-    def tearDownClass(cls) -> None:
-        pass
-
     def test_some_processes(self) -> None:
         processes = self.system.get_processes()
         self.assertTrue(len(processes) > 0)
@@ -28,7 +23,7 @@ def test_dump_files(self) -> None:
         open_files = self.system.dump_loaded_files()
         self.assertTrue(len(open_files) > 0)
         # Check we pulled at least one file from /bin/
-        with ZipFile(self.zip_path) as z:
+        with ZipFile(self.system.output_path) as z:
             binary_files = [binary for binary in z.namelist() if ("/bin/" in binary in binary.lower())]
             self.assertGreater(len(binary_files), 0)
 

Diff for: tests/test_shared.py

@@ -6,12 +6,11 @@
 
 class TestBaseCases(unittest.TestCase):
     system: BaseSystem
-    zip_path: str
 
     @classmethod
     def setUpClass(cls) -> None:
         cls.system = acquire_system()
-        cls.zip_path = cls.system.acquire_volatile()
+        cls.system.acquire_volatile()
 
     @classmethod
     def tearDownClass(cls) -> None:
@@ -27,5 +26,5 @@ def test_get_network(self) -> None:
 
     def test_got_files(self) -> None:
         # Check we got atleast 10 files
-        with ZipFile(self.zip_path) as z:
+        with ZipFile(self.system.output_path) as z:
             self.assertGreater(len(z.namelist()), 10)

Diff for: varc_core/systems/base_system.py

@@ -18,7 +18,7 @@
 import zipfile
 from base64 import b64encode
 from datetime import datetime
-from typing import Any, List, Optional
+from typing import IO, Any, List, Optional, Union
 
 import lz4.frame
 import mss
@@ -40,12 +40,12 @@ class _TarLz4Wrapper:
 
     def __init__(self, path) -> None:
         self._lz4 = lz4.frame.open(path, 'wb')
-        self._tar = tarfile.open(fileobj=self._lz4f, mode="w")
+        self._tar = tarfile.open(fileobj=self._lz4, mode="w")
 
-    def writestr(self, path: str, value: str | bytes):
+    def writestr(self, path: str, value: Union[str, bytes]):
         info = tarfile.TarInfo(path)
         info.size = len(value)
-        self._tar.addfile(info, io.BytesIO(value))
+        self._tar.addfile(info, io.BytesIO(value if isinstance(value, bytes) else value.encode()))
 
     def write(self, path: str, arcname: str):
         self._tar.add(path, arcname)
@@ -339,7 +339,7 @@ def acquire_volatile(self) -> None:
                     except FileNotFoundError:
                         logging.warning(f"Could not open {file_path} for reading")
 
-    def _open_output(self) -> zipfile.ZipFile | _TarLz4Wrapper:
+    def _open_output(self) -> Union[zipfile.ZipFile, _TarLz4Wrapper]:
         if self.output_path.endswith('.tar.lz4'):
             return _TarLz4Wrapper(self.output_path)
         else: