chore(dissect.cstruct): Git rid of Instance type annotation

- It was already interpreted essentially the same way as `typing.Any`,
  because of its `__getattr__` method
- Newer versions no longer have the `Instance` proxy object
- `cstruct().<x>` calls are annotated with `Any` in new versions
- The actual runtime type will be `Structure` in newer versions that
  needs to be changed in `logging` (not changed for now)

Relates-to: #888

Author: vlaci

tests/handlers/filesystem/test_jffs2.py

@@ -1,7 +1,7 @@
 import binascii
+from typing import Any
 
 import pytest
-from dissect.cstruct import Instance
 from helpers import unhex
 
 from unblob.file_utils import Endian, File
@@ -59,7 +59,7 @@ def get_valid_jffs2_old_be_header():
     )
 
 
-def calculate_crc(header: Instance):
+def calculate_crc(header: Any):
     return (binascii.crc32(header.dumps()[:-4], -1) ^ -1) & 0xFFFFFFFF
 
 
@@ -189,7 +189,7 @@ def calculate_crc(header: Instance):
     ],
 )
 def test_valid_header_new(
-    header: Instance, node_start_offset: int, eof: int, expected: bool
+    header: Any, node_start_offset: int, eof: int, expected: bool
 ):
     header.hdr_crc = calculate_crc(header)
     assert new_handler.valid_header(header, node_start_offset, eof) == expected
@@ -271,7 +271,7 @@ def test_valid_header_new(
     ],
 )
 def test_valid_header_old(
-    header: Instance, node_start_offset: int, eof: int, expected: bool
+    header: Any, node_start_offset: int, eof: int, expected: bool
 ):
     header.hdr_crc = calculate_crc(header)
     assert old_handler.valid_header(header, node_start_offset, eof) == expected

unblob/file_utils.py

@@ -10,9 +10,9 @@
 import struct
 import unicodedata
 from pathlib import Path
-from typing import Iterable, Iterator, List, Literal, Optional, Tuple, Union
+from typing import Any, Iterable, Iterator, List, Literal, Optional, Tuple, Union
 
-from dissect.cstruct import Instance, cstruct
+from dissect.cstruct import cstruct
 from structlog import get_logger
 
 from .logging import format_hex
@@ -336,7 +336,7 @@ def parse(
         struct_name: str,
         file: Union[File, bytes],
         endian: Endian,
-    ) -> Instance:
+    ) -> Any:
         cparser = self.cparser_le if endian is Endian.LITTLE else self.cparser_be
         struct_parser = getattr(cparser, struct_name)
         return struct_parser(file)

unblob/handlers/archive/arc.py

@@ -1,6 +1,5 @@
-from typing import Optional
+from typing import Any, Optional
 
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.extractors.command import Command
@@ -54,7 +53,7 @@ def valid_name(self, name: bytes) -> bool:
         except UnicodeDecodeError:
             return False
 
-    def valid_header(self, header: Instance) -> bool:
+    def valid_header(self, header: Any) -> bool:
         if header.archive_marker != 0x1A:
             return False
         if header.header_type > 0x07:

unblob/handlers/archive/cpio.py

@@ -2,10 +2,9 @@
 import os
 import stat
 from pathlib import Path
-from typing import Optional, Type
+from typing import Any, Optional, Type
 
 import attr
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from ...file_utils import (
@@ -252,7 +251,7 @@ def _pad_file(self, end_offset: int) -> int:
         return end_offset
 
     @classmethod
-    def _pad_header(cls, header: Instance, c_namesize: int) -> int:
+    def _pad_header(cls, header: Any, c_namesize: int) -> int:
         return round_up(len(header) + c_namesize, cls._PAD_ALIGN)
 
     @classmethod

unblob/handlers/archive/dlink/encrpted_img.py

@@ -1,9 +1,8 @@
 import io
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.file_utils import File, InvalidInputFormat
@@ -53,7 +52,7 @@ class EncrptedHandler(StructHandler):
     HEADER_STRUCT = "dlink_header_t"
     EXTRACTOR = EncrptedExtractor()
 
-    def is_valid_header(self, header: Instance) -> bool:
+    def is_valid_header(self, header: Any) -> bool:
         if header.size < len(header):
             return False
         return True

unblob/handlers/archive/dlink/shrs.py

@@ -1,10 +1,9 @@
 import hashlib
 import io
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.file_utils import File, InvalidInputFormat
@@ -70,7 +69,7 @@ class SHRSHandler(StructHandler):
     HEADER_STRUCT = "dlink_header_t"
     EXTRACTOR = SHRSExtractor()
 
-    def is_valid_header(self, header: Instance, file: File) -> bool:
+    def is_valid_header(self, header: Any, file: File) -> bool:
         if header.file_size < len(header):
             return False
         # we're exactly past the header, we compute the digest

unblob/handlers/archive/engeniustech/engenius.py

@@ -1,7 +1,6 @@
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.file_utils import Endian, File, InvalidInputFormat, StructParser
@@ -81,7 +80,7 @@ class EngeniusHandler(StructHandler):
     EXTRACTOR = EngeniusExtractor()
     PATTERN_MATCH_OFFSET = -0x5C
 
-    def is_valid_header(self, header: Instance) -> bool:
+    def is_valid_header(self, header: Any) -> bool:
         if header.length <= len(header):
             return False
         try:

unblob/handlers/archive/hp/bdl.py

@@ -1,8 +1,7 @@
 import io
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.extractor import carve_chunk_to_file
@@ -35,7 +34,7 @@
 """
 
 
-def is_valid_header(header: Instance) -> bool:
+def is_valid_header(header: Any) -> bool:
     if header.toc_offset == 0 or header.toc_entries == 0:
         return False
     try:

unblob/handlers/archive/hp/ipkg.py

@@ -1,8 +1,7 @@
 import io
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.file_utils import (
@@ -48,7 +47,7 @@
 """
 
 
-def is_valid_header(header: Instance) -> bool:
+def is_valid_header(header: Any) -> bool:
     if header.toc_offset == 0 or header.toc_entries == 0:
         return False
     try:

unblob/handlers/archive/instar/bneg.py

@@ -1,7 +1,6 @@
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
-from dissect.cstruct import Instance
 from structlog import get_logger
 
 from unblob.extractor import carve_chunk_to_file
@@ -70,7 +69,7 @@ class BNEGHandler(StructHandler):
     HEADER_STRUCT = "bneg_header_t"
     EXTRACTOR = BNEGExtractor()
 
-    def is_valid_header(self, header: Instance) -> bool:
+    def is_valid_header(self, header: Any) -> bool:
         if header.partition_1_size == 0:
             return False
         if header.partition_2_size == 0: