fix: removed jffs-root folder from jffs2 unpacker result

fkie-cad · Feb 21, 2025 · faf3b7b · faf3b7b
1 parent 34c706c
commit faf3b7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/fact_extractor/plugins/unpacking/jffs2/code/jffs2.py b/fact_extractor/plugins/unpacking/jffs2/code/jffs2.py
@@ -9,7 +9,7 @@
 
 NAME = 'JFFS2'
 MIME_PATTERNS = ['filesystem/jffs2', 'filesystem/jffs2-big']
-VERSION = '0.5'
+VERSION = '0.6.0'
 
 
 def unpack_function(file_path, tmp_dir):
@@ -18,8 +18,8 @@ def unpack_function(file_path, tmp_dir):
     local_tmp_dir should be used to store the extracted files.
     """
 
-    extract_dir = Path(tmp_dir) / 'jffs-root'
-    output = execute_shell_command(f'fakeroot jefferson -v -d {extract_dir} {file_path}') + '\n'
+    tmp_dir_path = Path(tmp_dir)
+    output = execute_shell_command(f'fakeroot jefferson -vfd {tmp_dir_path} {file_path}')
     meta_data = {'output': output}
     logging.debug(output)
     return meta_data

diff --git a/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py b/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py
@@ -10,12 +10,10 @@ def test_unpacker_selection_generic(self):
         self.check_unpacker_selection('filesystem/jffs2', 'JFFS2')
         self.check_unpacker_selection('filesystem/jffs2-big', 'JFFS2')
 
-    def test_extraction_little(self):
-        self.check_unpacking_of_standard_unpack_set(
-            TEST_DATA_DIR / 'jffs2_be.img', additional_prefix_folder='jffs-root'
-        )
-
     def test_extraction_big(self):
-        self.check_unpacking_of_standard_unpack_set(
-            TEST_DATA_DIR / 'jffs2_le.img', additional_prefix_folder='jffs-root'
-        )
+        meta_data = self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_be.img')
+        assert 'Jffs2_raw_inode count: 4' in meta_data['output']
+
+    def test_extraction_little(self):
+        meta_data = self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_le.img')
+        assert 'Jffs2_raw_inode count: 4' in meta_data['output']