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

chrome/common/safe_browsing/download_protection_util.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/download_protection_util.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 
 namespace safe_browsing {
 namespace download_protection_util {
 
 bool IsArchiveFile(const base::FilePath& file) {
+  const base::FilePath::CharType* kArchiveFileTypes[] = {
+    FILE_PATH_LITERAL(".zip"),
+    FILE_PATH_LITERAL(".rar"),
+    FILE_PATH_LITERAL(".7z"),
+    FILE_PATH_LITERAL(".cab"),
+  };
+  for (const auto& extension : kArchiveFileTypes)
+    if (file.MatchesExtension(extension))
+      return true;
   // TODO(mattm): should .dmg be checked here instead of IsBinaryFile?
-  return file.MatchesExtension(FILE_PATH_LITERAL(".zip"));
+  return false;
 }
 
 bool IsBinaryFile(const base::FilePath& file) {
   const base::FilePath::CharType* kSupportedBinaryFileTypes[] = {
       // Executable extensions for MS Windows.
-      FILE_PATH_LITERAL(".cab"),
       FILE_PATH_LITERAL(".cmd"),
       FILE_PATH_LITERAL(".com"),
       FILE_PATH_LITERAL(".dll"),
       FILE_PATH_LITERAL(".exe"),
       FILE_PATH_LITERAL(".msc"),
       FILE_PATH_LITERAL(".msi"),
       FILE_PATH_LITERAL(".msp"),
       FILE_PATH_LITERAL(".mst"),
       FILE_PATH_LITERAL(".pif"),
       FILE_PATH_LITERAL(".scr"),
@@ skipping 44 matching lines @@
   return IsArchiveFile(file);
 }
 
 ClientDownloadRequest::DownloadType GetDownloadType(
     const base::FilePath& file) {
   DCHECK(IsBinaryFile(file));
   if (file.MatchesExtension(FILE_PATH_LITERAL(".apk")))
     return ClientDownloadRequest::ANDROID_APK;
   else if (file.MatchesExtension(FILE_PATH_LITERAL(".crx")))
     return ClientDownloadRequest::CHROME_EXTENSION;
-  // For zip files, we use the ZIPPED_EXECUTABLE type since we will only send
-  // the pingback if we find an executable inside the zip archive.
+  // For .zip files, we send the ZIPPED_EXECUTABLE type although the type may
+  // change to ZIPPED_ARCHIVE based on the zip analyzer.

[mattm, 2015/07/29 22:53:25]

still a little confusing.. maybe "we initially set the ZIPPED_EXECUTABLE type,
although the type may change to ZIPPED_ARCHIVE before sending based on the zip
analyzer

[asanka, 2015/07/31 01:04:42]

Reworded.

   else if (file.MatchesExtension(FILE_PATH_LITERAL(".zip")))
     return ClientDownloadRequest::ZIPPED_EXECUTABLE;
   else if (file.MatchesExtension(FILE_PATH_LITERAL(".dmg")) ||
            file.MatchesExtension(FILE_PATH_LITERAL(".pkg")) ||
            file.MatchesExtension(FILE_PATH_LITERAL(".osx")) ||
            file.MatchesExtension(FILE_PATH_LITERAL(".app")))
     return ClientDownloadRequest::MAC_EXECUTABLE;
   return ClientDownloadRequest::WIN_EXECUTABLE;
 }
 
 }  // namespace download_protection_util
 }  // namespace safe_browsing