dissect.apfs 1.1.dev2__py3-none-any.whl → 1.2.dev2__py3-none-any.whl

dissect/apfs/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.apfs.apfs import APFS
 from dissect.apfs.exception import (
     Error,

dissect/apfs/c_apfs.py

@@ -2,6 +2,8 @@
 # - https://developer.apple.com/support/downloads/Apple-File-System-Reference.pdf
 # - https://github.com/sgan81/apfs-fuse
 # - https://github.com/linux-apfs/linux-apfs-rw
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 
 apfs_def = """

dissect/apfs/exception.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class Error(Exception):
     pass
 

dissect/apfs/objects/fs.py

@@ -792,27 +792,27 @@ class DirectoryEntry:
     @cached_property
     def type(self) -> int:
         """The file type of this directory entry."""
-        return self.value.flags & c_apfs.DREC_TYPE_MASK << 12
+        return (self.value.flags & c_apfs.DREC_TYPE_MASK) << 12
 
     def is_dir(self) -> bool:
         """Return whether this directory entry is a directory."""
-        return stat.S_ISDIR(self.type << 12)
+        return stat.S_ISDIR(self.type)
 
     def is_file(self) -> bool:
         """Return whether this directory entry is a regular file."""
-        return stat.S_ISREG(self.type << 12)
+        return stat.S_ISREG(self.type)
 
     def is_symlink(self) -> bool:
         """Return whether this directory entry is a symbolic link."""
-        return stat.S_ISLNK(self.type << 12)
+        return stat.S_ISLNK(self.type)
 
     def is_block_device(self) -> bool:
         """Return whether this directory entry is a block device."""
-        return stat.S_ISBLK(self.type << 12)
+        return stat.S_ISBLK(self.type)
 
     def is_character_device(self) -> bool:
         """Return whether this directory entry is a character device."""
-        return stat.S_ISCHR(self.type << 12)
+        return stat.S_ISCHR(self.type)
 
     def is_device(self) -> bool:
         """Return whether this directory entry is a device (block or character)."""
@@ -820,15 +820,15 @@ class DirectoryEntry:
 
     def is_fifo(self) -> bool:
         """Return whether this directory entry is a FIFO."""
-        return stat.S_ISFIFO(self.type << 12)
+        return stat.S_ISFIFO(self.type)
 
     def is_socket(self) -> bool:
         """Return whether this directory entry is a socket."""
-        return stat.S_ISSOCK(self.type << 12)
+        return stat.S_ISSOCK(self.type)
 
     def is_whiteout(self) -> bool:
         """Return whether this directory entry is a whiteout."""
-        return stat.S_ISWHT(self.type << 12)
+        return stat.S_ISWHT(self.type)
 
 
 class XAttr:

dissect/apfs/objects/keybag.py

@@ -292,7 +292,6 @@ def _create_cipher(key: bytes, iv: bytes = b"\x00" * 16, mode: str = "cbc") -> A
 
     Dynamic based on the available crypto module.
     """
-
     if HAS_PYSTANDALONE:
         key_size = len(key)
         if key_size not in (32, 24, 16):

dissect/apfs/stream.py

@@ -88,26 +88,30 @@ class FileStream(AlignedStream):
 
         while length:
             logical_address, physical_address, extent_length, crypto_id = self._lookup(offset)
-            block = self.volume.container._read_block(physical_address, extent_length // self.align)
+
+            offset_in_extent = offset - logical_address
+            if offset_in_extent >= extent_length:
+                raise Error(
+                    f"Offset {offset:#x} is out of bounds for extent ({logical_address:#x}, {extent_length:#x})"
+                )
+
+            block_in_extent = offset_in_extent // self.align
+            read_length = min(extent_length - offset_in_extent, length)
+            block = self.volume.container._read_block(physical_address + block_in_extent, read_length // self.align)
 
             if self.volume.is_encrypted:
                 if not self.volume._cipher:
                     raise Error("Volume is encrypted, unlock it first")
 
                 if self.volume.is_onekey:
-                    block = self.volume._cipher.decrypt(block, crypto_id * self.volume.container.sectors_per_block)
+                    sector = (crypto_id + block_in_extent) * self.volume.container.sectors_per_block
+                    block = self.volume._cipher.decrypt(block, sector)
                 else:
                     raise Error("Multi-key encryption is not supported yet")
 
-            if offset_in_extent := offset - logical_address:
-                block = block[offset_in_extent:]
-
-            if length < len(block):
-                block = block[:length]
-
             result.append(block)
-            offset += min(extent_length, length)
-            length -= min(extent_length, length)
+            offset += read_length
+            length -= read_length
 
         return b"".join(result)
 

{dissect_apfs-1.1.dev2.dist-info → dissect_apfs-1.2.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.apfs
-Version: 1.1.dev2
+Version: 1.2.dev2
 Summary: A Dissect module implementing a parser for the APFS file system, a commonly used Apple file system
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_apfs-1.1.dev2.dist-info → dissect_apfs-1.2.dev2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-dissect/apfs/__init__.py,sha256=4ihAtWM6Q-331fM4eSilok1s1seFNQoi3n2Gtu_o6h0,269
+dissect/apfs/__init__.py,sha256=ilg-krPgae8UJxja1oKpQm4qt7-ntdTccLpQL6oZwi4,305
 dissect/apfs/apfs.py,sha256=zZzGDx1YT3SI6O0qsF6nyunpv0dmRdijQWSc7V--mAg,2575
-dissect/apfs/c_apfs.py,sha256=Rq-v9dkfDsx31pZPkPA79Y_ipVMThxPTEVHammG91gY,52189
+dissect/apfs/c_apfs.py,sha256=fN_6UFNeFMKmneplj5-5OxXXCRtX6n-bD09ehklV62w,52225
 dissect/apfs/c_apfs.pyi,sha256=uC8exSo4ZPAG19UNDsBKaYe_Dzo1Vdmme4H2t1bfXd4,95421
 dissect/apfs/cursor.py,sha256=wN02FxEipcxUjw7roLcTa_wKjuxXofwNUnvrBrD04ac,5747
-dissect/apfs/exception.py,sha256=rVL-M01CBpk74d8VeeeqQuwD5P1WHluvNbAnj5D8BBw,263
-dissect/apfs/stream.py,sha256=DIjR1w8zsPt-_ye3x9nsUA2KshJjOsfsBlATcAJ_QTY,7550
+dissect/apfs/exception.py,sha256=3Y0ZcM4ScZ3ajsUniWJUYQBay86dtz6-jt67uOzFUHI,300
+dissect/apfs/stream.py,sha256=uR3QqZHy-owAoV0lARJ8e0W54DNXJAU0wRssrf_5gk8,7806
 dissect/apfs/util.py,sha256=a36KbuLbc7594V5_Iu8yggSSYF4057YSHd1z5nO0_ko,4688
 dissect/apfs/objects/__init__.py,sha256=d79CJGKxHrXOdLOhGp8cfvp_0A0Txi5KyFc6h9Fi7jw,1793
 dissect/apfs/objects/base.py,sha256=gr-8PGSzP7nPN7CkAdb1x2thuFK2wu-5S-Di9uD6XOs,6316
@@ -14,11 +14,11 @@ dissect/apfs/objects/checkpoint_map.py,sha256=sIrb8R5TYYFCW_8EsrjDrHGqYbUnetOnwD
 dissect/apfs/objects/efi_jumpstart.py,sha256=V9jb8f0ybckfRqTcezUqxacYWCqzYf-cc3GQ-93V6F8,313
 dissect/apfs/objects/er_recovery_block.py,sha256=qA2BoG4SE3F1MHCubzu_n39ModB-0cUKGTZukKoVGPs,367
 dissect/apfs/objects/er_state.py,sha256=zNU23weFk3WTrWIY_cWn0V8Ww_LXWaK9CE1BGHSnctY,323
-dissect/apfs/objects/fs.py,sha256=S_J0vr5d9_1_XetkvVCQjIh0duiNxiIslwwiK310SWI,31004
+dissect/apfs/objects/fs.py,sha256=2x4wjPsHqvo6KITb6X9gSJFCgmIApwjw-lCouskbBKE,30958
 dissect/apfs/objects/gbitmap.py,sha256=RMVa9e1mxsarshc0kuNs9Hqwv5I8xff1X7RYHZkcYS8,295
 dissect/apfs/objects/gbitmap_block.py,sha256=erBYsQ4YPYCe_LwX8TSfHDf_UYlrGRmKFvl6P7CKuuk,324
 dissect/apfs/objects/integrity_meta.py,sha256=IFQe5E3II0TL4iP3RxjpLiCL7yaydu5Jp1G6h5EzWgo,322
-dissect/apfs/objects/keybag.py,sha256=icoMjei3xHEiiZGCoIqeF2rwzanw4B2qz6m4uWMtqVk,9258
+dissect/apfs/objects/keybag.py,sha256=y9FB9CKe9T-WVigq7eRIyPSmaTkHiFdioTra2AiNpUE,9257
 dissect/apfs/objects/nx_fusion_wbc.py,sha256=HOrpiYbEaQY83o4q1M6XvwwAIljWMTtaLbE7RZi1kE4,320
 dissect/apfs/objects/nx_fusion_wbc_list.py,sha256=2RY6a2HzjAwoHAyp0MJVRNdbG8IEyBgl7SIGvBcMEug,344
 dissect/apfs/objects/nx_reap_list.py,sha256=P8Y9aPtTeXZWyuYmwBQVoZ-KCooAiSSr4gY_O0YQ15Y,311
@@ -30,9 +30,9 @@ dissect/apfs/objects/spaceman.py,sha256=LN8WHRA_QHhoQVdTid-5-CIXkYgcq3HOMwP5VaUE
 dissect/apfs/objects/spaceman_bitmap.py,sha256=F4idJVAmw2_6ypjH-Ovd-U-_ycBDvRdcQGTNByDDU1w,242
 dissect/apfs/objects/spaceman_cab.py,sha256=pf9tNPNoJTZ5Sae4n3UYci75XvYDJ-L0KrwfHDZ0qFQ,345
 dissect/apfs/objects/spaceman_cib.py,sha256=xKoIPb-Y4brgTZzpTw2Rqf564b0dAZZalcDtO6-326Y,334
-dissect_apfs-1.1.dev2.dist-info/licenses/COPYRIGHT,sha256=m2OYfg5NAsBXgWPGBn4p9g5-Fo0wViC65YkYsFNUaJk,299
-dissect_apfs-1.1.dev2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect_apfs-1.1.dev2.dist-info/METADATA,sha256=0AwPmTcmD5rh_VyBgOJ-BfMhEnS4g6BNT-dGFFqsrHw,3361
-dissect_apfs-1.1.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dissect_apfs-1.1.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_apfs-1.1.dev2.dist-info/RECORD,,
+dissect_apfs-1.2.dev2.dist-info/licenses/COPYRIGHT,sha256=m2OYfg5NAsBXgWPGBn4p9g5-Fo0wViC65YkYsFNUaJk,299
+dissect_apfs-1.2.dev2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect_apfs-1.2.dev2.dist-info/METADATA,sha256=zyRIQCSsK-aAzJrHoc0EbjhTwzzxv3-TvQfWRQ3BTf4,3361
+dissect_apfs-1.2.dev2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+dissect_apfs-1.2.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_apfs-1.2.dev2.dist-info/RECORD,,

{dissect_apfs-1.1.dev2.dist-info → dissect_apfs-1.2.dev2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any