Add chrome.cookies.{getAll, set, get} for Pinterest Save Button extension

brave/browser-laptop#6366
brave/browser-laptop#6262
brave/browser-laptop#8389

Pinterest extension public key and string

Fix broken import cookies

fix brave/browser-laptop#8849

Auditors: @bridiver, @bbondy

Author: darkdh

atom/browser/api/atom_api_cookies.cc

@@ -215,6 +215,11 @@ Cookies::Cookies(v8::Isolate* isolate,
 Cookies::~Cookies() {
 }
 
+void Cookies::GetAll(const base::DictionaryValue& filter,
+                  const GetCallback& callback) {
+  Cookies::Get(filter, callback);
+}
+
 void Cookies::Get(const base::DictionaryValue& filter,
                   const GetCallback& callback) {
   std::unique_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
@@ -255,9 +260,12 @@ void Cookies::BuildPrototype(v8::Isolate* isolate,
   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
       .SetMethod("get", &Cookies::Get)
       .SetMethod("remove", &Cookies::Remove)
-      .SetMethod("set", &Cookies::Set);
+      .SetMethod("set", &Cookies::Set)
+      .SetMethod("getAll", &Cookies::GetAll);
 }
 
 }  // namespace api
 
 }  // namespace atom
+
+

atom/browser/api/atom_api_cookies.h

@@ -47,6 +47,7 @@ class Cookies : public mate::TrackableObject<Cookies> {
   Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context);
   ~Cookies() override;
 
+  void GetAll(const base::DictionaryValue& filter, const GetCallback& callback);
   void Get(const base::DictionaryValue& filter, const GetCallback& callback);
   void Remove(const GURL& url, const std::string& name,
               const base::Closure& callback);

atom/browser/api/atom_api_importer.cc

@@ -18,7 +18,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "brave/browser/brave_content_browser_client.h"
-#include "chrome/browser/importer/external_process_importer_host.h"
+#include "brave/browser/importer/brave_external_process_importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/dictionary.h"
@@ -121,7 +121,7 @@ void Importer::StartImport(
 
   import_did_succeed_ = false;
 
-  importer_host_ = new ExternalProcessImporterHost();
+  importer_host_ = new BraveExternalProcessImporterHost();
   importer_host_->set_observer(this);
   importer_host_->StartImportSettings(source_profile, NULL,
                                       imported_items,

atom/common/api/resources/cookies_bindings.js

@@ -1,12 +1,48 @@
 var binding = require('binding').Binding.create('cookies')
+var ipc = require('ipc_utils')
+var lastError = require('lastError')
 
 binding.registerCustomHook(function (bindingsAPI, extensionId) {
   var apiFunctions = bindingsAPI.apiFunctions
   // var cookies = bindingsAPI.compiledApi
 
   apiFunctions.setHandleRequest('getAll', function (details, cb) {
-    var nothing = []
-    cb(nothing)
+    var responseId = ipc.guid()
+    cb && ipc.once('chrome-cookies-getall-response-' + responseId, function (evt, error, cookielist) {
+      if (error) {
+        lastError.run('cookies.getall', error, '', () => { cb(null) })
+      } else {
+        cb(cookielist)
+      }
+    })
+
+    ipc.send('chrome-cookies-getall', responseId, details)
+  })
+
+  apiFunctions.setHandleRequest('get', function (details, cb) {
+    var responseId = ipc.guid()
+    cb && ipc.once('chrome-cookies-get-response-' + responseId, function (evt, error, cookie) {
+      if (error) {
+        lastError.run('cookies.get', error, '', () => { cb(null) })
+      } else {
+        cb(cookie)
+      }
+    })
+
+    ipc.send('chrome-cookies-get', responseId, details)
+  })
+
+  apiFunctions.setHandleRequest('set', function (details, cb) {
+    var responseId = ipc.guid()
+    cb && ipc.once('chrome-cookies-set-response-' + responseId, function (evt, error, cookie) {
+      if (error) {
+        lastError.run('cookies.set', error, '', () => { cb(null) })
+      } else {
+        cb(cookie)
+      }
+    })
+
+    ipc.send('chrome-cookies-set', responseId, details)
   })
 })
 

brave/browser/BUILD.gn

@@ -32,6 +32,8 @@ source_set("browser") {
     "brave_javascript_dialog_manager.cc",
     "brave_permission_manager.h",
     "brave_permission_manager.cc",
+    "importer/brave_external_process_importer_host.cc",
+    "importer/brave_external_process_importer_host.h",
     "password_manager/brave_credentials_filter.h",
     "password_manager/brave_credentials_filter.cc",
     "password_manager/brave_password_manager_client.h",

brave/browser/api/brave_api_component_updater.cc

@@ -142,6 +142,9 @@ void ComponentUpdater::RegisterComponent(const std::string& component_id) {
   } else if (component_id == kHoneyId) {
     RegisterComponentForUpdate(
         kHoneyPublicKeyStr, registered_callback, ready_callback);
+  } else if (component_id == kPinterestId) {
+    RegisterComponentForUpdate(
+        kPinterestPublicKeyStr, registered_callback, ready_callback);
   } else if (component_id == kWidevineId) {
     brave::RegisterWidevineCdmComponent(
         g_browser_process->component_updater(),

brave/browser/component_updater/default_extensions.h

@@ -372,8 +372,39 @@ const uint8_t kHoneyPublicKey[162] = {
   0x54, 0xf7, 0xd1, 0x76, 0xf5, 0x02, 0x03, 0x01,
   0x00, 0x01
 };
+
 const std::string kHoneyPublicKeyStr(  // NOLINT
     (const char *)kHoneyPublicKey, sizeof(kHoneyPublicKey));
 const std::string kHoneyId("bmnlcjabgnpnenekpadlanbbkooimhnj");  // NOLINT
 
+// Pinterest
+// Download: https://clients2.google.com/service/update2/crx?response=redirect&prodversion=52.0.2743.116&x=id%3Dgpdjojdkbbmdfjfahjcgigfpmkopogic%26uc // NOLINT
+const uint8_t kPinterestPublicKey[162] = {
+  0x30, 0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01,
+  0x05, 0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81,
+  0x89, 0x02, 0x81, 0x81, 0x00, 0xc1, 0xf7, 0x9a,
+  0xb6, 0x87, 0x2b, 0x78, 0xf5, 0x90, 0xee, 0x56,
+  0x76, 0x08, 0xf7, 0x55, 0xda, 0x66, 0x1a, 0x90,
+  0x91, 0xb5, 0xee, 0xd1, 0x7d, 0xdf, 0xce, 0x83,
+  0x71, 0x3f, 0x18, 0x45, 0x6d, 0xfa, 0x86, 0x2b,
+  0x0b, 0x6d, 0xb3, 0xdd, 0x0b, 0x27, 0xb9, 0x43,
+  0xe4, 0x30, 0x88, 0x7e, 0x70, 0x60, 0xf1, 0x61,
+  0x85, 0x86, 0x9d, 0xde, 0x5b, 0x81, 0xb1, 0x3a,
+  0x09, 0x40, 0x2a, 0xb9, 0xe4, 0xb2, 0x62, 0x68,
+  0xc8, 0x00, 0xf9, 0x3e, 0x74, 0x80, 0xb9, 0xfc,
+  0x7c, 0x7c, 0x3d, 0xed, 0xad, 0x9b, 0xe8, 0xfd,
+  0x90, 0x2a, 0x17, 0x1d, 0x71, 0xe5, 0x79, 0xb7,
+  0x46, 0x6d, 0xf8, 0x12, 0x0b, 0xd5, 0x5d, 0xda,
+  0xda, 0x96, 0x01, 0xd2, 0x62, 0x2a, 0x9c, 0x11,
+  0x4f, 0xc5, 0x5f, 0x79, 0x18, 0x9c, 0xb2, 0xe1,
+  0xaf, 0x64, 0xd2, 0xe2, 0x57, 0x2b, 0xb2, 0x7d,
+  0x4a, 0x65, 0xdf, 0xe5, 0x71, 0x02, 0x03, 0x01,
+  0x00, 0x01
+};
+
+const std::string kPinterestPublicKeyStr(  // NOLINT
+    (const char *)kPinterestPublicKey, sizeof(kPinterestPublicKey));
+const std::string kPinterestId("gpdjojdkbbmdfjfahjcgigfpmkopogic");  // NOLINT
+
 #endif  // BRAVE_BROWSER_COMPONENT_UPDATER_DEFAULT_EXTENSIONS_H_

brave/browser/importer/brave_external_process_importer_host.cc

@@ -0,0 +1,31 @@
+// Copyright (c) 2017 The Brave 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 "brave/browser/importer/brave_external_process_importer_host.h"
+
+#include "atom/browser/importer/external_process_importer_client.h"
+#include "atom/browser/importer/in_process_importer_bridge.h"
+
+BraveExternalProcessImporterHost::BraveExternalProcessImporterHost()
+  : ExternalProcessImporterHost() {}
+
+void BraveExternalProcessImporterHost::LaunchImportIfReady() {
+  if (waiting_for_bookmarkbar_model_ || template_service_subscription_.get() ||
+      !is_source_readable_ || cancelled_)
+    return;
+
+  // This is the in-process half of the bridge, which catches data from the IPC
+  // pipe and feeds it to the ProfileWriter. The external process half of the
+  // bridge lives in the external process (see ProfileImportThread).
+  // The ExternalProcessImporterClient created in the next line owns the bridge,
+  // and will delete it.
+  atom::InProcessImporterBridge* bridge =
+      new atom::InProcessImporterBridge(writer_.get(),
+                                  weak_ptr_factory_.GetWeakPtr());
+  client_ = new atom::ExternalProcessImporterClient(
+      weak_ptr_factory_.GetWeakPtr(), source_profile_, items_, bridge);
+  client_->Start();
+}
+
+BraveExternalProcessImporterHost::~BraveExternalProcessImporterHost() {}

brave/browser/importer/brave_external_process_importer_host.h

@@ -0,0 +1,26 @@
+// Copyright (c) 2017 The Brave Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BRAVE_BROWSER_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_HOST_H_
+#define BRAVE_BROWSER_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_HOST_H_
+
+#include "chrome/browser/importer/external_process_importer_host.h"
+
+class BraveExternalProcessImporterHost : public ExternalProcessImporterHost {
+ public:
+  BraveExternalProcessImporterHost();
+
+ private:
+  ~BraveExternalProcessImporterHost() override;
+
+  // Launches the utility process that starts the import task, unless bookmark
+  // or template model are not yet loaded. If load is not detected, this method
+  // will be called when the loading observer sees that model loading is
+  // complete.
+  void LaunchImportIfReady() override;
+
+  DISALLOW_COPY_AND_ASSIGN(BraveExternalProcessImporterHost);
+};
+
+#endif  // BRAVE_BROWSER_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_HOST_H_

brave/utility/importer/chrome_importer.cc

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include "atom/browser/importer/in_process_importer_bridge.h"
+#include "brave/utility/importer/brave_external_process_importer_bridge.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
@@ -246,7 +246,7 @@ void ChromeImporter::ImportCookies() {
   }
 
   if (!cookies.empty() && !cancelled())
-    static_cast<atom::InProcessImporterBridge*>(bridge_.get())->
+    static_cast<BraveExternalProcessImporterBridge*>(bridge_.get())->
         SetCookies(cookies);
 }
 

brave/utility/importer/firefox_importer.cc

@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "atom/browser/importer/in_process_importer_bridge.h"
+#include "brave/utility/importer/brave_external_process_importer_bridge.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
@@ -33,15 +33,12 @@ void FirefoxImporter::StartImport(const importer::SourceProfile& source_profile,
 
   bridge_ = bridge;
   source_path_ = source_profile.source_path;
-
-  bridge_->NotifyStarted();
   if ((items & importer::COOKIES) && !cancelled()) {
     bridge_->NotifyItemStarted(importer::COOKIES);
     ImportCookies();
     bridge_->NotifyItemEnded(importer::COOKIES);
   }
   bridge_->NotifyEnded();
-  bridge_->NotifyEnded();
 }
 
 
@@ -86,7 +83,7 @@ void FirefoxImporter::ImportCookies() {
   }
 
   if (!cookies.empty() && !cancelled())
-    static_cast<atom::InProcessImporterBridge*>(bridge_.get())->
+    static_cast<BraveExternalProcessImporterBridge*>(bridge_.get())->
         SetCookies(cookies);
 }
 

brave/utility/importer/importer_creator.cc

@@ -39,7 +39,7 @@ scoped_refptr<Importer> CreateImporterByType(importer::ImporterType type) {
     case importer::TYPE_BOOKMARKS_FILE:
       return new BookmarksFileImporter();
     case importer::TYPE_FIREFOX:
-      return new FirefoxImporter();
+      return new brave::FirefoxImporter();
 #if defined(OS_MACOSX)
     case importer::TYPE_SAFARI:
       return new SafariImporter(base::mac::GetUserLibraryPath());

lib/browser/api/extensions.js

@@ -488,6 +488,36 @@ ipcMain.on('register-chrome-window-focus', function (evt, extensionId) {
     addBackgroundPageEvent(extensionId, 'chrome-window-focus')
 })
 
+ipcMain.on('chrome-cookies-getall', function (evt, responseId, details) {
+  const cb = (error, cookielist) => {
+    if (!evt.sender.isDestroyed()) {
+      evt.sender.send('chrome-cookies-getall-response-' + responseId, error, cookielist)
+    }
+  }
+
+  evt.sender.session.cookies.getAll(details, cb)
+})
+
+ipcMain.on('chrome-cookies-get', function (evt, responseId, details) {
+  const cb = (error, cookie) => {
+    if (!evt.sender.isDestroyed()) {
+      evt.sender.send('chrome-cookies-get-response-' + responseId, error, cookie)
+    }
+  }
+
+  evt.sender.session.cookies.get(details, cb)
+})
+
+ipcMain.on('chrome-cookies-set', function (evt, responseId, details) {
+  const cb = (error, cookie) => {
+    if (!evt.sender.isDestroyed()) {
+      evt.sender.send('chrome-cookies-set-response-' + responseId, error, cookie)
+    }
+  }
+
+  evt.sender.session.cookies.set(details, cb)
+})
+
 app.on('browser-window-focus', function (event, browserWindow) {
   var forthcomingWindow = browserWindow
   var forthcomingId = (forthcomingWindow == null) ? -1 : forthcomingWindow.id

patches/master_patch.patch

@@ -121,16 +121,17 @@ index edf5cc054ac3c703cc049509aed223313a875001..6c5f76eb7f8082afa02f6d0721efa3dc
        const importer::ImporterIE7PasswordInfo& importer_password_info) override;
 
 diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h
-index 08c6f28746cc5f345114a942834db18f5c7a1d41..45b3b8072cc352d3fc2824489b2b59a2cee38ec3 100644
+index 08c6f28746cc5f345114a942834db18f5c7a1d41..3a43ae76f054ba449e3b892ea752c62fdad2e5a3 100644
 --- a/chrome/browser/importer/external_process_importer_host.h
 +++ b/chrome/browser/importer/external_process_importer_host.h
-@@ -74,7 +74,9 @@ class ExternalProcessImporterHost
+@@ -74,7 +74,10 @@ class ExternalProcessImporterHost
 
   private:
    // ExternalProcessImporterHost deletes itself in OnImportEnded().
 + protected:
    ~ExternalProcessImporterHost() override;
 + private:
++  friend class BraveExternalProcessImporterHost;
 
    // Launches the utility process that starts the import task, unless bookmark
    // or template model are not yet loaded. If load is not detected, this method
@@ -831,6 +832,18 @@ index 7e05c4e04f8e61b418d373a73bd8901347df4c76..e7e6d9fa5e0d54c7755fe3a38eca6f70
 
    // Holds strings needed by the external importer because the resource
    // bundle isn't available to the external process.
+diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
+index 7f8d598bca0243e62f11d5d2ce50d8c25ba88764..d198d90e8872eb1d7a371aeaca6119c73a6cda1c 100644
+--- a/chrome/utility/importer/firefox_importer.cc
++++ b/chrome/utility/importer/firefox_importer.cc
+@@ -147,7 +147,6 @@ void FirefoxImporter::StartImport(const importer::SourceProfile& source_profile,
+     ImportAutofillFormData();
+     bridge_->NotifyItemEnded(importer::AUTOFILL_FORM_DATA);
+   }
+-  bridge_->NotifyEnded();
+ }
+ 
+ void FirefoxImporter::ImportHistory() {
 diff --git a/chrome/utility/importer/firefox_importer.h b/chrome/utility/importer/firefox_importer.h
 index c3f648f165483a2d618438c1a4ef1b35ad6fb10c..3c95e1256465b7b6a009d3bf7619c8f48e2d3d94 100644
 --- a/chrome/utility/importer/firefox_importer.h