dissect.target 3.22.dev10__tar.gz → 3.22.dev12__tar.gz

{dissect_target-3.22.dev10/dissect.target.egg-info → dissect_target-3.22.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.22.dev10
+Version: 3.22.dev12
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.22.dev10 → dissect_target-3.22.dev12}/dissect/target/loaders/tar.py

@@ -15,11 +15,6 @@ from dissect.target.helpers import fsutil, loaderutil
 from dissect.target.helpers.lazy import import_lazy
 from dissect.target.loader import Loader, SubLoader
 
-ContainerImageTarSubLoader: TarSubLoader = import_lazy(
-    "dissect.target.loaders.containerimage"
-).ContainerImageTarSubLoader
-GenericTarSubLoader: TarSubLoader = import_lazy("dissect.target.loaders.tar").GenericTarSubLoader
-
 log = logging.getLogger(__name__)
 
 TAR_EXT_COMP = (
@@ -38,7 +33,7 @@ TAR_MAGIC_COMP = (
     # gzip
     b"\x1f\x8b",
     # bzip2
-    b"\x42\x5A\x68",
+    b"\x42\x5a\x68",
     # xz
     b"\xfd\x37\x7a\x58\x5a\x00",
 )
@@ -46,59 +41,12 @@ TAR_MAGIC = (tf.GNU_MAGIC, tf.POSIX_MAGIC)
 
 ANON_FS_RE = re.compile(r"^fs[0-9]+$")
 
-
-class TarLoader(Loader):
-    """Load tar files."""
-
-    __subloaders__ = [
-        ContainerImageTarSubLoader,
-        GenericTarSubLoader,  # should be last
-    ]
-
-    def __init__(self, path: Path | str, **kwargs):
-        super().__init__(path)
-
-        if isinstance(path, str):
-            path = Path(path)
-
-        if is_compressed(path):
-            log.warning(
-                f"Tar file {path!r} is compressed, which will affect performance. "
-                "Consider uncompressing the archive before passing the tar file to Dissect."
-            )
-
-        self.fh = path.open("rb")
-        self.tar = tf.open(mode="r:*", fileobj=self.fh)
-        self.subloader = None
-
-    @staticmethod
-    def detect(path: Path) -> bool:
-        return path.name.lower().endswith(TAR_EXT + TAR_EXT_COMP) or is_tar_magic(path, TAR_MAGIC + TAR_MAGIC_COMP)
-
-    def map(self, target: target.Target) -> None:
-        for candidate in self.__subloaders__:
-            if candidate.detect(self.tar):
-                self.subloader = candidate(self.tar)
-                self.subloader.map(target)
-                break
-
-
-def is_tar_magic(path: Path, magics: Iterable[bytes]) -> bool:
-    if not path.is_file():
-        return False
-
-    with path.open("rb") as fh:
-        headers = [fh.read(6)]
-        fh.seek(257)
-        headers.append(fh.read(8))
-        for header in headers:
-            if header.startswith(magics):
-                return True
-    return False
-
-
-def is_compressed(path: Path) -> bool:
-    return path.name.lower().endswith(TAR_EXT_COMP) or is_tar_magic(path, TAR_MAGIC_COMP)
+WINDOWS_MEMBERS = (
+    "windows/system32",
+    "/windows/system32",
+    "winnt",
+    "/winnt",
+)
 
 
 class TarSubLoader(SubLoader[tf.TarFile]):
@@ -130,15 +78,22 @@ class GenericTarSubLoader(TarSubLoader):
 
     def map(self, target: target.Target) -> None:
         volumes = {}
+        windows_found = False
 
         for member in self.tar.getmembers():
             if member.name == ".":
                 continue
 
+            if member.name.lower().startswith(WINDOWS_MEMBERS):
+                windows_found = True
+                if "/" in volumes:
+                    # Root filesystem was already added
+                    volumes["/"].case_sensitive = False
+
             if not member.name.startswith(("/fs/", "fs/", "/sysvol/", "sysvol/")):
                 # Not an acquire tar
                 if "/" not in volumes:
-                    vol = filesystem.VirtualFilesystem(case_sensitive=True)
+                    vol = filesystem.VirtualFilesystem(case_sensitive=not windows_found)
                     vol.tar = self.tar
                     volumes["/"] = vol
                     target.filesystems.add(vol)
@@ -197,3 +152,57 @@ class GenericTarSubLoader(TarSubLoader):
             )
 
             target.fs.mount(vol_name, vol)
+
+
+class TarLoader(Loader):
+    """Load tar files."""
+
+    __subloaders__ = [
+        import_lazy("dissect.target.loaders.containerimage").ContainerImageTarSubLoader,
+        GenericTarSubLoader,  # should be last
+    ]
+
+    def __init__(self, path: Path | str, **kwargs):
+        super().__init__(path)
+
+        if isinstance(path, str):
+            path = Path(path)
+
+        if is_compressed(path):
+            log.warning(
+                f"Tar file {path!r} is compressed, which will affect performance. "
+                "Consider uncompressing the archive before passing the tar file to Dissect."
+            )
+
+        self.fh = path.open("rb")
+        self.tar = tf.open(mode="r:*", fileobj=self.fh)
+        self.subloader = None
+
+    @staticmethod
+    def detect(path: Path) -> bool:
+        return path.name.lower().endswith(TAR_EXT + TAR_EXT_COMP) or is_tar_magic(path, TAR_MAGIC + TAR_MAGIC_COMP)
+
+    def map(self, target: target.Target) -> None:
+        for candidate in self.__subloaders__:
+            if candidate.detect(self.tar):
+                self.subloader = candidate(self.tar)
+                self.subloader.map(target)
+                break
+
+
+def is_tar_magic(path: Path, magics: Iterable[bytes]) -> bool:
+    if not path.is_file():
+        return False
+
+    with path.open("rb") as fh:
+        headers = [fh.read(6)]
+        fh.seek(257)
+        headers.append(fh.read(8))
+        for header in headers:
+            if header.startswith(magics):
+                return True
+    return False
+
+
+def is_compressed(path: Path) -> bool:
+    return path.name.lower().endswith(TAR_EXT_COMP) or is_tar_magic(path, TAR_MAGIC_COMP)

{dissect_target-3.22.dev10 → dissect_target-3.22.dev12/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.22.dev10
+Version: 3.22.dev12
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.22.dev10 → dissect_target-3.22.dev12}/tests/loaders/test_tar.py

@@ -1,4 +1,5 @@
 import pathlib
+import tarfile
 
 import pytest
 
@@ -6,6 +7,7 @@ from dissect.target import Target
 from dissect.target.loaders.tar import TarLoader
 from dissect.target.plugins.os.windows._os import WindowsPlugin
 from tests._utils import absolute_path
+from tests.filesystems.test_tar import _mkdir
 
 
 def test_tar_loader_compressed_tar_file(target_win: Target) -> None:
@@ -78,6 +80,32 @@ def test_tar_loader_windows_sysvol_formats(target_default: Target, archive: str,
     assert sorted(target_default.fs.mounts.keys()) == [expected_drive_letter]
 
 
+def test_tar_loader_windows_case_sensitivity(target_default: Target, tmp_path: pathlib.Path) -> None:
+    """test if we correctly map a tar with Windows folder structure as a case-insensitive filesystem."""
+
+    tar_path = tmp_path.joinpath("target.tar.gz")
+    with tarfile.open(tar_path, "w:gz") as tf:
+        _mkdir(tf, "Windows")
+        _mkdir(tf, "Windows/System32")
+
+    loader = TarLoader(tar_path)
+    loader.map(target_default)
+
+    # Make sure the case sensitiveness is changed to False and make sure we detect the target as Windows.
+    assert not target_default.filesystems[0].case_sensitive
+    assert WindowsPlugin.detect(target_default)
+
+    # We also test the inverse, make sure a random Linux target is not marked as case-insensitive.
+    tar_path = tmp_path.joinpath("second_target.tar.gz")
+    with tarfile.open(tar_path, "w:gz") as tf:
+        _mkdir(tf, "etc")
+        _mkdir(tf, "var")
+        _mkdir(tf, "opt")
+    loader = TarLoader(tar_path)
+    loader.map(target_default)
+    assert target_default.filesystems[1].case_sensitive
+
+
 def test_tar_anonymous_filesystems(target_default: Target) -> None:
     tar_file = absolute_path("_data/loaders/tar/test-anon-filesystems.tar")
 

{dissect_target-3.22.dev10 → dissect_target-3.22.dev12}/tox.ini

@@ -16,10 +16,11 @@ extras = dev
 deps =
     pytest
     pytest-cov
+    pytest-xdist
     coverage
     docutils
 commands =
-    pytest --basetemp="{envtmpdir}" {posargs:--color=yes --cov=dissect --cov-report=term-missing -v tests}
+    pytest --basetemp="{envtmpdir}" {posargs:--color=yes --cov=dissect --cov-report=term-missing -n auto -v tests}
     coverage report
     coverage xml