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>
146 lines
4.3 KiB
C++
146 lines
4.3 KiB
C++
// Copyright 2023 Slack Technologies, Inc.
|
|
// Contributors: Weiyun Dai (https://github.com/WeiyunD/), Andrew Lay
|
|
// (https://github.com/guohaolay) Use of this source code is governed by the MIT
|
|
// license that can be found in the LICENSE file.
|
|
|
|
#include "shell/common/asar/archive.h"
|
|
|
|
#include <algorithm>
|
|
#include <string_view>
|
|
|
|
#include "base/base_paths.h"
|
|
#include "base/containers/map_util.h"
|
|
#include "base/json/json_reader.h"
|
|
#include "base/logging.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/path_service.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "base/strings/string_util_win.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/common/asar/asar_util.h"
|
|
#include "third_party/abseil-cpp/absl/container/flat_hash_map.h"
|
|
|
|
namespace asar {
|
|
|
|
const wchar_t kIntegrityCheckResourceType[] = L"Integrity";
|
|
const wchar_t kIntegrityCheckResourceItem[] = L"ElectronAsar";
|
|
|
|
std::optional<base::FilePath> Archive::RelativePath() const {
|
|
base::FilePath assets_dir;
|
|
if (!base::PathService::Get(base::DIR_ASSETS, &assets_dir)) {
|
|
LOG(FATAL) << "Couldn't get assets directory path";
|
|
}
|
|
|
|
base::FilePath relative_path;
|
|
if (!assets_dir.AppendRelativePath(path_, &relative_path)) {
|
|
return std::nullopt;
|
|
}
|
|
|
|
return relative_path;
|
|
}
|
|
|
|
namespace {
|
|
|
|
auto LoadIntegrityConfig() {
|
|
absl::flat_hash_map<std::string, IntegrityPayload> cache;
|
|
|
|
// Load integrity config from exe resource
|
|
HMODULE module_handle = ::GetModuleHandle(NULL);
|
|
|
|
HRSRC resource = ::FindResource(module_handle, kIntegrityCheckResourceItem,
|
|
kIntegrityCheckResourceType);
|
|
if (!resource) {
|
|
PLOG(FATAL) << "FindResource failed.";
|
|
}
|
|
|
|
HGLOBAL rcData = ::LoadResource(module_handle, resource);
|
|
if (!rcData) {
|
|
PLOG(FATAL) << "LoadResource failed.";
|
|
}
|
|
|
|
const auto* res_data = static_cast<const char*>(::LockResource(rcData));
|
|
const auto res_size = SizeofResource(module_handle, resource);
|
|
|
|
if (!res_data) {
|
|
PLOG(FATAL) << "Failed to integrity config from exe resource.";
|
|
}
|
|
|
|
if (!res_size) {
|
|
PLOG(FATAL) << "Unexpected empty integrity config from exe resource.";
|
|
}
|
|
|
|
// Parse integrity config payload
|
|
std::optional<base::Value> root =
|
|
base::JSONReader::Read(std::string_view{res_data, res_size},
|
|
base::JSON_PARSE_CHROMIUM_EXTENSIONS);
|
|
|
|
if (!root.has_value()) {
|
|
LOG(FATAL) << "Invalid integrity config: NOT a valid JSON.";
|
|
}
|
|
|
|
const base::ListValue* file_configs = root.value().GetIfList();
|
|
if (!file_configs) {
|
|
LOG(FATAL) << "Invalid integrity config: NOT a list.";
|
|
}
|
|
|
|
// Parse each individual file integrity config
|
|
cache.reserve(file_configs->size());
|
|
for (size_t i = 0; i < file_configs->size(); i++) {
|
|
// Skip invalid file configs
|
|
const base::DictValue* ele_dict = (*file_configs)[i].GetIfDict();
|
|
if (!ele_dict) {
|
|
LOG(WARNING) << "Skip config " << i << ": NOT a valid dict";
|
|
continue;
|
|
}
|
|
|
|
const std::string* file = ele_dict->FindString("file");
|
|
if (!file || file->empty()) {
|
|
LOG(WARNING) << "Skip config " << i << ": Invalid file";
|
|
continue;
|
|
}
|
|
|
|
const std::string* alg = ele_dict->FindString("alg");
|
|
if (!alg || base::ToLowerASCII(*alg) != "sha256") {
|
|
LOG(WARNING) << "Skip config " << i << ": Invalid alg";
|
|
continue;
|
|
}
|
|
|
|
const std::string* value = ele_dict->FindString("value");
|
|
if (!value || value->empty()) {
|
|
LOG(WARNING) << "Skip config " << i << ": Invalid hash value";
|
|
continue;
|
|
}
|
|
|
|
// Add valid file config into cache
|
|
IntegrityPayload header_integrity;
|
|
header_integrity.algorithm = HashAlgorithm::kSHA256;
|
|
header_integrity.hash = base::ToLowerASCII(*value);
|
|
|
|
cache.insert_or_assign(base::ToLowerASCII(*file),
|
|
std::move(header_integrity));
|
|
}
|
|
|
|
return cache;
|
|
}
|
|
|
|
const auto& GetIntegrityConfigCache() {
|
|
static const auto cache = base::NoDestructor(LoadIntegrityConfig());
|
|
return *cache;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
std::optional<IntegrityPayload> Archive::HeaderIntegrity() const {
|
|
const std::optional<base::FilePath> relative_path = RelativePath();
|
|
CHECK(relative_path);
|
|
|
|
const auto key = base::ToLowerASCII(base::WideToUTF8(relative_path->value()));
|
|
|
|
if (const auto* payload = base::FindOrNull(GetIntegrityConfigCache(), key))
|
|
return *payload;
|
|
|
|
LOG(FATAL) << "Failed to find file integrity info for " << key;
|
|
}
|
|
|
|
} // namespace asar
|