dissect.target 3.17.dev20__tar.gz → 3.17.dev21__tar.gz

{dissect.target-3.17.dev20/dissect.target.egg-info → dissect.target-3.17.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.17.dev20
+Version: 3.17.dev21
 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.17.dev20 → dissect.target-3.17.dev21}/dissect/target/helpers/network_managers.py

@@ -1,9 +1,12 @@
+from __future__ import annotations
+
+import logging
 import re
 from collections import defaultdict
 from configparser import ConfigParser, MissingSectionHeaderError
 from io import StringIO
 from re import compile, sub
-from typing import Any, Callable, Iterable, Match, Optional, Union
+from typing import Any, Callable, Iterable, Match, Optional
 
 from defusedxml import ElementTree
 
@@ -11,6 +14,8 @@ from dissect.target.exceptions import PluginError
 from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.target import Target
 
+log = logging.getLogger(__name__)
+
 try:
     from ruamel.yaml import YAML
 
@@ -60,7 +65,7 @@ class Template:
         """
 
         if not path.exists() or path.is_dir():
-            self.target.log.debug("Failed to get config file %s", path)
+            log.debug("Failed to get config file %s", path)
             config = None
 
         if self.name == "netplan":
@@ -85,7 +90,7 @@ class Template:
         if HAS_YAML:
             return self.parser(path.open("rb"))
         else:
-            self.target.log.error("Failed to parse %s. Cannot import ruamel.yaml", self.name)
+            log.error("Failed to parse %s. Cannot import ruamel.yaml", self.name)
             return None
 
     def _parse_wicked_config(self, path: TargetPath) -> dict:
@@ -278,7 +283,7 @@ class Parser:
             if option in translation_values and value:
                 return translation_key
 
-    def _get_option(self, config: dict, option: str, section: Optional[str] = None) -> Union[str, Callable]:
+    def _get_option(self, config: dict, option: str, section: Optional[str] = None) -> Optional[str | Callable]:
         """Internal function to get arbitrary options values from a parsed (non-translated) dictionary.
 
         Args:
@@ -289,8 +294,13 @@ class Parser:
         Returns:
             Value(s) corrensponding to that network configuration option.
         """
+        if not config:
+            log.error("Cannot get option %s: No config to parse", option)
+            return
+
         if section:
-            config = config[section]
+            config = config.get(section, {})
+
         for key, value in config.items():
             if key == option:
                 return value
@@ -364,7 +374,7 @@ class NetworkManager:
         if self.registered:
             self.config = self.parser.parse()
         else:
-            self.target.log.error("Network manager %s is not registered. Cannot parse config.", self.name)
+            log.error("Network manager %s is not registered. Cannot parse config.", self.name)
 
     @property
     def interface(self) -> set:

{dissect.target-3.17.dev20 → dissect.target-3.17.dev21/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.17.dev20
+Version: 3.17.dev21
 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