dissect.squashfs 1.3.dev1__tar.gz → 1.3.dev3__tar.gz

{dissect.squashfs-1.3.dev1/dissect.squashfs.egg-info → dissect.squashfs-1.3.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.3.dev1
+Version: 1.3.dev3
 Summary: A Dissect module implementing a parser for the SquashFS file system, commonly used in appliance or device firmware
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect.squashfs-1.3.dev1 → dissect.squashfs-1.3.dev3}/dissect/squashfs/squashfs.py

@@ -212,24 +212,42 @@ class INode:
     def __repr__(self) -> str:
         return f"<inode {self.inode_number} ({self.block}, {self.offset})>"
 
-    @cached_property
-    def header(self) -> Instance:
+    def _metadata(self) -> tuple[Instance, int, int]:
         base_struct = c_squashfs.squashfs_base_inode_header
 
         block = self.fs.sb.inode_table_start + self.block
-        _, _, data = self.fs._read_metadata(block, self.offset, len(base_struct))
+        data_block, data_offset, data = self.fs._read_metadata(block, self.offset, len(base_struct))
 
         header = base_struct(data)
         actual_struct = INODE_STRUCT_MAP.get(header.inode_type)
 
         if len(actual_struct) != len(base_struct):
-            _, _, data = self.fs._read_metadata(block, self.offset, len(actual_struct))
+            data_block, data_offset, data = self.fs._read_metadata(block, self.offset, len(actual_struct))
 
         if actual_struct != base_struct:
             header = actual_struct(data)
 
+        self.header = header
+        self.data_block = data_block
+        self.data_offset = data_offset
+
+        return header, data_block, data_offset
+
+    @cached_property
+    def header(self) -> Instance:
+        header, _, _ = self._metadata()
         return header
 
+    @cached_property
+    def data_block(self) -> int:
+        _, data_block, _ = self._metadata()
+        return data_block
+
+    @cached_property
+    def data_offset(self) -> int:
+        _, _, data_offset = self._metadata()
+        return data_offset
+
     @property
     def inode_number(self) -> int:
         return self._inode_number or self.header.inode_number
@@ -298,8 +316,8 @@ class INode:
             raise NotASymlinkError(f"{self!r} is not a symlink")
 
         _, _, data = self.fs._read_metadata(
-            self.fs.sb.inode_table_start + self.block,
-            self.offset + len(self.header),
+            self.data_block,
+            self.data_offset,
             self.header.symlink_size,
         )
         return data.decode(errors="surrogateescape")
@@ -362,8 +380,8 @@ class INode:
 
         if blocks:
             _, _, data = self.fs._read_metadata(
-                self.fs.sb.inode_table_start + self.block,
-                self.offset + len(self.header),
+                self.data_block,
+                self.data_offset,
                 blocks * 4,
             )
             block_list = [(block, 1) for block in c_squashfs.uint32[blocks](data)]

{dissect.squashfs-1.3.dev1 → dissect.squashfs-1.3.dev3/dissect.squashfs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.squashfs
-Version: 1.3.dev1
+Version: 1.3.dev3
 Summary: A Dissect module implementing a parser for the SquashFS file system, commonly used in appliance or device firmware
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3