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>
240 lines
9.0 KiB
C++
240 lines
9.0 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_API_ELECTRON_API_SESSION_H_
|
|
#define ELECTRON_SHELL_BROWSER_API_ELECTRON_API_SESSION_H_
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/raw_ref.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/values.h"
|
|
#include "content/public/browser/download_manager.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "gin/weak_cell.h"
|
|
#include "gin/wrappable.h"
|
|
#include "services/network/public/mojom/host_resolver.mojom-forward.h"
|
|
#include "services/network/public/mojom/ssl_config.mojom-forward.h"
|
|
#include "shell/browser/api/ipc_dispatcher.h"
|
|
#include "shell/browser/event_emitter_mixin.h"
|
|
#include "shell/browser/net/resolve_proxy_helper.h"
|
|
#include "shell/common/gin_helper/constructible.h"
|
|
#include "shell/common/gin_helper/self_keep_alive.h"
|
|
|
|
#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
|
|
#include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" // nogncheck
|
|
#endif
|
|
|
|
class GURL;
|
|
|
|
namespace base {
|
|
class FilePath;
|
|
}
|
|
|
|
namespace gin {
|
|
class Arguments;
|
|
} // namespace gin
|
|
|
|
namespace gin_helper {
|
|
class Dictionary;
|
|
class ErrorThrower;
|
|
} // namespace gin_helper
|
|
|
|
namespace net {
|
|
class ProxyConfig;
|
|
}
|
|
|
|
namespace v8 {
|
|
template <typename T>
|
|
class TracedReference;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
class ElectronBrowserContext;
|
|
struct PreloadScript;
|
|
|
|
namespace api {
|
|
|
|
class NetLog;
|
|
class WebRequest;
|
|
|
|
class Session final : public gin::Wrappable<Session>,
|
|
public gin_helper::Constructible<Session>,
|
|
public gin_helper::EventEmitterMixin<Session>,
|
|
public gin::PerIsolateData::DisposeObserver,
|
|
public IpcDispatcher<Session>,
|
|
#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
|
|
private SpellcheckHunspellDictionary::Observer,
|
|
#endif
|
|
private content::DownloadManager::Observer {
|
|
public:
|
|
// Gets or creates Session from the |browser_context|.
|
|
static Session* FromOrCreate(v8::Isolate* isolate,
|
|
ElectronBrowserContext* browser_context);
|
|
|
|
// Convenience wrapper around the previous method: Checks that
|
|
// |browser_context| is an ElectronBrowserContext before downcasting.
|
|
static Session* FromOrCreate(v8::Isolate* isolate,
|
|
content::BrowserContext* browser_context);
|
|
|
|
static void New(); // Dummy, do not use!
|
|
|
|
static gin::WeakCell<Session>* FromBrowserContext(
|
|
content::BrowserContext* context);
|
|
|
|
// Gets the Session of |partition|.
|
|
static Session* FromPartition(v8::Isolate* isolate,
|
|
const std::string& partition,
|
|
base::DictValue options = {});
|
|
|
|
// Gets the Session based on |path|.
|
|
static Session* FromPath(gin::Arguments* args,
|
|
const base::FilePath& path,
|
|
base::DictValue options = {});
|
|
|
|
static void FillObjectTemplate(v8::Isolate*, v8::Local<v8::ObjectTemplate>);
|
|
static const char* GetClassName() { return "Session"; }
|
|
|
|
Session(v8::Isolate* isolate, ElectronBrowserContext* browser_context);
|
|
~Session() override;
|
|
|
|
ElectronBrowserContext* browser_context() const {
|
|
return &browser_context_.get();
|
|
}
|
|
|
|
// gin::Wrappable
|
|
static gin::WrapperInfo kWrapperInfo;
|
|
void Trace(cppgc::Visitor*) const override;
|
|
const gin::WrapperInfo* wrapper_info() const override;
|
|
const char* GetHumanReadableName() const override;
|
|
|
|
// gin::PerIsolateData::DisposeObserver
|
|
void OnBeforeDispose(v8::Isolate* isolate) override {}
|
|
void OnBeforeMicrotasksRunnerDispose(v8::Isolate* isolate) override;
|
|
void OnDisposed() override {}
|
|
|
|
// Methods.
|
|
void Dispose();
|
|
v8::Local<v8::Promise> ResolveHost(
|
|
std::string host,
|
|
std::optional<network::mojom::ResolveHostParametersPtr> params);
|
|
v8::Local<v8::Promise> ResolveProxy(gin::Arguments* args);
|
|
v8::Local<v8::Promise> GetCacheSize();
|
|
v8::Local<v8::Promise> ClearCache();
|
|
v8::Local<v8::Promise> ClearStorageData(gin::Arguments* args);
|
|
void FlushStorageData();
|
|
v8::Local<v8::Promise> SetProxy(gin::Arguments* args);
|
|
v8::Local<v8::Promise> ForceReloadProxyConfig();
|
|
void SetDownloadPath(const base::FilePath& path);
|
|
void EnableNetworkEmulation(const gin_helper::Dictionary& options);
|
|
void DisableNetworkEmulation();
|
|
void SetCertVerifyProc(v8::Local<v8::Value> proc, gin::Arguments* args);
|
|
void SetPermissionRequestHandler(v8::Local<v8::Value> val,
|
|
gin::Arguments* args);
|
|
void SetPermissionCheckHandler(v8::Local<v8::Value> val,
|
|
gin::Arguments* args);
|
|
void SetDevicePermissionHandler(v8::Local<v8::Value> val,
|
|
gin::Arguments* args);
|
|
void SetUSBProtectedClassesHandler(v8::Local<v8::Value> val,
|
|
gin::Arguments* args);
|
|
void SetBluetoothPairingHandler(v8::Local<v8::Value> val,
|
|
gin::Arguments* args);
|
|
v8::Local<v8::Promise> ClearHostResolverCache(gin::Arguments* args);
|
|
v8::Local<v8::Promise> ClearAuthCache();
|
|
void AllowNTLMCredentialsForDomains(const std::string& domains);
|
|
void SetUserAgent(const std::string& user_agent, gin::Arguments* args);
|
|
std::string GetUserAgent();
|
|
void SetSSLConfig(network::mojom::SSLConfigPtr config);
|
|
bool IsPersistent();
|
|
v8::Local<v8::Promise> GetBlobData(v8::Isolate* isolate,
|
|
const std::string& uuid);
|
|
void DownloadURL(const GURL& url, gin::Arguments* args);
|
|
void CreateInterruptedDownload(const gin_helper::Dictionary& options);
|
|
std::string RegisterPreloadScript(gin_helper::ErrorThrower thrower,
|
|
const PreloadScript& new_preload_script);
|
|
void UnregisterPreloadScript(gin_helper::ErrorThrower thrower,
|
|
const std::string& script_id);
|
|
std::vector<PreloadScript> GetPreloadScripts() const;
|
|
v8::Local<v8::Promise> GetSharedDictionaryInfo(
|
|
const gin_helper::Dictionary& options);
|
|
v8::Local<v8::Promise> GetSharedDictionaryUsageInfo();
|
|
v8::Local<v8::Promise> ClearSharedDictionaryCache();
|
|
v8::Local<v8::Promise> ClearSharedDictionaryCacheForIsolationKey(
|
|
const gin_helper::Dictionary& options);
|
|
v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
|
|
v8::Local<v8::Value> Extensions(v8::Isolate* isolate);
|
|
v8::Local<v8::Value> Protocol(v8::Isolate* isolate);
|
|
v8::Local<v8::Value> ServiceWorkerContext(v8::Isolate* isolate);
|
|
WebRequest* WebRequest(v8::Isolate* isolate);
|
|
api::NetLog* NetLog(v8::Isolate* isolate);
|
|
void Preconnect(const gin_helper::Dictionary& options, gin::Arguments* args);
|
|
v8::Local<v8::Promise> CloseAllConnections();
|
|
v8::Local<v8::Value> GetPath(v8::Isolate* isolate);
|
|
void SetCodeCachePath(gin::Arguments* args);
|
|
v8::Local<v8::Promise> ClearCodeCaches(const gin_helper::Dictionary& options);
|
|
v8::Local<v8::Value> ClearData(gin::Arguments* args);
|
|
#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
|
|
base::Value GetSpellCheckerLanguages();
|
|
void SetSpellCheckerLanguages(gin_helper::ErrorThrower thrower,
|
|
const std::vector<std::string>& languages);
|
|
v8::Local<v8::Promise> ListWordsInSpellCheckerDictionary();
|
|
bool AddWordToSpellCheckerDictionary(const std::string& word);
|
|
bool RemoveWordFromSpellCheckerDictionary(const std::string& word);
|
|
void SetSpellCheckerEnabled(bool b);
|
|
bool IsSpellCheckerEnabled() const;
|
|
#endif
|
|
|
|
// disable copy
|
|
Session(const Session&) = delete;
|
|
Session& operator=(const Session&) = delete;
|
|
|
|
protected:
|
|
// content::DownloadManager::Observer:
|
|
void OnDownloadCreated(content::DownloadManager* manager,
|
|
download::DownloadItem* item) override;
|
|
|
|
#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
|
|
// SpellcheckHunspellDictionary::Observer
|
|
void OnHunspellDictionaryInitialized(const std::string& language) override;
|
|
void OnHunspellDictionaryDownloadBegin(const std::string& language) override;
|
|
void OnHunspellDictionaryDownloadSuccess(
|
|
const std::string& language) override;
|
|
void OnHunspellDictionaryDownloadFailure(
|
|
const std::string& language) override;
|
|
#endif
|
|
|
|
private:
|
|
void SetDisplayMediaRequestHandler(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val);
|
|
|
|
// Cached gin_helper::Wrappable objects.
|
|
v8::TracedReference<v8::Value> cookies_;
|
|
v8::TracedReference<v8::Value> extensions_;
|
|
v8::TracedReference<v8::Value> protocol_;
|
|
cppgc::Member<api::NetLog> net_log_;
|
|
v8::TracedReference<v8::Value> service_worker_context_;
|
|
cppgc::Member<api::WebRequest> web_request_;
|
|
|
|
raw_ptr<v8::Isolate> isolate_;
|
|
|
|
// The client id to enable the network throttler.
|
|
base::UnguessableToken network_emulation_token_;
|
|
|
|
const raw_ref<ElectronBrowserContext> browser_context_;
|
|
|
|
gin::WeakCellFactory<Session> weak_factory_{this};
|
|
|
|
gin_helper::SelfKeepAlive<Session> keep_alive_{this};
|
|
};
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_SESSION_H_
|