3da598015b
* chore: bump chromium in DEPS to 100.0.4880.0 * resolve conflicts * chore: update patches * fix patch * PIP20: add a new DocumentOverlayWindowViews subtype https://chromium-review.googlesource.com/c/chromium/src/+/3252789 * Clean up PictureInPictureWindowManager::EnterPictureInPicture() https://chromium-review.googlesource.com/c/chromium/src/+/3424145 * Remove StoragePartitionId. https://chromium-review.googlesource.com/c/chromium/src/+/2811120 * Remove FLoC code https://chromium-review.googlesource.com/c/chromium/src/+/3424359 * media: Make AddSupportedKeySystems() Async https://chromium-review.googlesource.com/c/chromium/src/+/3430502 * [Extensions] Move some l10n file util methods to //extensions/browser https://chromium-review.googlesource.com/c/chromium/src/+/3408192 * chore: IWYU * Reland "webhid: Grant permissions for policy-allowed devices" https://chromium-review.googlesource.com/c/chromium/src/+/3444147 * Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N. https://chromium-review.googlesource.com/c/chromium/src/+/3435727 https://chromium-review.googlesource.com/c/chromium/src/+/3440910 https://chromium-review.googlesource.com/c/chromium/src/+/3440088 * [text blink period] Cache blink period instead of fetching from defaults https://chromium-review.googlesource.com/c/chromium/src/+/3419059 * chore: update picture-in-picture.patch https://chromium-review.googlesource.com/c/chromium/src/+/3252789 * ci: update to Xcode 13.2.1 https://chromium-review.googlesource.com/c/chromium/src/+/3437552 * chore: bump chromium in DEPS to 100.0.4882.1 * chore: update patches * chore: bump chromium in DEPS to 100.0.4884.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4886.0 * chore: update patches * Refactor DownloadManager to use StoragePartitionConfig https://chromium-review.googlesource.com/c/chromium/src/+/3222011 * Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers. https://chromium-review.googlesource.com/c/chromium/src/+/3433852 * refactor: autofill to use the color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 https://bugs.chromium.org/p/chromium/issues/detail?id=1003612 * [ProcessSingleton] Add many more trace events to cover all scenarios https://chromium-review.googlesource.com/c/chromium/src/+/3429325 * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * chore: bump chromium in DEPS to 100.0.4888.0 * chore: update patches * chore: update picture-in-picture.patch * fixup! refactor: autofill to use the color pipeline * ci: fixup fix sync (cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd) * chore: bump chromium in DEPS to 100.0.4889.0 * chore: update patches * chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * Remove remaining NativeTheme::GetSystemColor() machinery. https://chromium-review.googlesource.com/c/chromium/src/+/3421719 * ci: fetch proper esbuild for macos * ci: fixup fetch proper esbuild for macos * fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion * chore: bump chromium in DEPS to 100.0.4892.0 * 3460365: Set V8 fatal error callbacks during Isolate initialization https://chromium-review.googlesource.com/c/chromium/src/+/3460365 * 3454343: PIP20: use permanent top controls https://chromium-review.googlesource.com/c/chromium/src/+/3454343 * 3465574: Move most of GTK color mixers to ui/color/. https://chromium-review.googlesource.com/c/chromium/src/+/3465574 * chore: fixup patch indices * 3445327: [locales] Remove locales reference https://chromium-review.googlesource.com/c/chromium/src/+/3445327 * 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels https://chromium-review.googlesource.com/c/chromium/src/+/3456548 * 3441196: Convert GuestView's remaining legacy IPC messages to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/3441196 * 3455491: Don't include run_loop.h in thread_task_runner_handle.h https://chromium-review.googlesource.com/c/chromium/src/+/3455491 * fixup! 3454343: PIP20: use permanent top controls * 3442501: Add missing includes of //base/observer_list.h https://chromium-review.googlesource.com/c/chromium/src/+/3442501 * 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C100 https://chromium-review.googlesource.com/c/chromium/src/+/3437552 * chore: bump chromium in DEPS to 100.0.4894.0 * fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization * chore: update patches * 3425231: Use DnsOverHttpsConfig where appropriate https://chromium-review.googlesource.com/c/chromium/src/+/3425231 * test: disable test-heapsnapshot-near-heap-limit-worker.js As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503, heap snapshotting near the heap limit DCHECKS in Node.js specs. This will likely require a larger refactor in Node.js so i've disabled the test for now and opened an upstream issue on node-v8 issue at https://github.com/nodejs/node-v8/issues/218. * Port all usage of NativeTheme color IDs to color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 * chore: update patches after rebase * ci: use gen2 machine for more disk space * ci: don't try to make root volume writeable * ci: use older xcode/macos for tests * fix: html fullscreen transitions stacking (cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44) * ci: speed up woa testing (cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de) (cherry picked from commit e81996234029669663bf0daaababd34684dcbb17) * ci: disable flaky tests on WOA * ci: run remote tests separately to isolate issue there * tests: disable node test parallel/test-worker-debug for now * revert: fix: html fullscreen transitions stacking * tests: disable flaky test on macOS arm64 * fixup circleci config so build tools can find xcode version * make sure the workspace is clean before job runs (cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6) * tests: disable flaky test on Linux * ci: debug why windows i32 is crashing * Revert "ci: debug why windows i32 is crashing" This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@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_path =
|
|
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_path =
|
|
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
|