Merge pull request #60203 from ClickHouse/limit_libarchive_format

antonio2368 · web-flow · commit ffe1872e2372 · 2024-02-26T09:25:19.000+01:00
Limit libarchive format to what we use
diff --git a/src/IO/Archives/LibArchiveReader.cpp b/src/IO/Archives/LibArchiveReader.cpp
@@ -152,8 +152,17 @@ class LibArchiveReader::Handle
         auto * archive = archive_read_new();
         try
         {
-            archive_read_support_filter_all(archive);
-            archive_read_support_format_all(archive);
+            // Support for bzip2, gzip, lzip, xz, zstd and lz4
+            archive_read_support_filter_bzip2(archive);
+            archive_read_support_filter_gzip(archive);
+            archive_read_support_filter_xz(archive);
+            archive_read_support_filter_lz4(archive);
+            archive_read_support_filter_zstd(archive);
+            // Support tar, 7zip and zip
+            archive_read_support_format_tar(archive);
+            archive_read_support_format_7zip(archive);
+            archive_read_support_format_zip(archive);
+
             if (archive_read_open_filename(archive, path_to_archive.c_str(), 10240) != ARCHIVE_OK)
                 throw Exception(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't open archive {}: {}", quoteString(path_to_archive), archive_error_string(archive));
         }
diff --git a/tests/queries/0_stateless/02994_libarchive_compression.reference b/tests/queries/0_stateless/02994_libarchive_compression.reference
@@ -0,0 +1,14 @@
+1
+4
+1
+4
+1
+4
+1
+4
+1
+4
+1
+4
+Unrecognized archive format
+Unrecognized archive format
diff --git a/tests/queries/0_stateless/02994_libarchive_compression.sh b/tests/queries/0_stateless/02994_libarchive_compression.sh

-Original file line number
+Diff line change
@@ @@ -0,0 +1,14 @@ @@
 +1
 +4
 +1
 +4
 +1
 +4
 +1
 +4
 +1
 +4
 +1
 +4
 +Unrecognized archive format
 +Unrecognized archive format