ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
126 lines
4.7 KiB
C++
126 lines
4.7 KiB
C++
// Copyright (c) 2019 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/network_context_service.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "chrome/browser/browser_features.h"
|
|
#include "chrome/common/chrome_constants.h"
|
|
#include "content/public/browser/network_service_instance.h"
|
|
#include "content/public/browser/shared_cors_origin_access_list.h"
|
|
#include "electron/fuses.h"
|
|
#include "net/http/http_util.h"
|
|
#include "net/net_buildflags.h"
|
|
#include "services/network/network_service.h"
|
|
#include "services/network/public/cpp/cors/origin_access_list.h"
|
|
#include "shell/browser/browser_process_impl.h"
|
|
#include "shell/browser/electron_browser_client.h"
|
|
#include "shell/browser/net/system_network_context_manager.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
bool ShouldTriggerNetworkDataMigration() {
|
|
#if BUILDFLAG(IS_WIN)
|
|
// On Windows, if sandbox enabled means data must be migrated.
|
|
if (SystemNetworkContextManager::IsNetworkSandboxEnabled())
|
|
return true;
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
if (base::FeatureList::IsEnabled(features::kTriggerNetworkDataMigration))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NetworkContextService::NetworkContextService(content::BrowserContext* context)
|
|
: browser_context_(static_cast<ElectronBrowserContext*>(context)),
|
|
proxy_config_monitor_(browser_context_->prefs()) {}
|
|
|
|
NetworkContextService::~NetworkContextService() = default;
|
|
|
|
void NetworkContextService::ConfigureNetworkContextParams(
|
|
network::mojom::NetworkContextParams* network_context_params,
|
|
cert_verifier::mojom::CertVerifierCreationParams*
|
|
cert_verifier_creation_params) {
|
|
bool in_memory = browser_context_->IsOffTheRecord();
|
|
const base::FilePath& path = browser_context_->GetPath();
|
|
|
|
g_browser_process->system_network_context_manager()
|
|
->ConfigureDefaultNetworkContextParams(network_context_params);
|
|
|
|
mojo::Remote<network::mojom::SSLConfigClient> ssl_config_client;
|
|
network_context_params->ssl_config_client_receiver =
|
|
ssl_config_client.BindNewPipeAndPassReceiver();
|
|
browser_context_->SetSSLConfigClient(std::move(ssl_config_client));
|
|
|
|
network_context_params->initial_ssl_config = browser_context_->GetSSLConfig();
|
|
|
|
network_context_params->user_agent = browser_context_->GetUserAgent();
|
|
|
|
network_context_params->cors_origin_access_list =
|
|
browser_context_->GetSharedCorsOriginAccessList()
|
|
->GetOriginAccessList()
|
|
.CreateCorsOriginAccessPatternsList();
|
|
|
|
network_context_params->accept_language =
|
|
net::HttpUtil::GenerateAcceptLanguageHeader(
|
|
ElectronBrowserClient::Get()->GetApplicationLocale());
|
|
|
|
// Enable the HTTP cache.
|
|
network_context_params->http_cache_enabled =
|
|
browser_context_->CanUseHttpCache();
|
|
|
|
network_context_params->cookie_manager_params =
|
|
network::mojom::CookieManagerParams::New();
|
|
|
|
// Configure on-disk storage for persistent sessions.
|
|
if (!in_memory) {
|
|
// Configure the HTTP cache path and size.
|
|
network_context_params->http_cache_max_size =
|
|
browser_context_->GetMaxCacheSize();
|
|
|
|
network_context_params->file_paths =
|
|
network::mojom::NetworkContextFilePaths::New();
|
|
network_context_params->file_paths->data_directory =
|
|
path.Append(chrome::kNetworkDataDirname);
|
|
network_context_params->file_paths->unsandboxed_data_path = path;
|
|
network_context_params->file_paths->trigger_migration =
|
|
ShouldTriggerNetworkDataMigration();
|
|
network_context_params->file_paths->http_cache_directory =
|
|
path.Append(chrome::kCacheDirname);
|
|
|
|
// Currently this just contains HttpServerProperties
|
|
network_context_params->file_paths->http_server_properties_file_name =
|
|
base::FilePath(chrome::kNetworkPersistentStateFilename);
|
|
|
|
// Configure persistent cookie path.
|
|
network_context_params->file_paths->cookie_database_name =
|
|
base::FilePath(chrome::kCookieFilename);
|
|
|
|
network_context_params->file_paths->http_server_properties_file_name =
|
|
base::FilePath(chrome::kNetworkPersistentStateFilename);
|
|
|
|
network_context_params->file_paths->trust_token_database_name =
|
|
base::FilePath(chrome::kTrustTokenFilename);
|
|
|
|
network_context_params->restore_old_session_cookies = false;
|
|
network_context_params->persist_session_cookies = false;
|
|
|
|
network_context_params->enable_encrypted_cookies =
|
|
electron::fuses::IsCookieEncryptionEnabled();
|
|
|
|
network_context_params->file_paths->transport_security_persister_file_name =
|
|
base::FilePath(chrome::kTransportSecurityPersisterFilename);
|
|
}
|
|
|
|
proxy_config_monitor_.AddToNetworkContextParams(network_context_params);
|
|
|
|
BrowserProcessImpl::ApplyProxyModeFromCommandLine(
|
|
browser_context_->in_memory_pref_store());
|
|
}
|
|
|
|
} // namespace electron
|