Fix regression for reading unknown data types (#32)

Author: Schamper

dissect/cim/cim.py

@@ -22,6 +22,7 @@
     ClassDefinition,
     ClassDefinitionProperty,
     ClassInstance,
+    ClassInstanceProperty,
     InstanceKey,
     PropertyDefaultValues,
     Qualifier,
@@ -302,12 +303,6 @@ def __init__(self, cim: CIM, namespace: Namespace, class_: Class, 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 @@ def cd(self) -> ClassDefinition:
     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/classes.py

@@ -424,6 +424,18 @@ def get_value(self, value: CimType | BOOLEAN_STATES, value_type: c_cim.cim_type)
         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
 

tests/test_cim.py

@@ -8,3 +8,8 @@
 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"