Adding blacklisted dlls to safe browsing incident reports.

chrome/browser/safe_browsing/environment_data_collection_win.cc

 // Copyright 2014 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/environment_data_collection_win.h"
 
 #include <windows.h>
 #include <set>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/win/registry.h"
 #include "chrome/browser/install_verification/win/module_info.h"
 #include "chrome/browser/install_verification/win/module_verification_common.h"
 #include "chrome/browser/net/service_providers_win.h"
 #include "chrome/browser/safe_browsing/path_sanitizer.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
+#include "chrome_elf/chrome_elf_constants.h"
 
 namespace safe_browsing {
 
 namespace {
 
 // Helper function for expanding all environment variables in |path|.
 base::string16 ExpandEnvironmentVariables(const base::string16& path) {
   static const DWORD kMaxBuffer = 32 * 1024;  // Max according to MSDN.
   base::string16 path_expanded;
   DWORD path_len = MAX_PATH;
@@ skipping 53 matching lines @@
 
   // Look for a match between LSPs and loaded dlls.
   for (int i = 0; i < process->dll_size(); ++i) {
     if (lsp_paths.count(base::UTF8ToWide(process->dll(i).path()))) {
       process->mutable_dll(i)
           ->add_feature(ClientIncidentReport_EnvironmentData_Process_Dll::LSP);
     }
   }
 }
 
+void CollectDllBlacklistData(
+    ClientIncidentReport_EnvironmentData_Process* process) {
+  base::win::RegKey finch_blacklist_reigstry_key(

[grt (UTC plus 2), 2014/06/19 20:06:59]

i think this function can be simplified to:
{
  PathSanitizer path_sanitizer;
  base::win::RegistryValueIterator iter(HKEY_CURRENT_USER,
                                        blacklist::kRegistryFinchListPath);
  for (; iter.Valid(); ++iter) {
    base::FilePath dll_name(iter.Value());
    path_sanitizer.StripHomeDirectory(&dll_name);
    process->add_blacklisted_dll(dll_name.AsUTF8Unsafe());
  }
}

[krstnmnlsn, 2014/06/19 22:13:15]

wow, I didn't know that existed. that's much nicer.

+      HKEY_CURRENT_USER, blacklist::kRegistryFinchListPath, KEY_QUERY_VALUE);
+
+  if (!finch_blacklist_reigstry_key.Valid())
+    return;
+
+  std::wstring name;
+  std::wstring value;
+  PathSanitizer path_sanitizer;
+  int value_count = finch_blacklist_reigstry_key.GetValueCount();
+
+  for (int i = 0; i < value_count; ++i) {
+    finch_blacklist_reigstry_key.GetValueNameAt(i, &name);
+    finch_blacklist_reigstry_key.ReadValue(name.c_str(), &value);
+
+    base::FilePath dll_name(value);
+    path_sanitizer.StripHomeDirectory(&dll_name);
+    process->add_blacklisted_dll(dll_name.AsUTF8Unsafe());
+  }
+}
+
 void CollectPlatformProcessData(
     ClientIncidentReport_EnvironmentData_Process* process) {
   CollectDlls(process);
   RecordLspFeature(process);
+

[grt (UTC plus 2), 2014/06/19 20:06:59]

nit: remove newline

[krstnmnlsn, 2014/06/19 22:13:15]

Done.

+  CollectDllBlacklistData(process);
 }
 
 }  // namespace safe_browsing