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>
236 lines
7.5 KiB
C++
236 lines
7.5 KiB
C++
// Copyright 2014 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_system.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/functional/bind.h"
|
|
#include "base/json/json_string_value_serializer.h"
|
|
#include "base/path_service.h"
|
|
#include "base/values.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "chrome/grit/browser_resources.h"
|
|
#include "components/value_store/value_store_factory_impl.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/notification_details.h"
|
|
#include "content/public/browser/notification_service.h"
|
|
#include "content/public/browser/notification_source.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "extensions/browser/api/app_runtime/app_runtime_api.h"
|
|
#include "extensions/browser/extension_registry.h"
|
|
#include "extensions/browser/info_map.h"
|
|
#include "extensions/browser/management_policy.h"
|
|
#include "extensions/browser/notification_types.h"
|
|
#include "extensions/browser/null_app_sorting.h"
|
|
#include "extensions/browser/quota_service.h"
|
|
#include "extensions/browser/service_worker_manager.h"
|
|
#include "extensions/browser/user_script_manager.h"
|
|
#include "extensions/common/constants.h"
|
|
#include "extensions/common/file_util.h"
|
|
#include "shell/browser/extensions/electron_extension_loader.h"
|
|
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
#include "chrome/browser/pdf/pdf_extension_util.h" // nogncheck
|
|
#endif
|
|
|
|
using content::BrowserContext;
|
|
using content::BrowserThread;
|
|
|
|
namespace extensions {
|
|
|
|
ElectronExtensionSystem::ElectronExtensionSystem(
|
|
BrowserContext* browser_context)
|
|
: browser_context_(browser_context),
|
|
store_factory_(base::MakeRefCounted<value_store::ValueStoreFactoryImpl>(
|
|
browser_context->GetPath())) {}
|
|
|
|
ElectronExtensionSystem::~ElectronExtensionSystem() = default;
|
|
|
|
void ElectronExtensionSystem::LoadExtension(
|
|
const base::FilePath& extension_dir,
|
|
int load_flags,
|
|
base::OnceCallback<void(const Extension*, const std::string&)> cb) {
|
|
extension_loader_->LoadExtension(extension_dir, load_flags, std::move(cb));
|
|
}
|
|
|
|
void ElectronExtensionSystem::FinishInitialization() {
|
|
// Inform the rest of the extensions system to start.
|
|
ready_.Signal();
|
|
}
|
|
|
|
void ElectronExtensionSystem::ReloadExtension(const ExtensionId& extension_id) {
|
|
extension_loader_->ReloadExtension(extension_id);
|
|
}
|
|
|
|
void ElectronExtensionSystem::RemoveExtension(const ExtensionId& extension_id) {
|
|
extension_loader_->UnloadExtension(
|
|
extension_id, extensions::UnloadedExtensionReason::UNINSTALL);
|
|
}
|
|
|
|
void ElectronExtensionSystem::Shutdown() {
|
|
extension_loader_.reset();
|
|
}
|
|
|
|
void ElectronExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
|
|
service_worker_manager_ =
|
|
std::make_unique<ServiceWorkerManager>(browser_context_);
|
|
quota_service_ = std::make_unique<QuotaService>();
|
|
user_script_manager_ = std::make_unique<UserScriptManager>(browser_context_);
|
|
app_sorting_ = std::make_unique<NullAppSorting>();
|
|
extension_loader_ =
|
|
std::make_unique<ElectronExtensionLoader>(browser_context_);
|
|
|
|
if (!browser_context_->IsOffTheRecord())
|
|
LoadComponentExtensions();
|
|
|
|
management_policy_ = std::make_unique<ManagementPolicy>();
|
|
}
|
|
|
|
std::unique_ptr<base::Value::Dict> ParseManifest(
|
|
base::StringPiece manifest_contents) {
|
|
JSONStringValueDeserializer deserializer(manifest_contents);
|
|
std::unique_ptr<base::Value> manifest = deserializer.Deserialize(NULL, NULL);
|
|
|
|
if (!manifest.get() || !manifest->is_dict()) {
|
|
LOG(ERROR) << "Failed to parse extension manifest.";
|
|
return std::unique_ptr<base::Value::Dict>();
|
|
}
|
|
return std::make_unique<base::Value::Dict>(std::move(manifest->GetDict()));
|
|
}
|
|
|
|
void ElectronExtensionSystem::LoadComponentExtensions() {
|
|
std::string utf8_error;
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
std::string pdf_manifest_string = pdf_extension_util::GetManifest();
|
|
std::unique_ptr<base::Value::Dict> pdf_manifest =
|
|
ParseManifest(pdf_manifest_string);
|
|
if (pdf_manifest) {
|
|
base::FilePath root_directory;
|
|
CHECK(base::PathService::Get(chrome::DIR_RESOURCES, &root_directory));
|
|
root_directory = root_directory.Append(FILE_PATH_LITERAL("pdf"));
|
|
scoped_refptr<const Extension> pdf_extension =
|
|
extensions::Extension::Create(
|
|
root_directory, extensions::mojom::ManifestLocation::kComponent,
|
|
*pdf_manifest, extensions::Extension::REQUIRE_KEY, &utf8_error);
|
|
extension_loader_->registrar()->AddExtension(pdf_extension);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
ExtensionService* ElectronExtensionSystem::extension_service() {
|
|
return nullptr;
|
|
}
|
|
|
|
ManagementPolicy* ElectronExtensionSystem::management_policy() {
|
|
return management_policy_.get();
|
|
}
|
|
|
|
ServiceWorkerManager* ElectronExtensionSystem::service_worker_manager() {
|
|
return service_worker_manager_.get();
|
|
}
|
|
|
|
UserScriptManager* ElectronExtensionSystem::user_script_manager() {
|
|
return user_script_manager_.get();
|
|
}
|
|
|
|
StateStore* ElectronExtensionSystem::state_store() {
|
|
return nullptr;
|
|
}
|
|
|
|
StateStore* ElectronExtensionSystem::rules_store() {
|
|
return nullptr;
|
|
}
|
|
|
|
StateStore* ElectronExtensionSystem::dynamic_user_scripts_store() {
|
|
return nullptr;
|
|
}
|
|
|
|
scoped_refptr<value_store::ValueStoreFactory>
|
|
ElectronExtensionSystem::store_factory() {
|
|
return store_factory_;
|
|
}
|
|
|
|
InfoMap* ElectronExtensionSystem::info_map() {
|
|
if (!info_map_.get())
|
|
info_map_ = base::MakeRefCounted<InfoMap>();
|
|
return info_map_.get();
|
|
}
|
|
|
|
QuotaService* ElectronExtensionSystem::quota_service() {
|
|
return quota_service_.get();
|
|
}
|
|
|
|
AppSorting* ElectronExtensionSystem::app_sorting() {
|
|
return app_sorting_.get();
|
|
}
|
|
|
|
void ElectronExtensionSystem::RegisterExtensionWithRequestContexts(
|
|
const Extension* extension,
|
|
base::OnceClosure callback) {
|
|
content::GetIOThreadTaskRunner({})->PostTaskAndReply(
|
|
FROM_HERE,
|
|
base::BindOnce(&InfoMap::AddExtension, info_map(),
|
|
base::RetainedRef(extension), base::Time::Now(), false,
|
|
false),
|
|
std::move(callback));
|
|
}
|
|
|
|
void ElectronExtensionSystem::UnregisterExtensionWithRequestContexts(
|
|
const std::string& extension_id) {}
|
|
|
|
const base::OneShotEvent& ElectronExtensionSystem::ready() const {
|
|
return ready_;
|
|
}
|
|
|
|
bool ElectronExtensionSystem::is_ready() const {
|
|
return ready_.is_signaled();
|
|
}
|
|
|
|
ContentVerifier* ElectronExtensionSystem::content_verifier() {
|
|
return nullptr;
|
|
}
|
|
|
|
std::unique_ptr<ExtensionSet> ElectronExtensionSystem::GetDependentExtensions(
|
|
const Extension* extension) {
|
|
return std::make_unique<ExtensionSet>();
|
|
}
|
|
|
|
void ElectronExtensionSystem::InstallUpdate(
|
|
const std::string& extension_id,
|
|
const std::string& public_key,
|
|
const base::FilePath& temp_dir,
|
|
bool install_immediately,
|
|
InstallUpdateCallback install_update_callback) {
|
|
NOTREACHED();
|
|
base::DeletePathRecursively(temp_dir);
|
|
}
|
|
|
|
bool ElectronExtensionSystem::FinishDelayedInstallationIfReady(
|
|
const std::string& extension_id,
|
|
bool install_immediately) {
|
|
NOTREACHED();
|
|
return false;
|
|
}
|
|
|
|
void ElectronExtensionSystem::PerformActionBasedOnOmahaAttributes(
|
|
const std::string& extension_id,
|
|
const base::Value& attributes) {
|
|
NOTREACHED();
|
|
}
|
|
|
|
void ElectronExtensionSystem::OnExtensionRegisteredWithRequestContexts(
|
|
scoped_refptr<Extension> extension) {
|
|
ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context_);
|
|
registry->AddReady(extension);
|
|
registry->TriggerOnReady(extension.get());
|
|
}
|
|
|
|
} // namespace extensions
|