Update chrome_cleaner dirs from internal repo: chrome_utils, crash, logging

Get changes from the internal repo since last branch point:
- chrome_utils now uses the sandboxed JsonParser to parse extension install methods
- add JsonParser sandbox to crash client and process information logging
- get internal API keys for official build, dummy API keys for public build
- Add FOUND_IN_PROGRAMFILES trace location

R=csharp

Bug: 830892
Change-Id: I33944eaaf31be836ac4c91041fd7e4e0d25278d2
Reviewed-on: https://chromium-review.googlesource.com/1195798Reviewed-by: Chris Sharp <csharp@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587700}

chrome/chrome_cleaner/chrome_cleaner_args.gni

+# Copyright 2018 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.
+
+declare_args() {
+  # If this is true, builds an official release of the Chrome Cleanup Tool
+  # (requires extra Google-internal resources).
+  is_official_chrome_cleaner_build = false
+}

chrome/chrome_cleaner/chrome_utils/BUILD.gn

@@ -22,7 +22,9 @@ source_set("extensions_util_lib") {
   ]
 
   deps = [
+    ":chrome_util_lib",
     "//base:base",
+    "//chrome/chrome_cleaner/json_parser",
     "//chrome/chrome_cleaner/os:common_os",
   ]
 }
@@ -35,12 +37,10 @@ source_set("unittest_sources") {
   ]
 
   deps = [
-    ":chrome_util_lib",
     ":extensions_util_lib",
     "//base:base",
     "//base/test:test_support",
-    "//chrome/chrome_cleaner/constants:common_strings",
-    "//chrome/chrome_cleaner/os:common_os",
+    "//chrome/chrome_cleaner/json_parser",
     "//chrome/chrome_cleaner/test:test_util",
     "//testing/gtest",
   ]

chrome/chrome_cleaner/chrome_utils/chrome_util.cc

@@ -79,4 +79,42 @@ bool RetrieveChromeExePathFromCommandLine(base::FilePath* chrome_exe_path) {
   return true;
 }
 
+void ListChromeExePaths(std::set<base::FilePath>* paths) {
+  DCHECK(paths);
+
+  static const unsigned int install_paths[] = {
+      base::DIR_PROGRAM_FILESX86, base::DIR_PROGRAM_FILES,
+      base::DIR_LOCAL_APP_DATA,
+  };
+
+  for (unsigned int path : install_paths) {
+    base::FilePath install_path;
+    bool success = base::PathService::Get(path, &install_path);
+    if (!success) {
+      LOG(ERROR) << "Can't get path from PathService '" << path << "'.";
+      continue;
+    }
+
+    base::FilePath chrome_path =
+        install_path.Append(L"google\\chrome\\application");
+    if (!base::PathExists(chrome_path))
+      continue;
+    paths->insert(chrome_path);
+  }
+}
+
+void ListChromeInstallationPaths(std::set<base::FilePath>* paths) {
+  DCHECK(paths);
+
+  std::set<base::FilePath> exe_paths;
+  ListChromeExePaths(&exe_paths);
+
+  for (const base::FilePath& exe_path : exe_paths) {
+    base::FilePath pattern = exe_path.Append(L"??.*.*.*");
+    std::vector<base::FilePath> matches;
+    CollectMatchingPaths(pattern, &matches);
+    paths->insert(matches.begin(), matches.end());
+  }
+}
+
 }  // namespace chrome_cleaner

chrome/chrome_cleaner/chrome_utils/chrome_util.h

@@ -32,6 +32,14 @@ bool RetrieveChromeVersionAndInstalledDomain(base::string16* chrome_version,
 // path exists.
 bool RetrieveChromeExePathFromCommandLine(base::FilePath* chrome_exe_path);
 
+// Search for all Chrome executable paths, for example
+// "C:\Program Files\Google\Chrome\Application".
+void ListChromeExePaths(std::set<base::FilePath>* paths);
+
+// Search for all Chrome versioned installation paths, for example
+// "C:\Program Files\Google\Chrome\Application\68.0.3440.84".
+void ListChromeInstallationPaths(std::set<base::FilePath>* paths);
+
 }  // namespace chrome_cleaner
 
 #endif  // CHROME_CHROME_CLEANER_CHROME_UTILS_CHROME_UTIL_H_

chrome/chrome_cleaner/chrome_utils/extensions_util.h

@@ -7,31 +7,73 @@
 
 #include <vector>
 
+#include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/strings/string16.h"
+#include "base/synchronization/waitable_event.h"
+#include "chrome/chrome_cleaner/json_parser/json_parser_api.h"
 #include "chrome/chrome_cleaner/os/registry_util.h"
 
 namespace chrome_cleaner {
 
 // A registry key that holds some form of policy for |extension_id|.
-struct ExtensionRegistryPolicy {
+struct ExtensionPolicyRegistryEntry {
   base::string16 extension_id;
   HKEY hkey;
   base::string16 path;
   base::string16 name;
 
-  ExtensionRegistryPolicy(const base::string16& extension_id,
-                          HKEY hkey,
-                          const base::string16& path,
-                          const base::string16& name);
-  ExtensionRegistryPolicy(ExtensionRegistryPolicy&&);
-  ExtensionRegistryPolicy& operator=(ExtensionRegistryPolicy&&);
+  ExtensionPolicyRegistryEntry(const base::string16& extension_id,
+                               HKEY hkey,
+                               const base::string16& path,
+                               const base::string16& name);
+  ExtensionPolicyRegistryEntry(ExtensionPolicyRegistryEntry&&);
+  ExtensionPolicyRegistryEntry& operator=(ExtensionPolicyRegistryEntry&&);
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionRegistryPolicy);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionPolicyRegistryEntry);
+};
+
+// A file that holds some form of policy for |extension_id|.
+struct ExtensionPolicyFile {
+  base::string16 extension_id;
+  base::FilePath path;
+
+  ExtensionPolicyFile(const base::string16& extension_id,
+                      const base::FilePath& path);
+  ExtensionPolicyFile(ExtensionPolicyFile&&);
+  ExtensionPolicyFile& operator=(ExtensionPolicyFile&&);
+
+  DISALLOW_COPY_AND_ASSIGN(ExtensionPolicyFile);
 };
 
 // Find all extension forcelist registry policies and append to |policies|.
 void GetExtensionForcelistRegistryPolicies(
-    std::vector<ExtensionRegistryPolicy>* policies);
+    std::vector<ExtensionPolicyRegistryEntry>* policies);
+
+// Find non-whitelisted extension IDs in external_extensions.json files, which
+// are extensions that will be installed by default on new user profiles. Using
+// the input |json_parser| to parse JSON, append found extensions to |policies|.
+// Signals |done| when all parse tasks have finished.
+void GetNonWhitelistedDefaultExtensions(
+    JsonParserAPI* json_parser,
+    std::vector<ExtensionPolicyFile>* policies,
+    base::WaitableEvent* done);
+
+// Find all extensions whose enterprise policy settings contain
+// "installation_mode":"force_installed" and append them to |policies|. Uses the
+// input |json_parser| to parse JSON, and signals |done| when all parse tasks
+// have finished.
+void GetExtensionSettingsForceInstalledExtensions(
+    JsonParserAPI* json_parser,
+    std::vector<ExtensionPolicyRegistryEntry>* policies,
+    base::WaitableEvent* done);
+
+// Find master preferences extensions, which are installed to new user profiles,
+// and append them to |policies|. Uses the input |json_parser| to parse JSON,
+// and signals |done| when all parse tasks have finished.
+void GetMasterPreferencesExtensions(JsonParserAPI* json_parser,
+                                    std::vector<ExtensionPolicyFile>* policies,
+                                    base::WaitableEvent* done);
 
 }  // namespace chrome_cleaner
 

chrome/chrome_cleaner/crash/crashpad_crash_client.cc

@@ -195,6 +195,9 @@ bool CrashpadCrashClient::InitializeCrashReporting(Mode mode,
     case SandboxType::kEset:
       SetCrashKey(kProcessType, "eset");
       break;
+    case SandboxType::kJsonParser:
+      SetCrashKey(kProcessType, "json_parser");
+      break;
     default:
       NOTREACHED();
   }

chrome/chrome_cleaner/logging/BUILD.gn

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chrome/chrome_cleaner/chrome_cleaner_args.gni")
+
 source_set("scoped_timed_task_logger") {
   sources = [
     "scoped_timed_task_logger.cc",
@@ -66,11 +68,20 @@ source_set("logging_definitions") {
   ]
 }
 
-source_set("dummy_api_keys") {
+source_set("api_keys_header") {
   sources = [
     "api_keys.h",
+  ]
+}
+
+source_set("dummy_api_keys") {
+  sources = [
     "dummy_api_keys.cc",
   ]
+
+  deps = [
+    ":api_keys_header",
+  ]
 }
 
 static_library("cleaner_logging") {
@@ -84,7 +95,7 @@ static_library("cleaner_logging") {
   ]
 
   deps = [
-    ":dummy_api_keys",
+    ":api_keys_header",
     "//base",
     "//chrome/chrome_cleaner/chrome_utils:chrome_util_lib",
     "//chrome/chrome_cleaner/constants:chrome_cleanup_tool_branding_header",
@@ -101,6 +112,12 @@ static_library("cleaner_logging") {
     "//components/chrome_cleaner/public/constants:constants",
   ]
 
+  if (is_official_chrome_cleaner_build) {
+    deps += [ "//chrome_cleaner_internal/logging:api_keys" ]
+  } else {
+    deps += [ ":dummy_api_keys" ]
+  }
+
   public_deps = [
     ":common",
   ]
@@ -113,7 +130,7 @@ static_library("reporter_logging") {
   ]
 
   deps = [
-    ":dummy_api_keys",
+    ":api_keys_header",
     "//base",
     "//chrome/chrome_cleaner/chrome_utils:chrome_util_lib",
     "//chrome/chrome_cleaner/constants:common_strings",
@@ -127,6 +144,12 @@ static_library("reporter_logging") {
     "//components/chrome_cleaner/public/constants:constants",
   ]
 
+  if (is_official_chrome_cleaner_build) {
+    deps += [ "//chrome_cleaner_internal/logging:api_keys" ]
+  } else {
+    deps += [ ":dummy_api_keys" ]
+  }
+
   public_deps = [
     ":common",
   ]

chrome/chrome_cleaner/logging/proto/shared_data.proto

@@ -192,17 +192,18 @@ message UwS {
     FOUND_IN_STARTUP = 1;
     FOUND_IN_MEMORY = 2;
     FOUND_IN_UNINSTALLSTRING = 3;  // Contents of HKEY_LOCAL_MACHINE\SOFTWARE\
-                                  // Wow6432Node\Microsoft\Windows\
-                                  // CurrentVersion\Uninstall\<SoftwareName>\
-                                  // UninstallString
+                                   // Wow6432Node\Microsoft\Windows\
+                                   // CurrentVersion\Uninstall\<SoftwareName>\
+                                   // UninstallString
     FOUND_IN_INSTALLLOCATION = 4;  // InstallLocation
     FOUND_IN_MUICACHE = 5;         // HKEY_CLASSES_ROOT\Local Settings\Software\
-                                  // Microsoft\Windows\Shell\MuiCache
+                                   // Microsoft\Windows\Shell\MuiCache
     FOUND_IN_SERVICE = 6;          // Services
     FOUND_IN_SHELL = 7;            // Menu Start, Startup, Desktop
     FOUND_IN_SCHEDULED_TASK = 8;   // Task scheduler
     FOUND_IN_CLSID = 9;            // CLSID
     FOUND_IN_MODULES = 10;         // Loaded modules of a process
+    FOUND_IN_PROGRAMFILES = 11;    // "Program Files" directory
   }
   repeated TraceLocation trace_locations = 9;
 
@@ -244,6 +245,7 @@ message ProcessInformation {
     MAIN = 1;
     DEPRECATED_SIGNATURE_MATCHER_SANDBOX = 2;
     ESET_SANDBOX = 3;
+    JSON_PARSER_SANDBOX = 4;
   }
   optional Process process = 1;
 

chrome/chrome_cleaner/logging/reporter_logging_service.cc

@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/i18n.h"
 #include "base/win/windows_version.h"
@@ -27,7 +26,7 @@
 namespace chrome_cleaner {
 
 namespace {
-// TODO(joenotcharles): refer to the report definition in the "data" section.
+// TODO(joenotcharles): Refer to the report definition in the "data" section.
 constexpr net::NetworkTrafficAnnotationTag kReporterTrafficAnnotation =
     net::DefineNetworkTrafficAnnotation("unwanted_software_report", R"(
           semantics {

chrome/chrome_cleaner/logging/utils.cc

@@ -250,6 +250,9 @@ ProcessInformation GetProcessInformationProtoObject(
     case SandboxType::kEset:
       process_info.set_process(ProcessInformation::ESET_SANDBOX);
       break;
+    case SandboxType::kJsonParser:
+      process_info.set_process(ProcessInformation::JSON_PARSER_SANDBOX);
+      break;
     default:
       NOTREACHED() << "Unknown sandbox type " << static_cast<int>(process_type);
   }