d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
227 lines
8.6 KiB
C++
227 lines
8.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/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/functional/bind.h"
|
|
#include "base/logging.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/task/sequenced_task_runner.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/error_utils.h"
|
|
#include "extensions/common/file_util.h"
|
|
#include "extensions/common/manifest_constants.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);
|
|
}
|
|
|
|
// remove _metadata folder. Otherwise, the following warning will be thrown
|
|
// Cannot load extension with file or directory name _metadata.
|
|
// Filenames starting with "_" are reserved for use by the system.
|
|
// see: https://bugs.chromium.org/p/chromium/issues/detail?id=377278
|
|
base::FilePath metadata_dir = extension_dir.Append(kMetadataFolder);
|
|
if (base::DirectoryExists(metadata_dir)) {
|
|
base::DeletePathRecursively(metadata_dir);
|
|
}
|
|
|
|
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().empty()) {
|
|
std::string warning_prefix =
|
|
"Warnings loading extension at " +
|
|
base::UTF16ToUTF8(extension_dir.LossyDisplayName());
|
|
|
|
for (const auto& warning : extension->install_warnings()) {
|
|
std::string unrecognized_manifest_error = ErrorUtils::FormatErrorMessage(
|
|
manifest_errors::kUnrecognizedManifestKey, warning.key);
|
|
|
|
if (warning.message == unrecognized_manifest_error) {
|
|
// filter kUnrecognizedManifestKey error. This error does not have any
|
|
// impact e.g: Unrecognized manifest key 'minimum_chrome_version' etc.
|
|
LOG(WARNING) << warning_prefix << ": " << warning.message;
|
|
} else {
|
|
warnings += " " + warning.message + "\n";
|
|
}
|
|
}
|
|
|
|
if (warnings != "") {
|
|
warnings = warning_prefix + ":\n" + warnings;
|
|
}
|
|
}
|
|
|
|
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) {
|
|
GetExtensionFileTaskRunner()->PostTaskAndReplyWithResult(
|
|
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;
|
|
GetExtensionFileTaskRunner()->PostTaskAndReplyWithResult(
|
|
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
|