![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
239 lines
8.9 KiB
C++
239 lines
8.9 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/command_line.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/utf_string_conversions.h"
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "base/time/time.h"
|
|
#include "content/public/browser/browser_context.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/constants.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_(ExtensionRegistrar::Get(browser_context)) {
|
|
extension_registrar_->Init(
|
|
this, /*extensions_enabled=*/true, base::CommandLine::ForCurrentProcess(),
|
|
browser_context_->GetPath().AppendASCII(kInstallDirectoryName),
|
|
browser_context_->GetPath().AppendASCII(kUnpackedInstallDirectoryName));
|
|
}
|
|
|
|
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 int64_t now_usec =
|
|
base::Time::Now().since_origin().InMicroseconds();
|
|
preference->SetString("install_time", base::NumberToString(now_usec));
|
|
}
|
|
}
|
|
|
|
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_);
|
|
extension_prefs->RemoveDisableReason(extension->id(),
|
|
disable_reason::DISABLE_RELOAD);
|
|
}
|
|
|
|
void ElectronExtensionLoader::PostActivateExtension(
|
|
scoped_refptr<const Extension> extension) {}
|
|
|
|
void ElectronExtensionLoader::PostDeactivateExtension(
|
|
scoped_refptr<const Extension> extension) {}
|
|
|
|
void ElectronExtensionLoader::PreUninstallExtension(
|
|
scoped_refptr<const Extension> extension) {}
|
|
|
|
void ElectronExtensionLoader::PostUninstallExtension(
|
|
scoped_refptr<const Extension> extension,
|
|
base::OnceClosure done_callback) {}
|
|
|
|
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;
|
|
}
|
|
|
|
void ElectronExtensionLoader::ShowExtensionDisabledError(
|
|
const Extension* extension,
|
|
bool is_remote_install) {}
|
|
|
|
bool ElectronExtensionLoader::CanEnableExtension(const Extension* extension) {
|
|
return true;
|
|
}
|
|
|
|
bool ElectronExtensionLoader::CanDisableExtension(const Extension* extension) {
|
|
// Extensions cannot be disabled by the user.
|
|
return false;
|
|
}
|
|
|
|
void ElectronExtensionLoader::GrantActivePermissions(
|
|
const Extension* extension) {
|
|
NOTIMPLEMENTED();
|
|
}
|
|
|
|
} // namespace extensions
|