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

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.2.dev1.dist-info → dissect_apfs-1.2.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.apfs
-Version: 1.2.dev1
+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.2.dev1.dist-info → dissect_apfs-1.2.dev2.dist-info}/RECORD

@@ -4,7 +4,7 @@ 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=3Y0ZcM4ScZ3ajsUniWJUYQBay86dtz6-jt67uOzFUHI,300
-dissect/apfs/stream.py,sha256=DIjR1w8zsPt-_ye3x9nsUA2KshJjOsfsBlATcAJ_QTY,7550
+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
@@ -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.2.dev1.dist-info/licenses/COPYRIGHT,sha256=m2OYfg5NAsBXgWPGBn4p9g5-Fo0wViC65YkYsFNUaJk,299
-dissect_apfs-1.2.dev1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect_apfs-1.2.dev1.dist-info/METADATA,sha256=EEEFHSA3KSI5OuFYQrdwwOYMwYWNGyskJ3XypG6gFvI,3361
-dissect_apfs-1.2.dev1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-dissect_apfs-1.2.dev1.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_apfs-1.2.dev1.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,,