22a70eb803
* chore: bump chromium in DEPS to 91.0.4464.0 * chore: rebuild chromium/dcheck.patch with import-patches -3 Mechanical only; no code changes * chore: remove content_browser_main_loop.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 The function being patched (BrowserMainLoop::MainMessageLoopRun()) no longer exists. NB: if removing this introduces regressions the likely fix will be to add a similar patch for ShellBrowserMainParts::WillRunMainMessageLoop() which has similar code and was added at the same time this was removed. * chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3 Mechanical only; no code changes * chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3 Mechanical only; no code changes * chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch Mechanical only; no code changes * chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3 Mechanical only; no code changes * chore: rebuild chromium/ui_gtk_public_header.patch manually no code changes * chore: rebuild chromium/web_contents.patch with import-patches -3 Mechanical only; no code changes * chore: remove v8/skip_global_registration_of_shared_arraybuffer_backing_stores.patch Refs: https://chromium-review.googlesource.com/c/v8/v8/+/2763874 This patch has been merged upstream * chore: export patches * chore: update add_trustedauthclient_to_urlloaderfactory.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969 Sync with removal of render_frame_id_ * chore: sync chromium/put_back_deleted_colors_for_autofill.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785841 SkColorFromColorId() no longer takes theme, scheme args * chore: sync chromium/put_back_deleted_colors_for_autofill.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2772143 Change new calls to GetDarkSchemeColor to fit our patched call signature * chore: update add_trustedauthclient_to_urlloaderfactory.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969 Sync with removal of render_frame_id_ in our mojom * chore: update chromium/frame_host_manager.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008 UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool * chore: update chromium/revert_remove_contentrendererclient_shouldfork.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2755314 Upstream has removed `history_list_length_` which we were comparing to 0 to calculate our `is_initial_navigation` bool when calling ShouldFork(). ShouldFork() is ours and none of the code paths actually use that param, so this commit removes it altogether. * chore: update permissions_to_register Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2789074 Replace all uses of APIPermission::ID enum with Mojo type * refactor: update return type of PreMainMessageLoopRun() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 Used to return void; now returns an int errorcode. Note: 2725153 also has some nice doc updates about Browser's "stages" * refactor: sync ElectronBrowserMainParts to MainParts changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 RunMainMessageLoopParts has been replaced with WillRunMainMessageLoop so `BrowserMainLoop::result_code_` is no longer available to us for our exit_code_ pointer. This variable held a dual role: (1) of course, hold the exit code, but also (2) was a nullptr before the message loop was ready, indicating to anyone calling SetExitCode() that we were still in startup and could just exit() without any extra steps. exit_code_ still fulfills these two roles but is now a base::Optional. * chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 BrowserMainParts::BrowsePreDefaultMainMesssageLoopRun() has been removed; move that work to the new WillRunMainMessageLoop(). * refactor: stop using CallbackList; it has been removed. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973 * refactor: update use of threadpools. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2773408 The upstream code is still in flux (e.g. reverts and re-lands) but the tl;dr for this commit is (1) include thread_pool.h if you're using it and (2) don't instantiate pools directly. * refactor: remove routing_id from CreateLoaderAndStart Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858 NB: One logic branch in ProxyingURLLoaderFactory::CreateLoaderAndStart calls std::make_unique<InProgressRequest>, which needs a routing_id. This PR uses the member field `routing_id_` since there's no longer one being passed into CreateLoaderAndStart. * refactor: sync to upstream ParittionOptions churn Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318 PartitionOptions' enums have changed. * refactor: update Manifest::Location usage Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320 tldr: s/Manifest::FOO/ManifestLocation::kFoo/ * chore: bump chromium in DEPS to 91.0.4465.0 * update patches * refactor: update extensions::Manifest to upstream Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320 - extensions::Manifest::COMPONENT + extensions::mojom::ManifestLocation::kExternalComponent * refactor: sync with upstream UrlInfo ctor changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008 UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool * chore: update invocation of convert_protocol_to_json.py Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2792623 python3 is being used in parts of the upstream build, but the copy of convert_protocol_to_json.py invoked in v8/third_party/inspector_protocol is not python3-friendly. Node has a py2+3-friendly version of it in its tools directory, so call it instead. * chore: use extensions::mojom::APIPermissionID Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122 tldr: - extensions::APIPermission::kFoo + extensions::mojom::APIPermissionID::kFoo * chore: Remove support for TLS1.0/1.1 in SSLVersionMin policy Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2765737 Remove TLS v1.0 & 1.1 from our SSLProtocolVersionFromString() function. This is the same change made upstream at https://chromium-review.googlesource.com/c/chromium/src/+/2765737/8/chrome/browser/ssl/ssl_config_service_manager_pref.cc * fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun * chore: Use IDType for permission change subscriptions. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791431 tldr: {Subscribe,Unsubscribe}PermissionStatusChange's tag type used to be an int; now it's the new SubscriptionId type (which is an IdType64). * chore: sync PowerMonitor code to upstream refactor Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2752635 tldr: PowerMonitor has been split into PowerStateObserver, PowerSuspendObserver, and PowerThermalObserver to reduce number of tasks posted to consumers who only need notifications for one of those things instead of all of them. * chore: use PartitionOptions's new Cookies field Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318 * Revert "refactor: remove routing_id from CreateLoaderAndStart" This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245. 8c9773b was only a partial fix; reverting to start & try again. * update patches * chore: bump chromium in DEPS to 91.0.4466.0 * chore: update chromium/accelerator.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472 tldr: sync patch with upstream renamed variable & macro names. * chore: update chromium/gtk_visibility.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796200 tldr: no code changes; just updating the diff to apply cleanly. note: ooh upstream Wayland hacking! * chore: update chromium/picture-in-picture.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710023 tldr: no code changes; just updating the diff to apply cleanly. * chore: update chromium/worker_feat_add_hook_to_notify_script_ready.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2775573 tldr: no code changes; just updating the diff to apply cleanly. * chore: export_all_patches * chore: update chromium/feat_add_set_theme_source_to_allow_apps_to.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796511 tldr: NotifyObservers has been renamed to NotifyOnNativeThemeUpdated, so update the invocation in our patch. * chore: update ElectronBrowserClient w/upstream API Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797454 tldr: GetDevToolsManagerDelegate() was returning an owned raw pointer. Replaced it with CreateDevToolsManagerDelegate() which uses unique_ptr<>. * chore: handle new content::PermissionType::FILE_HANDLING in toV8() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762201 `file-handling` string confirmed in https://chromium-review.googlesource.com/c/chromium/src/+/2762201/18/chrome/browser/ui/webui/settings/site_settings_helper.cc * refactor: remove routing_id from CreateLoaderAndStart pt 1 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858 Part 1: the easiest ones * 2796724: Support Python3 https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724 * chore: bump chromium in DEPS to 91.0.4468.0 * 2668974: WebShare: Implement SharingServicePicker https://chromium-review.googlesource.com/c/chromium/src/+/2668974 * 2802766: Apply modernize-make-unique to media/ https://chromium-review.googlesource.com/c/chromium/src/+/2802766 * 2802823: Apply modernize-make-unique to gpu/ https://chromium-review.googlesource.com/c/chromium/src/+/2802823 * 2803041: Apply modernize-make-unique to remaining files https://chromium-review.googlesource.com/c/chromium/src/+/2803041 * 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks https://chromium-review.googlesource.com/c/chromium/src/+/2798873 * 2733595: [ch-r] Parse ACCEPT_CH H2/3 frame and restart with new headers if needed https://chromium-review.googlesource.com/c/chromium/src/+/2733595 * chore: update patch indices * 2795107: Remove unused PermissionRequest IDs. https://chromium-review.googlesource.com/c/chromium/src/+/2795107 * chore: bump chromium in DEPS to 91.0.4469.0 * chore: fixup patch indices * chore: bump chromium in DEPS to 91.0.4469.5 * PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window https://chromium-review.googlesource.com/c/chromium/src/+/2710023 * fixup! refactor: remove routing_id from CreateLoaderAndStart * refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader * fixup! chore: fixup patch indices * 2724817: Expand scope of wasm-eval to all URLs https://chromium-review.googlesource.com/c/chromium/src/+/2724817 * Fixup patch after rebase * chore: bump chromium in DEPS to 91.0.4472.0 * 2797341: [ozone/x11] Enabled the global shortcut listener. https://chromium-review.googlesource.com/c/chromium/src/+/2797341 * 2805553: Reland Add GTK ColorMixers to ColorPipeline P1 https://chromium-review.googlesource.com/c/chromium/src/+/2805553 *2804366
: PiP 1.5: Label back to tab button with origin and center it https://chromium-review.googlesource.com/c/chromium/src/+/2804366 * 2784730: Fix crash on AX mode change in NativeViewHost without a Widget https://chromium-review.googlesource.com/c/chromium/src/+/2784730 * chore: update patch indices * 2810174: Add PdfAnnotationsEnabled policy. https://chromium-review.googlesource.com/c/chromium/src/+/2810174 * 2807829: Allow capturers to indicate if they want a WakeLock or not. https://chromium-review.googlesource.com/c/chromium/src/+/2807829 * chore: bump chromium in DEPS to 92.0.4473.0 * chore: bump chromium in DEPS to 92.0.4474.0 * chore: bump chromium in DEPS to 92.0.4475.0 * chore: update patches * chore: updates patches * chore: update is_media_key patch to handle new ozone impl Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341 * fix: ExecuteJavascript requests now need to be flagged as non-bf-aware Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195 * chore: icon_util_x11 is now icon_util_linux Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362 * build: update sysroots Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496 * build: fix missing symbols on linux build * use_ozone and use_x11 are not exclusive * new button view to build for pip Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2804366 * chore: fix broken gtk_util color patch * chore: remove patch conflict * build: update linux manifests * chore: build bttlb on all platforms for pip * chore: add thread_pool include for views delegate win * chore: fix lint * chore: add node patches for V8 changes * build: add missing base include on windows * fix: update frame host manager patch for new state transitions Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464 * chore: update windows zip manifests * chore: update mac zip manifests * chore: fix patch linting * refactor: implement missing URLLoaderNetworkServiceObserver methods It is against The Mojo Rules to leave hanging callbacks. These always have to be called. Refs:186528aab9
* spec: fix locale test on local linux * fix: pass the exit code correctly in new PreMainMessageLoopRun Refs:2622e91c44
* fix: ensure we early-exit when request_handler_ is not provided Refs:93077afbfb
* fix: strongly set result_code in the BrowserMainLoop * fix: invalid usage of non-targetted PostTask You must always either use a host threadpool or specify a target thread. In this case we did neither after this refactor. Refs:4e33ee0ad3
* chore: fix gn check * chore: remove stray .rej files in patch * chore: add mojo error code to url loader failure * build: ensure CI is truthy in arm test env * fix: handle windowCaptureMacV2 being enabled when fetching media source id Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931 Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com>
204 lines
7.6 KiB
C++
204 lines
7.6 KiB
C++
// 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.
|
|
|
|
#include "shell/browser/extensions/electron_extension_loader.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/auto_reset.h"
|
|
#include "base/bind.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/logging.h"
|
|
#include "base/sequenced_task_runner.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/task_runner_util.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "base/time/time.h"
|
|
#include "extensions/browser/extension_file_task_runner.h"
|
|
#include "extensions/browser/extension_prefs.h"
|
|
#include "extensions/browser/extension_registry.h"
|
|
#include "extensions/browser/pref_names.h"
|
|
#include "extensions/common/file_util.h"
|
|
|
|
namespace extensions {
|
|
|
|
using LoadErrorBehavior = ExtensionRegistrar::LoadErrorBehavior;
|
|
|
|
namespace {
|
|
|
|
std::pair<scoped_refptr<const Extension>, std::string> LoadUnpacked(
|
|
const base::FilePath& extension_dir,
|
|
int load_flags) {
|
|
// app_shell only supports unpacked extensions.
|
|
// NOTE: If you add packed extension support consider removing the flag
|
|
// FOLLOW_SYMLINKS_ANYWHERE below. Packed extensions should not have symlinks.
|
|
if (!base::DirectoryExists(extension_dir)) {
|
|
std::string err = "Extension directory not found: " +
|
|
base::UTF16ToUTF8(extension_dir.LossyDisplayName());
|
|
return std::make_pair(nullptr, err);
|
|
}
|
|
|
|
std::string load_error;
|
|
scoped_refptr<Extension> extension = file_util::LoadExtension(
|
|
extension_dir, extensions::mojom::ManifestLocation::kCommandLine,
|
|
load_flags, &load_error);
|
|
if (!extension.get()) {
|
|
std::string err = "Loading extension at " +
|
|
base::UTF16ToUTF8(extension_dir.LossyDisplayName()) +
|
|
" failed with: " + load_error;
|
|
return std::make_pair(nullptr, err);
|
|
}
|
|
|
|
std::string warnings;
|
|
// Log warnings.
|
|
if (extension->install_warnings().size()) {
|
|
warnings += "Warnings loading extension at " +
|
|
base::UTF16ToUTF8(extension_dir.LossyDisplayName()) + ":\n";
|
|
for (const auto& warning : extension->install_warnings()) {
|
|
warnings += " " + warning.message + "\n";
|
|
}
|
|
}
|
|
|
|
return std::make_pair(extension, warnings);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ElectronExtensionLoader::ElectronExtensionLoader(
|
|
content::BrowserContext* browser_context)
|
|
: browser_context_(browser_context),
|
|
extension_registrar_(browser_context, this) {}
|
|
|
|
ElectronExtensionLoader::~ElectronExtensionLoader() = default;
|
|
|
|
void ElectronExtensionLoader::LoadExtension(
|
|
const base::FilePath& extension_dir,
|
|
int load_flags,
|
|
base::OnceCallback<void(const Extension*, const std::string&)> cb) {
|
|
base::PostTaskAndReplyWithResult(
|
|
GetExtensionFileTaskRunner().get(), FROM_HERE,
|
|
base::BindOnce(&LoadUnpacked, extension_dir, load_flags),
|
|
base::BindOnce(&ElectronExtensionLoader::FinishExtensionLoad,
|
|
weak_factory_.GetWeakPtr(), std::move(cb)));
|
|
}
|
|
|
|
void ElectronExtensionLoader::ReloadExtension(const ExtensionId& extension_id) {
|
|
const Extension* extension = ExtensionRegistry::Get(browser_context_)
|
|
->GetInstalledExtension(extension_id);
|
|
// We shouldn't be trying to reload extensions that haven't been added.
|
|
DCHECK(extension);
|
|
|
|
// This should always start false since it's only set here, or in
|
|
// LoadExtensionForReload() as a result of the call below.
|
|
DCHECK_EQ(false, did_schedule_reload_);
|
|
base::AutoReset<bool> reset_did_schedule_reload(&did_schedule_reload_, false);
|
|
|
|
extension_registrar_.ReloadExtension(extension_id, LoadErrorBehavior::kQuiet);
|
|
if (did_schedule_reload_)
|
|
return;
|
|
}
|
|
|
|
void ElectronExtensionLoader::UnloadExtension(
|
|
const ExtensionId& extension_id,
|
|
extensions::UnloadedExtensionReason reason) {
|
|
extension_registrar_.RemoveExtension(extension_id, reason);
|
|
}
|
|
|
|
void ElectronExtensionLoader::FinishExtensionLoad(
|
|
base::OnceCallback<void(const Extension*, const std::string&)> cb,
|
|
std::pair<scoped_refptr<const Extension>, std::string> result) {
|
|
scoped_refptr<const Extension> extension = result.first;
|
|
if (extension) {
|
|
extension_registrar_.AddExtension(extension);
|
|
|
|
// Write extension install time to ExtensionPrefs. This is required by
|
|
// WebRequestAPI which calls extensions::ExtensionPrefs::GetInstallTime.
|
|
//
|
|
// Implementation for writing the pref was based on
|
|
// PreferenceAPIBase::SetExtensionControlledPref.
|
|
{
|
|
ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser_context_);
|
|
ExtensionPrefs::ScopedDictionaryUpdate update(
|
|
extension_prefs, extension.get()->id(),
|
|
extensions::pref_names::kPrefPreferences);
|
|
auto preference = update.Create();
|
|
const base::Time install_time = base::Time().Now();
|
|
preference->SetString(
|
|
"install_time", base::NumberToString(install_time.ToInternalValue()));
|
|
}
|
|
}
|
|
|
|
std::move(cb).Run(extension.get(), result.second);
|
|
}
|
|
|
|
void ElectronExtensionLoader::FinishExtensionReload(
|
|
const ExtensionId& old_extension_id,
|
|
std::pair<scoped_refptr<const Extension>, std::string> result) {
|
|
scoped_refptr<const Extension> extension = result.first;
|
|
if (extension) {
|
|
extension_registrar_.AddExtension(extension);
|
|
}
|
|
}
|
|
|
|
void ElectronExtensionLoader::PreAddExtension(const Extension* extension,
|
|
const Extension* old_extension) {
|
|
if (old_extension)
|
|
return;
|
|
|
|
// The extension might be disabled if a previous reload attempt failed. In
|
|
// that case, we want to remove that disable reason.
|
|
ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser_context_);
|
|
if (extension_prefs->IsExtensionDisabled(extension->id()) &&
|
|
extension_prefs->HasDisableReason(extension->id(),
|
|
disable_reason::DISABLE_RELOAD)) {
|
|
extension_prefs->RemoveDisableReason(extension->id(),
|
|
disable_reason::DISABLE_RELOAD);
|
|
// Only re-enable the extension if there are no other disable reasons.
|
|
if (extension_prefs->GetDisableReasons(extension->id()) ==
|
|
disable_reason::DISABLE_NONE) {
|
|
extension_prefs->SetExtensionEnabled(extension->id());
|
|
}
|
|
}
|
|
}
|
|
|
|
void ElectronExtensionLoader::PostActivateExtension(
|
|
scoped_refptr<const Extension> extension) {}
|
|
|
|
void ElectronExtensionLoader::PostDeactivateExtension(
|
|
scoped_refptr<const Extension> extension) {}
|
|
|
|
void ElectronExtensionLoader::LoadExtensionForReload(
|
|
const ExtensionId& extension_id,
|
|
const base::FilePath& path,
|
|
LoadErrorBehavior load_error_behavior) {
|
|
CHECK(!path.empty());
|
|
|
|
// TODO(nornagon): we should save whether file access was granted
|
|
// when loading this extension and retain it here. As is, reloading an
|
|
// extension will cause the file access permission to be dropped.
|
|
int load_flags = Extension::FOLLOW_SYMLINKS_ANYWHERE;
|
|
base::PostTaskAndReplyWithResult(
|
|
GetExtensionFileTaskRunner().get(), FROM_HERE,
|
|
base::BindOnce(&LoadUnpacked, path, load_flags),
|
|
base::BindOnce(&ElectronExtensionLoader::FinishExtensionReload,
|
|
weak_factory_.GetWeakPtr(), extension_id));
|
|
did_schedule_reload_ = true;
|
|
}
|
|
|
|
bool ElectronExtensionLoader::CanEnableExtension(const Extension* extension) {
|
|
return true;
|
|
}
|
|
|
|
bool ElectronExtensionLoader::CanDisableExtension(const Extension* extension) {
|
|
// Extensions cannot be disabled by the user.
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionLoader::ShouldBlockExtension(const Extension* extension) {
|
|
return false;
|
|
}
|
|
|
|
} // namespace extensions
|