dissect.target 3.23.dev48__tar.gz → 3.23.dev50__tar.gz

{dissect_target-3.23.dev48 → dissect_target-3.23.dev50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev48
+Version: 3.23.dev50
 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.23.dev48 → dissect_target-3.23.dev50}/dissect/target/plugins/os/unix/linux/proc.py

@@ -490,7 +490,7 @@ class ProcProcess:
             yield Environ(variable, contents)
 
     @property
-    def _boottime(self) -> int:
+    def _boottime(self) -> int | None:
         """Returns the boot time of the system.
 
         Used internally to determine process start- and runtimes.
@@ -555,18 +555,25 @@ class ProcProcess:
         return ProcessStateEnum[self._stat_file.get("state", "N")].value
 
     @property
-    def starttime(self) -> datetime:
+    def starttime(self) -> datetime | None:
         """Returns the start time of the process."""
         # Starttime is saved in clockticks per second from the boot time.
         # we asume a standard of 100 clockticks per second. the actual value can be obtained from `getconf CLK_TCK`
         starttime = self._stat_file.get("starttime", 0) / 100
 
-        return from_unix(self._boottime + starttime)
+        # Check if there is a boottime. If not, we cannot determine the starttime.
+        if boottime := self._boottime:
+            return from_unix(boottime + starttime)
+
+        return None
 
     @property
-    def runtime(self) -> timedelta:
+    def runtime(self) -> timedelta | None:
         """Returns the runtime of a process until the moment of acquisition."""
-        return self.now - self.starttime
+        if starttime := self.starttime:
+            return self.now - starttime
+
+        return None
 
     @property
     def now(self) -> datetime:

{dissect_target-3.23.dev48 → dissect_target-3.23.dev50}/dissect/target/tools/fs.py

@@ -156,14 +156,17 @@ def main() -> int:
         log.debug("", exc_info=e)
         return 1
 
-    path = target.fs.path(args.path)
+    glob_path = str(args.path).lstrip("/")
 
-    if not path.exists():
+    found = False
+    for path in target.fs.path("/").glob(glob_path):
+        args.handler(target, path, args)
+        found = True
+
+    if not found:
         print("[!] Path doesn't exist")
         return 1
 
-    args.handler(target, path, args)
-
     return 0
 
 

{dissect_target-3.23.dev48 → dissect_target-3.23.dev50}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev48
+Version: 3.23.dev50
 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.23.dev48 → dissect_target-3.23.dev50}/tests/plugins/os/unix/linux/test_proc.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
+from unittest.mock import PropertyMock, patch
 
 import pytest
 
@@ -52,6 +53,24 @@ def test_processes(target_linux_users: Target, fs_linux_proc: VirtualFilesystem)
             assert env.contents == "1"
 
 
+def test_processes_without_boottime(target_linux_users: Target, fs_linux_proc: VirtualFilesystem) -> None:
+    target_linux_users.add_plugin(ProcPlugin)
+
+    with patch.object(ProcProcess, "_boottime", new_callable=PropertyMock) as mock_boottime:
+        mock_boottime.return_value = None
+
+        for process in target_linux_users.proc.processes():
+            assert process.pid in (1, 2, 3, 1337)
+            assert process.state in ("Sleeping", "Waking", "Running", "Wakekill")
+            assert process.name in ("systemd", "kthread", "acquire", "sshd")
+            assert process.starttime is None
+            assert process.runtime is None
+
+            for env in process.environ():
+                assert env.variable == "VAR"
+                assert env.contents == "1"
+
+
 def test_proc_plugin_incompatible(target_linux_users: Target, fs_linux: VirtualFilesystem) -> None:
     with pytest.raises(UnsupportedPluginError, match="No /proc directory found"):
         target_linux_users.add_plugin(ProcPlugin)

{dissect_target-3.23.dev48 → dissect_target-3.23.dev50}/tests/tools/test_fs.py

@@ -8,6 +8,7 @@ import pytest
 
 from dissect.target.filesystem import VirtualFile, VirtualFilesystem
 from dissect.target.tools.fs import _extract_path, cp
+from dissect.target.tools.fs import main as target_fs
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -24,6 +25,30 @@ def vfs(files: list[str]) -> VirtualFilesystem:
     return vfs
 
 
+@pytest.mark.parametrize(
+    ("path", "expected_files"),
+    [
+        ("root/.bash_history", 1),
+        ("this/path/doesntexist", 0),
+        ("**/*_history", 4),
+    ],
+)
+def test_target_fs(
+    capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch, path: str, expected_files: int
+) -> None:
+    with monkeypatch.context() as m:
+        m.setattr("sys.argv", ["target-fs", "tests/_data/tools/info/image.tar", "cp", path])
+
+        target_fs()
+        stdout, stderr = capsys.readouterr()
+
+        if expected_files > 0:
+            lines = [line for line in stdout.split("\n") if line != ""]
+            assert len(lines) == expected_files
+        else:
+            assert stdout == "[!] Path doesn't exist\n"
+
+
 @pytest.mark.parametrize("files", [["file"]])
 def test_extract_file(vfs: VirtualFilesystem, tmp_path: Path) -> None:
     output_path = tmp_path / "file"