dissect.target 3.17.dev10__tar.gz → 3.17.dev11__tar.gz

{dissect.target-3.17.dev10/dissect.target.egg-info → dissect.target-3.17.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.17.dev10
+Version: 3.17.dev11
 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
@@ -53,7 +53,7 @@ Requires-Dist: dissect.xfs<4.0.dev,>=3.0.dev; extra == "full"
 Requires-Dist: ipython; extra == "full"
 Requires-Dist: fusepy; extra == "full"
 Requires-Dist: pycryptodome; extra == "full"
-Requires-Dist: pyyaml; extra == "full"
+Requires-Dist: ruamel.yaml; extra == "full"
 Requires-Dist: tomli; python_version < "3.11" and extra == "full"
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: yara

{dissect.target-3.17.dev10 → dissect.target-3.17.dev11}/dissect/target/helpers/configutil.py

@@ -29,11 +29,11 @@ from dissect.target.filesystem import FilesystemEntry
 from dissect.target.helpers.fsutil import TargetPath
 
 try:
-    import yaml
+    from ruamel.yaml import YAML
 
-    PY_YAML = True
+    HAS_YAML = True
 except ImportError:
-    PY_YAML = False
+    HAS_YAML = False
 
 try:
     if sys.version_info < (3, 11):
@@ -413,11 +413,11 @@ class Yaml(ConfigurationParser):
     """Parses a Yaml file."""
 
     def parse_file(self, fh: TextIO) -> None:
-        if PY_YAML:
-            parsed_data = yaml.load(fh, yaml.BaseLoader)
+        if HAS_YAML:
+            parsed_data = YAML(typ="safe").load(fh)
             self.parsed_data = ListUnwrapper.unwrap(parsed_data)
         else:
-            raise ConfigurationParsingError("Failed to parse file, please install PyYAML.")
+            raise ConfigurationParsingError("Failed to parse file, please install ruamel.yaml.")
 
 
 class Toml(ConfigurationParser):

{dissect.target-3.17.dev10 → dissect.target-3.17.dev11}/dissect/target/helpers/network_managers.py

@@ -12,11 +12,11 @@ from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.target import Target
 
 try:
-    import yaml
+    from ruamel.yaml import YAML
 
-    PY_YAML = True
+    HAS_YAML = True
 except ImportError:
-    PY_YAML = False
+    HAS_YAML = False
 
 IGNORED_IPS = [
     "0.0.0.0",
@@ -49,7 +49,7 @@ class Template:
         """Sets the name of the the used parsing template to the name of the discovered network manager."""
         self.name = name
 
-    def create_config(self, path: TargetPath) -> Union[dict, None]:
+    def create_config(self, path: TargetPath) -> Optional[dict]:
         """Create a network config dictionary based on the configured template and supplied path.
 
         Args:
@@ -73,26 +73,26 @@ class Template:
             config = self._parse_configparser_config(path)
         return config
 
-    def _parse_netplan_config(self, fh: TargetPath) -> Union[dict, None]:
+    def _parse_netplan_config(self, path: TargetPath) -> Optional[dict]:
         """Internal function to parse a netplan YAML based configuration file into a dict.
 
         Args:
-            fh: A file-like object to the configuration file to be parsed.
+            fh: A path to the configuration file to be parsed.
 
         Returns:
             Dictionary containing the parsed YAML based configuration file.
         """
-        if PY_YAML:
-            return self.parser(stream=fh.open(), Loader=yaml.FullLoader)
+        if HAS_YAML:
+            return self.parser(path.open("rb"))
         else:
-            self.target.log.error("Failed to parse %s. Cannot import PyYAML", self.name)
+            self.target.log.error("Failed to parse %s. Cannot import ruamel.yaml", self.name)
             return None
 
-    def _parse_wicked_config(self, fh: TargetPath) -> dict:
+    def _parse_wicked_config(self, path: TargetPath) -> dict:
         """Internal function to parse a wicked XML based configuration file into a dict.
 
         Args:
-            fh: A file-like object to the configuration file to be parsed.
+            fh: A path to the configuration file to be parsed.
 
         Returns:
             Dictionary containing the parsed xml based Linux network manager based configuration file.
@@ -101,44 +101,43 @@ class Template:
         # we have to replace the ":" for this with "___" (three underscores) to make the xml config non-namespaced.
         pattern = compile(r"(?<=\n)\s+(<.+?>)")
         replace_match: Callable[[Match]] = lambda match: match.group(1).replace(":", "___")
-        text = sub(pattern, replace_match, fh.open("rt").read())
+        text = sub(pattern, replace_match, path.open("rt").read())
 
         xml = self.parser.parse(StringIO(text))
         return self._parse_xml_config(xml, self.sections, self.options)
 
-    def _parse_configparser_config(self, fh: TargetPath) -> dict:
+    def _parse_configparser_config(self, path: TargetPath) -> dict:
         """Internal function to parse ConfigParser compatible configuration files into a dict.
 
         Args:
-            fh: A file-like object to the configuration file to be parsed.
+            path: A path to the configuration file to be parsed.
 
         Returns:
             Dictionary containing the parsed ConfigParser compatible configuration file.
         """
         try:
-            self.parser.read_string(fh.open("rt").read(), fh.name)
+            self.parser.read_string(path.open("rt").read(), path.name)
             return self.parser._sections
         except MissingSectionHeaderError:
             # configparser does like config files without headers, so we inject a header to make it work.
-            self.parser.read_string(f"[{self.name}]\n" + fh.open("rt").read(), fh.name)
+            self.parser.read_string(f"[{self.name}]\n" + path.open("rt").read(), path.name)
             return self.parser._sections
 
-    def _parse_text_config(self, comments: str, delim: str, fh: TargetPath) -> dict:
+    def _parse_text_config(self, comments: str, delim: str, path: TargetPath) -> dict:
         """Internal function to parse a basic plain text based configuration file into a dict.
 
         Args:
             comments: A string value defining the comment style of the configuration file.
             delim: A string value defining the delimiters used in the configuration file.
-            fh: A file-like object to the configuration file to be parsed.
+            path: A path to the configuration file to be parsed.
 
         Returns:
             Dictionary with a parsed plain text based Linux network manager configuration file.
         """
         config = defaultdict(dict)
         option_dict = {}
-        fh = fh.open("rt")
 
-        for line in fh.readlines():
+        for line in path.open("rt"):
             line = line.strip()
 
             if not line or line.startswith(comments):
@@ -631,7 +630,9 @@ TEMPLATES = {
         ["netctl"],
         ["address", "gateway", "dns", "ip"],
     ),
-    "netplan": Template("netplan", yaml.load if PY_YAML else None, ["network"], ["addresses", "dhcp4", "gateway4"]),
+    "netplan": Template(
+        "netplan", YAML(typ="safe").load if HAS_YAML else None, ["network"], ["addresses", "dhcp4", "gateway4"]
+    ),
     "NetworkManager": Template(
         "NetworkManager",
         ConfigParser(delimiters=("="), comment_prefixes="#", dict_type=dict),

dissect.target-3.17.dev11/dissect/target/loaders/target.py

@@ -0,0 +1,30 @@
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+try:
+    from ruamel.yaml import YAML
+except ImportError:
+    raise ImportError("Missing ruamel.yaml dependency")
+
+from dissect.target import container
+from dissect.target.loader import Loader
+
+if TYPE_CHECKING:
+    from dissect.target.target import Target
+
+
+class TargetLoader(Loader):
+    """Load target files."""
+
+    def __init__(self, path: Path, **kwargs):
+        super().__init__(path)
+        self.base_dir = path.parent
+        self.definition = YAML(typ="safe").load(path.open("rb"))
+
+    @staticmethod
+    def detect(path: Path) -> bool:
+        return path.suffix.lower() == ".target"
+
+    def map(self, target: Target) -> None:
+        for disk in self.definition["disks"]:
+            target.disks.add(container.open(disk))

{dissect.target-3.17.dev10 → dissect.target-3.17.dev11/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.17.dev10
+Version: 3.17.dev11
 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
@@ -53,7 +53,7 @@ Requires-Dist: dissect.xfs<4.0.dev,>=3.0.dev; extra == "full"
 Requires-Dist: ipython; extra == "full"
 Requires-Dist: fusepy; extra == "full"
 Requires-Dist: pycryptodome; extra == "full"
-Requires-Dist: pyyaml; extra == "full"
+Requires-Dist: ruamel.yaml; extra == "full"
 Requires-Dist: tomli; python_version < "3.11" and extra == "full"
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: yara

{dissect.target-3.17.dev10 → dissect.target-3.17.dev11}/dissect.target.egg-info/requires.txt

@@ -34,7 +34,7 @@ dissect.xfs<4.0.dev,>=3.0.dev
 ipython
 fusepy
 pycryptodome
-pyyaml
+ruamel.yaml
 zstandard
 
 [full:python_version < "3.11"]

{dissect.target-3.17.dev10 → dissect.target-3.17.dev11}/pyproject.toml

@@ -65,7 +65,7 @@ full = [
     "ipython",
     "fusepy",
     "pycryptodome",
-    "pyyaml",
+    "ruamel.yaml",
     "tomli; python_version<'3.11'",
     # dissect.target's caching uses flow.record functionlity which depends on the
     # zstandard module being available. However flow.record does not define

dissect.target-3.17.dev10/dissect/target/loaders/target.py

@@ -1,27 +0,0 @@
-try:
-    import yaml
-except ImportError:
-    raise ImportError("Missing PyYAML dependency")
-
-from dissect.target import container
-from dissect.target.loader import Loader
-
-
-class TargetLoader(Loader):
-    """Load target files."""
-
-    def __init__(self, path, **kwargs):
-        super().__init__(path)
-        self.base_dir = path.parent
-        self.definition = yaml.safe_load(path.open("rb"))
-
-    @staticmethod
-    def detect(path):
-        return path.suffix.lower() == ".target"
-
-    def map(self, target):
-        for disk in self.definition["disks"]:
-            target.disks.add(container.open(disk))
-
-    def open(self, path):
-        return self.base_dir.joinpath(path).open("rb")