Improve Zip File Scanning on Mac

chrome/browser/safe_browsing/sandboxed_zip_analyzer_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/sandboxed_zip_analyzer.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 48 matching lines @@
     ArchiveAnalyzerResults* results_;
     DISALLOW_COPY_AND_ASSIGN(ResultsGetter);
   };
 
   SandboxedZipAnalyzerTest()
       : browser_thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   void SetUp() override {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data_));
     dir_test_data_ = dir_test_data_.AppendASCII("safe_browsing");
-    dir_test_data_ = dir_test_data_.AppendASCII("download_protection");
+    // dir_test_data_ = dir_test_data_.AppendASCII("download_protection");
   }
 
   // Runs a sandboxed zip analyzer on |file_path|, writing its results into
   // |results|.
   void RunAnalyzer(const base::FilePath& file_path,
                    ArchiveAnalyzerResults* results) {
     DCHECK(results);
     base::RunLoop run_loop;
     ResultsGetter results_getter(run_loop.QuitClosure(), results);
     scoped_refptr<SandboxedZipAnalyzer> analyzer(
@@ skipping 37 matching lines @@
     EXPECT_EQ(data.length, binary.length());
 #if defined(OS_WIN)
     // ExtractImageFeatures only implemented for Windows, and only works on PE
     // files.
     if (binary.file_basename().find(".exe") != std::string::npos) {
       ExpectPEHeaders(data, binary);
       return;
     }
 #endif  // OS_WIN
     ASSERT_FALSE(binary.has_signature());
+#if defined(OS_MACOSX)
+    ASSERT_TRUE(binary.has_image_headers());
+#else
     ASSERT_FALSE(binary.has_image_headers());
+#endif
   }
 
   static const uint8_t kUnsignedDigest[];
   static const uint8_t kSignedDigest[];
   static const uint8_t kJSEFileDigest[];
   static const BinaryData kUnsignedExe;
   static const BinaryData kSignedExe;
   static const BinaryData kJSEFile;
 
+#if defined(OS_MACOSX)
+  static const uint8_t kMachODigest[];
+  static const BinaryData kMachO;
+#endif  // OS_MACOSX
+
   base::FilePath dir_test_data_;
   content::TestBrowserThreadBundle browser_thread_bundle_;
   content::InProcessUtilityThreadHelper utility_thread_helper_;
 };
 
 // static
 const uint8_t SandboxedZipAnalyzerTest::kUnsignedDigest[] = {
     0x1e, 0x95, 0x4d, 0x9c, 0xe0, 0x38, 0x9e, 0x2b, 0xa7, 0x44, 0x72,
     0x16, 0xf2, 0x17, 0x61, 0xf9, 0x8d, 0x1e, 0x65, 0x40, 0xc2, 0xab,
     0xec, 0xdb, 0xec, 0xff, 0x57, 0x0e, 0x36, 0xc4, 0x93, 0xdb};
@@ skipping 23 matching lines @@
 };
 const SandboxedZipAnalyzerTest::BinaryData SandboxedZipAnalyzerTest::kJSEFile =
     {
         "hello.jse",
         ClientDownloadRequest_DownloadType_WIN_EXECUTABLE,
         &kJSEFileDigest[0],
         6,
         false,  // is_signed
 };
 
+#if defined(OS_MACOSX)
+const uint8_t SandboxedZipAnalyzerTest::kMachODigest[] = {
+    0xe4, 0x62, 0xff, 0x75, 0x2f, 0xf9, 0xd8, 0x4e, 0x34, 0xd8, 0x43,
+    0xe5, 0xd4, 0x6e, 0x20, 0x12, 0xad, 0xcb, 0xd4, 0x85, 0x40, 0xa8,
+    0x47, 0x3f, 0xb7, 0x94, 0xb2, 0x86, 0xa3, 0x89, 0xb9, 0x45};
+const SandboxedZipAnalyzerTest::BinaryData SandboxedZipAnalyzerTest::kMachO = {
+    "executablefat",
+    ClientDownloadRequest_DownloadType_MAC_EXECUTABLE,
+    &kMachODigest[0],
+    16640,
+    false,  // !is_signed
+};
+#endif  // OS_MACOSX
+
 TEST_F(SandboxedZipAnalyzerTest, NoBinaries) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_no_binaries.zip"), &results);
+  RunAnalyzer(
+      dir_test_data_.AppendASCII("download_protection/zipfile_no_binaries.zip"),
+      &results);
   ASSERT_TRUE(results.success);
   EXPECT_FALSE(results.has_executable);
   EXPECT_FALSE(results.has_archive);
   EXPECT_EQ(0, results.archived_binary.size());
 }
 
 TEST_F(SandboxedZipAnalyzerTest, OneUnsignedBinary) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_one_unsigned_binary.zip"),
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_one_unsigned_binary.zip"),
               &results);
   ASSERT_TRUE(results.success);
   EXPECT_TRUE(results.has_executable);
   EXPECT_FALSE(results.has_archive);
   ASSERT_EQ(1, results.archived_binary.size());
   ExpectBinary(kUnsignedExe, results.archived_binary.Get(0));
 }
 
 TEST_F(SandboxedZipAnalyzerTest, TwoBinariesOneSigned) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_two_binaries_one_signed.zip"),
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_two_binaries_one_signed.zip"),
               &results);
   ASSERT_TRUE(results.success);
   EXPECT_TRUE(results.has_executable);
   EXPECT_FALSE(results.has_archive);
   ASSERT_EQ(2, results.archived_binary.size());
   ExpectBinary(kUnsignedExe, results.archived_binary.Get(0));
   ExpectBinary(kSignedExe, results.archived_binary.Get(1));
 }
 
 TEST_F(SandboxedZipAnalyzerTest, ZippedArchiveNoBinaries) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_archive_no_binaries.zip"),
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_archive_no_binaries.zip"),
               &results);
   ASSERT_TRUE(results.success);
   EXPECT_FALSE(results.has_executable);
   EXPECT_TRUE(results.has_archive);
   EXPECT_EQ(1, results.archived_binary.size());
   ASSERT_EQ(1u, results.archived_archive_filenames.size());
   EXPECT_EQ(FILE_PATH_LITERAL("hello.zip"),
             results.archived_archive_filenames[0].value());
 }
 
 TEST_F(SandboxedZipAnalyzerTest, ZippedRarArchiveNoBinaries) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_rar_archive_no_binaries.zip"),
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_rar_archive_no_binaries.zip"),
               &results);
   ASSERT_TRUE(results.success);
   EXPECT_FALSE(results.has_executable);
   EXPECT_TRUE(results.has_archive);
   EXPECT_EQ(1, results.archived_binary.size());
   ASSERT_EQ(1u, results.archived_archive_filenames.size());
   EXPECT_EQ(FILE_PATH_LITERAL("hello.rar"),
             results.archived_archive_filenames[0].value());
 }
 
 TEST_F(SandboxedZipAnalyzerTest, ZippedArchiveAndBinaries) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_archive_and_binaries.zip"),
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_archive_and_binaries.zip"),
               &results);
   ASSERT_TRUE(results.success);
   EXPECT_TRUE(results.has_executable);
   EXPECT_TRUE(results.has_archive);
   ASSERT_EQ(2, results.archived_binary.size());
   ExpectBinary(kSignedExe, results.archived_binary.Get(0));
   ASSERT_EQ(1u, results.archived_archive_filenames.size());
   EXPECT_EQ(FILE_PATH_LITERAL("hello.7z"),
             results.archived_archive_filenames[0].value());
 }
 
 TEST_F(SandboxedZipAnalyzerTest,
        ZippedArchiveAndBinariesWithTrailingSpaceAndPeriodChars) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_two_binaries_one_archive_"
-                                         "trailing_space_and_period_chars.zip"),
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_two_binaries_one_archive_"
+                  "trailing_space_and_period_chars.zip"),
               &results);
   ASSERT_TRUE(results.success);
   EXPECT_TRUE(results.has_executable);
   EXPECT_TRUE(results.has_archive);
   ASSERT_EQ(3, results.archived_binary.size());
 
   BinaryData SignedExe = kSignedExe;
   SignedExe.file_basename = "signed.exe ";
   BinaryData UnsignedExe = kUnsignedExe;
   UnsignedExe.file_basename = "unsigned.exe.";
   ExpectBinary(SignedExe, results.archived_binary.Get(0));
   ExpectBinary(UnsignedExe, results.archived_binary.Get(1));
   ASSERT_EQ(1u, results.archived_archive_filenames.size());
   EXPECT_EQ(FILE_PATH_LITERAL("zipfile_no_binaries.zip  .  . "),
             results.archived_archive_filenames[0].value());
 }
 
 TEST_F(SandboxedZipAnalyzerTest, ZippedJSEFile) {
   ArchiveAnalyzerResults results;
-  RunAnalyzer(dir_test_data_.AppendASCII("zipfile_one_jse_file.zip"), &results);
+  RunAnalyzer(dir_test_data_.AppendASCII(
+                  "download_protection/zipfile_one_jse_file.zip"),
+              &results);
   ASSERT_TRUE(results.success);
   EXPECT_TRUE(results.has_executable);
   EXPECT_FALSE(results.has_archive);
   ASSERT_EQ(1, results.archived_binary.size());
   ExpectBinary(kJSEFile, results.archived_binary.Get(0));
   EXPECT_TRUE(results.archived_archive_filenames.empty());
 }
 
+#if defined(OS_MACOSX)
+TEST_F(SandboxedZipAnalyzerTest, ZippedAppWithExecutable) {
+  ArchiveAnalyzerResults results;
+  RunAnalyzer(
+      dir_test_data_.AppendASCII("mach_o/zipped-app-with-executable.zip"),
+      &results);
+  ASSERT_TRUE(results.success);
+  EXPECT_TRUE(results.has_executable);
+  EXPECT_FALSE(results.has_archive);
+  ASSERT_EQ(1, results.archived_binary.size());
+  ExpectBinary(kMachO, results.archived_binary.Get(0));
+}
+#endif  // OS_MACOSX
+
 }  // namespace safe_browsing