dissect.target 3.20.dev38__tar.gz → 3.20.dev40__tar.gz

{dissect_target-3.20.dev38/dissect.target.egg-info → dissect_target-3.20.dev40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev38
+Version: 3.20.dev40
 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.20.dev38 → dissect_target-3.20.dev40}/dissect/target/helpers/record.py

@@ -185,3 +185,24 @@ MacInterfaceRecord = TargetRecordDescriptor(
         ("boolean", "dhcp"),
     ],
 )
+
+
+COMMON_APPLICATION_FIELDS = [
+    ("datetime", "ts_modified"),
+    ("datetime", "ts_installed"),
+    ("string", "name"),
+    ("string", "version"),
+    ("string", "author"),
+    ("string", "type"),
+    ("path", "path"),
+]
+
+UnixApplicationRecord = TargetRecordDescriptor(
+    "unix/application",
+    COMMON_APPLICATION_FIELDS,
+)
+
+WindowsApplicationRecord = TargetRecordDescriptor(
+    "windows/application",
+    COMMON_APPLICATION_FIELDS,
+)

{dissect_target-3.20.dev38 → dissect_target-3.20.dev40}/dissect/target/helpers/regutil.py

@@ -310,6 +310,7 @@ class VirtualKey(RegistryKey):
         self._class_name = class_name
         self._values: dict[str, RegistryValue] = {}
         self._subkeys: dict[str, RegistryKey] = {}
+        self._timestamp: datetime = None
         self.top: RegistryKey = None
         super().__init__(hive=hive)
 
@@ -339,11 +340,19 @@ class VirtualKey(RegistryKey):
         return self._path
 
     @property
-    def timestamp(self) -> datetime:
+    def timestamp(self) -> datetime | None:
         if self.top:
             return self.top.timestamp
+
+        if self._timestamp:
+            return self._timestamp
+
         return None
 
+    @timestamp.setter
+    def timestamp(self, ts: datetime) -> None:
+        self._timestamp = ts
+
     def subkey(self, subkey: str) -> RegistryKey:
         try:
             return self._subkeys[subkey.lower()]

dissect_target-3.20.dev40/dissect/target/plugins/apps/editor/editor.py

@@ -0,0 +1,23 @@
+from dissect.target.plugin import NamespacePlugin, export
+
+COMMON_EDITOR_FIELDS = [
+    ("datetime", "ts"),
+    ("string", "editor"),
+    ("path", "source"),
+]
+
+
+class EditorPlugin(NamespacePlugin):
+    """Editor plugin."""
+
+    __namespace__ = "editor"
+
+    @export
+    def extensions(self) -> None:
+        """Yields installed extensions."""
+        raise NotImplementedError
+
+    @export
+    def history(self) -> None:
+        """Yields history of files."""
+        raise NotImplementedError

{dissect_target-3.20.dev38/dissect/target/plugins/apps/texteditor → dissect_target-3.20.dev40/dissect/target/plugins/apps/editor}/windowsnotepad.py

@@ -16,11 +16,8 @@ from dissect.target.helpers.record import (
     WindowsUserRecord,
     create_extended_descriptor,
 )
-from dissect.target.plugin import export
-from dissect.target.plugins.apps.texteditor.texteditor import (
-    GENERIC_TAB_CONTENTS_RECORD_FIELDS,
-    TexteditorPlugin,
-)
+from dissect.target.plugin import alias, export
+from dissect.target.plugins.apps.editor.editor import COMMON_EDITOR_FIELDS, EditorPlugin
 from dissect.target.target import Target
 
 # Thanks to @Nordgaren, @daddycocoaman, @JustArion and @ogmini for their suggestions and feedback in the PR
@@ -94,16 +91,25 @@ struct options_v2 {
 };
 """
 
-WINDOWS_SAVED_TABS_EXTRA_FIELDS = [("datetime", "modification_time"), ("digest", "hashes"), ("path", "saved_path")]
+GENERIC_TAB_CONTENTS_RECORD_FIELDS = [
+    ("string", "content"),
+    ("path", "path"),
+    ("string", "deleted_content"),
+]
 
 WindowsNotepadUnsavedTabRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
-    "texteditor/windowsnotepad/tab/unsaved",
-    GENERIC_TAB_CONTENTS_RECORD_FIELDS,
+    "application/editor/windowsnotepad/tab/unsaved",
+    COMMON_EDITOR_FIELDS + GENERIC_TAB_CONTENTS_RECORD_FIELDS,
 )
 
 WindowsNotepadSavedTabRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
-    "texteditor/windowsnotepad/tab/saved",
-    GENERIC_TAB_CONTENTS_RECORD_FIELDS + WINDOWS_SAVED_TABS_EXTRA_FIELDS,
+    "application/editor/windowsnotepad/tab/saved",
+    COMMON_EDITOR_FIELDS
+    + GENERIC_TAB_CONTENTS_RECORD_FIELDS
+    + [
+        ("digest", "digest"),
+        ("path", "saved_path"),
+    ],
 )
 
 c_windowstab = cstruct().load(windowstab_def)
@@ -264,7 +270,7 @@ class WindowsNotepadTab:
         self.deleted_content = deleted_content if deleted_content else None
 
 
-class WindowsNotepadPlugin(TexteditorPlugin):
+class WindowsNotepadPlugin(EditorPlugin):
     """Windows notepad tab content plugin."""
 
     __namespace__ = "windowsnotepad"
@@ -273,28 +279,27 @@ class WindowsNotepadPlugin(TexteditorPlugin):
 
     def __init__(self, target: Target):
         super().__init__(target)
-        self.users_tabs: list[TargetPath, UnixUserRecord | WindowsUserRecord] = []
+        self.users_tabs: set[TargetPath, UnixUserRecord | WindowsUserRecord] = set()
         for user_details in self.target.user_details.all_with_home():
             for tab_file in user_details.home_path.glob(self.GLOB):
-                # These files seem to contain information on different settings / configurations,
-                # and are skipped for now
+                # These files contain information on different settings / configurations, and are skipped for now.
                 if tab_file.name.endswith(".1.bin") or tab_file.name.endswith(".0.bin"):
                     continue
 
-                self.users_tabs.append((tab_file, user_details.user))
+                self.users_tabs.add((tab_file, user_details.user))
 
     def check_compatible(self) -> None:
         if not self.users_tabs:
             raise UnsupportedPluginError("No Windows Notepad tab files found")
 
+    @alias("tabs")
     @export(record=[WindowsNotepadSavedTabRecord, WindowsNotepadUnsavedTabRecord])
-    def tabs(self) -> Iterator[WindowsNotepadSavedTabRecord | WindowsNotepadUnsavedTabRecord]:
+    def history(self) -> Iterator[WindowsNotepadSavedTabRecord | WindowsNotepadUnsavedTabRecord]:
         """Return contents from Windows 11 Notepad tabs - and its deleted content if available.
 
         Windows Notepad application for Windows 11 is now able to restore both saved and unsaved tabs when you re-open
         the application.
 
-
         Resources:
             - https://github.com/fox-it/dissect.target/pull/540
             - https://github.com/JustArion/Notepad-Tabs
@@ -304,37 +309,41 @@ class WindowsNotepadPlugin(TexteditorPlugin):
             - https://github.com/Nordgaren/tabstate-util/issues/1
             - https://medium.com/@mahmoudsoheem/new-digital-forensics-artifact-from-windows-notepad-527645906b7b
 
-        Yields a WindowsNotepadSavedTabRecord or WindowsNotepadUnsavedTabRecord. with fields:
+        Yields ``WindowsNotepadSavedTabRecord`` or ``WindowsNotepadUnsavedTabRecord`` records:
 
         .. code-block:: text
 
-            content (string): The content of the tab.
-            path (path): The path to the tab file.
-            deleted_content (string): The deleted content of the tab, if available.
-            hashes (digest): A digest of the tab content.
-            saved_path (path): The path where the tab was saved.
-            modification_time (datetime): The modification time of the tab.
+            ts              (datetime): The modification time of the tab.
+            content         (string):   The content of the tab.
+            path            (path):     The path to the tab file.
+            deleted_content (string):   The deleted content of the tab, if available.
+            digest          (digest):   A digest of the tab content.
+            saved_path      (path):     The path where the tab was saved.
         """
         for file, user in self.users_tabs:
-            # Parse the file
-            tab: WindowsNotepadTab = WindowsNotepadTab(file)
+            tab = WindowsNotepadTab(file)
 
             if tab.is_saved:
                 yield WindowsNotepadSavedTabRecord(
+                    ts=wintimestamp(tab.tab_header.timestamp),
+                    editor="windowsnotepad",
                     content=tab.content,
                     path=tab.file,
                     deleted_content=tab.deleted_content,
-                    hashes=digest((None, None, tab.tab_header.sha256.hex())),
+                    digest=digest((None, None, tab.tab_header.sha256.hex())),
                     saved_path=tab.tab_header.filePath,
-                    modification_time=wintimestamp(tab.tab_header.timestamp),
-                    _target=self.target,
+                    source=file,
                     _user=user,
+                    _target=self.target,
                 )
+
             else:
                 yield WindowsNotepadUnsavedTabRecord(
+                    editor="windowsnotepad",
                     content=tab.content,
+                    deleted_content=tab.deleted_content,
                     path=tab.file,
-                    _target=self.target,
+                    source=file,
                     _user=user,
-                    deleted_content=tab.deleted_content,
+                    _target=self.target,
                 )

dissect_target-3.20.dev40/dissect/target/plugins/os/unix/applications.py

@@ -0,0 +1,78 @@
+from typing import Iterator
+
+from dissect.target.exceptions import UnsupportedPluginError
+from dissect.target.helpers import configutil
+from dissect.target.helpers.fsutil import TargetPath
+from dissect.target.helpers.record import UnixApplicationRecord
+from dissect.target.plugin import Plugin, export
+from dissect.target.target import Target
+
+
+class UnixApplicationsPlugin(Plugin):
+    """Unix Applications plugin."""
+
+    SYSTEM_PATHS = [
+        "/usr/share/applications/",
+        "/usr/local/share/applications/",
+        "/var/lib/snapd/desktop/applications/",
+        "/var/lib/flatpak/exports/share/applications/",
+    ]
+
+    USER_PATHS = [
+        ".local/share/applications/",
+    ]
+
+    SYSTEM_APPS = ("org.gnome.",)
+
+    def __init__(self, target: Target):
+        super().__init__(target)
+        self.desktop_files = list(self._find_desktop_files())
+
+    def _find_desktop_files(self) -> Iterator[TargetPath]:
+        for dir in self.SYSTEM_PATHS:
+            for file in self.target.fs.path(dir).glob("*.desktop"):
+                yield file
+
+        for user_details in self.target.user_details.all_with_home():
+            for dir in self.USER_PATHS:
+                for file in user_details.home_path.joinpath(dir).glob("*.desktop"):
+                    yield file
+
+    def check_compatible(self) -> None:
+        if not self.desktop_files:
+            raise UnsupportedPluginError("No application .desktop files found")
+
+    @export(record=UnixApplicationRecord)
+    def applications(self) -> Iterator[UnixApplicationRecord]:
+        """Yield installed Unix GUI applications from GNOME and XFCE.
+
+        Resources:
+            - https://wiki.archlinux.org/title/Desktop_entries
+            - https://specifications.freedesktop.org/desktop-entry-spec/latest/
+            - https://unix.stackexchange.com/questions/582928/where-gnome-apps-are-installed
+
+        Yields ``UnixApplicationRecord`` records with the following fields:
+
+        .. code-block:: text
+
+            ts_modified  (datetime): timestamp when the installation was modified
+            ts_installed (datetime): timestamp when the application was installed on the system
+            name         (string):   name of the application
+            version      (string):   version of the application
+            author       (string):   author of the application
+            type         (string):   type of the application, either user or system
+            path         (string):   path to the desktop file entry of the application
+        """
+        for file in self.desktop_files:
+            config = configutil.parse(file, hint="ini").get("Desktop Entry") or {}
+            stat = file.lstat()
+
+            yield UnixApplicationRecord(
+                ts_modified=stat.st_mtime,
+                ts_installed=stat.st_btime if hasattr(stat, "st_btime") else None,
+                name=config.get("Name"),
+                version=config.get("Version"),
+                path=config.get("Exec"),
+                type="system" if config.get("Icon", "").startswith(self.SYSTEM_APPS) else "user",
+                _target=self.target,
+            )

dissect_target-3.20.dev40/dissect/target/plugins/os/unix/linux/debian/snap.py

@@ -0,0 +1,79 @@
+from typing import Iterator
+
+from dissect.target.exceptions import UnsupportedPluginError
+from dissect.target.filesystems.squashfs import SquashFSFilesystem
+from dissect.target.helpers import configutil
+from dissect.target.helpers.fsutil import TargetPath
+from dissect.target.helpers.record import UnixApplicationRecord
+from dissect.target.plugin import Plugin, alias, export
+from dissect.target.target import Target
+
+
+class SnapPlugin(Plugin):
+    """Canonical Linux Snapcraft plugin."""
+
+    PATHS = [
+        "/var/lib/snapd/snaps",
+    ]
+
+    def __init__(self, target: Target):
+        super().__init__(target)
+        self.installs = list(self._find_installs())
+
+    def check_compatible(self) -> None:
+        if not configutil.HAS_YAML:
+            raise UnsupportedPluginError("Missing required dependency ruamel.yaml")
+
+        if not self.installs:
+            raise UnsupportedPluginError("No snapd install folder(s) found")
+
+    def _find_installs(self) -> Iterator[TargetPath]:
+        for str_path in self.PATHS:
+            if (path := self.target.fs.path(str_path)).exists():
+                yield path
+
+    @export(record=UnixApplicationRecord)
+    @alias("snaps")
+    def snap(self) -> Iterator[UnixApplicationRecord]:
+        """Yields installed Canonical Linux Snapcraft (snaps) applications on the target system.
+
+        Reads information from installed SquashFS ``*.snap`` files found in ``/var/lib/snapd/snaps``.
+        Logs of the ``snapd`` daemon can be parsed using the ``journal`` or ``syslog`` plugins.
+
+        Resources:
+            - https://github.com/canonical/snapcraft
+            - https://en.wikipedia.org/wiki/Snap_(software)
+
+        Yields ``UnixApplicationRecord`` records with the following fields:
+
+        .. code-block:: text
+
+            ts_modified  (datetime): timestamp when the installation was modified
+            name         (string):   name of the application
+            version      (string):   version of the application
+            path         (string):   path to the application snap file
+        """
+
+        for install_path in self.installs:
+            for snap in install_path.glob("*.snap"):
+                try:
+                    squashfs = SquashFSFilesystem(snap.open())
+
+                except (ValueError, NotImplementedError) as e:
+                    self.target.log.warning("Unable to open snap file %s", snap)
+                    self.target.log.debug("", exc_info=e)
+                    continue
+
+                if not (meta := squashfs.path("meta/snap.yaml")).exists():
+                    self.target.log.warning("Snap %s has no meta/snap.yaml file")
+                    continue
+
+                meta_data = configutil.parse(meta, hint="yaml")
+
+                yield UnixApplicationRecord(
+                    ts_modified=meta.lstat().st_mtime,
+                    name=meta_data.get("name"),
+                    version=meta_data.get("version"),
+                    path=snap,
+                    _target=self.target,
+                )

{dissect_target-3.20.dev38 → dissect_target-3.20.dev40}/dissect/target/plugins/os/unix/packagemanager.py

@@ -6,7 +6,7 @@ from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.plugin import NamespacePlugin
 
 PackageManagerLogRecord = TargetRecordDescriptor(
-    "unix/log/packagemanager",
+    "unix/packagemanager/log",
     [
         ("datetime", "ts"),
         ("string", "package_manager"),

dissect_target-3.20.dev40/dissect/target/plugins/os/windows/regf/applications.py

@@ -0,0 +1,62 @@
+from datetime import datetime
+from typing import Iterator
+
+from dissect.target.exceptions import UnsupportedPluginError
+from dissect.target.helpers.record import WindowsApplicationRecord
+from dissect.target.plugin import Plugin, export
+from dissect.target.target import Target
+
+
+class WindowsApplicationsPlugin(Plugin):
+    """Windows Applications plugin."""
+
+    def __init__(self, target: Target):
+        super().__init__(target)
+        self.keys = list(self.target.registry.keys("HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"))
+
+    def check_compatible(self) -> None:
+        if not self.target.has_function("registry"):
+            raise UnsupportedPluginError("No Windows registry found")
+
+        if not self.keys:
+            raise UnsupportedPluginError("No 'Uninstall' registry keys found")
+
+    @export(record=WindowsApplicationRecord)
+    def applications(self) -> Iterator[WindowsApplicationRecord]:
+        """Yields currently installed applications from the Windows registry.
+
+        Use the Windows eventlog plugin (``evtx``, ``evt``) to parse install and uninstall events
+        of applications and services (e.g. ``4697``, ``110707``, ``1034`` and ``11724``).
+
+        Resources:
+            - https://learn.microsoft.com/en-us/windows/win32/msi/uninstall-registry-key
+
+        Yields ``WindowsApplicationRecord`` records with the following fields:
+
+        .. code-block:: text
+
+            ts_modified  (datetime): timestamp when the installation was modified according to the registry
+            ts_installed (datetime): timestamp when the application was installed according to the application
+            name         (string):   name of the application
+            version      (string):   version of the application
+            author       (string):   author of the application
+            type         (string):   type of the application, either user or system
+            path         (string):   path to the installed location or installer of the application
+        """
+        for uninstall in self.keys:
+            for app in uninstall.subkeys():
+                values = {value.name: value.value for value in app.values()}
+
+                if install_date := values.get("InstallDate"):
+                    install_date = datetime.strptime(install_date, "%Y%m%d")
+
+                yield WindowsApplicationRecord(
+                    ts_modified=app.ts,
+                    ts_installed=install_date,
+                    name=values.get("DisplayName") or app.name,
+                    version=values.get("DisplayVersion"),
+                    author=values.get("Publisher"),
+                    type="system" if values.get("SystemComponent") or not values else "user",
+                    path=values.get("DisplayIcon") or values.get("InstallLocation") or values.get("InstallSource"),
+                    _target=self.target,
+                )

{dissect_target-3.20.dev38 → dissect_target-3.20.dev40/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev38
+Version: 3.20.dev40
 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.20.dev38 → dissect_target-3.20.dev40}/dissect.target.egg-info/SOURCES.txt

@@ -139,6 +139,9 @@ dissect/target/plugins/apps/browser/firefox.py
 dissect/target/plugins/apps/browser/iexplore.py
 dissect/target/plugins/apps/container/__init__.py
 dissect/target/plugins/apps/container/docker.py
+dissect/target/plugins/apps/editor/__init__.py
+dissect/target/plugins/apps/editor/editor.py
+dissect/target/plugins/apps/editor/windowsnotepad.py
 dissect/target/plugins/apps/other/__init__.py
 dissect/target/plugins/apps/other/env.py
 dissect/target/plugins/apps/remoteaccess/__init__.py
@@ -153,9 +156,6 @@ dissect/target/plugins/apps/ssh/openssh.py
 dissect/target/plugins/apps/ssh/opensshd.py
 dissect/target/plugins/apps/ssh/putty.py
 dissect/target/plugins/apps/ssh/ssh.py
-dissect/target/plugins/apps/texteditor/__init__.py
-dissect/target/plugins/apps/texteditor/texteditor.py
-dissect/target/plugins/apps/texteditor/windowsnotepad.py
 dissect/target/plugins/apps/virtualization/__init__.py
 dissect/target/plugins/apps/virtualization/vmware_workstation.py
 dissect/target/plugins/apps/vpn/__init__.py
@@ -207,6 +207,7 @@ dissect/target/plugins/general/users.py
 dissect/target/plugins/os/__init__.py
 dissect/target/plugins/os/unix/__init__.py
 dissect/target/plugins/os/unix/_os.py
+dissect/target/plugins/os/unix/applications.py
 dissect/target/plugins/os/unix/cronjobs.py
 dissect/target/plugins/os/unix/datetime.py
 dissect/target/plugins/os/unix/generic.py
@@ -252,6 +253,7 @@ dissect/target/plugins/os/unix/linux/debian/__init__.py
 dissect/target/plugins/os/unix/linux/debian/_os.py
 dissect/target/plugins/os/unix/linux/debian/apt.py
 dissect/target/plugins/os/unix/linux/debian/dpkg.py
+dissect/target/plugins/os/unix/linux/debian/snap.py
 dissect/target/plugins/os/unix/linux/debian/vyos/__init__.py
 dissect/target/plugins/os/unix/linux/debian/vyos/_os.py
 dissect/target/plugins/os/unix/linux/fortios/__init__.py
@@ -336,6 +338,7 @@ dissect/target/plugins/os/windows/log/pfro.py
 dissect/target/plugins/os/windows/log/schedlgu.py
 dissect/target/plugins/os/windows/regf/7zip.py
 dissect/target/plugins/os/windows/regf/__init__.py
+dissect/target/plugins/os/windows/regf/applications.py
 dissect/target/plugins/os/windows/regf/appxdebugkeys.py
 dissect/target/plugins/os/windows/regf/auditpol.py
 dissect/target/plugins/os/windows/regf/bam.py
@@ -473,6 +476,8 @@ tests/plugins/apps/browser/test_firefox.py
 tests/plugins/apps/browser/test_iexplore.py
 tests/plugins/apps/container/__init__.py
 tests/plugins/apps/container/test_docker.py
+tests/plugins/apps/editor/__init__.py
+tests/plugins/apps/editor/test_windowsnotepad.py
 tests/plugins/apps/other/__init__.py
 tests/plugins/apps/other/test_envfile.py
 tests/plugins/apps/remoteaccess/__init__.py
@@ -485,8 +490,6 @@ tests/plugins/apps/ssh/__init__.py
 tests/plugins/apps/ssh/test_openssh.py
 tests/plugins/apps/ssh/test_opensshd.py
 tests/plugins/apps/ssh/test_putty.py
-tests/plugins/apps/texteditor/__init__.py
-tests/plugins/apps/texteditor/test_texteditor.py
 tests/plugins/apps/virtualization/__init__.py
 tests/plugins/apps/virtualization/test_vmware_workstation.py
 tests/plugins/apps/vpn/__init__.py
@@ -532,6 +535,7 @@ tests/plugins/general/test_users.py
 tests/plugins/os/__init__.py
 tests/plugins/os/unix/__init__.py
 tests/plugins/os/unix/test__os.py
+tests/plugins/os/unix/test_applications.py
 tests/plugins/os/unix/test_generic.py
 tests/plugins/os/unix/test_history.py
 tests/plugins/os/unix/test_ips.py
@@ -567,6 +571,7 @@ tests/plugins/os/unix/linux/android/test__os.py
 tests/plugins/os/unix/linux/debian/__init__.py
 tests/plugins/os/unix/linux/debian/test_apt.py
 tests/plugins/os/unix/linux/debian/test_dpkg.py
+tests/plugins/os/unix/linux/debian/test_snap.py
 tests/plugins/os/unix/linux/fortios/test_keys.py
 tests/plugins/os/unix/linux/redhat/__init__.py
 tests/plugins/os/unix/linux/redhat/test_yum.py
@@ -621,6 +626,7 @@ tests/plugins/os/windows/log/test_evt.py
 tests/plugins/os/windows/log/test_evtx.py
 tests/plugins/os/windows/log/test_schedlgu.py
 tests/plugins/os/windows/regf/__init__.py
+tests/plugins/os/windows/regf/test_applications.py
 tests/plugins/os/windows/regf/test_appxdebugkeys.py
 tests/plugins/os/windows/regf/test_cit.py
 tests/plugins/os/windows/regf/test_clsid.py

dissect_target-3.20.dev38/tests/plugins/apps/texteditor/test_texteditor.py → dissect_target-3.20.dev40/tests/plugins/apps/editor/test_windowsnotepad.py

@@ -1,10 +1,9 @@
 import os
+from datetime import datetime, timezone
 from pathlib import Path
 
-from flow.record.fieldtypes import datetime as dt
-
 from dissect.target.filesystem import VirtualFilesystem
-from dissect.target.plugins.apps.texteditor.windowsnotepad import (
+from dissect.target.plugins.apps.editor.windowsnotepad import (
     WindowsNotepadPlugin,
     WindowsNotepadTab,
 )
@@ -77,8 +76,10 @@ def test_windows_tab_plugin_deleted_contents(
 
     # The recovered content in the records should match the original data, as well as the length
     for rec in records:
+        assert rec.editor == "windowsnotepad"
         assert rec.content == file_text_map[rec.path.name][0]
         assert rec.deleted_content == file_text_map[rec.path.name][1]
+        assert rec.source is not None
 
 
 def test_windows_tab_plugin_default(
@@ -137,8 +138,10 @@ def test_windows_tab_plugin_default(
 
     # The recovered content in the records should match the original data, as well as the length
     for rec in records:
+        assert rec.editor == "windowsnotepad"
         assert rec.content == file_text_map[rec.path.name][0]
         assert rec.deleted_content == file_text_map[rec.path.name][1]
+        assert rec.source is not None
 
 
 def test_windows_saved_tab_plugin_extra_fields(
@@ -148,13 +151,13 @@ def test_windows_saved_tab_plugin_extra_fields(
         "saved.bin": (
             "Saved!",
             "C:\\Users\\user\\Desktop\\Saved!.txt",
-            dt(2024, 3, 28, 13, 7, 55, 482183),
+            datetime(2024, 3, 28, 13, 7, 55, 482183, tzinfo=timezone.utc),
             "ed9b760289e614c9dc8776e7280abe870be0a85019a32220b35acc54c0ecfbc1",
         ),
         "appclosed_saved_and_deletions.bin": (
             text8,
             "C:\\Users\\user\\Desktop\\Saved.txt",
-            dt(2024, 3, 28, 13, 16, 21, 158279),
+            datetime(2024, 3, 28, 13, 16, 21, 158279, tzinfo=timezone.utc),
             "8d0533144aa42e2d81e7474332bdef6473e42b699041528d55a62e5391e914ce",
         ),
     }
@@ -183,8 +186,10 @@ def test_windows_saved_tab_plugin_extra_fields(
     # The recovered content in the records should match the original data, as well as the length and all the
     # other saved metadata
     for rec in records:
+        assert rec.editor == "windowsnotepad"
         assert len(rec.content) == len(file_text_map[rec.path.name][0])
         assert rec.content == file_text_map[rec.path.name][0]
         assert rec.saved_path == file_text_map[rec.path.name][1]
-        assert rec.modification_time == file_text_map[rec.path.name][2]
-        assert rec.hashes.sha256 == file_text_map[rec.path.name][3]
+        assert rec.ts == file_text_map[rec.path.name][2]
+        assert rec.digest.sha256 == file_text_map[rec.path.name][3]
+        assert rec.source is not None

dissect_target-3.20.dev40/tests/plugins/os/unix/linux/debian/test_snap.py

@@ -0,0 +1,38 @@
+from datetime import datetime, timezone
+from io import BytesIO
+
+from dissect.target.filesystem import VirtualFilesystem
+from dissect.target.plugins.os.unix._os import UnixPlugin
+from dissect.target.plugins.os.unix.linux.debian.snap import SnapPlugin
+from dissect.target.target import Target
+from tests._utils import absolute_path
+
+
+def test_snap_packages(target_unix_users: Target, fs_unix: VirtualFilesystem) -> None:
+    """test if snap packages are discovered on unix systems"""
+
+    fs_unix.map_file_fh("/etc/hostname", BytesIO(b"hostname"))
+    fs_unix.map_file(
+        "/var/lib/snapd/snaps/firefox_12345.snap",
+        absolute_path("_data/plugins/os/unix/linux/debian/snap/firefox.snap"),
+    )
+    fs_unix.map_file(
+        "/var/lib/snapd/snaps/firefox_67890.snap",
+        absolute_path("_data/plugins/os/unix/linux/debian/snap/firefox.snap"),
+    )
+
+    target_unix_users.add_plugin(UnixPlugin)
+    target_unix_users.add_plugin(SnapPlugin)
+
+    assert target_unix_users.has_function("snap")
+
+    results = list(target_unix_users.snaps())
+    assert len(results) == 2
+
+    assert results[0].hostname == "hostname"
+    assert results[0].ts_modified == datetime(2024, 9, 17, 13, 18, 58, tzinfo=timezone.utc)
+    assert results[0].name == "firefox"
+    assert results[0].version == "129.0.2-1"
+    assert results[0].author is None
+    assert results[0].type is None
+    assert results[0].path == "/var/lib/snapd/snaps/firefox_12345.snap"