![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS | https://chromium-review.googlesource.com/c/chromium/src/+/6384240 * 6422872: Remove unused includes in isolation_info_mojom_traits.h | https://chromium-review.googlesource.com/c/chromium/src/+/6422872 * chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files | https://chromium-review.googlesource.com/c/chromium/src/+/6400733 * chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 * chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 * 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). | https://chromium-review.googlesource.com/c/chromium/src/+/6433203 * chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077 * chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077 * fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 * chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. | https://chromium-review.googlesource.com/c/chromium/src/+/6431756 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077 * 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate | https://chromium-review.googlesource.com/c/chromium/src/+/6428345 * 6384315: Migrate extensions_enabled from ExtensionService to Registrar | https://chromium-review.googlesource.com/c/chromium/src/+/6384315 * 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. | https://chromium-review.googlesource.com/c/chromium/src/+/6428749 * chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow | https://chromium-review.googlesource.com/c/chromium/src/+/6440290 * 6429230: FSA: Move blocked paths to the PermissionContext class | https://chromium-review.googlesource.com/c/chromium/src/+/6429230 * chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain | https://chromium-review.googlesource.com/c/chromium/src/+/6443473 * fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() | https://chromium-review.googlesource.com/c/chromium/src/+/6448510 * chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow | https://chromium-review.googlesource.com/c/chromium/src/+/6440290 * refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() | https://chromium-review.googlesource.com/c/chromium/src/+/6442265 * Provide dbus appmenu information on Wayland | https://chromium-review.googlesource.com/c/chromium/src/+/6405535 * [extensions] Move OnExtensionInstalled out of ExtensionService. | https://chromium-review.googlesource.com/c/chromium/src/+/6443325 * refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). | https://chromium-review.googlesource.com/c/chromium/src/+/6433203 * chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() | https://chromium-review.googlesource.com/c/chromium/src/+/6404386 NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController | https://chromium-review.googlesource.com/c/chromium/src/+/6420753 * 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter | https://chromium-review.googlesource.com/c/chromium/src/+/6429573 * chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual | https://chromium-review.googlesource.com/c/chromium/src/+/6419936 * 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. | https://chromium-review.googlesource.com/c/chromium/src/+/6423410 remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS | https://chromium-review.googlesource.com/c/chromium/src/+/6394283 Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077 * chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() | https://chromium-review.googlesource.com/c/chromium/src/+/6459201 * 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions | https://chromium-review.googlesource.com/c/chromium/src/+/6454796 * chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs https://chromium-review.googlesource.com/c/chromium/src/+/6428649 * feat: allow opt-out animated_content_sampler. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6438681 * Trigger CI --------- 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: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
107 lines
4.9 KiB
C++
107 lines
4.9 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.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
|
|
#define ELECTRON_SHELL_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
|
|
|
|
#include "chrome/browser/net/proxy_config_monitor.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "net/base/features.h"
|
|
#include "sandbox/policy/features.h"
|
|
#include "services/network/public/cpp/shared_url_loader_factory.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "services/network/public/mojom/network_service.mojom-forward.h"
|
|
#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
|
|
|
|
namespace electron {
|
|
network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams();
|
|
}
|
|
|
|
// Responsible for creating and managing access to the system NetworkContext.
|
|
// Lives on the UI thread. The NetworkContext this owns is intended for requests
|
|
// not associated with a session. It stores no data on disk, and has no HTTP
|
|
// cache, but it does have ephemeral cookie and channel ID stores.
|
|
//
|
|
// This class is also responsible for configuring global NetworkService state.
|
|
//
|
|
// The "system" NetworkContext will either share a URLRequestContext with
|
|
// IOThread's SystemURLRequestContext and be part of IOThread's NetworkService
|
|
// (If the network service is disabled) or be an independent NetworkContext
|
|
// using the actual network service.
|
|
class SystemNetworkContextManager {
|
|
public:
|
|
~SystemNetworkContextManager();
|
|
|
|
// disable copy
|
|
SystemNetworkContextManager(const SystemNetworkContextManager&) = delete;
|
|
SystemNetworkContextManager& operator=(const SystemNetworkContextManager&) =
|
|
delete;
|
|
|
|
// Creates the global instance of SystemNetworkContextManager. If an
|
|
// instance already exists, this will cause a DCHECK failure.
|
|
static SystemNetworkContextManager* CreateInstance(PrefService* pref_service);
|
|
|
|
// Gets the global SystemNetworkContextManager instance.
|
|
static SystemNetworkContextManager* GetInstance();
|
|
|
|
// Destroys the global SystemNetworkContextManager instance.
|
|
static void DeleteInstance();
|
|
|
|
// c.f.
|
|
// https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/net/system_network_context_manager.cc;l=730-740;drc=15a616c8043551a7cb22c4f73a88e83afb94631c;bpv=1;bpt=1
|
|
// Returns whether the network sandbox is enabled. This depends on policy but
|
|
// also feature status from sandbox. Called before there is an instance of
|
|
// SystemNetworkContextManager.
|
|
static bool IsNetworkSandboxEnabled();
|
|
|
|
// Configures default set of parameters for configuring the network context.
|
|
void ConfigureDefaultNetworkContextParams(
|
|
network::mojom::NetworkContextParams* network_context_params);
|
|
|
|
// Same as ConfigureDefaultNetworkContextParams() but returns a newly
|
|
// allocated network::mojom::NetworkContextParams with the
|
|
// CertVerifierCreationParams already placed into the NetworkContextParams.
|
|
network::mojom::NetworkContextParamsPtr CreateDefaultNetworkContextParams();
|
|
|
|
// Returns the System NetworkContext. May only be called after SetUp(). Does
|
|
// any initialization of the NetworkService that may be needed when first
|
|
// called.
|
|
network::mojom::NetworkContext* GetContext();
|
|
|
|
// Returns a URLLoaderFactory owned by the SystemNetworkContextManager that is
|
|
// backed by the SystemNetworkContext. Allows sharing of the URLLoaderFactory.
|
|
// Prefer this to creating a new one. Call Clone() on the value returned by
|
|
// this method to get a URLLoaderFactory that can be used on other threads.
|
|
network::mojom::URLLoaderFactory* GetURLLoaderFactory();
|
|
|
|
// Returns a SharedURLLoaderFactory owned by the SystemNetworkContextManager
|
|
// that is backed by the SystemNetworkContext.
|
|
scoped_refptr<network::SharedURLLoaderFactory> GetSharedURLLoaderFactory();
|
|
|
|
// Called when content creates a NetworkService. Creates the
|
|
// SystemNetworkContext, if the network service is enabled.
|
|
void OnNetworkServiceCreated(network::mojom::NetworkService* network_service);
|
|
|
|
private:
|
|
class URLLoaderFactoryForSystem;
|
|
|
|
explicit SystemNetworkContextManager(PrefService* pref_service);
|
|
|
|
// Creates parameters for the NetworkContext. May only be called once, since
|
|
// it initializes some class members.
|
|
network::mojom::NetworkContextParamsPtr CreateNetworkContextParams();
|
|
|
|
ProxyConfigMonitor proxy_config_monitor_;
|
|
|
|
// NetworkContext using the network service, if the network service is
|
|
// enabled. nullptr, otherwise.
|
|
mojo::Remote<network::mojom::NetworkContext> network_context_;
|
|
|
|
// URLLoaderFactory backed by the NetworkContext returned by GetContext(), so
|
|
// consumers don't all need to create their own factory.
|
|
scoped_refptr<URLLoaderFactoryForSystem> shared_url_loader_factory_;
|
|
mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory_;
|
|
};
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
|