feat: moved gzip unpacking from patool to 7z plugin

fact_extractor/plugins/unpacking/patool/code/patool.py

@@ -6,7 +6,6 @@
 
 NAME = 'PaTool'
 MIME_PATTERNS = [
-    'application/gzip',
     'application/java-archive',
     'application/vnd.debian.binary-package',
     'application/vnd.ms-cab-compressed',
@@ -22,7 +21,6 @@
     'application/x-cpio',
     'application/x-debian-package',
     'application/x-dms',
-    'application/x-gzip',
     'application/x-lha',
     'application/x-lrzip',
     'application/x-lz4',
@@ -40,7 +38,7 @@
     'application/zpaq',
     'audio/flac',
 ]
-VERSION = '0.6.0'
+VERSION = '0.6.1'
 
 TOOL_PATH = execute_shell_command('which patool').strip()
 

fact_extractor/plugins/unpacking/patool/test/test_plugin_patool.py

@@ -24,10 +24,9 @@ def test_unpacker_selection_generic(self):
             ('test.shar', None),
             ('test.tar.Z', None),
             ('test.tar.bz2', None),
-            ('test.tar.gz', None),
+            ('test.tar', None),
             ('test.tar.lz', None),
             ('test.tar.xz', None),
-            ('test.tar.zip', None),
             ('test.zoo', None),
             ('test.zpaq', None),
         ],
@@ -45,7 +44,6 @@ def test_archive_extraction(self, in_file, ignore):
         [
             'test.a',
             'test.bz2',
-            'test.gz',
             'test.lrz',
             'test.lz',
             'test.lz4',

fact_extractor/plugins/unpacking/sevenz/code/sevenz.py

@@ -3,7 +3,7 @@
 """
 
 import logging
-import os
+from pathlib import Path
 
 from common_helper_passwords import get_merged_password_set
 from common_helper_process import execute_shell_command
@@ -13,8 +13,10 @@
 NAME = '7z'
 MIME_PATTERNS = [
     # compressed archives
+    'application/gzip',
     'application/rar',
     'application/x-7z-compressed',
+    'application/x-gzip',
     'application/x-iso9660-image',
     'application/x-lzma',
     'application/x-rar',
@@ -32,13 +34,13 @@
     'filesystem/hfs',
     'filesystem/ntfs',
 ]
-VERSION = '0.8.2'
+VERSION = '0.8.3'
 
 UNPACKER_EXECUTABLE = '7z'
 
 # Empty password must be first in list to correctly detect if archive has no password
 PW_LIST = ['']
-PW_LIST.extend(get_merged_password_set(os.path.join(get_src_dir(), 'unpacker/passwords')))
+PW_LIST.extend(get_merged_password_set(Path(get_src_dir()) / 'unpacker/passwords'))
 
 
 def unpack_function(file_path, tmp_dir):

fact_extractor/plugins/unpacking/sevenz/test/test_plugin_sevenz.py

@@ -55,3 +55,12 @@ def test_extraction_password(self, test_file):
             TEST_DATA_DIR / test_file, additional_prefix_folder='get_files_test', output=True
         )
         assert meta['password'] == 'test', 'password info not set'
+
+    def test_gzip_extraction(self):
+        input_file = TEST_DATA_DIR / 'test.gz'
+        files, meta_data = self.unpacker.extract_files_from_file(str(input_file), self.tmp_dir.name)
+        assert meta_data['plugin_used'] == '7z'
+        assert len(files) == 1
+        assert Path(files[0]).name == 'test.data'
+        assert 'Type = gzip' in meta_data['output']
+        assert 'Everything is Ok' in meta_data['output']