Report and parse .img, .iso, and .smi as DMGs when downloading

chrome/browser/safe_browsing/download_protection_service.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/browser/safe_browsing/download_protection_service.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 317 matching lines @@
     RecordFileExtensionType(item_->GetTargetFilePath());
 
     // Compute features from the file contents. Note that we record histograms
     // based on the result, so this runs regardless of whether the pingbacks
     // are enabled.
     if (item_->GetTargetFilePath().MatchesExtension(
         FILE_PATH_LITERAL(".zip"))) {
       StartExtractZipFeatures();
 #if defined(OS_MACOSX)
     } else if (item_->GetTargetFilePath().MatchesExtension(
-                  FILE_PATH_LITERAL(".dmg"))) {
+                   FILE_PATH_LITERAL(".dmg")) ||
+               item_->GetTargetFilePath().MatchesExtension(
+                   FILE_PATH_LITERAL(".img")) ||
+               item_->GetTargetFilePath().MatchesExtension(
+                   FILE_PATH_LITERAL(".iso")) ||
+               item_->GetTargetFilePath().MatchesExtension(
+                   FILE_PATH_LITERAL(".smi"))) {
       StartExtractDmgFeatures();
 #endif
     } else {
       StartExtractFileFeatures();
     }
   }
 
   // Start a timeout to cancel the request if it takes too long.
   // This should only be called after we have finished accessing the file.
   void StartTimeout() {
@@ skipping 269 matching lines @@
         // Normal zip w/o EXEs, or invalid zip and not extended-reporting.
         PostFinishTask(UNKNOWN, REASON_ARCHIVE_WITHOUT_BINARIES);
         return;
       }
     }
 
     OnFileFeatureExtractionDone();
   }
 
 #if defined(OS_MACOSX)
+  // This is called for .DMGs and other files that can be parsed by
+  // SandboxedDMGAnalyzer.
   void StartExtractDmgFeatures() {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(item_);
     dmg_analyzer_ = new SandboxedDMGAnalyzer(
         item_->GetFullPath(),
         base::Bind(&CheckClientDownloadRequest::OnDmgAnalysisFinished,
                    weakptr_factory_.GetWeakPtr()));
     dmg_analyzer_->Start();
     dmg_analysis_start_time_ = base::TimeTicks::Now();
   }
 
   void OnDmgAnalysisFinished(const zip_analyzer::Results& results) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK_EQ(ClientDownloadRequest::MAC_EXECUTABLE, type_);
     if (!service_)
       return;
 
     // Even if !results.success, some of the DMG may have been parsed.
     archive_is_valid_ =
         (results.success ? ArchiveValid::VALID : ArchiveValid::INVALID);
     archived_executable_ = results.has_executable;
     archived_binary_.CopyFrom(results.archived_binary);
     DVLOG(1) << "DMG analysis has finished for " << item_->GetFullPath().value()
              << ", has_executable=" << results.has_executable
              << ", success=" << results.success;
 
-    UMA_HISTOGRAM_BOOLEAN("SBClientDownload.DmgFileSuccess", results.success);
-    UMA_HISTOGRAM_BOOLEAN("SBClientDownload.DmgFileHasExecutable",
-                          archived_executable_);
+    int uma_file_type =
+        download_protection_util::GetSBClientDownloadExtensionValueForUMA(
+            item_->GetTargetFilePath());
+
+    if (results.success) {
+      UMA_HISTOGRAM_SPARSE_SLOWLY("SBClientDownload.DmgFileSuccessByType",
+                                  uma_file_type);
+    } else {
+      UMA_HISTOGRAM_SPARSE_SLOWLY("SBClientDownload.DmgFileFailureByType",
+                                  uma_file_type);
+    }
+
+    if (archived_executable_) {
+      UMA_HISTOGRAM_SPARSE_SLOWLY("SBClientDownload.DmgFileHasExecutableByType",
+                                  uma_file_type);
+    } else {
+      UMA_HISTOGRAM_SPARSE_SLOWLY(
+          "SBClientDownload.DmgFileHasNoExecutableByType", uma_file_type);
+    }
+
     UMA_HISTOGRAM_TIMES("SBClientDownload.ExtractDmgFeaturesTime",
                         base::TimeTicks::Now() - dmg_analysis_start_time_);
 
     if (!archived_executable_) {
       if (!results.success && CanReportInvalidArchives()) {
         type_ = ClientDownloadRequest::INVALID_MAC_ARCHIVE;
       } else {
         PostFinishTask(UNKNOWN, REASON_ARCHIVE_WITHOUT_BINARIES);
         return;
       }
@@ skipping 587 matching lines @@
 GURL DownloadProtectionService::GetDownloadRequestUrl() {
   GURL url(kDownloadRequestUrl);
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty())
     url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
 
   return url;
 }
 
 }  // namespace safe_browsing