mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- 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: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
200 lines
7.8 KiB
C++
200 lines
7.8 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/node_util.h"
|
|
|
|
#include "base/compiler_specific.h"
|
|
#include "base/containers/to_value_list.h"
|
|
#include "base/json/json_writer.h"
|
|
#include "base/logging.h"
|
|
#include "base/memory/ptr_util.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/strings/strcat.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/threading/thread_local.h"
|
|
#include "base/values.h"
|
|
#include "gin/converter.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/process_util.h"
|
|
#include "third_party/electron_node/src/node_process-inl.h"
|
|
|
|
namespace electron::util {
|
|
|
|
v8::MaybeLocal<v8::Value> CompileAndCall(
|
|
v8::Isolate* const isolate,
|
|
v8::Local<v8::Context> context,
|
|
const char* id,
|
|
v8::LocalVector<v8::String>* parameters,
|
|
v8::LocalVector<v8::Value>* arguments) {
|
|
v8::TryCatch try_catch{isolate};
|
|
|
|
static base::NoDestructor<
|
|
base::ThreadLocalOwnedPointer<node::builtins::BuiltinLoader>>
|
|
builtin_loader;
|
|
if (!builtin_loader->Get()) {
|
|
builtin_loader->Set(base::WrapUnique(new node::builtins::BuiltinLoader));
|
|
}
|
|
v8::MaybeLocal<v8::Function> compiled =
|
|
builtin_loader->Get()->LookupAndCompile(context, id, parameters,
|
|
node::Realm::GetCurrent(context));
|
|
|
|
if (compiled.IsEmpty()) {
|
|
// TODO(samuelmaddock): how can we get the compilation error message?
|
|
LOG(ERROR) << "CompileAndCall failed to compile electron script (" << id
|
|
<< ")";
|
|
return {};
|
|
}
|
|
|
|
v8::Local<v8::Function> fn = compiled.ToLocalChecked().As<v8::Function>();
|
|
v8::MaybeLocal<v8::Value> ret = fn->Call(
|
|
context, v8::Null(isolate), arguments->size(), arguments->data());
|
|
|
|
// This will only be caught when something has gone terrible wrong as all
|
|
// electron scripts are wrapped in a try {} catch {} by webpack
|
|
if (try_catch.HasCaught()) {
|
|
std::string msg = "no error message";
|
|
if (!try_catch.Message().IsEmpty()) {
|
|
gin::ConvertFromV8(isolate, try_catch.Message()->Get(), &msg);
|
|
} else if (try_catch.HasTerminated()) {
|
|
msg = "script execution has been terminated";
|
|
}
|
|
LOG(ERROR) << "CompileAndCall failed to evaluate electron script (" << id
|
|
<< "): " << msg;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void EmitWarning(const std::string_view warning_msg,
|
|
const std::string_view warning_type) {
|
|
EmitWarning(JavascriptEnvironment::GetIsolate(), warning_msg, warning_type);
|
|
}
|
|
|
|
void EmitWarning(v8::Isolate* isolate,
|
|
const std::string_view warning_msg,
|
|
const std::string_view warning_type) {
|
|
node::Environment* env = node::Environment::GetCurrent(isolate);
|
|
if (!env) {
|
|
// No Node.js environment available, fall back to console logging.
|
|
LOG(WARNING) << "[" << warning_type << "] " << warning_msg;
|
|
return;
|
|
}
|
|
node::ProcessEmitWarningGeneric(env, warning_msg, warning_type);
|
|
}
|
|
|
|
void EmitDeprecationWarning(const std::string_view warning_msg,
|
|
const std::string_view deprecation_code) {
|
|
EmitDeprecationWarning(JavascriptEnvironment::GetIsolate(), warning_msg,
|
|
deprecation_code);
|
|
}
|
|
|
|
void EmitDeprecationWarning(v8::Isolate* isolate,
|
|
const std::string_view warning_msg,
|
|
const std::string_view deprecation_code) {
|
|
node::Environment* env = node::Environment::GetCurrent(isolate);
|
|
if (!env) {
|
|
// No Node.js environment available, fall back to console logging.
|
|
LOG(WARNING) << "[DeprecationWarning] " << warning_msg
|
|
<< " (code: " << deprecation_code << ")";
|
|
return;
|
|
}
|
|
node::ProcessEmitWarningGeneric(env, warning_msg, "DeprecationWarning",
|
|
deprecation_code);
|
|
}
|
|
|
|
node::Environment* CreateEnvironment(v8::Isolate* isolate,
|
|
node::IsolateData* isolate_data,
|
|
v8::Local<v8::Context> context,
|
|
const std::vector<std::string>& args,
|
|
const std::vector<std::string>& exec_args,
|
|
node::EnvironmentFlags::Flags env_flags,
|
|
std::string_view process_type) {
|
|
v8::TryCatch try_catch{isolate};
|
|
node::Environment* env = node::CreateEnvironment(isolate_data, context, args,
|
|
exec_args, env_flags);
|
|
if (auto message = try_catch.Message(); !message.IsEmpty()) {
|
|
base::DictValue dict;
|
|
|
|
if (std::string str; gin::ConvertFromV8(isolate, message->Get(), &str))
|
|
dict.Set("message", std::move(str));
|
|
|
|
if (std::string str; gin::ConvertFromV8(
|
|
isolate, message->GetScriptOrigin().ResourceName(), &str)) {
|
|
const auto line_num = message->GetLineNumber(context).FromJust();
|
|
const auto line_str = base::NumberToString(line_num);
|
|
dict.Set("location", base::StrCat({", at ", str, ":", line_str}));
|
|
}
|
|
|
|
if (std::string str; gin::ConvertFromV8(
|
|
isolate, message->GetSourceLine(context).ToLocalChecked(), &str))
|
|
dict.Set("source_line", std::move(str));
|
|
|
|
if (!std::empty(process_type))
|
|
dict.Set("process_type", process_type);
|
|
|
|
if (auto list = base::ToValueList(args); !std::empty(list))
|
|
dict.Set("args", std::move(list));
|
|
|
|
if (auto list = base::ToValueList(exec_args); !std::empty(list))
|
|
dict.Set("exec_args", std::move(list));
|
|
|
|
std::string errstr = "Failed to initialize Node.js.";
|
|
if (std::optional<std::string> jsonstr = base::WriteJsonWithOptions(
|
|
dict, base::JsonOptions::OPTIONS_PRETTY_PRINT))
|
|
errstr += base::StrCat({" ", *jsonstr});
|
|
|
|
LOG(ERROR) << errstr;
|
|
}
|
|
|
|
return env;
|
|
}
|
|
|
|
ExplicitMicrotasksScope::ExplicitMicrotasksScope(v8::MicrotaskQueue* queue)
|
|
: microtask_queue_(queue), original_policy_(queue->microtasks_policy()) {
|
|
// In browser-like processes, some nested run loops (macOS usually) may
|
|
// re-enter. This is safe because we expect the policy was explicit in the
|
|
// first place for those processes. However, in renderer processes, there may
|
|
// be unexpected behavior if this code is triggered within a pending microtask
|
|
// scope.
|
|
if (electron::IsBrowserProcess() || electron::IsUtilityProcess()) {
|
|
DCHECK_EQ(original_policy_, v8::MicrotasksPolicy::kExplicit);
|
|
} else {
|
|
DCHECK_EQ(microtask_queue_->GetMicrotasksScopeDepth(), 0);
|
|
}
|
|
|
|
microtask_queue_->set_microtasks_policy(v8::MicrotasksPolicy::kExplicit);
|
|
}
|
|
|
|
ExplicitMicrotasksScope::~ExplicitMicrotasksScope() {
|
|
microtask_queue_->set_microtasks_policy(original_policy_);
|
|
}
|
|
|
|
} // namespace electron::util
|
|
|
|
namespace electron::Buffer {
|
|
|
|
// SAFETY: There is no node::Buffer API that passes the UNSAFE_BUFFER_USAGE
|
|
// test, so let's isolate the unsafe API use into this function. Instead of
|
|
// calling `Buffer::Data()` and `Buffer::Length()` directly, the rest of our
|
|
// code should prefer to use spans returned by this function.
|
|
base::span<uint8_t> as_byte_span(v8::Local<v8::Value> node_buffer) {
|
|
auto* data = reinterpret_cast<uint8_t*>(node::Buffer::Data(node_buffer));
|
|
const auto size = node::Buffer::Length(node_buffer);
|
|
return UNSAFE_BUFFERS(base::span{data, size});
|
|
}
|
|
|
|
v8::MaybeLocal<v8::Object> Copy(v8::Isolate* isolate,
|
|
const base::span<const char> data) {
|
|
// SAFETY: span-friendly version of node::Buffer::Copy()
|
|
return UNSAFE_BUFFERS(node::Buffer::Copy(isolate, data.data(), data.size()));
|
|
}
|
|
|
|
v8::MaybeLocal<v8::Object> Copy(v8::Isolate* isolate,
|
|
const base::span<const uint8_t> data) {
|
|
return Copy(isolate, base::as_chars(data));
|
|
}
|
|
|
|
} // namespace electron::Buffer
|