mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: upgrade to chromium 89.0.4336.0 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * update patches * update patches * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: update patches * chore: update patches * clear out cache * Revert "clear out cache" This reverts commit 6e811fae4b7f4eeb736225ce2460857922763b66. * Update to 89.0.4342.2 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 (cherry picked from commit 102a2a3b8d57b6cddb85e9d24e44de77730c81c3) * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true (cherry picked from commit 7a2510a9f68339a252a25df3839e9e215a476d4b) * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 (cherry picked from commit b67d89155d87c86aa295cda645fdee591dacd512) * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 (cherry picked from commit 8cd4ee013eec12205832d0f763ab4480cdb10c28) * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 (cherry picked from commit 56a4a87dec21c1332e508adae4638bf00371dc73) * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 (cherry picked from commit 338d4304bc9c0abcd24306aa4901558b9db9368b) * Actually apply nan patch (cherry picked from commit bf20236386f83229ec09c434d21aca4712d0d53b) * update patches * update to 89.0.4348.1 see if this resolves Windows crashes * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum (cherry picked from commit 36accef04a9047da4f31f214f133866e48f7942c) * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 (cherry picked from commit cab78df863acfb6ca24830eac8f9df11d7d877fd) * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 (cherry picked from commit d0ba1ec443e5ea234706ee93b5b413ed6c9095d7) * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 (cherry picked from commit 1ca2fa5a3c7bd39419b50a439eb9eec4582ced28) * Remove deprecated performFileOperation usage (cherry picked from commit d2dca0c24950cbc81cec80beac9ba640e200d6fa) * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 (cherry picked from commit 944da70791253e9a564317f93814ab544c944a8e) * fixup: Add disconnect logic to ElectronBrowserHandlerImpl (cherry picked from commit e4582a10bbdd20d08d94389953cad8a4ea2b7a1d) * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 (cherry picked from commit ef1d0164bdd8b730c51d46c3099d7d4efea0133b) * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html (cherry picked from commit f4a0b5834b78d189acb03d3b43b2160dcc749a7e) * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 (cherry picked from commitcf09a792f0) * Update patches after rebase * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl (cherry picked from commitbe270753e1) * Remove unneeded BindTo (cherry picked from commitca3287895a) * Don't assign ElectronBrowserHandlerImpl at all (cherry picked from commit899ef067ed) * update patches Co-authored-by: Electron Bot <electron@github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
376 lines
13 KiB
C++
376 lines
13 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_extensions_browser_client.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/memory/ptr_util.h"
|
|
#include "base/path_service.h"
|
|
#include "base/task/post_task.h"
|
|
#include "build/build_config.h"
|
|
#include "chrome/browser/extensions/chrome_url_request_util.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "chrome/common/extensions/chrome_manifest_url_handlers.h"
|
|
#include "components/version_info/version_info.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/render_frame_host.h"
|
|
#include "content/public/common/user_agent.h"
|
|
#include "extensions/browser/api/extensions_api_client.h"
|
|
#include "extensions/browser/component_extension_resource_manager.h"
|
|
#include "extensions/browser/core_extensions_browser_api_provider.h"
|
|
#include "extensions/browser/event_router.h"
|
|
#include "extensions/browser/extension_protocols.h"
|
|
#include "extensions/browser/extensions_browser_interface_binders.h"
|
|
#include "extensions/browser/null_app_sorting.h"
|
|
#include "extensions/browser/updater/null_extension_cache.h"
|
|
#include "extensions/browser/url_request_util.h"
|
|
#include "extensions/common/features/feature_channel.h"
|
|
#include "extensions/common/file_util.h"
|
|
#include "extensions/common/manifest_constants.h"
|
|
#include "extensions/common/manifest_url_handlers.h"
|
|
#include "net/base/mime_util.h"
|
|
#include "services/network/public/mojom/url_loader.mojom.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/electron_browser_client.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.h"
|
|
#include "shell/browser/extensions/electron_component_extension_resource_manager.h"
|
|
#include "shell/browser/extensions/electron_extension_host_delegate.h"
|
|
#include "shell/browser/extensions/electron_extension_system_factory.h"
|
|
#include "shell/browser/extensions/electron_extension_web_contents_observer.h"
|
|
#include "shell/browser/extensions/electron_extensions_api_client.h"
|
|
#include "shell/browser/extensions/electron_extensions_browser_api_provider.h"
|
|
#include "shell/browser/extensions/electron_kiosk_delegate.h"
|
|
#include "shell/browser/extensions/electron_navigation_ui_data.h"
|
|
#include "shell/browser/extensions/electron_process_manager_delegate.h"
|
|
#include "ui/base/resource/resource_bundle.h"
|
|
|
|
using content::BrowserContext;
|
|
using content::BrowserThread;
|
|
using extensions::ExtensionsBrowserClient;
|
|
|
|
namespace electron {
|
|
|
|
ElectronExtensionsBrowserClient::ElectronExtensionsBrowserClient()
|
|
: api_client_(new extensions::ElectronExtensionsAPIClient),
|
|
process_manager_delegate_(new extensions::ElectronProcessManagerDelegate),
|
|
extension_cache_(new extensions::NullExtensionCache()) {
|
|
// Electron does not have a concept of channel, so leave UNKNOWN to
|
|
// enable all channel-dependent extension APIs.
|
|
extensions::SetCurrentChannel(version_info::Channel::UNKNOWN);
|
|
resource_manager_.reset(
|
|
new extensions::ElectronComponentExtensionResourceManager());
|
|
|
|
AddAPIProvider(
|
|
std::make_unique<extensions::CoreExtensionsBrowserAPIProvider>());
|
|
AddAPIProvider(
|
|
std::make_unique<extensions::ElectronExtensionsBrowserAPIProvider>());
|
|
}
|
|
|
|
ElectronExtensionsBrowserClient::~ElectronExtensionsBrowserClient() {}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsShuttingDown() {
|
|
return electron::Browser::Get()->is_shutting_down();
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::AreExtensionsDisabled(
|
|
const base::CommandLine& command_line,
|
|
BrowserContext* context) {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsValidContext(BrowserContext* context) {
|
|
auto& context_map = ElectronBrowserContext::browser_context_map();
|
|
for (auto const& entry : context_map) {
|
|
if (entry.second && entry.second.get() == context)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsSameContext(BrowserContext* first,
|
|
BrowserContext* second) {
|
|
return first == second;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::HasOffTheRecordContext(
|
|
BrowserContext* context) {
|
|
return false;
|
|
}
|
|
|
|
BrowserContext* ElectronExtensionsBrowserClient::GetOffTheRecordContext(
|
|
BrowserContext* context) {
|
|
// app_shell only supports a single context.
|
|
return nullptr;
|
|
}
|
|
|
|
BrowserContext* ElectronExtensionsBrowserClient::GetOriginalContext(
|
|
BrowserContext* context) {
|
|
DCHECK(context);
|
|
if (context->IsOffTheRecord()) {
|
|
return ElectronBrowserContext::From("", false);
|
|
} else {
|
|
return context;
|
|
}
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsGuestSession(
|
|
BrowserContext* context) const {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsExtensionIncognitoEnabled(
|
|
const std::string& extension_id,
|
|
content::BrowserContext* context) const {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::CanExtensionCrossIncognito(
|
|
const extensions::Extension* extension,
|
|
content::BrowserContext* context) const {
|
|
return false;
|
|
}
|
|
|
|
base::FilePath ElectronExtensionsBrowserClient::GetBundleResourcePath(
|
|
const network::ResourceRequest& request,
|
|
const base::FilePath& extension_resources_path,
|
|
int* resource_id) const {
|
|
*resource_id = 0;
|
|
base::FilePath chrome_resources_path;
|
|
if (!base::PathService::Get(chrome::DIR_RESOURCES, &chrome_resources_path))
|
|
return base::FilePath();
|
|
|
|
// Since component extension resources are included in
|
|
// component_extension_resources.pak file in |chrome_resources_path|,
|
|
// calculate the extension |request_relative_path| against
|
|
// |chrome_resources_path|.
|
|
if (!chrome_resources_path.IsParent(extension_resources_path))
|
|
return base::FilePath();
|
|
|
|
const base::FilePath request_relative_path =
|
|
extensions::file_util::ExtensionURLToRelativeFilePath(request.url);
|
|
if (!ExtensionsBrowserClient::Get()
|
|
->GetComponentExtensionResourceManager()
|
|
->IsComponentExtensionResource(extension_resources_path,
|
|
request_relative_path, resource_id)) {
|
|
return base::FilePath();
|
|
}
|
|
DCHECK_NE(0, *resource_id);
|
|
|
|
return request_relative_path;
|
|
}
|
|
|
|
void ElectronExtensionsBrowserClient::LoadResourceFromResourceBundle(
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
const base::FilePath& resource_relative_path,
|
|
int resource_id,
|
|
const std::string& content_security_policy,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
bool send_cors_header) {
|
|
extensions::chrome_url_request_util::LoadResourceFromResourceBundle(
|
|
request, std::move(loader), resource_relative_path, resource_id,
|
|
content_security_policy, std::move(client), send_cors_header);
|
|
}
|
|
|
|
namespace {
|
|
bool AllowCrossRendererResourceLoad(const network::ResourceRequest& request,
|
|
blink::mojom::ResourceType resource_type,
|
|
ui::PageTransition page_transition,
|
|
int child_id,
|
|
bool is_incognito,
|
|
const extensions::Extension* extension,
|
|
const extensions::ExtensionSet& extensions,
|
|
const extensions::ProcessMap& process_map,
|
|
bool* allowed) {
|
|
if (extensions::url_request_util::AllowCrossRendererResourceLoad(
|
|
request, resource_type, page_transition, child_id, is_incognito,
|
|
extension, extensions, process_map, allowed)) {
|
|
return true;
|
|
}
|
|
|
|
// If there aren't any explicitly marked web accessible resources, the
|
|
// load should be allowed only if it is by DevTools. A close approximation is
|
|
// checking if the extension contains a DevTools page.
|
|
if (extension && !extensions::chrome_manifest_urls::GetDevToolsPage(extension)
|
|
.is_empty()) {
|
|
*allowed = true;
|
|
return true;
|
|
}
|
|
|
|
// Couldn't determine if the resource is allowed or not.
|
|
return false;
|
|
}
|
|
} // namespace
|
|
|
|
bool ElectronExtensionsBrowserClient::AllowCrossRendererResourceLoad(
|
|
const network::ResourceRequest& request,
|
|
blink::mojom::ResourceType resource_type,
|
|
ui::PageTransition page_transition,
|
|
int child_id,
|
|
bool is_incognito,
|
|
const extensions::Extension* extension,
|
|
const extensions::ExtensionSet& extensions,
|
|
const extensions::ProcessMap& process_map) {
|
|
bool allowed = false;
|
|
if (::electron::AllowCrossRendererResourceLoad(
|
|
request, resource_type, page_transition, child_id, is_incognito,
|
|
extension, extensions, process_map, &allowed)) {
|
|
return allowed;
|
|
}
|
|
|
|
// Couldn't determine if resource is allowed. Block the load.
|
|
return false;
|
|
}
|
|
|
|
PrefService* ElectronExtensionsBrowserClient::GetPrefServiceForContext(
|
|
BrowserContext* context) {
|
|
return static_cast<ElectronBrowserContext*>(context)->prefs();
|
|
}
|
|
|
|
void ElectronExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
|
|
content::BrowserContext* context,
|
|
std::vector<extensions::EarlyExtensionPrefsObserver*>* observers) const {}
|
|
|
|
extensions::ProcessManagerDelegate*
|
|
ElectronExtensionsBrowserClient::GetProcessManagerDelegate() const {
|
|
return process_manager_delegate_.get();
|
|
}
|
|
|
|
std::unique_ptr<extensions::ExtensionHostDelegate>
|
|
ElectronExtensionsBrowserClient::
|
|
CreateExtensionHostDelegate() { // TODO(samuelmaddock):
|
|
return base::WrapUnique(new extensions::ElectronExtensionHostDelegate);
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::DidVersionUpdate(
|
|
BrowserContext* context) {
|
|
// TODO(jamescook): We might want to tell extensions when app_shell updates.
|
|
return false;
|
|
}
|
|
|
|
void ElectronExtensionsBrowserClient::PermitExternalProtocolHandler() {}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsInDemoMode() {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsScreensaverInDemoMode(
|
|
const std::string& app_id) {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsRunningInForcedAppMode() {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsAppModeForcedForApp(
|
|
const extensions::ExtensionId& extension_id) {
|
|
return false;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsLoggedInAsPublicAccount() {
|
|
return false;
|
|
}
|
|
|
|
extensions::ExtensionSystemProvider*
|
|
ElectronExtensionsBrowserClient::GetExtensionSystemFactory() {
|
|
return extensions::ElectronExtensionSystemFactory::GetInstance();
|
|
}
|
|
|
|
std::unique_ptr<extensions::RuntimeAPIDelegate>
|
|
ElectronExtensionsBrowserClient::CreateRuntimeAPIDelegate(
|
|
content::BrowserContext* context) const {
|
|
return std::make_unique<extensions::ElectronRuntimeAPIDelegate>(context);
|
|
}
|
|
|
|
const extensions::ComponentExtensionResourceManager*
|
|
ElectronExtensionsBrowserClient::GetComponentExtensionResourceManager() {
|
|
return resource_manager_.get();
|
|
}
|
|
|
|
void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
|
|
extensions::events::HistogramValue histogram_value,
|
|
const std::string& event_name,
|
|
std::unique_ptr<base::ListValue> args,
|
|
bool dispatch_to_off_the_record_profiles) {
|
|
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
|
|
base::PostTask(
|
|
FROM_HERE, {BrowserThread::UI},
|
|
base::BindOnce(
|
|
&ElectronExtensionsBrowserClient::BroadcastEventToRenderers,
|
|
base::Unretained(this), histogram_value, event_name,
|
|
std::move(args), dispatch_to_off_the_record_profiles));
|
|
return;
|
|
}
|
|
|
|
std::unique_ptr<extensions::Event> event(
|
|
new extensions::Event(histogram_value, event_name, std::move(args)));
|
|
auto& context_map = ElectronBrowserContext::browser_context_map();
|
|
for (auto const& entry : context_map) {
|
|
if (entry.second) {
|
|
extensions::EventRouter::Get(entry.second.get())
|
|
->BroadcastEvent(std::move(event));
|
|
}
|
|
}
|
|
}
|
|
|
|
extensions::ExtensionCache*
|
|
ElectronExtensionsBrowserClient::GetExtensionCache() {
|
|
return extension_cache_.get();
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsBackgroundUpdateAllowed() {
|
|
return true;
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsMinBrowserVersionSupported(
|
|
const std::string& min_version) {
|
|
return true;
|
|
}
|
|
|
|
void ElectronExtensionsBrowserClient::SetAPIClientForTest(
|
|
extensions::ExtensionsAPIClient* api_client) {
|
|
api_client_.reset(api_client);
|
|
}
|
|
|
|
extensions::ExtensionWebContentsObserver*
|
|
ElectronExtensionsBrowserClient::GetExtensionWebContentsObserver(
|
|
content::WebContents* web_contents) {
|
|
return extensions::ElectronExtensionWebContentsObserver::FromWebContents(
|
|
web_contents);
|
|
}
|
|
|
|
extensions::KioskDelegate* ElectronExtensionsBrowserClient::GetKioskDelegate() {
|
|
if (!kiosk_delegate_)
|
|
kiosk_delegate_.reset(new ElectronKioskDelegate());
|
|
return kiosk_delegate_.get();
|
|
}
|
|
|
|
bool ElectronExtensionsBrowserClient::IsLockScreenContext(
|
|
content::BrowserContext* context) {
|
|
return false;
|
|
}
|
|
|
|
std::string ElectronExtensionsBrowserClient::GetApplicationLocale() {
|
|
return ElectronBrowserClient::Get()->GetApplicationLocale();
|
|
}
|
|
|
|
std::string ElectronExtensionsBrowserClient::GetUserAgent() const {
|
|
return ElectronBrowserClient::Get()->GetUserAgent();
|
|
}
|
|
|
|
void ElectronExtensionsBrowserClient::RegisterBrowserInterfaceBindersForFrame(
|
|
mojo::BinderMapWithContext<content::RenderFrameHost*>* map,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const extensions::Extension* extension) const {
|
|
PopulateExtensionFrameBinders(map, render_frame_host, extension);
|
|
}
|
|
|
|
} // namespace electron
|