Fix DirectoryEntry type parsing (#4)

Author: Schamper

dissect/apfs/objects/fs.py

@@ -792,43 +792,43 @@ def dt(self) -> c_apfs.DT:
     @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)."""
         return self.is_block_device() or self.is_character_device()
 
     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:

tests/test_apfs.py

@@ -36,6 +36,11 @@ def _assert_apfs_content(volume: FS, beta: bool) -> None:
         ]
     )
 
+    # Test direntry parsing
+    assert node.listdir()["dir"].is_dir()
+    assert node.listdir()["hardlink"].is_file()
+    assert node.listdir()["symlink-dir"].is_symlink()
+
     # Empty file
     node = volume.get("empty")
     assert node.name == "empty"
@@ -240,6 +245,9 @@ def _assert_apfs_content(volume: FS, beta: bool) -> None:
 
     if ".HFS+ Private Directory Data\r" not in volume.get("/").listdir() and not beta:
         # Special files
+        dirents = volume.get("dir").listdir()
+        assert dirents["blockdev"].is_block_device()
+
         node = volume.get("dir/blockdev")
         assert node.name == "blockdev"
         assert node.is_block_device()
@@ -263,6 +271,8 @@ def _assert_apfs_content(volume: FS, beta: bool) -> None:
             "chardev-svr4",
             "chardev-ultrix",
         ]:
+            assert dirents[name].is_character_device()
+
             node = volume.get(f"dir/{name}")
             assert node.name == name
             assert node.is_character_device()