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>
121 lines
3.1 KiB
C++
121 lines
3.1 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_COMMON_ASAR_ARCHIVE_H_
|
|
#define ELECTRON_SHELL_COMMON_ASAR_ARCHIVE_H_
|
|
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <uv.h>
|
|
|
|
#include "base/files/file.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/synchronization/lock.h"
|
|
#include "base/values.h"
|
|
#include "third_party/abseil-cpp/absl/container/flat_hash_map.h"
|
|
|
|
namespace asar {
|
|
|
|
class ScopedTemporaryFile;
|
|
|
|
enum class HashAlgorithm {
|
|
kSHA256,
|
|
kNone,
|
|
};
|
|
|
|
struct IntegrityPayload {
|
|
IntegrityPayload();
|
|
~IntegrityPayload();
|
|
IntegrityPayload(const IntegrityPayload& other);
|
|
HashAlgorithm algorithm = HashAlgorithm::kNone;
|
|
std::string hash;
|
|
uint32_t block_size = 0U;
|
|
std::vector<std::string> blocks;
|
|
};
|
|
|
|
// This class represents an asar package, and provides methods to read
|
|
// information from it. It is thread-safe after |Init| has been called.
|
|
class Archive {
|
|
public:
|
|
struct FileInfo {
|
|
FileInfo();
|
|
~FileInfo();
|
|
bool unpacked = false;
|
|
bool executable = false;
|
|
uint32_t size = 0U;
|
|
uint64_t offset = 0U;
|
|
std::optional<IntegrityPayload> integrity;
|
|
};
|
|
|
|
enum class FileType {
|
|
kFile = UV_DIRENT_FILE,
|
|
kDirectory = UV_DIRENT_DIR,
|
|
kLink = UV_DIRENT_LINK,
|
|
};
|
|
|
|
struct Stats : public FileInfo {
|
|
FileType type = FileType::kFile;
|
|
};
|
|
|
|
explicit Archive(const base::FilePath& path);
|
|
virtual ~Archive();
|
|
|
|
// disable copy
|
|
Archive(const Archive&) = delete;
|
|
Archive& operator=(const Archive&) = delete;
|
|
|
|
// Read and parse the header.
|
|
bool Init();
|
|
|
|
std::optional<IntegrityPayload> HeaderIntegrity() const;
|
|
std::optional<base::FilePath> RelativePath() const;
|
|
|
|
// Get the info of a file.
|
|
bool GetFileInfo(const base::FilePath& path, FileInfo* info) const;
|
|
|
|
// Fs.stat(path).
|
|
bool Stat(const base::FilePath& path, Stats* stats) const;
|
|
|
|
// Fs.readdir(path).
|
|
bool Readdir(const base::FilePath& path,
|
|
std::vector<base::FilePath>* files) const;
|
|
|
|
// Fs.realpath(path).
|
|
bool Realpath(const base::FilePath& path, base::FilePath* realpath) const;
|
|
|
|
// Copy the file into a temporary file, and return the new path.
|
|
// For unpacked file, this method will return its real path.
|
|
bool CopyFileOut(const base::FilePath& path, base::FilePath* out);
|
|
|
|
// Returns the file's fd.
|
|
// Using this fd will not validate the integrity of any files
|
|
// you read out of the ASAR manually. Callers are responsible
|
|
// for integrity validation after this fd is handed over.
|
|
int GetUnsafeFD() const;
|
|
|
|
base::FilePath path() const { return path_; }
|
|
|
|
private:
|
|
bool initialized_ = false;
|
|
bool header_validated_ = false;
|
|
const base::FilePath path_;
|
|
base::File file_{base::File::FILE_OK};
|
|
int fd_ = -1;
|
|
uint32_t header_size_ = 0;
|
|
std::optional<base::DictValue> header_;
|
|
|
|
// Cached external temporary files.
|
|
base::Lock external_files_lock_;
|
|
absl::flat_hash_map<base::FilePath::StringType,
|
|
std::unique_ptr<ScopedTemporaryFile>>
|
|
external_files_;
|
|
};
|
|
|
|
} // namespace asar
|
|
|
|
#endif // ELECTRON_SHELL_COMMON_ASAR_ARCHIVE_H_
|