dissect.target 3.11.dev21__py3-none-any.whl → 3.11.dev22__py3-none-any.whl

dissect/target/plugins/os/unix/services.py

@@ -1,6 +1,8 @@
+import io
 import re
+from configparser import ConfigParser
 from itertools import chain
-from typing import BinaryIO, Iterator
+from typing import Iterator, TextIO
 
 from dissect.target.exceptions import FileNotFoundError, UnsupportedPluginError
 from dissect.target.helpers.record import TargetRecordDescriptor
@@ -51,30 +53,29 @@ class ServicesPlugin(Plugin):
             if not path.exists() or not path.is_dir():
                 continue
 
-            for file_ in path.iterdir():
-                if should_ignore_file(file_.name, ignored_suffixes):
+            for service_file in path.iterdir():
+                if should_ignore_file(service_file.name, ignored_suffixes):
                     continue
 
                 try:
-                    fh = file_.open("rt")
+                    with service_file.open("rt") as fh:
+                        config = parse_systemd_config(fh)
                 except FileNotFoundError:
                     # The service is registered but the symlink is broken.
                     yield LinuxServiceRecord(
-                        ts=file_.stat(follow_symlinks=False).st_mtime,
-                        name=file_.name,
+                        ts=service_file.stat(follow_symlinks=False).st_mtime,
+                        name=service_file.name,
                         config=None,
-                        source=file_,
+                        source=service_file,
                         _target=self.target,
                     )
                     continue
 
-                config = parse_systemd_config(fh)
-
                 yield LinuxServiceRecord(
-                    ts=file_.stat().st_mtime,
-                    name=file_.name,
+                    ts=service_file.stat().st_mtime,
+                    name=service_file.name,
                     config=config,
-                    source=file_,
+                    source=service_file,
                     _target=self.target,
                 )
 
@@ -106,43 +107,45 @@ def should_ignore_file(needle: str, haystack: list) -> bool:
     return False
 
 
-def parse_systemd_config(fh: BinaryIO) -> str:
+def parse_systemd_config(fh: TextIO) -> str:
     """Returns a string of key/value pairs from a toml/ini-like string.
 
     This should probably be rewritten to return a proper dict as in
     its current form this is only useful when used in Splunk.
     """
-    variables = ""
+    parser = ConfigParser(strict=False, delimiters=("=",), allow_no_value=True)
+    # to preserve casing from configuration.
+    parser.optionxform = str
+    parser.read_file(fh)
 
+    output = io.StringIO()
     try:
-        for line in fh:
-            line = line.strip().replace("\n", "")
-
-            # segment start eg. [ExampleSegment]
-            if line[:1] == "[":
-                segment = re.sub(r"\[|\]", "", line)
-
-            # ignore comments and empty lines
-            elif line[:1] == ";" or line[:1] == "#" or line == "":
-                continue
-
-            # if line ends with \ it is likely part of a multi-line command argument
-            elif line[-1] == "\\" or line[-1] == "'":
-                variables = f"{variables} {line} "
-
-            else:
-                line = line.split("=", 1)
-                if "segment" in locals():
-                    # some variables/arguments are not delimited by a '='
-                    # (eg. '-Kvalue' instead of '-key=value')
-                    if len(line) < 2:
-                        variables = f"{variables} {segment}_{line[0]} "
-                    else:
-                        variables = f'{variables} {segment}_{line[0]}="{line[1]}" '
+        for segment, configuration in parser.items():
+            original_key = ""
+            previous_value = ""
+            concat_value = False
+            for key, value in configuration.items():
+                original_key = original_key or key
+
+                if concat_value:
+                    # A backslash was found at the end of the previous line
+                    # If value is None, it might not contain a backslash
+                    # So we turn it into an empty string.
+                    value = f"{previous_value} {key} {value or ''}".strip()
+
+                concat_value = str(value).endswith("\\")
+                if concat_value:
+                    # Remove any dangling empty space or backslashes
+                    previous_value = value.rstrip("\\ ")
                 else:
-                    variables = f"{variables} {line} ".strip()
+                    output.write(f'{segment}_{original_key or key}="{value}" ')
+                    original_key = ""
+                    previous_value = ""
 
     except UnicodeDecodeError:
         pass
 
-    return variables.strip()
+    output_data = output.getvalue()
+    # Remove any back slashes or new line characters.
+    output_data = re.sub(r"(\\|\n)", "", output_data)
+    return output_data.strip()

{dissect.target-3.11.dev21.dist-info → dissect.target-3.11.dev22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.11.dev21
+Version: 3.11.dev22
 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.11.dev21.dist-info → dissect.target-3.11.dev22.dist-info}/RECORD

@@ -153,7 +153,7 @@ dissect/target/plugins/os/unix/generic.py,sha256=R9fi1qNDaY5_l5g0XVLuXv1jOSz9wpb
 dissect/target/plugins/os/unix/history.py,sha256=ocFkn3LX1-ptkWs6cfRHo3Daa2MSwSyaP2sxVOE7LIY,4423
 dissect/target/plugins/os/unix/locale.py,sha256=EJEZiRvhlETPbOp6NHCskBAb8dsJIulcZTxaKgttvxU,2811
 dissect/target/plugins/os/unix/packagemanager.py,sha256=-mxNhDjvj497-wBvu3z22316Ux4KOnMp4cs26BJchyQ,2437
-dissect/target/plugins/os/unix/services.py,sha256=G7Lcd4r7BPelr2ifcGTsv5UN-hxGMSbjFXLitl8bT4s,4935
+dissect/target/plugins/os/unix/services.py,sha256=t9vN1OOdDM_f59JK47EnQHLWPrc3pFC0QnbaMarRIno,5273
 dissect/target/plugins/os/unix/shadow.py,sha256=7ztW_fYLihxNjS2opFToF-xKZngYDGcTEbZKnodRkc8,3409
 dissect/target/plugins/os/unix/bsd/_os.py,sha256=e5rttTOFOmd7e2HqP9ZZFMEiPLBr-8rfH0XH1IIeroQ,1372
 dissect/target/plugins/os/unix/bsd/freebsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -273,10 +273,10 @@ dissect/target/volumes/bde.py,sha256=gYGg5yF9MNARwNzEkrEfZmKkxyZW4rhLkpdnPJCbhGk
 dissect/target/volumes/disk.py,sha256=95grSsPt1BLVpKwTclwQYzPFGKTkFFqapIk0RoGWf38,968
 dissect/target/volumes/lvm.py,sha256=_kIB1mdRs1OFhRgoT4VEP5Fv8imQnI7oQ_ie4x710tQ,1814
 dissect/target/volumes/vmfs.py,sha256=mlAJ8278tYaoRjk1u6tFFlCaDQUrVu5ZZE4ikiFvxi8,1707
-dissect.target-3.11.dev21.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.11.dev21.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.11.dev21.dist-info/METADATA,sha256=vItcyHWWxmMfSO1_bhaL_fYAVEBBfR8caKoKAaY4QgI,10755
-dissect.target-3.11.dev21.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-dissect.target-3.11.dev21.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.11.dev21.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.11.dev21.dist-info/RECORD,,
+dissect.target-3.11.dev22.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.11.dev22.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.11.dev22.dist-info/METADATA,sha256=W5FRbLJTPd1qh1WasztwQ5BSCPpd0AzaSVihYRSXlvw,10755
+dissect.target-3.11.dev22.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+dissect.target-3.11.dev22.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.11.dev22.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.11.dev22.dist-info/RECORD,,