a4de915b74
* chore: bump chromium in DEPS to db7d7b3e7cb2bc925f2abfde526280cfdfc21a41 * Update patches * chore: bump chromium in DEPS to 5613e1b99a44fcbe22f3910f803ca76903a77ec1 * Update patches * Network service: Remove primary_network_context bool. https://chromium-review.googlesource.com/c/chromium/src/+/2204678 * WebContentsObserver now implements OnRendererResponsive https://chromium-review.googlesource.com/c/chromium/src/+/2211066 * update patches * Fixup printing patch * chore: bump chromium in DEPS to e387b972cdd7160c416fa6c64a724e2258aa0218 * update patches * [printing] Move PrintHostMsg_DidPrintContent_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2212110 * [XProto] Move items from ::x11::XProto to ::x11 https://chromium-review.googlesource.com/c/chromium/src/+/2218476 * revert Add IChromeAccessible This was added in https://chromium-review.googlesource.com/c/chromium/src/+/2206224 but it breaks WOA builds because third_party/win_build_output/midl/ui/accessibility/platform/arm64 does not exist. The link above says that the new interface is behind a feature flag which is disabled by default so it is safe to remove for now. * rebaseline ichromeaccessible for Windows arm64 This patch will not be needed once we get the next roll. * Update to 1b9e01844e8bf1aaafc4a52c0c62af7f56d9637b to get arm64 fix * update patches * chore: bump chromium in DEPS to 096aefa04092ea00f7b68d8d19345883f20db3c3 * chore: bump chromium in DEPS to a524a45ffd1d6fd46a7a86138fe2b22df5b6651a * chore: update patches * Window Placement: Gate cross-screen fullscreen behavior on permission https://chromium-review.googlesource.com/c/chromium/src/+/2203268 * chore: add spec for https://crbug.com/1085836 * chore: bump chromium in DEPS to ff6c4f4b826d66c2e32380bf5d1eb5e1fe37faef * update patches Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
233 lines
8.3 KiB
C++
233 lines
8.3 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 <string>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.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/service_names.mojom.h"
|
|
#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
|
#include "net/net_buildflags.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/electron_browser_client.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "url/gurl.h"
|
|
|
|
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);
|
|
|
|
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 routing_id,
|
|
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), routing_id, 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());
|
|
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();
|
|
|
|
#if !BUILDFLAG(DISABLE_FTP_SUPPORT)
|
|
network_context_params->enable_ftp_url_support = true;
|
|
#endif
|
|
}
|
|
|
|
// 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_ = new 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());
|
|
}
|
|
|
|
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;
|
|
|
|
proxy_config_monitor_.AddToNetworkContextParams(network_context_params.get());
|
|
|
|
return network_context_params;
|
|
}
|