dissect.target 3.17.dev8__tar.gz → 3.17.dev10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.17.dev8
+Version: 3.17.dev10
 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
@@ -54,6 +54,7 @@ Requires-Dist: ipython; extra == "full"
 Requires-Dist: fusepy; extra == "full"
 Requires-Dist: pycryptodome; extra == "full"
 Requires-Dist: pyyaml; extra == "full"
+Requires-Dist: tomli; python_version < "3.11" and extra == "full"
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: yara
 Requires-Dist: dissect.target[full]; extra == "yara"

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

@@ -3,6 +3,7 @@ from __future__ import annotations
 import io
 import json
 import re
+import sys
 from collections import deque
 from configparser import ConfigParser, MissingSectionHeaderError
 from dataclasses import dataclass
@@ -31,9 +32,20 @@ try:
     import yaml
 
     PY_YAML = True
-except (AttributeError, ImportError):
+except ImportError:
     PY_YAML = False
 
+try:
+    if sys.version_info < (3, 11):
+        import tomli as toml
+    else:
+        # tomllib is included since python 3.11
+        import tomllib as toml  # novermin
+
+    HAS_TOML = True
+except ImportError:
+    HAS_TOML = False
+
 
 def _update_dictionary(current: dict[str, Any], key: str, value: Any) -> None:
     if prev_value := current.get(key):
@@ -408,6 +420,16 @@ class Yaml(ConfigurationParser):
             raise ConfigurationParsingError("Failed to parse file, please install PyYAML.")
 
 
+class Toml(ConfigurationParser):
+    """Parses a Toml file."""
+
+    def parse_file(self, fh: TextIO) -> None:
+        if HAS_TOML:
+            self.parsed_data = toml.loads(fh.read())
+        else:
+            raise ConfigurationParsingError("Failed to parse file, please install tomli.")
+
+
 class ScopeManager:
     """A (context)manager for dictionary scoping.
 
@@ -696,6 +718,7 @@ CONFIG_MAP: dict[tuple[str, ...], ParserConfig] = {
     "sample": ParserConfig(Txt),
     "systemd": ParserConfig(SystemD),
     "template": ParserConfig(Txt),
+    "toml": ParserConfig(Toml),
 }
 
 KNOWN_FILES: dict[str, type[ConfigurationParser]] = {

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.17.dev8
+Version: 3.17.dev10
 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
@@ -54,6 +54,7 @@ Requires-Dist: ipython; extra == "full"
 Requires-Dist: fusepy; extra == "full"
 Requires-Dist: pycryptodome; extra == "full"
 Requires-Dist: pyyaml; extra == "full"
+Requires-Dist: tomli; python_version < "3.11" and extra == "full"
 Requires-Dist: zstandard; extra == "full"
 Provides-Extra: yara
 Requires-Dist: dissect.target[full]; extra == "yara"

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

@@ -37,6 +37,9 @@ pycryptodome
 pyyaml
 zstandard
 
+[full:python_version < "3.11"]
+tomli
+
 [mqtt]
 dissect.target[full]
 paho-mqtt==1.6.1

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

@@ -66,6 +66,7 @@ full = [
     "fusepy",
     "pycryptodome",
     "pyyaml",
+    "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
     # zstandard as a dependency, nor does it allow zstandard to be installed

{dissect.target-3.17.dev8 → dissect.target-3.17.dev10}/tests/plugins/general/test_config.py

@@ -75,6 +75,7 @@ def test_collapse_types(
         ("conf", b"key value"),
         ("sample", b"currently_just_text"),
         ("template", b"currently_just_text"),
+        ("toml", b"key = 'value'"),
     ],
 )
 def test_as_dict(

{dissect.target-3.17.dev8 → dissect.target-3.17.dev10}/tox.ini

@@ -4,7 +4,7 @@ envlist = lint, py3, pypy3
 # requires if they are not available on the host system. This requires the
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
-minversion = 4.2.4
+minversion = 4.4.3
 # This version of virtualenv will install setuptools version 65.5.0 and pip
 # 22.3. These versions fully support python projects defined only through a
 # pyproject.toml file (PEP-517/PEP-518/PEP-621)