![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 101.0.4911.0 * chore: bump chromium in DEPS to 101.0.4913.0 * chore: bump chromium in DEPS to 101.0.4915.0 * chore: bump chromium in DEPS to 101.0.4917.0 * chore: bump chromium in DEPS to 101.0.4919.0 * chore: bump chromium in DEPS to 101.0.4921.0 * chore: bump chromium in DEPS to 101.0.4923.0 * chore: bump chromium in DEPS to 101.0.4925.0 * chore: bump chromium in DEPS to 101.0.4927.0 * chore: bump chromium in DEPS to 101.0.4929.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4931.0 * chore: update patches * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types |1824792
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: reconcile patches with main rebase * chore: bump chromium in DEPS to 101.0.4933.0 * chore: update patches * 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame Ref:3329593
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h Ref:3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags Ref:3499818
* chore: bump chromium in DEPS to 101.0.4935.0 * chore: update patches * 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N) Ref:3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations" Ref:3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types |1880987
The change in the roll started causing the legacy types to fail * chore: missing SkRegion include * 3499600: Introduce blink::WebCssOrigin Ref:3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: bump chromium in DEPS to 101.0.4937.0 * chore: update patches * 3500826: [locales] Refactor locales for ios Ref:3500826
* 3509531: Make some public Blink media files private Ref:3509531
* 3497377: bluetooth: Add BluetoothDevice.forget() Ref:3497377
* chore: bump chromium in DEPS to 101.0.4939.0 * chore: bump chromium in DEPS to 101.0.4941.0 * 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value. Ref:3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf. Ref:3502592
* chore: update patches * fixup! 3502592: Delete PPAPI init/shutdown code in //pdf. * chore: bump chromium in DEPS to 101.0.4943.0 * chore: fix lint, remove unneeded headers * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> * update mojo calls in offscreen patch * update hunspell filenames * chore: bump chromium in DEPS to 101.0.4945.0 * chore: update patches * fix offscreen patch again * chore: bump chromium in DEPS to 101.0.4947.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4949.0 * support unseasoned pdf * update patches * chore: update patches * chore: [IWYU] include missing skia headers * chore: bump chromium in DEPS to 101.0.4951.0 * chore: update patches * 3457645: media: Remove IsKeySystemsUpdateNeeded()3457645
* chore: bump chromium in DEPS to 102.0.4952.2 * chore: update patches * 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage(). Ref:3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download Ref:3508375
* chore: bump chromium in DEPS to 102.0.4953.0 * chore: update patches * 3510189: Harden up drag and drop support across same-process boundaries. Ref:3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/. Ref:3526815
* chore: bump chromium in DEPS to 102.0.4955.0 * build: add af and ur locale to manifests 3498914 [locales] Add af and ur to desktop Ref:3498914
* fixup! build: add af and ur locale to manifests * chore: bump chromium in DEPS to 102.0.4957.0 * 3529090: gin: set JS flags before v8 initialization Xref:3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch * chore: update patches * 3536433: [network] Rename data_path and http_cache_path from _path to _directory. Xref:3536433
* 3111565: Relocated Page.printToPDF implementation to //components Xref:3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback TODO: currently passes a placeholder for job_settings. We have other code paths that inject settings from electron_api_web_contents.cc. Should those be injected here as well? (CC @codebytere) * fixup! 3111565: Relocated Page.printToPDF implementation to //components * fixup! 3111565: Relocated Page.printToPDF implementation to //components * 3520025: Make "libcxx_abi_unstable" not a gn arg Xref:3520025
build: since it is no longer a gn arg, patch it in * chore: change usages of std::vector with const elements (#33373) * chore: bump chromium in DEPS to 102.0.4959.0 * chore: update patches * build: iwyu base/threading/platform_thread.h * 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. Xref:3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager * use gclient_gn_args_from instead of hand-copying * checkout mac on mac * chore: update patches * Revert "checkout mac on mac" This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769. * fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. * fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded() add nogncheck * fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc * Xref:6dfdf79b8c
Xref: https://reviews.llvm.org/D101458 Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and so it must be enumerated in filenames.libcxxabi.gni * 3511268: Remove unused headers from cxx17_backports.h3511268
use std::size instead of base::size * iwyu: SkPaint 3488428: [includes] Fix transitive includes of SkImageEncoder * chore: [IWYU] include missing skia headers * fixup! 3511268: Remove unused headers from cxx17_backports.h * chore: bump chromium in DEPS to 102.0.4961.0 * chore: update patches * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> chore: remove unused #include * fixup! 3510189: Harden up drag and drop support across same-process boundaries. |3510189
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: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
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_directory =
|
|
path.Append(chrome::kCacheDirname);
|
|
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();
|
|
|
|
// 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
|