dissect.target 3.22.dev35__tar.gz → 3.22.dev37__tar.gz

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.22.dev35
+Version: 3.22.dev37
 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
@@ -47,6 +47,7 @@ Requires-Dist: dissect.ffs<4,>=3; extra == "full"
 Requires-Dist: dissect.fve<5,>=4.2.dev; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "full"
 Requires-Dist: dissect.jffs<2,>=1.5.dev; extra == "full"
 Requires-Dist: dissect.ole<4,>=3; extra == "full"
+Requires-Dist: dissect.qnxfs<2,>=0.1.dev; extra == "full"
 Requires-Dist: dissect.shellitem<4,>=3; extra == "full"
 Requires-Dist: dissect.squashfs<2,>=1; extra == "full"
 Requires-Dist: dissect.sql<4,>=3; extra == "full"
@@ -77,6 +78,7 @@ Requires-Dist: dissect.fve[dev]<5.0.dev,>=4.2.dev; (platform_system != "Windows"
 Requires-Dist: dissect.hypervisor[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.jffs[dev]<2.0.dev,>=1.5.dev; extra == "dev"
 Requires-Dist: dissect.ntfs[dev]<4.0.dev,>=3.4.dev; extra == "dev"
+Requires-Dist: dissect.qnxfs[dev]<2.0.dev,>=0.0.dev; extra == "dev"
 Requires-Dist: dissect.regf[dev]<4.0.dev,>=3.3.dev; extra == "dev"
 Requires-Dist: dissect.shellitem[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.sql[dev]<4.0.dev,>=3.0.dev; extra == "dev"

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/dissect/target/filesystem.py

@@ -1768,6 +1768,7 @@ register("btrfs", "BtrfsFilesystem")
 register("exfat", "ExfatFilesystem")
 register("squashfs", "SquashFSFilesystem")
 register("jffs", "JffsFilesystem")
+register("qnxfs", "QnxFilesystem")
 register("zip", "ZipFilesystem")
 register("tar", "TarFilesystem")
 register("vmtar", "VmtarFilesystem")

dissect_target-3.22.dev37/dissect/target/filesystems/qnxfs.py

@@ -0,0 +1,130 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, BinaryIO, Union
+
+import dissect.qnxfs as qnxfs
+from dissect.qnxfs.qnx4 import INode as INode4
+from dissect.qnxfs.qnx6 import INode as INode6
+
+from dissect.target.exceptions import (
+    FileNotFoundError,
+    FilesystemError,
+    IsADirectoryError,
+    NotADirectoryError,
+    NotASymlinkError,
+)
+from dissect.target.filesystem import Filesystem, FilesystemEntry
+from dissect.target.helpers import fsutil
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+INode = Union[INode4, INode6]
+
+
+class QnxFilesystem(Filesystem):
+    __type__ = "qnxfs"
+
+    def __init__(self, fh: BinaryIO, *args, **kwargs):
+        super().__init__(fh, *args, **kwargs)
+        self.qnxfs = qnxfs.QNXFS(fh)
+
+    @staticmethod
+    def _detect(fh: BinaryIO) -> bool:
+        return qnxfs.is_qnxfs(fh)
+
+    def get(self, path: str) -> FilesystemEntry:
+        return QnxFilesystemEntry(self, path, self._get_node(path))
+
+    def _get_node(self, path: str, node: INode | None = None) -> INode:
+        try:
+            return self.qnxfs.get(path, node)
+        except qnxfs.FileNotFoundError as e:
+            raise FileNotFoundError(path) from e
+        except qnxfs.NotADirectoryError as e:
+            raise NotADirectoryError(path, cause=e)
+        except qnxfs.NotASymlinkError as e:
+            raise NotASymlinkError(path, cause=e)
+        except qnxfs.Error as e:
+            raise FileNotFoundError(path, cause=e)
+
+
+class QnxFilesystemEntry(FilesystemEntry):
+    fs: QnxFilesystem
+    entry: INode
+
+    def get(self, path: str) -> FilesystemEntry:
+        entry_path = fsutil.join(self.path, path, alt_separator=self.fs.alt_separator)
+        return QnxFilesystemEntry(self.fs, entry_path, self.fs._get_node(path, self.entry))
+
+    def open(self) -> BinaryIO:
+        if self.is_dir():
+            raise IsADirectoryError(self.path)
+        return self._resolve().entry.open()
+
+    def _iterdir(self) -> Iterator[tuple[str, INode]]:
+        if not self.is_dir():
+            raise NotADirectoryError(self.path)
+
+        if self.is_symlink():
+            yield from self.readlink_ext().iterdir()
+        else:
+            yield from self.entry.iterdir()
+
+    def iterdir(self) -> Iterator[str]:
+        yield from (name for name, _ in self._iterdir())
+
+    def scandir(self) -> Iterator[FilesystemEntry]:
+        for name, entry in self._iterdir():
+            entry_path = fsutil.join(self.path, name, alt_separator=self.fs.alt_separator)
+            yield QnxFilesystemEntry(self.fs, entry_path, entry)
+
+    def is_dir(self, follow_symlinks: bool = True) -> bool:
+        try:
+            return self._resolve(follow_symlinks).entry.is_dir()
+        except FilesystemError:
+            return False
+
+    def is_file(self, follow_symlinks: bool = True) -> bool:
+        try:
+            return self._resolve(follow_symlinks).entry.is_file()
+        except FilesystemError:
+            return False
+
+    def is_symlink(self) -> bool:
+        return self.entry.is_symlink()
+
+    def readlink(self) -> str:
+        if not self.is_symlink():
+            raise NotASymlinkError
+
+        return self.entry.link
+
+    def stat(self, follow_symlinks: bool = True) -> fsutil.stat_result:
+        return self._resolve(follow_symlinks).lstat()
+
+    def lstat(self) -> fsutil.stat_result:
+        # mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime
+        st_info = fsutil.stat_result(
+            [
+                self.entry.mode,
+                self.entry.inum,
+                id(self.fs),
+                getattr(self.entry, "nlink", 1),  # Only QNX4 has nlink
+                self.entry.uid,
+                self.entry.gid,
+                self.entry.size,
+                self.entry.atime.timestamp(),
+                self.entry.mtime.timestamp(),
+                self.entry.ctime.timestamp(),
+            ]
+        )
+
+        st_info.st_birthtime = self.entry.ftime.timestamp()
+
+        st_info.st_blksize = self.fs.qnxfs.block_size
+        # Blocks are always calculated based on 512 byte blocks
+        # https://github.com/torvalds/linux/blob/c1e939a21eb111a6d6067b38e8e04b8809b64c4e/fs/qnx6/inode.c#L560-L561
+        st_info.st_blocks = (self.entry.size + 511) >> 9
+
+        return st_info

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/dissect/target/plugins/os/unix/_os.py

@@ -169,10 +169,14 @@ class UnixPlugin(OSPlugin):
 
     @export(property=True)
     def domain(self) -> str | None:
-        if self._domain is None or self._domain == "localhost":
-            # fall back to /etc/hosts file
-            return self._hosts_dict.get("hostname")
-        return self._domain
+        if self._domain and "localhost" not in self._domain:
+            return self._domain
+
+        # fall back to /etc/hosts file
+        if "localhost" not in (domain := self._hosts_dict.get("hostname", "")):
+            return domain or None
+
+        return None
 
     @export(property=True)
     def os(self) -> str:

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.22.dev35
+Version: 3.22.dev37
 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
@@ -47,6 +47,7 @@ Requires-Dist: dissect.ffs<4,>=3; extra == "full"
 Requires-Dist: dissect.fve<5,>=4.2.dev; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "full"
 Requires-Dist: dissect.jffs<2,>=1.5.dev; extra == "full"
 Requires-Dist: dissect.ole<4,>=3; extra == "full"
+Requires-Dist: dissect.qnxfs<2,>=0.1.dev; extra == "full"
 Requires-Dist: dissect.shellitem<4,>=3; extra == "full"
 Requires-Dist: dissect.squashfs<2,>=1; extra == "full"
 Requires-Dist: dissect.sql<4,>=3; extra == "full"
@@ -77,6 +78,7 @@ Requires-Dist: dissect.fve[dev]<5.0.dev,>=4.2.dev; (platform_system != "Windows"
 Requires-Dist: dissect.hypervisor[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.jffs[dev]<2.0.dev,>=1.5.dev; extra == "dev"
 Requires-Dist: dissect.ntfs[dev]<4.0.dev,>=3.4.dev; extra == "dev"
+Requires-Dist: dissect.qnxfs[dev]<2.0.dev,>=0.0.dev; extra == "dev"
 Requires-Dist: dissect.regf[dev]<4.0.dev,>=3.3.dev; extra == "dev"
 Requires-Dist: dissect.shellitem[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.sql[dev]<4.0.dev,>=3.0.dev; extra == "dev"

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/dissect.target.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ dissect/target/filesystems/jffs.py
 dissect/target/filesystems/nfs.py
 dissect/target/filesystems/ntfs.py
 dissect/target/filesystems/overlay.py
+dissect/target/filesystems/qnxfs.py
 dissect/target/filesystems/smb.py
 dissect/target/filesystems/squashfs.py
 dissect/target/filesystems/tar.py
@@ -464,6 +465,7 @@ tests/filesystems/test_jffs2.py
 tests/filesystems/test_nfs.py
 tests/filesystems/test_ntfs.py
 tests/filesystems/test_overlay.py
+tests/filesystems/test_qnxfs.py
 tests/filesystems/test_smb.py
 tests/filesystems/test_tar.py
 tests/filesystems/test_vmtar.py

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/dissect.target.egg-info/requires.txt

@@ -31,6 +31,7 @@ dissect.ffs[dev]<4.0.dev,>=3.0.dev
 dissect.hypervisor[dev]<4.0.dev,>=3.0.dev
 dissect.jffs[dev]<2.0.dev,>=1.5.dev
 dissect.ntfs[dev]<4.0.dev,>=3.4.dev
+dissect.qnxfs[dev]<2.0.dev,>=0.0.dev
 dissect.regf[dev]<4.0.dev,>=3.3.dev
 dissect.shellitem[dev]<4.0.dev,>=3.0.dev
 dissect.sql[dev]<4.0.dev,>=3.0.dev
@@ -59,6 +60,7 @@ dissect.fat<4,>=3
 dissect.ffs<4,>=3
 dissect.jffs<2,>=1.5.dev
 dissect.ole<4,>=3
+dissect.qnxfs<2,>=0.1.dev
 dissect.shellitem<4,>=3
 dissect.squashfs<2,>=1
 dissect.sql<4,>=3

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/pyproject.toml

@@ -59,6 +59,7 @@ full = [
     "dissect.fve>=4.2.dev,<5; platform_system != 'Windows' or platform_python_implementation != 'PyPy'",  # TODO: update on release
     "dissect.jffs>=1.5.dev,<2",  # TODO: update on release
     "dissect.ole>=3,<4",
+    "dissect.qnxfs>=0.1.dev,<2",  # TODO: update on release
     "dissect.shellitem>=3,<4",
     "dissect.squashfs>=1,<2",
     "dissect.sql>=3,<4",
@@ -97,6 +98,7 @@ dev = [
     "dissect.hypervisor[dev]>=3.0.dev,<4.0.dev",
     "dissect.jffs[dev]>=1.5.dev,<2.0.dev",
     "dissect.ntfs[dev]>=3.4.dev,<4.0.dev",
+    "dissect.qnxfs[dev]>=0.0.dev,<2.0.dev",  # TODO: update on release
     "dissect.regf[dev]>=3.3.dev,<4.0.dev",
     "dissect.shellitem[dev]>=3.0.dev,<4.0.dev",
     "dissect.sql[dev]>=3.0.dev,<4.0.dev",

dissect_target-3.22.dev37/tests/filesystems/test_qnxfs.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+import gzip
+from datetime import datetime, timezone
+from typing import TYPE_CHECKING
+from unittest.mock import Mock, patch
+
+import pytest
+
+from dissect.target.filesystems.qnxfs import QnxFilesystem, QnxFilesystemEntry
+from tests._utils import absolute_path
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+
+@pytest.mark.parametrize(
+    "filename",
+    [
+        "_data/filesystems/qnxfs/qnx4.bin.gz",
+        "_data/filesystems/qnxfs/qnx6-be.bin.gz",
+        "_data/filesystems/qnxfs/qnx6-le.bin.gz",
+    ],
+)
+def test_qnxfs_detect(filename: str) -> None:
+    """Test that QNX filesystems are correctly detected."""
+    with gzip.open(absolute_path(filename), "rb") as fh:
+        assert QnxFilesystem.detect(fh)
+        assert QnxFilesystem(fh).qnxfs
+
+
+@pytest.fixture
+def qnx_fs() -> Iterator[QnxFilesystem]:
+    with patch("dissect.qnxfs.QNXFS", return_value=Mock(block_size=4096)):
+        qnx_fs = QnxFilesystem(Mock())
+        yield qnx_fs
+
+
+@pytest.fixture
+def qnxfs_fs_file_entry(qnx_fs: QnxFilesystem) -> Iterator[QnxFilesystemEntry]:
+    inode = Mock(
+        mode=0o100664,
+        inum=4,
+        size=165002,
+        uid=1000,
+        gid=999,
+        atime=datetime(2024, 10, 1, 12, 0, 0, tzinfo=timezone.utc),
+        mtime=datetime(2024, 10, 2, 12, 0, 0, tzinfo=timezone.utc),
+        ctime=datetime(2024, 10, 3, 12, 0, 0, tzinfo=timezone.utc),
+        ftime=datetime(2024, 10, 4, 12, 0, 0, tzinfo=timezone.utc),
+        nlink=2,
+        is_file=lambda: True,
+        is_dir=lambda: False,
+        is_symlink=lambda: False,
+    )
+
+    return QnxFilesystemEntry(qnx_fs, "/some_file", inode)
+
+
+@pytest.mark.parametrize(
+    ("entry_fixture", "expected_blocks"),
+    [("qnxfs_fs_file_entry", 323)],
+)
+def test_qnxfs_stat(entry_fixture: str, expected_blocks: int, request: pytest.FixtureRequest) -> None:
+    """Test consistency in ``stat()`` results."""
+    qnxfs_entry: QnxFilesystemEntry = request.getfixturevalue(entry_fixture)
+    stat = qnxfs_entry.stat()
+
+    entry = qnxfs_entry.entry
+    assert stat.st_mode == entry.mode
+    assert stat.st_ino == entry.inum
+    assert stat.st_dev == id(qnxfs_entry.fs)
+    assert stat.st_nlink == entry.nlink
+    assert stat.st_uid == entry.uid
+    assert stat.st_gid == entry.gid
+    assert stat.st_size == entry.size
+    assert stat.st_atime == entry.atime.timestamp()
+    assert stat.st_mtime == entry.mtime.timestamp()
+    assert stat.st_ctime == entry.ctime.timestamp()
+    assert stat.st_blksize == qnxfs_entry.fs.qnxfs.block_size
+    assert stat.st_blocks == expected_blocks

{dissect_target-3.22.dev35 → dissect_target-3.22.dev37}/tests/plugins/os/unix/test__os.py

@@ -109,7 +109,9 @@ def test_mount_volume_name_regression(fs_unix: VirtualFilesystem) -> None:
     [
         (b"", b"", "localhost", None),
         (b"", b"127.0.0.1 mydomain", "mydomain", "mydomain"),
-        (b"", b"127.0.0.1 localhost", "localhost", "localhost"),
+        (b"", b"127.0.0.1 localhost", "localhost", None),
+        (b"hostname", b"127.0.0.1 localhost\n::1 ip6-localhost", "hostname", None),
+        (b"hostname.example.internal", b"127.0.0.1 localhost\n::1 ip6-localhost", "hostname", "example.internal"),
         (b"myhost", b"", "myhost", None),
         (b"myhost.mydomain", b"", "myhost", "mydomain"),
         (b"myhost", b"127.0.0.1 mydomain", "myhost", "mydomain"),
@@ -132,8 +134,10 @@ def test_parse_domain(
     fs_unix.map_file_fh("/etc/hosts", BytesIO(hosts_content))
     target_unix.add_plugin(UnixPlugin)
 
-    assert target_unix.hostname == expected_hostname
-    assert target_unix.domain == expected_domain
+    assert target_unix.hostname == expected_hostname, (
+        f"Expected hostname {expected_hostname!r} but got {target_unix.hostname!r}"
+    )
+    assert target_unix.domain == expected_domain, f"Expected domain {expected_domain!r} but got {target_unix.domain!r}"
 
 
 @pytest.mark.parametrize(
@@ -167,8 +171,8 @@ def test_parse_hostname_string(
 
     hostname, domain = target_unix._os._parse_hostname_string()
 
-    assert hostname == expected_hostname
-    assert domain == expected_domain
+    assert hostname == expected_hostname, f"Expected hostname {expected_hostname!r} but got {hostname!r}"
+    assert domain == expected_domain, f"Expected domain {expected_domain!r} but got {domain!r}"
 
 
 def test_users(target_unix_users: Target) -> None: