5513e66982
* chore: bump chromium in DEPS to 94.0.4604.0 * build: 3-way merge of chromium patches * chore: bump chromium in DEPS to 94.0.4605.0 * build: 3-way merge of chromium patches * 3076040: Reland Remove delete_children RemoveAllChildViews arg Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3076040 * 3069287: Remove the remaining uses and delete the deprecated API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3069287 * 2297212: Replace RemoveWithoutPathExpansion(.*, nullptr) with Value::RemoveKey() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2297212 Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 * 3082756: Change transport_security_persister_path param to be a path to a file. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3082756 > this CL intentionally changes the name of the parameter > in the network context parameters and the order of the constructor > parameters to ensure all callers update their code to pass a full > file path rather than a path to a directory. The 'path' in this diff is already an absolute path, coming from `CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &path_));` at08ff1c2cbf/shell/browser/electron_browser_context.cc (L126)
* iwyu: network::mojom::HttpRawHeaderPair * fixup! 3076040: Reland Remove delete_children RemoveAllChildViews arg Missed one. * 2999884: CodeHealth: Remove DictionaryValue::GetStringWithoutPathExpansion Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2999884 (example of replacing GetStringWithoutPathExpansion() w/FindStringKey()) Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 (removal of DictionaryValue::GetStringWithoutPathExpansion) * 3059260: Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3059260 We had both of these in a 'disable_features' list. Since these feature have been removed upstream, remove them from our disable list, too. IMPORTANT: this commit should not be backported to older branches that still have these features, because doing so would un-disable them. * 2920890: Load reroute_info from download in-progress and history db back into DownloadItem. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2920890 * 3039323: [Clipboard API] Clipboard Custom Formats implementation Part 5. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * chore: bump chromium in DEPS to 94.0.4606.0 * 3084502: Add a new PrintRasterizePdfDpi policy. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 94.0.4606.3 * chore: bump chromium in DEPS to 95.0.4608.0 * chore: bump chromium in DEPS to 95.0.4609.0 * [DevTools] Remove report_raw_headers from network::ResourceRequest https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * Remove content::WebContentsObserver::OnInterfaceRequestFromFrame https://chromium-review.googlesource.com/c/chromium/src/+/3092665 * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * Add a new PrintRasterizePdfDpi policy. https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 95.0.4609.3 * disable `use_lld` for macos * chore: update patches * Linux: use chrome_crashpad_handler instead of crashpad_handler https://chromium-review.googlesource.com/c/chromium/src/+/3054290 * chore: fix lint * Revert "[DevTools] Remove report_raw_headers from network::ResourceRequest" This reverts commit 28f4da1582d046e96cb58f3cbb590503e89dfd0d. * [DevTools] Remove report_raw_headers from network::ResourceRequest (Attempt #2) https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * DCHECK that predictor always has a non-empty NetworkIsolationKey. https://chromium-review.googlesource.com/c/chromium/src/+/3067698 * Remove --no-untrusted-code-mitigations from //content and //gin https://chromium-review.googlesource.com/c/chromium/src/+/3096585 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure https://chromium-review.googlesource.com/c/chromium/src/+/3059260 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Convert PrintManager to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3072019 * chore: bump chromium in DEPS to 95.0.4612.5 * chore: disable v8 oilpan * [Compiler] Remove untrusted code mitigations. https://chromium-review.googlesource.com/c/v8/v8/+/3045704 * Remove most FTP logic from services/network. https://chromium-review.googlesource.com/c/chromium/src/+/3076119 * Rename scale_factor.h -> resource_scale_factor.h https://chromium-review.googlesource.com/c/chromium/src/+/3057113 * [GURL -> SiteForCookies] extensions/ https://chromium-review.googlesource.com/c/chromium/src/+/3100825 * breadcrumbs: add desktop entry point https://chromium-review.googlesource.com/c/chromium/src/+/3021746 * Move args_ to private in ExtensionFunction https://chromium-review.googlesource.com/c/chromium/src/+/3076261 * chore: iwyu * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * fixup! [Compiler] Remove untrusted code mitigations. * fixup! Disable kDesktopCaptureMacV2 * Revert "chore: disable v8 oilpan" This reverts commit 5d255cf1d8e8efbb906047937a713279e5f800d0. * Reland "chore: disable v8 oilpan" This reverts commit 1c252765b07a205560e7b5eed06de2605336e2d8. The previous revert was to test on which platforms did the heapsnapshot test actually fail. * [Clipboard API] Clipboard Custom Formats implementation Part 5. https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * Convert ExtensionFrameHost to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3063358 * Convert PDFWebContentsHelper to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3049751 * [Underscore Migration] Migrate ui/legacy https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3093160 * chore: remove unknown permission error * chore: fix lint * chore: ignore -Wunreachable-code-return for node deps/ * fixup! chore: ignore -Wunreachable-code-return for node deps/ * fix: windows build * fix: build dependency Dependency was missed incbeae20438
* 3108669: arm,dsp: Fix 8bpp Dct64_NEON(). https://chromium-review.googlesource.com/c/codecs/libgav1/+/3108669 * chore: revert libgav1 roll * Revert "3108669: arm,dsp: Fix 8bpp Dct64_NEON()." This reverts commit 7ed31323127aac8ba2eaff9cae6c9be9a4954f33. * Revert "chore: revert libgav1 roll" This reverts commit 084a490d298811267316c786762fe7aa91b6318d. * chore: revert clang roll * chore: Fix -Wunreachable-code-aggressive warnings in arm and arm64 code Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: mlaurencin <mlaurencin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
309 lines
11 KiB
C++
309 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/path_service.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "chrome/common/chrome_switches.h"
|
|
#include "components/os_crypt/os_crypt.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/network_service_instance.h"
|
|
#include "content/public/common/content_features.h"
|
|
#include "content/public/common/network_service_util.h"
|
|
#include "electron/fuses.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.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/shared_url_loader_factory.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "shell/browser/api/electron_api_safe_storage.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/electron_browser_client.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/electron_paths.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "url/gurl.h"
|
|
|
|
#if defined(OS_MAC)
|
|
#include "components/os_crypt/keychain_password_mac.h"
|
|
#endif
|
|
|
|
#if defined(OS_LINUX)
|
|
#include "components/os_crypt/key_storage_config_linux.h"
|
|
#endif
|
|
|
|
namespace {
|
|
|
|
// 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();
|
|
|
|
auth_static_params->supported_schemes = {"basic", "digest", "ntlm",
|
|
"negotiate"};
|
|
|
|
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);
|
|
|
|
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_);
|
|
}
|
|
|
|
// 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_);
|
|
SystemNetworkContextManager* manager_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(URLLoaderFactoryForSystem);
|
|
};
|
|
|
|
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::mojom::kBrowserProcessId;
|
|
params->is_corb_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_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;
|
|
}
|
|
|
|
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());
|
|
|
|
std::string app_name = electron::Browser::Get()->GetName();
|
|
#if defined(OS_MAC)
|
|
KeychainPassword::GetServiceName() = app_name + " Safe Storage";
|
|
KeychainPassword::GetAccountName() = app_name;
|
|
#endif
|
|
#if defined(OS_LINUX)
|
|
// c.f.
|
|
// https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/net/system_network_context_manager.cc;l=515;drc=9d82515060b9b75fa941986f5db7390299669ef1;bpv=1;bpt=1
|
|
const base::CommandLine& command_line =
|
|
*base::CommandLine::ForCurrentProcess();
|
|
|
|
auto config = std::make_unique<os_crypt::Config>();
|
|
config->store = command_line.GetSwitchValueASCII(::switches::kPasswordStore);
|
|
config->product_name = app_name;
|
|
config->application_name = app_name;
|
|
config->main_thread_runner = base::ThreadTaskRunnerHandle::Get();
|
|
// c.f.
|
|
// https://source.chromium.org/chromium/chromium/src/+/master:chrome/common/chrome_switches.cc;l=689;drc=9d82515060b9b75fa941986f5db7390299669ef1
|
|
config->should_use_preference =
|
|
command_line.HasSwitch(::switches::kEnableEncryptionSelection);
|
|
base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
|
|
#endif
|
|
|
|
// 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()) {
|
|
#if defined(OS_LINUX)
|
|
network::mojom::CryptConfigPtr network_crypt_config =
|
|
network::mojom::CryptConfig::New();
|
|
network_crypt_config->application_name = config->application_name;
|
|
network_crypt_config->product_name = config->product_name;
|
|
network_crypt_config->store = config->store;
|
|
network_crypt_config->should_use_preference = config->should_use_preference;
|
|
network_crypt_config->user_data_path = config->user_data_path;
|
|
|
|
network_service->SetCryptConfig(std::move(network_crypt_config));
|
|
|
|
#else
|
|
network_service->SetEncryptionKey(OSCrypt::GetRawEncryptionKey());
|
|
#endif
|
|
}
|
|
|
|
#if defined(OS_LINUX)
|
|
OSCrypt::SetConfig(std::move(config));
|
|
#endif
|
|
|
|
#if DCHECK_IS_ON()
|
|
electron::safestorage::SetElectronCryptoReady(true);
|
|
#endif
|
|
}
|
|
|
|
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->context_name = std::string("system");
|
|
|
|
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;
|
|
}
|