fix(handler): extend valid states to 0, 1, and 2.

onekey-sec · Jan 12, 2024 · a8f24d3 · a8f24d3
1 parent ab5436d
commit a8f24d3
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 2 deletions.
diff --git a/tests/integration/filesystem/extfs/__input__/ext2.1024.nullstate.img b/tests/integration/filesystem/extfs/__input__/ext2.1024.nullstate.img
diff --git a/tests/integration/filesystem/extfs/__input__/ext3.1024.nullstate.img b/tests/integration/filesystem/extfs/__input__/ext3.1024.nullstate.img
diff --git a/tests/integration/filesystem/extfs/__input__/ext4.1024.nullstate.img b/tests/integration/filesystem/extfs/__input__/ext4.1024.nullstate.img
diff --git a/tests/integration/filesystem/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs
diff --git a/...esystem/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/apple.txt b/...esystem/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/apple.txt
diff --git a/...system/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/banana.txt b/...system/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/banana.txt
diff --git a/...system/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/cherry.txt b/...system/extfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/cherry.txt
diff --git a/...tfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/...tfs/__output__/ext2.1024.nullstate.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
diff --git a/...gration/filesystem/extfs/__output__/ext2.1024.nullstate.img_extract/524288-524289.padding b/...gration/filesystem/extfs/__output__/ext2.1024.nullstate.img_extract/524288-524289.padding
diff --git a/tests/integration/filesystem/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs
diff --git a/...esystem/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/apple.txt b/...esystem/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/apple.txt
diff --git a/...system/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/banana.txt b/...system/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/banana.txt
diff --git a/...system/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/cherry.txt b/...system/extfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/cherry.txt
diff --git a/...tfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/...tfs/__output__/ext3.1024.nullstate.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
diff --git a/...gration/filesystem/extfs/__output__/ext3.1024.nullstate.img_extract/524288-524289.padding b/...gration/filesystem/extfs/__output__/ext3.1024.nullstate.img_extract/524288-524289.padding
diff --git a/tests/integration/filesystem/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs b/tests/integration/filesystem/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs
diff --git a/...esystem/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/apple.txt b/...esystem/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/apple.txt
diff --git a/...system/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/banana.txt b/...system/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/banana.txt
diff --git a/...system/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/cherry.txt b/...system/extfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/cherry.txt
diff --git a/...tfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/lost+found/.gitkeep b/...tfs/__output__/ext4.1024.nullstate.img_extract/0-524288.extfs_extract/lost+found/.gitkeep
diff --git a/...gration/filesystem/extfs/__output__/ext4.1024.nullstate.img_extract/524288-524289.padding b/...gration/filesystem/extfs/__output__/ext4.1024.nullstate.img_extract/524288-524289.padding
diff --git a/unblob/handlers/filesystem/extfs.py b/unblob/handlers/filesystem/extfs.py
@@ -28,7 +28,7 @@
 class EXTHandler(StructHandler):
     NAME = "extfs"
 
-    PATTERNS = [HexString("53 ef ( 01 | 02 ) 00 ( 00 | 01 | 02 | 03 | 04 ) 00")]
+    PATTERNS = [HexString("53 ef ( 00 | 01 | 02 ) 00 ( 00 | 01 | 02 | 03 | 04 ) 00")]
 
     C_DEFINITIONS = r"""
         typedef struct ext4_superblock {
@@ -67,7 +67,7 @@ class EXTHandler(StructHandler):
     EXTRACTOR = Command("debugfs", "-R", 'rdump / "{outdir}"', "{inpath}")
 
     def valid_header(self, header) -> bool:
-        if header.s_state not in [0x1, 0x2]:
+        if header.s_state not in [0x0, 0x1, 0x2]:
             logger.debug("ExtFS header state not valid", state=header.s_state)
             return False
         if header.s_errors not in [0x0, 0x1, 0x2, 0x3]: