7e59d784a0
* 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: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/3329593
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail
* chore: missing SkRegion include
* 3499600: Introduce blink::WebCssOrigin
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: bump chromium in DEPS to 101.0.4937.0
* chore: update patches
* 3500826: [locales] Refactor locales for ios
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826
* 3509531: Make some public Blink media files private
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531
* 3497377: bluetooth: Add BluetoothDevice.forget()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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()
https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/3536433
* 3111565: Relocated Page.printToPDF implementation to //components
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/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: https://chromium-review.googlesource.com/c/chromium/src/+/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.h
https://chromium-review.googlesource.com/c/chromium/src/+/3511268
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. | https://chromium-review.googlesource.com/c/chromium/src/+/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>
287 lines
12 KiB
C++
287 lines
12 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.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
|
|
#define ELECTRON_SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
|
|
|
|
#include <cstdint>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <set>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "content/public/browser/content_browser_client.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "extensions/browser/api/web_request/web_request_info.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
#include "mojo/public/cpp/bindings/receiver.h"
|
|
#include "mojo/public/cpp/bindings/receiver_set.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "net/base/completion_once_callback.h"
|
|
#include "net/traffic_annotation/network_traffic_annotation.h"
|
|
#include "services/network/public/cpp/resource_request.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "services/network/public/mojom/url_loader.mojom.h"
|
|
#include "services/network/public/mojom/url_loader_factory.mojom.h"
|
|
#include "services/network/public/mojom/url_response_head.mojom.h"
|
|
#include "services/network/url_loader_factory.h"
|
|
#include "shell/browser/net/electron_url_loader_factory.h"
|
|
#include "shell/browser/net/web_request_api_interface.h"
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
#include "url/gurl.h"
|
|
|
|
namespace electron {
|
|
|
|
// This class is responsible for following tasks when NetworkService is enabled:
|
|
// 1. handling intercepted protocols;
|
|
// 2. implementing webRequest module;
|
|
//
|
|
// For the task #2, the code is referenced from the
|
|
// extensions::WebRequestProxyingURLLoaderFactory class.
|
|
class ProxyingURLLoaderFactory
|
|
: public network::mojom::URLLoaderFactory,
|
|
public network::mojom::TrustedURLLoaderHeaderClient {
|
|
public:
|
|
class InProgressRequest : public network::mojom::URLLoader,
|
|
public network::mojom::URLLoaderClient,
|
|
public network::mojom::TrustedHeaderClient {
|
|
public:
|
|
// For usual requests
|
|
InProgressRequest(
|
|
ProxyingURLLoaderFactory* factory,
|
|
uint64_t web_request_id,
|
|
int32_t view_routing_id,
|
|
int32_t frame_routing_id,
|
|
int32_t network_service_request_id,
|
|
uint32_t options,
|
|
const network::ResourceRequest& request,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader_receiver,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client);
|
|
// For CORS preflights
|
|
InProgressRequest(ProxyingURLLoaderFactory* factory,
|
|
uint64_t request_id,
|
|
int32_t frame_routing_id,
|
|
const network::ResourceRequest& request);
|
|
~InProgressRequest() override;
|
|
|
|
// disable copy
|
|
InProgressRequest(const InProgressRequest&) = delete;
|
|
InProgressRequest& operator=(const InProgressRequest&) = delete;
|
|
|
|
void Restart();
|
|
|
|
// network::mojom::URLLoader:
|
|
void FollowRedirect(
|
|
const std::vector<std::string>& removed_headers,
|
|
const net::HttpRequestHeaders& modified_headers,
|
|
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
|
const absl::optional<GURL>& new_url) override;
|
|
void SetPriority(net::RequestPriority priority,
|
|
int32_t intra_priority_value) override;
|
|
void PauseReadingBodyFromNet() override;
|
|
void ResumeReadingBodyFromNet() override;
|
|
|
|
// network::mojom::URLLoaderClient:
|
|
void OnReceiveEarlyHints(
|
|
network::mojom::EarlyHintsPtr early_hints) override;
|
|
void OnReceiveResponse(network::mojom::URLResponseHeadPtr head,
|
|
mojo::ScopedDataPipeConsumerHandle body) override;
|
|
void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
|
|
network::mojom::URLResponseHeadPtr head) override;
|
|
void OnUploadProgress(int64_t current_position,
|
|
int64_t total_size,
|
|
OnUploadProgressCallback callback) override;
|
|
void OnReceiveCachedMetadata(mojo_base::BigBuffer data) override;
|
|
void OnTransferSizeUpdated(int32_t transfer_size_diff) override;
|
|
void OnStartLoadingResponseBody(
|
|
mojo::ScopedDataPipeConsumerHandle body) override;
|
|
void OnComplete(const network::URLLoaderCompletionStatus& status) override;
|
|
|
|
void OnLoaderCreated(
|
|
mojo::PendingReceiver<network::mojom::TrustedHeaderClient> receiver);
|
|
|
|
// network::mojom::TrustedHeaderClient:
|
|
void OnBeforeSendHeaders(const net::HttpRequestHeaders& headers,
|
|
OnBeforeSendHeadersCallback callback) override;
|
|
void OnHeadersReceived(const std::string& headers,
|
|
const net::IPEndPoint& endpoint,
|
|
OnHeadersReceivedCallback callback) override;
|
|
|
|
private:
|
|
// These two methods combined form the implementation of Restart().
|
|
void UpdateRequestInfo();
|
|
void RestartInternal();
|
|
|
|
void ContinueToBeforeSendHeaders(int error_code);
|
|
void ContinueToSendHeaders(const std::set<std::string>& removed_headers,
|
|
const std::set<std::string>& set_headers,
|
|
int error_code);
|
|
void ContinueToStartRequest(int error_code);
|
|
void ContinueToHandleOverrideHeaders(int error_code);
|
|
void ContinueToResponseStarted(int error_code);
|
|
void ContinueToBeforeRedirect(const net::RedirectInfo& redirect_info,
|
|
int error_code);
|
|
void HandleResponseOrRedirectHeaders(
|
|
net::CompletionOnceCallback continuation);
|
|
void OnRequestError(const network::URLLoaderCompletionStatus& status);
|
|
void HandleBeforeRequestRedirect();
|
|
|
|
ProxyingURLLoaderFactory* const factory_;
|
|
network::ResourceRequest request_;
|
|
const absl::optional<url::Origin> original_initiator_;
|
|
const uint64_t request_id_ = 0;
|
|
const int32_t network_service_request_id_ = 0;
|
|
const int32_t view_routing_id_ = MSG_ROUTING_NONE;
|
|
const int32_t frame_routing_id_ = MSG_ROUTING_NONE;
|
|
const uint32_t options_ = 0;
|
|
const net::MutableNetworkTrafficAnnotationTag traffic_annotation_;
|
|
mojo::Receiver<network::mojom::URLLoader> proxied_loader_receiver_;
|
|
mojo::Remote<network::mojom::URLLoaderClient> target_client_;
|
|
|
|
absl::optional<extensions::WebRequestInfo> info_;
|
|
|
|
mojo::Receiver<network::mojom::URLLoaderClient> proxied_client_receiver_{
|
|
this};
|
|
mojo::Remote<network::mojom::URLLoader> target_loader_;
|
|
|
|
network::mojom::URLResponseHeadPtr current_response_;
|
|
mojo::ScopedDataPipeConsumerHandle current_body_;
|
|
scoped_refptr<net::HttpResponseHeaders> override_headers_;
|
|
GURL redirect_url_;
|
|
|
|
const bool for_cors_preflight_ = false;
|
|
|
|
// If |has_any_extra_headers_listeners_| is set to true, the request will be
|
|
// sent with the network::mojom::kURLLoadOptionUseHeaderClient option, and
|
|
// we expect events to come through the
|
|
// network::mojom::TrustedURLLoaderHeaderClient binding on the factory. This
|
|
// is only set to true if there is a listener that needs to view or modify
|
|
// headers set in the network process.
|
|
bool has_any_extra_headers_listeners_ = false;
|
|
bool current_request_uses_header_client_ = false;
|
|
OnBeforeSendHeadersCallback on_before_send_headers_callback_;
|
|
OnHeadersReceivedCallback on_headers_received_callback_;
|
|
mojo::Receiver<network::mojom::TrustedHeaderClient> header_client_receiver_{
|
|
this};
|
|
|
|
// If |has_any_extra_headers_listeners_| is set to false and a redirect is
|
|
// in progress, this stores the parameters to FollowRedirect that came from
|
|
// the client. That way we can combine it with any other changes that
|
|
// extensions made to headers in their callbacks.
|
|
struct FollowRedirectParams {
|
|
FollowRedirectParams();
|
|
~FollowRedirectParams();
|
|
std::vector<std::string> removed_headers;
|
|
net::HttpRequestHeaders modified_headers;
|
|
net::HttpRequestHeaders modified_cors_exempt_headers;
|
|
absl::optional<GURL> new_url;
|
|
|
|
// disable copy
|
|
FollowRedirectParams(const FollowRedirectParams&) = delete;
|
|
FollowRedirectParams& operator=(const FollowRedirectParams&) = delete;
|
|
};
|
|
std::unique_ptr<FollowRedirectParams> pending_follow_redirect_params_;
|
|
|
|
base::WeakPtrFactory<InProgressRequest> weak_factory_{this};
|
|
};
|
|
|
|
ProxyingURLLoaderFactory(
|
|
WebRequestAPI* web_request_api,
|
|
const HandlersMap& intercepted_handlers,
|
|
int render_process_id,
|
|
int frame_routing_id,
|
|
int view_routing_id,
|
|
uint64_t* request_id_generator,
|
|
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
|
|
absl::optional<int64_t> navigation_id,
|
|
mojo::PendingReceiver<network::mojom::URLLoaderFactory> loader_request,
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory>
|
|
target_factory_remote,
|
|
mojo::PendingReceiver<network::mojom::TrustedURLLoaderHeaderClient>
|
|
header_client_receiver,
|
|
content::ContentBrowserClient::URLLoaderFactoryType loader_factory_type);
|
|
|
|
~ProxyingURLLoaderFactory() override;
|
|
|
|
// disable copy
|
|
ProxyingURLLoaderFactory(const ProxyingURLLoaderFactory&) = delete;
|
|
ProxyingURLLoaderFactory& operator=(const ProxyingURLLoaderFactory&) = delete;
|
|
|
|
// network::mojom::URLLoaderFactory:
|
|
void CreateLoaderAndStart(
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
int32_t request_id,
|
|
uint32_t options,
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation)
|
|
override;
|
|
void Clone(mojo::PendingReceiver<network::mojom::URLLoaderFactory>
|
|
loader_receiver) override;
|
|
|
|
// network::mojom::TrustedURLLoaderHeaderClient:
|
|
void OnLoaderCreated(
|
|
int32_t request_id,
|
|
mojo::PendingReceiver<network::mojom::TrustedHeaderClient> receiver)
|
|
override;
|
|
void OnLoaderForCorsPreflightCreated(
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingReceiver<network::mojom::TrustedHeaderClient> receiver)
|
|
override;
|
|
|
|
WebRequestAPI* web_request_api() { return web_request_api_; }
|
|
|
|
bool IsForServiceWorkerScript() const;
|
|
|
|
private:
|
|
void OnTargetFactoryError();
|
|
void OnProxyBindingError();
|
|
void RemoveRequest(int32_t network_service_request_id, uint64_t request_id);
|
|
void MaybeDeleteThis();
|
|
|
|
bool ShouldIgnoreConnectionsLimit(const network::ResourceRequest& request);
|
|
|
|
// Passed from api::WebRequest.
|
|
WebRequestAPI* web_request_api_;
|
|
|
|
// This is passed from api::Protocol.
|
|
//
|
|
// The Protocol instance lives through the lifetime of BrowserContext,
|
|
// which is guaranteed to cover the lifetime of URLLoaderFactory, so the
|
|
// reference is guaranteed to be valid.
|
|
//
|
|
// In this way we can avoid using code from api namespace in this file.
|
|
const HandlersMap& intercepted_handlers_;
|
|
|
|
const int render_process_id_;
|
|
const int frame_routing_id_;
|
|
const int view_routing_id_;
|
|
uint64_t* request_id_generator_; // managed by ElectronBrowserClient
|
|
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data_;
|
|
absl::optional<int64_t> navigation_id_;
|
|
mojo::ReceiverSet<network::mojom::URLLoaderFactory> proxy_receivers_;
|
|
mojo::Remote<network::mojom::URLLoaderFactory> target_factory_;
|
|
mojo::Receiver<network::mojom::TrustedURLLoaderHeaderClient>
|
|
url_loader_header_client_receiver_{this};
|
|
const content::ContentBrowserClient::URLLoaderFactoryType
|
|
loader_factory_type_;
|
|
|
|
// Mapping from our own internally generated request ID to an
|
|
// InProgressRequest instance.
|
|
std::map<uint64_t, std::unique_ptr<InProgressRequest>> requests_;
|
|
|
|
// A mapping from the network stack's notion of request ID to our own
|
|
// internally generated request ID for the same request.
|
|
std::map<int32_t, uint64_t> network_request_id_to_web_request_id_;
|
|
|
|
std::vector<std::string> ignore_connections_limit_domains_;
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
|