Merge pull request #907 from onekey-sec/relax-dissect-cstruct-annotation

chore(dissect.cstruct): Make Unblob compatible with version 4.0
onekey-sec · Jul 23, 2024 · 18a2ce1 · 18a2ce1
2 parents eb8b1b5 + 94f9129
commit 18a2ce1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.8"
 click = "^8.1.7"
-"dissect.cstruct" = "^2.0"
+"dissect.cstruct" = ">=2.0,<5.0"
 attrs = ">=23.1.0"
 structlog = ">=24.1.0"
 arpy = "^2.3.0"

diff --git a/unblob/logging.py b/unblob/logging.py
@@ -7,7 +7,14 @@
 from typing import Any
 
 import structlog
-from dissect.cstruct import Instance, dumpstruct
+from dissect.cstruct import dumpstruct
+
+try:
+    # dissect.cstruct >= 4.0
+    from dissect.cstruct import Structure
+except ImportError:
+    # dissect.cstruct == 2.0
+    from dissect.cstruct import Instance as Structure
 
 
 def format_hex(value: int):
@@ -42,7 +49,7 @@ def _format_message(value: Any, extract_root: Path) -> Any:
             new_value = value
         return new_value.as_posix().encode("utf-8", errors="surrogateescape")
 
-    if isinstance(value, Instance):
+    if isinstance(value, Structure):
         return dumpstruct(value, output="string")
 
     if isinstance(value, int):