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>
306 lines
11 KiB
C++
306 lines
11 KiB
C++
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/net/system_network_context_manager.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/path_service.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
|
|
#include "chrome/common/chrome_features.h"
|
|
#include "chrome/common/chrome_switches.h"
|
|
#include "components/os_crypt/sync/os_crypt.h"
|
|
#include "components/prefs/pref_service.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/network_service_instance.h"
|
|
#include "content/public/browser/network_service_util.h"
|
|
#include "content/public/common/content_features.h"
|
|
#include "electron/fuses.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
|
#include "net/dns/public/dns_over_https_config.h"
|
|
#include "net/dns/public/util.h"
|
|
#include "net/net_buildflags.h"
|
|
#include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
|
|
#include "services/network/network_service.h"
|
|
#include "services/network/public/cpp/cross_thread_pending_shared_url_loader_factory.h"
|
|
#include "services/network/public/cpp/features.h"
|
|
#include "services/network/public/cpp/originating_process.h"
|
|
#include "services/network/public/cpp/shared_url_loader_factory.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "services/network/public/mojom/url_response_head.mojom.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/electron_browser_client.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "url/gurl.h"
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
#include "components/os_crypt/sync/key_storage_config_linux.h"
|
|
#endif
|
|
|
|
namespace {
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
namespace {
|
|
|
|
const char kNetworkServiceSandboxEnabled[] = "net.network_service_sandbox";
|
|
|
|
}
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
// The global instance of the SystemNetworkContextManager.
|
|
SystemNetworkContextManager* g_system_network_context_manager = nullptr;
|
|
|
|
network::mojom::HttpAuthStaticParamsPtr CreateHttpAuthStaticParams() {
|
|
network::mojom::HttpAuthStaticParamsPtr auth_static_params =
|
|
network::mojom::HttpAuthStaticParams::New();
|
|
|
|
return auth_static_params;
|
|
}
|
|
|
|
network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams() {
|
|
auto* command_line = base::CommandLine::ForCurrentProcess();
|
|
network::mojom::HttpAuthDynamicParamsPtr auth_dynamic_params =
|
|
network::mojom::HttpAuthDynamicParams::New();
|
|
|
|
auth_dynamic_params->server_allowlist = command_line->GetSwitchValueASCII(
|
|
electron::switches::kAuthServerWhitelist);
|
|
auth_dynamic_params->delegate_allowlist = command_line->GetSwitchValueASCII(
|
|
electron::switches::kAuthNegotiateDelegateWhitelist);
|
|
auth_dynamic_params->enable_negotiate_port =
|
|
command_line->HasSwitch(electron::switches::kEnableAuthNegotiatePort);
|
|
auth_dynamic_params->ntlm_v2_enabled =
|
|
!command_line->HasSwitch(electron::switches::kDisableNTLMv2);
|
|
auth_dynamic_params->allowed_schemes = {"basic", "digest", "ntlm",
|
|
"negotiate"};
|
|
|
|
return auth_dynamic_params;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// SharedURLLoaderFactory backed by a SystemNetworkContextManager and its
|
|
// network context. Transparently handles crashes.
|
|
class SystemNetworkContextManager::URLLoaderFactoryForSystem
|
|
: public network::SharedURLLoaderFactory {
|
|
public:
|
|
explicit URLLoaderFactoryForSystem(SystemNetworkContextManager* manager)
|
|
: manager_(manager) {
|
|
DETACH_FROM_SEQUENCE(sequence_checker_);
|
|
}
|
|
|
|
// disable copy
|
|
URLLoaderFactoryForSystem(const URLLoaderFactoryForSystem&) = delete;
|
|
URLLoaderFactoryForSystem& operator=(const URLLoaderFactoryForSystem&) =
|
|
delete;
|
|
|
|
// mojom::URLLoaderFactory implementation:
|
|
void CreateLoaderAndStart(
|
|
mojo::PendingReceiver<network::mojom::URLLoader> request,
|
|
int32_t request_id,
|
|
uint32_t options,
|
|
const network::ResourceRequest& url_request,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation)
|
|
override {
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
if (!manager_)
|
|
return;
|
|
manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
|
|
std::move(request), request_id, options, url_request, std::move(client),
|
|
traffic_annotation);
|
|
}
|
|
|
|
void Clone(mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver)
|
|
override {
|
|
if (!manager_)
|
|
return;
|
|
manager_->GetURLLoaderFactory()->Clone(std::move(receiver));
|
|
}
|
|
|
|
// SharedURLLoaderFactory implementation:
|
|
std::unique_ptr<network::PendingSharedURLLoaderFactory> Clone() override {
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
return std::make_unique<network::CrossThreadPendingSharedURLLoaderFactory>(
|
|
this);
|
|
}
|
|
|
|
void Shutdown() { manager_ = nullptr; }
|
|
|
|
private:
|
|
friend class base::RefCounted<URLLoaderFactoryForSystem>;
|
|
~URLLoaderFactoryForSystem() override = default;
|
|
|
|
SEQUENCE_CHECKER(sequence_checker_);
|
|
raw_ptr<SystemNetworkContextManager> manager_;
|
|
};
|
|
|
|
network::mojom::NetworkContext* SystemNetworkContextManager::GetContext() {
|
|
if (!network_context_ || !network_context_.is_connected()) {
|
|
// This should call into OnNetworkServiceCreated(), which will re-create
|
|
// the network service, if needed. There's a chance that it won't be
|
|
// invoked, if the NetworkContext has encountered an error but the
|
|
// NetworkService has not yet noticed its pipe was closed. In that case,
|
|
// trying to create a new NetworkContext would fail, anyways, and hopefully
|
|
// a new NetworkContext will be created on the next GetContext() call.
|
|
content::GetNetworkService();
|
|
DCHECK(network_context_);
|
|
}
|
|
return network_context_.get();
|
|
}
|
|
|
|
network::mojom::URLLoaderFactory*
|
|
SystemNetworkContextManager::GetURLLoaderFactory() {
|
|
// Create the URLLoaderFactory as needed.
|
|
if (url_loader_factory_ && url_loader_factory_.is_connected()) {
|
|
return url_loader_factory_.get();
|
|
}
|
|
|
|
network::mojom::URLLoaderFactoryParamsPtr params =
|
|
network::mojom::URLLoaderFactoryParams::New();
|
|
params->process_id = network::OriginatingProcess::browser();
|
|
params->is_orb_enabled = false;
|
|
url_loader_factory_.reset();
|
|
GetContext()->CreateURLLoaderFactory(
|
|
url_loader_factory_.BindNewPipeAndPassReceiver(), std::move(params));
|
|
return url_loader_factory_.get();
|
|
}
|
|
|
|
scoped_refptr<network::SharedURLLoaderFactory>
|
|
SystemNetworkContextManager::GetSharedURLLoaderFactory() {
|
|
return shared_url_loader_factory_;
|
|
}
|
|
|
|
network::mojom::NetworkContextParamsPtr
|
|
SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
|
|
network::mojom::NetworkContextParamsPtr network_context_params =
|
|
network::mojom::NetworkContextParams::New();
|
|
|
|
ConfigureDefaultNetworkContextParams(network_context_params.get());
|
|
|
|
cert_verifier::mojom::CertVerifierCreationParamsPtr
|
|
cert_verifier_creation_params =
|
|
cert_verifier::mojom::CertVerifierCreationParams::New();
|
|
network_context_params->cert_verifier_params =
|
|
content::GetCertVerifierParams(std::move(cert_verifier_creation_params));
|
|
return network_context_params;
|
|
}
|
|
|
|
void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
|
|
network::mojom::NetworkContextParams* network_context_params) {
|
|
network_context_params->enable_brotli = true;
|
|
network_context_params->enable_zstd = true;
|
|
|
|
network_context_params->enable_referrers = true;
|
|
|
|
network_context_params->proxy_resolver_factory =
|
|
ChromeMojoProxyResolverFactory::CreateWithSelfOwnedReceiver();
|
|
}
|
|
|
|
// static
|
|
SystemNetworkContextManager* SystemNetworkContextManager::CreateInstance(
|
|
PrefService* pref_service) {
|
|
DCHECK(!g_system_network_context_manager);
|
|
g_system_network_context_manager =
|
|
new SystemNetworkContextManager(pref_service);
|
|
return g_system_network_context_manager;
|
|
}
|
|
|
|
// static
|
|
SystemNetworkContextManager* SystemNetworkContextManager::GetInstance() {
|
|
return g_system_network_context_manager;
|
|
}
|
|
|
|
// static
|
|
void SystemNetworkContextManager::DeleteInstance() {
|
|
DCHECK(g_system_network_context_manager);
|
|
delete g_system_network_context_manager;
|
|
}
|
|
|
|
// c.f.
|
|
// https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/net/system_network_context_manager.cc;l=730-740;drc=15a616c8043551a7cb22c4f73a88e83afb94631c;bpv=1;bpt=1
|
|
bool SystemNetworkContextManager::IsNetworkSandboxEnabled() {
|
|
#if BUILDFLAG(IS_WIN)
|
|
auto* local_state = g_browser_process->local_state();
|
|
if (local_state && local_state->HasPrefPath(kNetworkServiceSandboxEnabled)) {
|
|
return local_state->GetBoolean(kNetworkServiceSandboxEnabled);
|
|
}
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
// If no policy is specified, then delegate to global sandbox configuration.
|
|
return sandbox::policy::features::IsNetworkSandboxEnabled();
|
|
}
|
|
|
|
SystemNetworkContextManager::SystemNetworkContextManager(
|
|
PrefService* pref_service)
|
|
: proxy_config_monitor_(pref_service) {
|
|
shared_url_loader_factory_ =
|
|
base::MakeRefCounted<URLLoaderFactoryForSystem>(this);
|
|
}
|
|
|
|
SystemNetworkContextManager::~SystemNetworkContextManager() {
|
|
shared_url_loader_factory_->Shutdown();
|
|
}
|
|
|
|
void SystemNetworkContextManager::OnNetworkServiceCreated(
|
|
network::mojom::NetworkService* network_service) {
|
|
network_service->SetUpHttpAuth(CreateHttpAuthStaticParams());
|
|
network_service->ConfigureHttpAuthPrefs(CreateHttpAuthDynamicParams());
|
|
|
|
network_context_.reset();
|
|
network_service->CreateNetworkContext(
|
|
network_context_.BindNewPipeAndPassReceiver(),
|
|
CreateNetworkContextParams());
|
|
|
|
net::SecureDnsMode default_secure_dns_mode = net::SecureDnsMode::kOff;
|
|
std::string default_doh_templates;
|
|
net::DnsOverHttpsConfig doh_config;
|
|
if (!default_doh_templates.empty() &&
|
|
default_secure_dns_mode != net::SecureDnsMode::kOff) {
|
|
doh_config = *net::DnsOverHttpsConfig::FromString(default_doh_templates);
|
|
}
|
|
|
|
bool additional_dns_query_types_enabled = true;
|
|
|
|
// Configure the stub resolver. This must be done after the system
|
|
// NetworkContext is created, but before anything has the chance to use it.
|
|
content::GetNetworkService()->ConfigureStubHostResolver(
|
|
base::FeatureList::IsEnabled(net::features::kAsyncDns),
|
|
base::FeatureList::IsEnabled(net::features::kHappyEyeballsV3),
|
|
default_secure_dns_mode, doh_config, additional_dns_query_types_enabled,
|
|
{} /*fallback_doh_nameservers*/);
|
|
|
|
// The OSCrypt keys are process bound, so if network service is out of
|
|
// process, send it the required key.
|
|
if (content::IsOutOfProcessNetworkService() &&
|
|
electron::fuses::IsCookieEncryptionEnabled()) {
|
|
network_service->SetEncryptionKey(OSCrypt::GetRawEncryptionKey());
|
|
}
|
|
}
|
|
|
|
network::mojom::NetworkContextParamsPtr
|
|
SystemNetworkContextManager::CreateNetworkContextParams() {
|
|
// TODO(mmenke): Set up parameters here (in memory cookie store, etc).
|
|
network::mojom::NetworkContextParamsPtr network_context_params =
|
|
CreateDefaultNetworkContextParams();
|
|
|
|
network_context_params->user_agent =
|
|
electron::ElectronBrowserClient::Get()->GetUserAgent();
|
|
|
|
network_context_params->http_cache_enabled = false;
|
|
|
|
auto ssl_config = network::mojom::SSLConfig::New();
|
|
ssl_config->version_min = network::mojom::SSLVersion::kTLS12;
|
|
network_context_params->initial_ssl_config = std::move(ssl_config);
|
|
|
|
proxy_config_monitor_.AddToNetworkContextParams(network_context_params.get());
|
|
|
|
return network_context_params;
|
|
}
|