Universial component install for chrome os.

chrome/browser/component_updater/cros_component_installer.cc

Index: chrome/browser/component_updater/cros_component_installer.cc
diff --git a/chrome/browser/component_updater/cros_component_installer.cc b/chrome/browser/component_updater/cros_component_installer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3068302e04a11ccce6043c103536a491f7d0ad9d
--- /dev/null
+++ b/chrome/browser/component_updater/cros_component_installer.cc
@@ -0,0 +1,174 @@
+// Copyright 2017 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/component_updater/cros_component_installer.h"
+#include "base/task_scheduler/post_task.h"
+#include "base/task_scheduler/task_traits.h"

[waffles, 2017/03/02 20:50:16]

Do you need the two above headers?

[xiaochu, 2017/03/02 21:08:34]

Done.

+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/component_updater/component_installer_errors.h"
+#include "components/component_updater/component_updater_paths.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/plugin_service.h"

[waffles, 2017/03/02 20:50:16]

Can we remove the dependency on plugin_service.h?

[xiaochu, 2017/03/02 21:08:34]

Done.

+
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/dbus_method_call_status.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/image_loader_client.h"
+#endif  // defined(OS_CHROMEOS)
+
+using content::BrowserThread;
+using content::PluginService;

[waffles, 2017/03/02 20:50:16]

remove this line

[xiaochu, 2017/03/02 21:08:34]

Done.

+
+namespace component_updater {
+
+#if defined(OS_CHROMEOS)
+void LogRegistrationResult(chromeos::DBusMethodCallStatus call_status,
+                           bool result) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) {
+    LOG(ERROR) << "Call to imageloader service failed.";
+    return;
+  }
+  if (!result) {
+    LOG(ERROR) << "Component registration failed";

[waffles, 2017/03/02 20:50:16]

Can this be DVLOG(1)?

Also on lines 30 and 49.

[xiaochu, 2017/03/02 21:08:34]

Done.

+    return;
+  }
+}
+void ImageLoaderRegistration(const std::string& version,
+                             const base::FilePath& install_dir,
+                             const std::string& name) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  chromeos::ImageLoaderClient* loader =
+      chromeos::DBusThreadManager::Get()->GetImageLoaderClient();
+
+  if (loader) {
+    loader->RegisterComponent(name, version, install_dir.value(),
+                              base::Bind(&LogRegistrationResult));
+  } else {
+    LOG(ERROR) << "Failed to get ImageLoaderClient object.";
+  }
+}
+
+// Determine whether or not to skip registering this cros component updates.
+bool SkipCupsRegistration(ComponentUpdateService* cus) {

[waffles, 2017/03/02 20:50:15]

I'm not sure what the purpose of this function is. Can it be removed?

[xiaochu, 2017/03/02 21:08:34]

Done.

+  return false;
+}
+
+CrOSComponentInstallerTraits::CrOSComponentInstallerTraits(
+    std::string dir_name,
+    std::string name,
+    std::string sha2HashStr)
+    : dir_name(dir_name), name(name) {
+  if (sha2HashStr.length() != 64)
+    return;
+  for (unsigned int i = 0; i < sizeof(kSha2Hash_); i++) {
+    kSha2Hash_[i] = stoul(sha2HashStr.substr(i * 2, 2), nullptr, 16);
+  }
+}
+
+bool CrOSComponentInstallerTraits::SupportsGroupPolicyEnabledComponentUpdates()
+    const {
+  return true;
+}
+
+bool CrOSComponentInstallerTraits::RequiresNetworkEncryption() const {
+  return false;

[waffles, 2017/03/02 20:50:15]

We should think about this carefully. Since the intent is not to ship these
components to everyone, can a MITM infer information (e.g. fingerprint the user)
based on which set of components they have installed? Can a MITM infer
information about how the user is using the browser?

It might be best to set this to true for now.

[xiaochu, 2017/03/02 21:08:34]

Done.

+}
+
+update_client::CrxInstaller::Result
+CrOSComponentInstallerTraits::OnCustomInstall(
+    const base::DictionaryValue& manifest,
+    const base::FilePath& install_dir) {
+  DVLOG(1) << "[CrOSComponentInstallerTraits::OnCustomInstall]";
+  std::string version;
+  if (!manifest.GetString("version", &version)) {
+    return ToInstallerResult(update_client::InstallError::GENERIC_ERROR);
+  }
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&ImageLoaderRegistration, version, install_dir, name));
+  return update_client::CrxInstaller::Result(update_client::InstallError::NONE);
+}
+
+void CrOSComponentInstallerTraits::ComponentReady(
+    const base::Version& version,
+    const base::FilePath& path,
+    std::unique_ptr<base::DictionaryValue> manifest) {}
+
+bool CrOSComponentInstallerTraits::VerifyInstallation(
+    const base::DictionaryValue& manifest,
+    const base::FilePath& install_dir) const {
+  return true;
+}
+
+base::FilePath CrOSComponentInstallerTraits::GetRelativeInstallDir() const {
+  return base::FilePath(FILE_PATH_LITERAL(dir_name));

[waffles, 2017/03/02 20:50:15]

dir_name is not literal, so don't use FILE_PATH_LITERAL.

Since this is compiled only on chromeos, you can just pass dir_name without the
macro.

[xiaochu, 2017/03/02 21:08:34]

Done.

+}
+
+void CrOSComponentInstallerTraits::GetHash(std::vector<uint8_t>* hash) const {
+  hash->assign(kSha2Hash_, kSha2Hash_ + arraysize(kSha2Hash_));
+}
+
+std::string CrOSComponentInstallerTraits::GetName() const {
+  return name;
+}
+
+update_client::InstallerAttributes
+CrOSComponentInstallerTraits::GetInstallerAttributes() const {
+  return update_client::InstallerAttributes();
+}
+
+std::vector<std::string> CrOSComponentInstallerTraits::GetMimeTypes() const {
+  std::vector<std::string> mime_types;
+  return mime_types;
+}
+
+void RegisterCrOSComponentInternal(ComponentUpdateService* cus,
+                                   const ComponentConfig& config) {
+  std::unique_ptr<ComponentInstallerTraits> traits(
+      new CrOSComponentInstallerTraits(config.dir, config.name,
+                                       config.sha2hashstr));
+  // |cus| will take ownership of |installer| during
+  // installer->Register(cus).
+  DefaultComponentInstaller* installer =
+      new DefaultComponentInstaller(std::move(traits));
+  installer->Register(cus, base::Closure());
+}
+
+bool RegisterCrOSComponentInternal(ComponentUpdateService* cus,
+                                   const std::string& name) {
+  if (name.length() == 0) {
+    DVLOG(1) << "[RegisterCrOSComponents] name is empty.";
+    return false;
+  }
+  const std::map<std::string, std::map<std::string, std::string>> components = {
+      {"escpr",
+       {{"dir", "epson-inkjet-printer-escpr"},
+        {"sha2hashstr",
+         "1913a5e0a6cad30b6f03e176177e0d7ed62c5d6700a9c66da556d7c3f5d6a47e"}}}};
+  auto component = components.find(name);
+  if (component != components.end()) {
+    ComponentConfig config;
+    config.name = component->first;
+    config.dir = component->second.find("dir")->second;
+    config.sha2hashstr = component->second.find("sha2hashstr")->second;
+    RegisterCrOSComponentInternal(cus, config);
+    return true;
+  }
+  DVLOG(1) << "[RegisterCrOSComponents] component " << name
+           << " is not in configuration.";
+  return false;
+}
+
+#endif  // defined(OS_CHROMEOS)
+
+bool RegisterCrOSComponent(ComponentUpdateService* cus,
+                           const std::string& name) {
+#if defined(OS_CHROMEOS)
+  return RegisterCrOSComponentInternal(cus, name);
+#else
+  return false;
+#endif  // defined(OS_CHROMEOS)
+}
+}  // namespace component_updater