[Merge M45][SafeBrowsing] Send pings for Zip files that contain other archives.

chrome/common/safe_browsing/zip_analyzer.cc

 // Copyright (c) 2012 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/common/safe_browsing/zip_analyzer.h"
 
+#include <set>
+
 #include "base/i18n/streaming_utf8_validator.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chrome/common/safe_browsing/binary_feature_extractor.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/download_protection_util.h"
 #include "chrome/common/safe_browsing/zip_analyzer_results.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "third_party/zlib/google/zip_reader.h"
@@ skipping 66 matching lines @@
       archived_binary->clear_signature();
     }
   }
 }
 
 }  // namespace
 
 void AnalyzeZipFile(base::File zip_file,
                     base::File temp_file,
                     Results* results) {
+  std::set<base::FilePath::StringType> archived_archive_filetypes;
   scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor(
       new BinaryFeatureExtractor());
   zip::ZipReader reader;
   if (!reader.OpenFromPlatformFile(zip_file.GetPlatformFile())) {
     DVLOG(1) << "Failed to open zip file";
     return;
   }
 
   bool advanced = true;
   for (; reader.HasMore(); advanced = reader.AdvanceToNextEntry()) {
     if (!advanced) {
       DVLOG(1) << "Could not advance to next entry, aborting zip scan.";
       return;
     }
     if (!reader.OpenCurrentEntryInZip()) {
       DVLOG(1) << "Failed to open current entry in zip file";
       continue;
     }
     const base::FilePath& file = reader.current_entry_info()->file_path();
-    if (download_protection_util::IsBinaryFile(file)) {
-      // Don't consider an archived archive to be executable, but record
-      // a histogram.
-      if (download_protection_util::IsArchiveFile(file)) {
-        results->has_archive = true;
-      } else {
-        DVLOG(2) << "Downloaded a zipped executable: " << file.value();
-        results->has_executable = true;
-        AnalyzeContainedFile(binary_feature_extractor, file, &reader,
-                             &temp_file, results->archived_binary.Add());
-      }
+    if (download_protection_util::IsArchiveFile(file)) {
+      DVLOG(2) << "Downloaded a zipped archive: " << file.value();
+      results->has_archive = true;
+      archived_archive_filetypes.insert(file.FinalExtension());
+    } else if (download_protection_util::IsSupportedBinaryFile(file)) {
+      DVLOG(2) << "Downloaded a zipped executable: " << file.value();
+      results->has_executable = true;
+      AnalyzeContainedFile(binary_feature_extractor, file, &reader, &temp_file,
+                           results->archived_binary.Add());
     } else {
       DVLOG(3) << "Ignoring non-binary file: " << file.value();
     }
   }
+  results->archived_archive_filetypes.assign(archived_archive_filetypes.begin(),
+                                             archived_archive_filetypes.end());
   results->success = true;
 }
 
 }  // namespace zip_analyzer
 }  // namespace safe_browsing