dissect.cim 3.11.dev2__tar.gz → 3.12.dev1__tar.gz

dissect_cim-3.12.dev1/.gitattributes

@@ -0,0 +1 @@
+tests/_data/** filter=lfs diff=lfs merge=lfs -text

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.cim
-Version: 3.11.dev2
+Version: 3.12.dev1
 Summary: A Dissect module implementing a parser for the Windows Common Information Model (CIM) database, used in the Windows operating system
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -27,6 +27,7 @@ Requires-Dist: dissect.util<4,>=3
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.cim
 

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/dissect/cim/cim.py

@@ -22,6 +22,7 @@ from dissect.cim.classes import (
     ClassDefinition,
     ClassDefinitionProperty,
     ClassInstance,
+    ClassInstanceProperty,
     InstanceKey,
     PropertyDefaultValues,
     Qualifier,
@@ -302,12 +303,6 @@ class Instance:
         self.class_definition = class_.class_definition
         self.class_instance = class_instance
 
-    def __getattr__(self, attr: str) -> Any:
-        try:
-            return getattr(self.class_instance, attr)
-        except AttributeError:
-            return object.__getattribute__(self, attr)
-
     @property
     def key(self) -> InstanceKey:
         return self.class_instance.key
@@ -328,6 +323,10 @@ class Instance:
     def ci(self) -> ClassInstance:
         return self.class_instance
 
+    @property
+    def properties(self) -> dict[str, ClassInstanceProperty]:
+        return self.class_instance.properties
+
 
 class Property:
     def __init__(self, class_: Class, prop: ClassDefinitionProperty):

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/dissect/cim/classes.py

@@ -331,6 +331,18 @@ class ClassInstance:
 
 
 class InstanceKey(dict):
+    """A dictionary subclass that allows for attribute-style access and assignment.
+
+    Is represented as a string in the format "key1=value1;key2=value2" or "default" if empty.
+
+    Example:
+
+        >>> d = InstanceKey()
+        >>> d.foo = "bar"
+        >>> d.foo
+        "bar"
+    """
+
     def __getattr__(self, key: str) -> Any:
         return self[key]
 
@@ -412,6 +424,18 @@ class DataRegion:
         if t in (CIM_TYPES.STRING, CIM_TYPES.REFERENCE, CIM_TYPES.DATETIME):
             return self.get_string(value)
 
+        if t in (
+            CIM_TYPES.INT8,
+            CIM_TYPES.UINT8,
+            CIM_TYPES.INT16,
+            CIM_TYPES.UINT16,
+            CIM_TYPES.INT32,
+            CIM_TYPES.UINT32,
+            CIM_TYPES.INT64,
+            CIM_TYPES.UINT64,
+        ):
+            return value
+
         if t == CIM_TYPES.BOOLEAN:
             return value == BOOLEAN_STATES.TRUE
 

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/dissect.cim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.cim
-Version: 3.11.dev2
+Version: 3.12.dev1
 Summary: A Dissect module implementing a parser for the Windows Common Information Model (CIM) database, used in the Windows operating system
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -27,6 +27,7 @@ Requires-Dist: dissect.util<4,>=3
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.cim
 

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/dissect.cim.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 .git-blame-ignore-revs
+.gitattributes
 COPYRIGHT
 LICENSE
 MANIFEST.in
@@ -22,11 +23,12 @@ dissect/cim/utils.py
 tests/__init__.py
 tests/conftest.py
 tests/test_cim.py
-tests/data/INDEX.BTR.gz
-tests/data/MAPPING1.MAP.gz
-tests/data/MAPPING2.MAP.gz
-tests/data/MAPPING3.MAP.gz
-tests/data/OBJECTS.DATA.gz
-tests/docs/Makefile
-tests/docs/conf.py
-tests/docs/index.rst
+tests/_data/INDEX.BTR.gz
+tests/_data/MAPPING1.MAP.gz
+tests/_data/MAPPING2.MAP.gz
+tests/_data/MAPPING3.MAP.gz
+tests/_data/OBJECTS.DATA.gz
+tests/_docs/Makefile
+tests/_docs/__init__.py
+tests/_docs/conf.py
+tests/_docs/index.rst

{dissect_cim-3.11.dev2/tests/docs → dissect_cim-3.12.dev1/tests/_docs}/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?= -jauto
+SPHINXOPTS    ?= -jauto -w $(BUILDDIR)/warnings.log --fail-on-warning
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = build

{dissect_cim-3.11.dev2/tests/docs → dissect_cim-3.12.dev1/tests/_docs}/conf.py

@@ -1,3 +1,5 @@
+project = "dissect.cim"
+
 extensions = [
     "autoapi.extension",
     "sphinx.ext.autodoc",
@@ -32,3 +34,8 @@ autodoc_typehints = "signature"
 autodoc_member_order = "groupwise"
 
 autosectionlabel_prefix_document = True
+
+suppress_warnings = [
+    # https://github.com/readthedocs/sphinx-autoapi/issues/285
+    "autoapi.python_import_resolution",
+]

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/tests/conftest.py

@@ -21,14 +21,14 @@ def open_file_gz(name: str, mode: str = "rb") -> Iterator[gzip.GzipFile]:
 
 @pytest.fixture
 def index_bin() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/INDEX.BTR.gz")
+    yield from open_file_gz("_data/INDEX.BTR.gz")
 
 
 @pytest.fixture
 def objects_bin() -> Iterator[BinaryIO]:
-    yield from open_file_gz("data/OBJECTS.DATA.gz")
+    yield from open_file_gz("_data/OBJECTS.DATA.gz")
 
 
 @pytest.fixture
 def mappings_bin() -> Iterator[list[BinaryIO]]:
-    yield from zip(*[open_file_gz(f"data/MAPPING{i}.MAP.gz") for i in range(1, 4)])
+    yield from zip(*[open_file_gz(f"_data/MAPPING{i}.MAP.gz") for i in range(1, 4)])

dissect_cim-3.12.dev1/tests/test_cim.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from typing import BinaryIO
+
+from dissect.cim.cim import CIM
+
+
+def test_cim(index_bin: BinaryIO, objects_bin: BinaryIO, mappings_bin: list[BinaryIO]) -> None:
+    repo = CIM(index_bin, objects_bin, mappings_bin)
+    assert repo
+
+    subscription_ns = repo.root.namespace("subscription")
+    binding = next(subscription_ns.class_("__filtertoconsumerbinding").instances)
+    consumer = subscription_ns.query(binding.properties["Consumer"].value)
+    assert consumer.properties["SourceName"].value == "Service Control Manager"

{dissect_cim-3.11.dev2 → dissect_cim-3.12.dev1}/tox.ini

@@ -62,12 +62,12 @@ deps =
     sphinx-design
     furo
 commands =
-    make -C tests/docs clean
-    make -C tests/docs html
+    make -C tests/_docs clean
+    make -C tests/_docs html
 
 [testenv:docs-linkcheck]
 allowlist_externals = make
 deps = {[testenv:docs-build]deps}
 commands =
-    make -C tests/docs clean
-    make -C tests/docs linkcheck
+    make -C tests/_docs clean
+    make -C tests/_docs linkcheck

dissect_cim-3.11.dev2/tests/test_cim.py

@@ -1,10 +0,0 @@
-from __future__ import annotations
-
-from typing import BinaryIO
-
-from dissect.cim.cim import CIM
-
-
-def test_cim(index_bin: BinaryIO, objects_bin: BinaryIO, mappings_bin: list[BinaryIO]) -> None:
-    repo = CIM(index_bin, objects_bin, mappings_bin)
-    assert repo