dissect.target 3.19.dev54__tar.gz → 3.19.dev56__tar.gz

{dissect_target-3.19.dev54/dissect.target.egg-info → dissect_target-3.19.dev56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev54
+Version: 3.19.dev56
 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.19.dev54 → dissect_target-3.19.dev56}/dissect/target/plugins/os/unix/linux/_os.py

@@ -76,6 +76,9 @@ class LinuxPlugin(UnixPlugin, LinuxNetworkManager):
             or self._os_release.get("DISTRIB_RELEASE", "")
         )
 
+        if not any([name, version, distrib_description]):
+            return None
+
         if len(f"{name} {version}") > len(distrib_description):
             distrib_description = f"{name} {version}"
 

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/dissect/target/plugins/os/unix/linux/redhat/_os.py

@@ -5,7 +5,7 @@ from dissect.target.plugins.os.unix.linux._os import LinuxPlugin
 from dissect.target.target import Target
 
 
-class RedHat(LinuxPlugin):
+class RedHatPlugin(LinuxPlugin):
     def __init__(self, target: Target):
         super().__init__(target)
 

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/dissect/target/plugins/os/unix/locale.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 from pathlib import Path
+from typing import Iterator
 
 from dissect.target.helpers.localeutil import normalize_language
 from dissect.target.helpers.record import TargetRecordDescriptor
@@ -30,7 +33,7 @@ class LocalePlugin(Plugin):
         pass
 
     @export(property=True)
-    def timezone(self):
+    def timezone(self) -> str | None:
         """Get the timezone of the system."""
 
         # /etc/timezone should contain a simple timezone string
@@ -58,15 +61,23 @@ class LocalePlugin(Plugin):
             size = p_localtime.stat().st_size
             sha1 = p_localtime.get().sha1()
             for path in self.target.fs.path("/usr/share/zoneinfo").rglob("*"):
+                # Ignore posix files in zoneinfo directory (RHEL).
+                if path.name.startswith("posix"):
+                    continue
+
                 if path.is_file() and path.stat().st_size == size and path.get().sha1() == sha1:
                     return timezone_from_path(path)
 
     @export(property=True)
-    def language(self):
+    def language(self) -> list[str]:
         """Get the configured locale(s) of the system."""
-        # Although this purports to be a generic function for Unix targets,
-        # these paths are Linux specific.
-        locale_paths = ["/etc/default/locale", "/etc/locale.conf"]
+
+        # Although this purports to be a generic function for Unix targets, these paths are Linux specific.
+        locale_paths = [
+            "/etc/default/locale",
+            "/etc/locale.conf",
+            "/etc/sysconfig/i18n",
+        ]
 
         found_languages = []
 
@@ -79,7 +90,7 @@ class LocalePlugin(Plugin):
         return found_languages
 
     @export(record=UnixKeyboardRecord)
-    def keyboard(self):
+    def keyboard(self) -> Iterator[UnixKeyboardRecord]:
         """Get the keyboard layout(s) of the system."""
 
         paths = ["/etc/default/keyboard", "/etc/vconsole.conf"] + list(

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/dissect/target/plugins/os/windows/adpolicy.py

@@ -69,7 +69,10 @@ class ADPolicyPlugin(Plugin):
                 xml = task_file.read_text()
                 tree = ElementTree.fromstring(xml)
                 for task in tree.findall(".//{*}Task"):
-                    properties = task.find("Properties") or task
+                    # https://github.com/python/cpython/issues/83122
+                    if (properties := task.find("Properties")) is None:
+                        properties = task
+
                     task_data = ElementTree.tostring(task)
                     yield ADPolicyRecord(
                         last_modification_time=task_file_stat.st_mtime,

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/dissect/target/plugins/os/windows/regf/shimcache.py

@@ -1,6 +1,6 @@
 import binascii
 from datetime import datetime
-from enum import IntEnum, auto
+from enum import IntEnum
 from io import BytesIO
 from typing import Callable, Generator, Optional, Tuple, Union
 
@@ -116,7 +116,7 @@ class SHIMCACHE_WIN_TYPE(IntEnum):
     VERSION_NT61 = 0x0601
     VERSION_NT52 = 0x0502
 
-    VERSION_WIN81_NO_HEADER = auto()
+    VERSION_WIN81_NO_HEADER = 0x1002  # auto()
 
 
 def win_10_path(ed: Structure) -> str:

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/dissect/target/plugins/os/windows/task_helpers/tasks_xml.py

@@ -189,7 +189,7 @@ class XmlTask:
             bytes: The raw XML data as string of the element if found, otherwise None.
         """
         data = self.task_element.find(xml_path) if xml_path else self.task_element
-        if data:
+        if data is not None:
             return ElementTree.tostring(data, encoding="utf-8").strip()
 
     def get_triggers(self) -> Iterator[GroupedRecord]:

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/dissect/target/tools/query.py

@@ -5,7 +5,7 @@ import argparse
 import logging
 import pathlib
 import sys
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Callable
 
 from flow.record import RecordPrinter, RecordStreamWriter, RecordWriter
@@ -390,7 +390,7 @@ def main():
         log.debug("", exc_info=e)
         parser.exit(1)
 
-    timestamp = datetime.utcnow()
+    timestamp = datetime.now(tz=timezone.utc)
 
     execution_report.set_plugin_stats(PLUGINS)
     log.debug("%s", execution_report.get_formatted_report())

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev54
+Version: 3.19.dev56
 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.19.dev54 → dissect_target-3.19.dev56}/tests/conftest.py

@@ -20,7 +20,7 @@ from dissect.target.plugins.os.unix.bsd.osx._os import MacPlugin
 from dissect.target.plugins.os.unix.linux._os import LinuxPlugin
 from dissect.target.plugins.os.unix.linux.android._os import AndroidPlugin
 from dissect.target.plugins.os.unix.linux.debian._os import DebianPlugin
-from dissect.target.plugins.os.unix.linux.redhat._os import RedHat
+from dissect.target.plugins.os.unix.linux.redhat._os import RedHatPlugin
 from dissect.target.plugins.os.unix.linux.suse._os import SuSEPlugin
 from dissect.target.plugins.os.windows import registry
 from dissect.target.plugins.os.windows._os import WindowsPlugin
@@ -290,7 +290,7 @@ def target_debian(tmp_path: pathlib.Path, fs_debian: Filesystem) -> Iterator[Tar
 
 @pytest.fixture
 def target_redhat(tmp_path: pathlib.Path, fs_redhat: Filesystem) -> Iterator[Target]:
-    yield make_os_target(tmp_path, RedHat, root_fs=fs_redhat)
+    yield make_os_target(tmp_path, RedHatPlugin, root_fs=fs_redhat)
 
 
 @pytest.fixture

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/tests/plugins/apps/ssh/test_putty.py

@@ -102,9 +102,10 @@ def test_putty_plugin_saved_sessions_unix(target_unix_users: Target, fs_unix: Vi
 
     assert len(records) == 1
 
-    assert records[0].ts == datetime.utcfromtimestamp(
-        stat(absolute_path("_data/plugins/apps/ssh/putty/sessions/example-saved-session")).st_mtime
-    ).replace(tzinfo=timezone.utc)
+    assert records[0].ts == datetime.fromtimestamp(
+        stat(absolute_path("_data/plugins/apps/ssh/putty/sessions/example-saved-session")).st_mtime,
+        tz=timezone.utc,
+    )
     assert records[0].session_name == "example-saved-session"
     assert records[0].protocol == "ssh"
     assert records[0].host == "192.168.123.130"

{dissect_target-3.19.dev54 → dissect_target-3.19.dev56}/tests/plugins/os/unix/test_generic.py

@@ -10,10 +10,10 @@ log_mtime = stat(absolute_path("_data/plugins/os/unix/log/empty.log")).st_mtime
 def test_unix_generic_activity(target_unix, fs_unix):
     fs_unix.map_file("/var/log/some.log", absolute_path("_data/plugins/os/unix/log/empty.log"))
     target_unix.add_plugin(GenericPlugin)
-    assert target_unix.activity == datetime.utcfromtimestamp(log_mtime).replace(tzinfo=timezone.utc)
+    assert target_unix.activity == datetime.fromtimestamp(log_mtime, tz=timezone.utc)
 
 
 def test_unix_generic_install_date(target_unix, fs_unix):
     fs_unix.map_file("/var/log/installer/syslog", absolute_path("_data/plugins/os/unix/log/empty.log"))
     target_unix.add_plugin(GenericPlugin)
-    assert target_unix.install_date == datetime.utcfromtimestamp(log_mtime).replace(tzinfo=timezone.utc)
+    assert target_unix.install_date == datetime.fromtimestamp(log_mtime, tz=timezone.utc)