5513e66982
* chore: bump chromium in DEPS to 94.0.4604.0 * build: 3-way merge of chromium patches * chore: bump chromium in DEPS to 94.0.4605.0 * build: 3-way merge of chromium patches * 3076040: Reland Remove delete_children RemoveAllChildViews arg Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3076040 * 3069287: Remove the remaining uses and delete the deprecated API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3069287 * 2297212: Replace RemoveWithoutPathExpansion(.*, nullptr) with Value::RemoveKey() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2297212 Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 * 3082756: Change transport_security_persister_path param to be a path to a file. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3082756 > this CL intentionally changes the name of the parameter > in the network context parameters and the order of the constructor > parameters to ensure all callers update their code to pass a full > file path rather than a path to a directory. The 'path' in this diff is already an absolute path, coming from `CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &path_));` at08ff1c2cbf/shell/browser/electron_browser_context.cc (L126)
* iwyu: network::mojom::HttpRawHeaderPair * fixup! 3076040: Reland Remove delete_children RemoveAllChildViews arg Missed one. * 2999884: CodeHealth: Remove DictionaryValue::GetStringWithoutPathExpansion Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2999884 (example of replacing GetStringWithoutPathExpansion() w/FindStringKey()) Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 (removal of DictionaryValue::GetStringWithoutPathExpansion) * 3059260: Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3059260 We had both of these in a 'disable_features' list. Since these feature have been removed upstream, remove them from our disable list, too. IMPORTANT: this commit should not be backported to older branches that still have these features, because doing so would un-disable them. * 2920890: Load reroute_info from download in-progress and history db back into DownloadItem. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2920890 * 3039323: [Clipboard API] Clipboard Custom Formats implementation Part 5. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * chore: bump chromium in DEPS to 94.0.4606.0 * 3084502: Add a new PrintRasterizePdfDpi policy. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 94.0.4606.3 * chore: bump chromium in DEPS to 95.0.4608.0 * chore: bump chromium in DEPS to 95.0.4609.0 * [DevTools] Remove report_raw_headers from network::ResourceRequest https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * Remove content::WebContentsObserver::OnInterfaceRequestFromFrame https://chromium-review.googlesource.com/c/chromium/src/+/3092665 * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * Add a new PrintRasterizePdfDpi policy. https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 95.0.4609.3 * disable `use_lld` for macos * chore: update patches * Linux: use chrome_crashpad_handler instead of crashpad_handler https://chromium-review.googlesource.com/c/chromium/src/+/3054290 * chore: fix lint * Revert "[DevTools] Remove report_raw_headers from network::ResourceRequest" This reverts commit 28f4da1582d046e96cb58f3cbb590503e89dfd0d. * [DevTools] Remove report_raw_headers from network::ResourceRequest (Attempt #2) https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * DCHECK that predictor always has a non-empty NetworkIsolationKey. https://chromium-review.googlesource.com/c/chromium/src/+/3067698 * Remove --no-untrusted-code-mitigations from //content and //gin https://chromium-review.googlesource.com/c/chromium/src/+/3096585 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure https://chromium-review.googlesource.com/c/chromium/src/+/3059260 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Convert PrintManager to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3072019 * chore: bump chromium in DEPS to 95.0.4612.5 * chore: disable v8 oilpan * [Compiler] Remove untrusted code mitigations. https://chromium-review.googlesource.com/c/v8/v8/+/3045704 * Remove most FTP logic from services/network. https://chromium-review.googlesource.com/c/chromium/src/+/3076119 * Rename scale_factor.h -> resource_scale_factor.h https://chromium-review.googlesource.com/c/chromium/src/+/3057113 * [GURL -> SiteForCookies] extensions/ https://chromium-review.googlesource.com/c/chromium/src/+/3100825 * breadcrumbs: add desktop entry point https://chromium-review.googlesource.com/c/chromium/src/+/3021746 * Move args_ to private in ExtensionFunction https://chromium-review.googlesource.com/c/chromium/src/+/3076261 * chore: iwyu * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * fixup! [Compiler] Remove untrusted code mitigations. * fixup! Disable kDesktopCaptureMacV2 * Revert "chore: disable v8 oilpan" This reverts commit 5d255cf1d8e8efbb906047937a713279e5f800d0. * Reland "chore: disable v8 oilpan" This reverts commit 1c252765b07a205560e7b5eed06de2605336e2d8. The previous revert was to test on which platforms did the heapsnapshot test actually fail. * [Clipboard API] Clipboard Custom Formats implementation Part 5. https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * Convert ExtensionFrameHost to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3063358 * Convert PDFWebContentsHelper to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3049751 * [Underscore Migration] Migrate ui/legacy https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3093160 * chore: remove unknown permission error * chore: fix lint * chore: ignore -Wunreachable-code-return for node deps/ * fixup! chore: ignore -Wunreachable-code-return for node deps/ * fix: windows build * fix: build dependency Dependency was missed incbeae20438
* 3108669: arm,dsp: Fix 8bpp Dct64_NEON(). https://chromium-review.googlesource.com/c/codecs/libgav1/+/3108669 * chore: revert libgav1 roll * Revert "3108669: arm,dsp: Fix 8bpp Dct64_NEON()." This reverts commit 7ed31323127aac8ba2eaff9cae6c9be9a4954f33. * Revert "chore: revert libgav1 roll" This reverts commit 084a490d298811267316c786762fe7aa91b6318d. * chore: revert clang roll * chore: Fix -Wunreachable-code-aggressive warnings in arm and arm64 code Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: mlaurencin <mlaurencin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
178 lines
7 KiB
C++
178 lines
7 KiB
C++
// Copyright 2020 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_BROWSER_NET_PROXYING_WEBSOCKET_H_
|
|
#define SHELL_BROWSER_NET_PROXYING_WEBSOCKET_H_
|
|
|
|
#include <set>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "content/public/browser/content_browser_client.h"
|
|
#include "extensions/browser/api/web_request/web_request_info.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
|
#include "mojo/public/cpp/bindings/receiver.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "services/network/public/cpp/resource_request.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "services/network/public/mojom/websocket.mojom.h"
|
|
#include "shell/browser/net/web_request_api_interface.h"
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
#include "url/gurl.h"
|
|
#include "url/origin.h"
|
|
|
|
namespace electron {
|
|
|
|
// A ProxyingWebSocket proxies a WebSocket connection and dispatches
|
|
// WebRequest API events.
|
|
//
|
|
// The code is referenced from the
|
|
// extensions::WebRequestProxyingWebSocket class.
|
|
class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
|
|
public network::mojom::WebSocketAuthenticationHandler,
|
|
public network::mojom::TrustedHeaderClient {
|
|
public:
|
|
using WebSocketFactory = content::ContentBrowserClient::WebSocketFactory;
|
|
|
|
// AuthRequiredResponse indicates how an OnAuthRequired call is handled.
|
|
enum class AuthRequiredResponse {
|
|
// No credentials were provided.
|
|
kNoAction,
|
|
// AuthCredentials is filled in with a username and password, which should
|
|
// be used in a response to the provided auth challenge.
|
|
kSetAuth,
|
|
// The request should be canceled.
|
|
kCancelAuth,
|
|
// The action will be decided asynchronously. |callback| will be invoked
|
|
// when the decision is made, and one of the other AuthRequiredResponse
|
|
// values will be passed in with the same semantics as described above.
|
|
kIoPending,
|
|
};
|
|
|
|
ProxyingWebSocket(
|
|
WebRequestAPI* web_request_api,
|
|
WebSocketFactory factory,
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
|
|
handshake_client,
|
|
bool has_extra_headers,
|
|
int process_id,
|
|
int render_frame_id,
|
|
content::BrowserContext* browser_context,
|
|
uint64_t* request_id_generator);
|
|
~ProxyingWebSocket() override;
|
|
|
|
void Start();
|
|
|
|
// network::mojom::WebSocketHandshakeClient methods:
|
|
void OnOpeningHandshakeStarted(
|
|
network::mojom::WebSocketHandshakeRequestPtr request) override;
|
|
void OnFailure(const std::string& message,
|
|
int32_t net_error,
|
|
int32_t response_code) override;
|
|
void OnConnectionEstablished(
|
|
mojo::PendingRemote<network::mojom::WebSocket> websocket,
|
|
mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,
|
|
network::mojom::WebSocketHandshakeResponsePtr response,
|
|
mojo::ScopedDataPipeConsumerHandle readable,
|
|
mojo::ScopedDataPipeProducerHandle writable) override;
|
|
|
|
// network::mojom::WebSocketAuthenticationHandler method:
|
|
void OnAuthRequired(const net::AuthChallengeInfo& auth_info,
|
|
const scoped_refptr<net::HttpResponseHeaders>& headers,
|
|
const net::IPEndPoint& remote_endpoint,
|
|
OnAuthRequiredCallback callback) override;
|
|
|
|
// network::mojom::TrustedHeaderClient methods:
|
|
void OnBeforeSendHeaders(const net::HttpRequestHeaders& headers,
|
|
OnBeforeSendHeadersCallback callback) override;
|
|
void OnHeadersReceived(const std::string& headers,
|
|
const net::IPEndPoint& endpoint,
|
|
OnHeadersReceivedCallback callback) override;
|
|
|
|
static void StartProxying(
|
|
WebRequestAPI* web_request_api,
|
|
WebSocketFactory factory,
|
|
const GURL& url,
|
|
const net::SiteForCookies& site_for_cookies,
|
|
const absl::optional<std::string>& user_agent,
|
|
mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
|
|
handshake_client,
|
|
bool has_extra_headers,
|
|
int process_id,
|
|
int render_frame_id,
|
|
const url::Origin& origin,
|
|
content::BrowserContext* browser_context,
|
|
uint64_t* request_id_generator);
|
|
|
|
WebRequestAPI* web_request_api() { return web_request_api_; }
|
|
|
|
private:
|
|
void OnBeforeRequestComplete(int error_code);
|
|
void OnBeforeSendHeadersComplete(const std::set<std::string>& removed_headers,
|
|
const std::set<std::string>& set_headers,
|
|
int error_code);
|
|
void ContinueToStartRequest(int error_code);
|
|
void OnHeadersReceivedComplete(int error_code);
|
|
void ContinueToHeadersReceived();
|
|
void OnAuthRequiredComplete(AuthRequiredResponse rv);
|
|
void OnHeadersReceivedCompleteForAuth(const net::AuthChallengeInfo& auth_info,
|
|
int rv);
|
|
void ContinueToCompleted();
|
|
|
|
void PauseIncomingMethodCallProcessing();
|
|
void ResumeIncomingMethodCallProcessing();
|
|
void OnError(int error_code);
|
|
// This is used for detecting errors on mojo connection with the network
|
|
// service.
|
|
void OnMojoConnectionErrorWithCustomReason(uint32_t custom_reason,
|
|
const std::string& description);
|
|
// This is used for detecting errors on mojo connection with original client
|
|
// (i.e., renderer).
|
|
void OnMojoConnectionError();
|
|
|
|
// Passed from api::WebRequest.
|
|
WebRequestAPI* web_request_api_;
|
|
|
|
// Saved to feed the api::WebRequest.
|
|
network::ResourceRequest request_;
|
|
|
|
WebSocketFactory factory_;
|
|
mojo::Remote<network::mojom::WebSocketHandshakeClient>
|
|
forwarding_handshake_client_;
|
|
mojo::Receiver<network::mojom::WebSocketHandshakeClient>
|
|
receiver_as_handshake_client_{this};
|
|
mojo::Receiver<network::mojom::WebSocketAuthenticationHandler>
|
|
receiver_as_auth_handler_{this};
|
|
mojo::Receiver<network::mojom::TrustedHeaderClient>
|
|
receiver_as_header_client_{this};
|
|
|
|
net::HttpRequestHeaders request_headers_;
|
|
network::mojom::URLResponseHeadPtr response_;
|
|
net::AuthCredentials auth_credentials_;
|
|
OnAuthRequiredCallback auth_required_callback_;
|
|
scoped_refptr<net::HttpResponseHeaders> override_headers_;
|
|
std::vector<network::mojom::HttpHeaderPtr> additional_headers_;
|
|
|
|
OnBeforeSendHeadersCallback on_before_send_headers_callback_;
|
|
OnHeadersReceivedCallback on_headers_received_callback_;
|
|
|
|
GURL redirect_url_;
|
|
bool is_done_ = false;
|
|
bool has_extra_headers_;
|
|
mojo::PendingRemote<network::mojom::WebSocket> websocket_;
|
|
mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver_;
|
|
network::mojom::WebSocketHandshakeResponsePtr handshake_response_ = nullptr;
|
|
mojo::ScopedDataPipeConsumerHandle readable_;
|
|
mojo::ScopedDataPipeProducerHandle writable_;
|
|
|
|
extensions::WebRequestInfo info_;
|
|
|
|
base::WeakPtrFactory<ProxyingWebSocket> weak_factory_{this};
|
|
DISALLOW_COPY_AND_ASSIGN(ProxyingWebSocket);
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_BROWSER_NET_PROXYING_WEBSOCKET_H_
|