c3b4cd987c
* chore: bump chromium in DEPS to 126.0.6470.0
* 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs | https://chromium-review.googlesource.com/c/chromium/src/+/5492605
* 5513277: Move subresource-filter-ruleset to GCS | https://chromium-review.googlesource.com/c/chromium/src/+/5513277
* 5512656: Remove CustomizeChromeSupportsChromeRefresh2023 | https://chromium-review.googlesource.com/c/chromium/src/+/5512656
* 5516009: Accept mouse events in inactive window for Top Chrome WebUIs | https://chromium-review.googlesource.com/c/chromium/src/+/5516009
* 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. | https://chromium-review.googlesource.com/c/chromium/src/+/5376861
* 5490530: Use partition_alloc PA_BUILDFLAG(...) outside PA. #cleanup | https://chromium-review.googlesource.com/c/chromium/src/+/5490530
* 5296870: network: Allow trusted loaders to learn the sent request cookies. | https://chromium-review.googlesource.com/c/chromium/src/+/5296870
* 5453438: Delegate delegated ink trails to RWHI from RWHIER. | https://chromium-review.googlesource.com/c/chromium/src/+/5453438
* chore: update patches
* chore: bump chromium in DEPS to 126.0.6472.0
* chore: bump chromium in DEPS to 126.0.6474.0
* chore: update patches
* chore: bump chromium in DEPS to 126.0.6476.0
* chore: bump chromium in DEPS to 126.0.6478.0
* chore: bump chromium in DEPS to 126.0.6478.3
* chore: bump chromium in DEPS to 126.0.6478.8
* update patches
* only disable enterprise_cloud_content_analysis
* 5403888: [api] support v8::Data in v8::TracedReference and v8::EmbedderGraph
https://chromium-review.googlesource.com/c/v8/v8/+/5403888
* chore: bump chromium in DEPS to 127.0.6484.0
* chore: bump chromium in DEPS to 127.0.6485.0
* 5539004: Use NOTREACHED_IN_MIGRATION() in remaining chrome/ | https://chromium-review.googlesource.com/c/chromium/src/+/5539004
* src: cast to v8::Value before using v8::EmbedderGraph::V8Node | https://github.com/nodejs/node/pull/52638/files
* chore: update patches
* chore: update v8 patches
* chore: bump chromium in DEPS to 127.0.6486.0
* chore: bump chromium in DEPS to 127.0.6488.0
* chore: bump chromium in DEPS to 127.0.6490.0
* chore: bump chromium in DEPS to 127.0.6492.0
* chore: update patches
For some reason, `feat_expose_raw_response_headers_from_urlloader.patch` got messed up in an earlier commit.
* chore: update patches
printing.patch was updated due to https://chromium-review.googlesource.com/c/chromium/src/+/5535938
* 5527572: Move Connectors prefs files to components/enterprise/connectors/
https://chromium-review.googlesource.com/c/chromium/src/+/5527572
* chore: bump chromium in DEPS to 127.0.6494.0
* chore: bump chromium in DEPS to 127.0.6495.0
* chore: bump chromium in DEPS to 127.0.6496.0
* 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation
https://chromium-review.googlesource.com/c/v8/v8/+/5465511
* chore: revert v8 deprecation
See patch message for more details.
https://chromium-review.googlesource.com/c/v8/v8/+/5526611
* chore: update patches
* 5538771: Remove srcdoc else-if block in CalculateOrigin()
https://chromium-review.googlesource.com/c/chromium/src/+/5538771
* 5522321: [devtools] Support saving base64 encoded files via host bindings
https://chromium-review.googlesource.com/c/chromium/src/+/5522321
* 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI.
https://chromium-review.googlesource.com/c/chromium/src/+/5376861
* 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum
https://chromium-review.googlesource.com/c/chromium/src/+/5530163
* 5463431: iwa: Only create IsolatedWebAppURLLoaderFactory for subresources in IWAs
https://chromium-review.googlesource.com/c/chromium/src/+/5463431
* fixup! 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation https://chromium-review.googlesource.com/c/v8/v8/+/5465511
* 5512176: Remove OnEnvironmentEstimationComplete()
https://chromium-review.googlesource.com/c/chromium/src/+/5512176
* 5528282: Move Web Speech API .mojom files to //media/mojo/mojom
https://chromium-review.googlesource.com/c/chromium/src/+/5528282
* 5513740: Reland "[Extensions] Restructure extensions::ProcessMap"
https://chromium-review.googlesource.com/c/chromium/src/+/5513740
* 5483406: [PEPC] Make PEPC permission subscription take into account device status
https://chromium-review.googlesource.com/c/chromium/src/+/5483406
* 5526034: [DoH] Remove kDnsOverHttps feature flag
https://chromium-review.googlesource.com/c/chromium/src/+/5526034
The title is a bit misleading. They removed handling for the feature flag and generally intend to remove it but haven't yet.
I only changed our code to address the flag that was removed. A quick search on GitHub for `DnsOverHttpsFallback` yielded a few results, but they were all C++ chromium code or patches, 0 app code or discussion results. Since I couldn't find any evidence of this flag being used in developer applications, I've chosen to exclude this change from the breaking changes docs.
* chore: revert v8 removal
https://chromium-review.googlesource.com/c/v8/v8/+/5497515
See patch message for more details.
* chore: cherry-pick Node.js patch for V8 API removal fix
Node.js PR: https://github.com/nodejs/node/pull/52996
V8 API Removal CL: https://chromium-review.googlesource.com/c/v8/v8/+/5539888
See the patch description for more details.
* 5492183: Extensions: CodeHealth: Give enums some class
https://chromium-review.googlesource.com/c/chromium/src/+/5492183
* fixup! 5528282: Move Web Speech API .mojom files to //media/mojo/mojom https://chromium-review.googlesource.com/c/chromium/src/+/5528282
* 5514687: Reland "Add a secret handshake to the base::Feature constructor"
https://chromium-review.googlesource.com/c/chromium/src/+/5514687
* fixup! 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum https://chromium-review.googlesource.com/c/chromium/src/+/5530163
* 5466238: PDF Viewer: add metrics to record if PDF is opened with a11y
https://chromium-review.googlesource.com/c/chromium/src/+/5466238
* 5502081: Migrate OnDisplayRemoved to OnDisplaysRemoved
https://chromium-review.googlesource.com/c/chromium/src/+/5502081
* 5539888: [api] Remove several APIs deprecated in version 12.6
https://chromium-review.googlesource.com/c/v8/v8/+/5539888
This commit essentially only removes the `only_terminate_in_safe_scope` isolate creation parameter. This undoes some work that was originally done in #35766.
* 5498236: Make browser_tests force full async initialization for OSCrypt Async
https://chromium-review.googlesource.com/c/chromium/src/+/5498236
* fixup! 5528282: Move Web Speech API .mojom files to //media/mojo/mojom https://chromium-review.googlesource.com/c/chromium/src/+/5528282
* 5545807: Migrate most remaining NOTREACHED()
https://chromium-review.googlesource.com/c/chromium/src/+/5545807
I took a systematic approach to modifying all of our uses of `NOTREACHED` that were causing errors:
* If there was a `return` or `break` (etc.) immediately after `NOTREACHED`, I removed the control flow instruction and left the `NOTREACHED` unmodified
* All other instances were migrated to `NOTREACHED_IN_MIGRATION`
We should revisit pretty much all usage of `NOTREACHED` as an upgrade follow-up item.
* fixup! 5526034: [DoH] Remove kDnsOverHttps feature flag https://chromium-review.googlesource.com/c/chromium/src/+/5526034
Turns out the feature flags were removed in the `.cc` file, but not the
`.h` feature list file. This means that the feature flags are pretty
much officially gone. (The leftover symbols in the header are likely an
oversight from what I can gather.)
We may potentially decide to put this in the breaking changes doc if we
decide this feature flag is important enough to highlight.
* chore: bump chromium in DEPS to 127.0.6498.3
* chore: bump chromium in DEPS to 127.0.6500.0
* chore: bump chromium in DEPS to 127.0.6502.0
* chore: bump chromium in DEPS to 127.0.6504.0
* chore: bump chromium in DEPS to 127.0.6505.0
* chore: bump chromium in DEPS to 127.0.6508.0
* build: use Sha256Sum in script/sysroots.json
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5506275
* chore: update chore_add_electron_deps_to_gitignores.patch
Xref: no manual changes; patch applied with fuzz 2
* chore: update feat_allow_code_cache_in_custom_schemes.patch
Xref: no manual changes; patch applied with fuzz 1
* chore: e patches all
* fixup! build: use Sha256Sum in script/sysroots.json
`sync` succeeds now
* chore: replace absl::optional with std::optional
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5253843
* chore: update CalculatePreferredSize() to new upstream semantics
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5459174
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5541220
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5514708
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5504212
Xref: https://chromium-review.googlesource.com/516542
* chore: replace absl::optional with std::optional
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5296147
* chore: add kPip to enumeration as a no-op
https://chromium-review.googlesource.com/c/chromium/src/+/5546257
* [Autofill] Remove RenderFrame::ElementBoundsInWindow()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5553982
* chore: fix feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
need new header to pick up definition of BLINK_PLATFORM_EXPORT macro
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5463143
* chore: bump chromium in DEPS to 127.0.6510.0
* chore: update patches
* chore: fix include path for native_web_keyboard_event.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5541976
* chore: add currently-unused should_include_device_status arg to GetPermissionStatusForCurrentDocument()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5545382
* chore: bump chromium in DEPS to 127.0.6512.0
* chore: update mas_avoid_private_macos_api_usage.patch.patch
No manual changes; patch applied with fuzz 1
* chore: update feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
No manual changes; patch applied with fuzz 1
* chore: update webview_fullscreen.patch
No manual changes; patch applied with fuzz 1
* chore=: remove cherry-pick-22db6918bac9.patch
already present upstream
* chore: remove nonexistent patchfiles from .patches
* chore: remove cherry-pick-3e037e195e50.patch
no longer needed; merged upstream
* Update namespace for files moved to //components/input
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5563251
* Require client for InitParams to always specify an ownership mode.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5532482
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5578714
* chore: e patches all
* fixup! Update namespace for files moved to //components/input
* chore: remove profile_keyed_service_factory, profile_selections from chromium_src
already being linked in via chrome browser for printing
* chore: bump chromium in DEPS to 127.0.6515.0
* chore: bump chromium in DEPS to 127.0.6516.0
* chore: update render_widget_host_view_base.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5547803
patch applied manually due to simple upstream shear
* chore: update feat_allow_code_cache_in_custom_schemes.patch
No manual changes; patch applied with fuzz 1
* chore: e patches all
* Pull RWHIER and RWT to //content/common/input.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5397681
* chore: bump chromium in DEPS to 127.0.6517.0
* chore: update patches
* fixup: Update namespace for files moved to //components/input
* Remove 0-arg (default) constructor for views::Widget::InitParams.
https://chromium-review.googlesource.com/c/chromium/src/+/5578714
* fixup: only disable enterprise_cloud_content_analysis
The original commit a5480accc2
, was due to this CL 5527572: Move Connectors prefs files to components/enterprise/connectors/ | https://chromium-review.googlesource.com/c/chromium/src/+/5527572
* chore: bump chromium in DEPS to 127.0.6519.0
* chore: update patches
* src: do not use deprecated V8 API
https://github.com/nodejs/node/pull/53084
* src: remove dependency on wrapper-descriptor-based cpp heap
https://github.com/nodejs/node/pull/53086
* 5344413: [DevTools] Add `getHostConfig` UI binding for sending status of `base::Features` to DevTools
https://chromium-review.googlesource.com/c/chromium/src/+/5344413
* 5585788: Extensions: ManifestHandler: Separate Registry like ExtensionRegistry
https://chromium-review.googlesource.com/c/chromium/src/+/5585788
* chore: update filenames.libcxx.gni
* 5506857: Reland "Migrate clang-format to gcs first class deps"
https://chromium-review.googlesource.com/c/chromium/src/+/5506857
* fixup: 5539888: [api] Remove several APIs deprecated in version 12.6
* fixup: 5506857: Reland Migrate clang-format to gcs first class deps
* chore: bump chromium in DEPS to 127.0.6521.0
* chore: update patches
* spec: update navigator.keyboard should lock the keyboard
* Block or allow all MIDI using the existing SysEx permission
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5154368
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5499157
* spec: update test/parallel/test-v8-stats
* views: remove CalculatePreferredSize()
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5504212
* chore: update patches after rebase
* 5560288: Re-enable ChromeOS XNNPack on Intel only
https://chromium-review.googlesource.com/c/chromium/src/+/5560288
* chore: add nan patches for v8 changes
Refs
5539888: [api] Remove several APIs deprecated in version 12.6 | https://chromium-review.googlesource.com/c/v8/v8/+/5539888
and
5539852: [heap][api] Remove deprecated v8::Isolate::IdleNotificationDeadline | https://chromium-review.googlesource.com/c/v8/v8/+/5539852
* 5573603: Modularize //chrome/browser/themes
https://chromium-review.googlesource.com/c/chromium/src/+/5573603
* 5539888: [api] Remove several APIs deprecated in version 12.6
https://chromium-review.googlesource.com/c/v8/v8/+/5539888
* chore: update patches
* test: fixup navigator.keyboard.lock on Windows
* chore: remove unneeded profile target
---------
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: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
455 lines
15 KiB
C++
455 lines
15 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.
|
|
|
|
#include "electron/shell/browser/net/proxying_websocket.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "extensions/browser/extension_navigation_ui_data.h"
|
|
#include "net/base/ip_endpoint.h"
|
|
#include "net/http/http_util.h"
|
|
#include "services/network/public/mojom/url_response_head.mojom.h"
|
|
|
|
namespace electron {
|
|
|
|
ProxyingWebSocket::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)
|
|
: web_request_api_(web_request_api),
|
|
request_(request),
|
|
factory_(std::move(factory)),
|
|
forwarding_handshake_client_(std::move(handshake_client)),
|
|
request_headers_(request.headers),
|
|
response_(network::mojom::URLResponseHead::New()),
|
|
has_extra_headers_(has_extra_headers),
|
|
info_(extensions::WebRequestInfoInitParams(
|
|
++(*request_id_generator),
|
|
process_id,
|
|
render_frame_id,
|
|
nullptr,
|
|
request,
|
|
/*is_download=*/false,
|
|
/*is_async=*/true,
|
|
/*is_service_worker_script=*/false,
|
|
/*navigation_id=*/std::nullopt)) {}
|
|
|
|
ProxyingWebSocket::~ProxyingWebSocket() {
|
|
if (on_before_send_headers_callback_) {
|
|
std::move(on_before_send_headers_callback_)
|
|
.Run(net::ERR_ABORTED, std::nullopt);
|
|
}
|
|
if (on_headers_received_callback_) {
|
|
std::move(on_headers_received_callback_)
|
|
.Run(net::ERR_ABORTED, std::nullopt, GURL());
|
|
}
|
|
}
|
|
|
|
void ProxyingWebSocket::Start() {
|
|
// If the header client will be used, we start the request immediately, and
|
|
// OnBeforeSendHeaders and OnSendHeaders will be handled there. Otherwise,
|
|
// send these events before the request starts.
|
|
base::RepeatingCallback<void(int)> continuation;
|
|
if (has_extra_headers_) {
|
|
continuation = base::BindRepeating(
|
|
&ProxyingWebSocket::ContinueToStartRequest, weak_factory_.GetWeakPtr());
|
|
} else {
|
|
continuation =
|
|
base::BindRepeating(&ProxyingWebSocket::OnBeforeRequestComplete,
|
|
weak_factory_.GetWeakPtr());
|
|
}
|
|
|
|
int result = web_request_api_->OnBeforeRequest(&info_, request_, continuation,
|
|
&redirect_url_);
|
|
|
|
if (result == net::ERR_BLOCKED_BY_CLIENT) {
|
|
OnError(result);
|
|
return;
|
|
}
|
|
|
|
if (result == net::ERR_IO_PENDING) {
|
|
return;
|
|
}
|
|
|
|
DCHECK_EQ(net::OK, result);
|
|
continuation.Run(net::OK);
|
|
}
|
|
|
|
void ProxyingWebSocket::OnOpeningHandshakeStarted(
|
|
network::mojom::WebSocketHandshakeRequestPtr request) {
|
|
DCHECK(forwarding_handshake_client_);
|
|
forwarding_handshake_client_->OnOpeningHandshakeStarted(std::move(request));
|
|
}
|
|
|
|
void ProxyingWebSocket::ContinueToHeadersReceived() {
|
|
auto continuation =
|
|
base::BindRepeating(&ProxyingWebSocket::OnHeadersReceivedComplete,
|
|
weak_factory_.GetWeakPtr());
|
|
info_.AddResponseInfoFromResourceResponse(*response_);
|
|
int result = web_request_api_->OnHeadersReceived(
|
|
&info_, request_, continuation, response_->headers.get(),
|
|
&override_headers_, &redirect_url_);
|
|
|
|
if (result == net::ERR_BLOCKED_BY_CLIENT) {
|
|
OnError(result);
|
|
return;
|
|
}
|
|
|
|
PauseIncomingMethodCallProcessing();
|
|
if (result == net::ERR_IO_PENDING)
|
|
return;
|
|
|
|
DCHECK_EQ(net::OK, result);
|
|
OnHeadersReceivedComplete(net::OK);
|
|
}
|
|
|
|
void ProxyingWebSocket::OnFailure(const std::string& message,
|
|
int32_t net_error,
|
|
int32_t response_code) {}
|
|
|
|
void ProxyingWebSocket::OnConnectionEstablished(
|
|
mojo::PendingRemote<network::mojom::WebSocket> websocket,
|
|
mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,
|
|
network::mojom::WebSocketHandshakeResponsePtr response,
|
|
mojo::ScopedDataPipeConsumerHandle readable,
|
|
mojo::ScopedDataPipeProducerHandle writable) {
|
|
DCHECK(forwarding_handshake_client_);
|
|
DCHECK(!is_done_);
|
|
is_done_ = true;
|
|
websocket_ = std::move(websocket);
|
|
client_receiver_ = std::move(client_receiver);
|
|
handshake_response_ = std::move(response);
|
|
readable_ = std::move(readable);
|
|
writable_ = std::move(writable);
|
|
|
|
response_->remote_endpoint = handshake_response_->remote_endpoint;
|
|
|
|
// response_->headers will be set in OnBeforeSendHeaders if
|
|
// |receiver_as_header_client_| is set.
|
|
if (receiver_as_header_client_.is_bound()) {
|
|
ContinueToCompleted();
|
|
return;
|
|
}
|
|
|
|
response_->headers =
|
|
base::MakeRefCounted<net::HttpResponseHeaders>(base::StringPrintf(
|
|
"HTTP/%d.%d %d %s", handshake_response_->http_version.major_value(),
|
|
handshake_response_->http_version.minor_value(),
|
|
handshake_response_->status_code,
|
|
handshake_response_->status_text.c_str()));
|
|
for (const auto& header : handshake_response_->headers)
|
|
response_->headers->AddHeader(header->name, header->value);
|
|
|
|
ContinueToHeadersReceived();
|
|
}
|
|
|
|
void ProxyingWebSocket::ContinueToCompleted() {
|
|
DCHECK(forwarding_handshake_client_);
|
|
DCHECK(is_done_);
|
|
web_request_api_->OnCompleted(&info_, request_, net::ERR_WS_UPGRADE);
|
|
forwarding_handshake_client_->OnConnectionEstablished(
|
|
std::move(websocket_), std::move(client_receiver_),
|
|
std::move(handshake_response_), std::move(readable_),
|
|
std::move(writable_));
|
|
|
|
// Deletes |this|.
|
|
delete this;
|
|
}
|
|
|
|
void ProxyingWebSocket::OnAuthRequired(
|
|
const net::AuthChallengeInfo& auth_info,
|
|
const scoped_refptr<net::HttpResponseHeaders>& headers,
|
|
const net::IPEndPoint& remote_endpoint,
|
|
OnAuthRequiredCallback callback) {
|
|
if (!callback) {
|
|
OnError(net::ERR_FAILED);
|
|
return;
|
|
}
|
|
|
|
response_->headers = headers;
|
|
response_->remote_endpoint = remote_endpoint;
|
|
auth_required_callback_ = std::move(callback);
|
|
|
|
auto continuation =
|
|
base::BindRepeating(&ProxyingWebSocket::OnHeadersReceivedCompleteForAuth,
|
|
weak_factory_.GetWeakPtr(), auth_info);
|
|
info_.AddResponseInfoFromResourceResponse(*response_);
|
|
int result = web_request_api_->OnHeadersReceived(
|
|
&info_, request_, continuation, response_->headers.get(),
|
|
&override_headers_, &redirect_url_);
|
|
|
|
if (result == net::ERR_BLOCKED_BY_CLIENT) {
|
|
OnError(result);
|
|
return;
|
|
}
|
|
|
|
PauseIncomingMethodCallProcessing();
|
|
if (result == net::ERR_IO_PENDING)
|
|
return;
|
|
|
|
DCHECK_EQ(net::OK, result);
|
|
OnHeadersReceivedCompleteForAuth(auth_info, net::OK);
|
|
}
|
|
|
|
void ProxyingWebSocket::OnBeforeSendHeaders(
|
|
const net::HttpRequestHeaders& headers,
|
|
OnBeforeSendHeadersCallback callback) {
|
|
DCHECK(receiver_as_header_client_.is_bound());
|
|
|
|
request_headers_ = headers;
|
|
on_before_send_headers_callback_ = std::move(callback);
|
|
OnBeforeRequestComplete(net::OK);
|
|
}
|
|
|
|
void ProxyingWebSocket::OnHeadersReceived(const std::string& headers,
|
|
const net::IPEndPoint& endpoint,
|
|
OnHeadersReceivedCallback callback) {
|
|
DCHECK(receiver_as_header_client_.is_bound());
|
|
|
|
on_headers_received_callback_ = std::move(callback);
|
|
response_->headers = base::MakeRefCounted<net::HttpResponseHeaders>(headers);
|
|
|
|
ContinueToHeadersReceived();
|
|
}
|
|
|
|
void ProxyingWebSocket::StartProxying(
|
|
WebRequestAPI* web_request_api,
|
|
WebSocketFactory factory,
|
|
const GURL& url,
|
|
const net::SiteForCookies& site_for_cookies,
|
|
const std::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) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
network::ResourceRequest request;
|
|
request.url = url;
|
|
request.site_for_cookies = site_for_cookies;
|
|
if (user_agent) {
|
|
request.headers.SetHeader(net::HttpRequestHeaders::kUserAgent, *user_agent);
|
|
}
|
|
request.request_initiator = origin;
|
|
|
|
auto* proxy = new ProxyingWebSocket(
|
|
web_request_api, std::move(factory), request, std::move(handshake_client),
|
|
has_extra_headers, process_id, render_frame_id, browser_context,
|
|
request_id_generator);
|
|
proxy->Start();
|
|
}
|
|
|
|
void ProxyingWebSocket::OnBeforeRequestComplete(int error_code) {
|
|
DCHECK(receiver_as_header_client_.is_bound() ||
|
|
!receiver_as_handshake_client_.is_bound());
|
|
DCHECK(info_.url.SchemeIsWSOrWSS());
|
|
if (error_code != net::OK) {
|
|
OnError(error_code);
|
|
return;
|
|
}
|
|
|
|
auto continuation =
|
|
base::BindRepeating(&ProxyingWebSocket::OnBeforeSendHeadersComplete,
|
|
weak_factory_.GetWeakPtr());
|
|
|
|
info_.AddResponseInfoFromResourceResponse(*response_);
|
|
int result = web_request_api_->OnBeforeSendHeaders(
|
|
&info_, request_, continuation, &request_headers_);
|
|
|
|
if (result == net::ERR_BLOCKED_BY_CLIENT) {
|
|
OnError(result);
|
|
return;
|
|
}
|
|
|
|
if (result == net::ERR_IO_PENDING)
|
|
return;
|
|
|
|
DCHECK_EQ(net::OK, result);
|
|
OnBeforeSendHeadersComplete(std::set<std::string>(), std::set<std::string>(),
|
|
net::OK);
|
|
}
|
|
|
|
void ProxyingWebSocket::OnBeforeSendHeadersComplete(
|
|
const std::set<std::string>& removed_headers,
|
|
const std::set<std::string>& set_headers,
|
|
int error_code) {
|
|
DCHECK(receiver_as_header_client_.is_bound() ||
|
|
!receiver_as_handshake_client_.is_bound());
|
|
if (error_code != net::OK) {
|
|
OnError(error_code);
|
|
return;
|
|
}
|
|
|
|
if (receiver_as_header_client_.is_bound()) {
|
|
CHECK(on_before_send_headers_callback_);
|
|
std::move(on_before_send_headers_callback_)
|
|
.Run(error_code, request_headers_);
|
|
}
|
|
|
|
info_.AddResponseInfoFromResourceResponse(*response_);
|
|
web_request_api_->OnSendHeaders(&info_, request_, request_headers_);
|
|
|
|
if (!receiver_as_header_client_.is_bound())
|
|
ContinueToStartRequest(net::OK);
|
|
}
|
|
|
|
void ProxyingWebSocket::ContinueToStartRequest(int error_code) {
|
|
if (error_code != net::OK) {
|
|
OnError(error_code);
|
|
return;
|
|
}
|
|
|
|
base::flat_set<std::string> used_header_names;
|
|
std::vector<network::mojom::HttpHeaderPtr> additional_headers;
|
|
for (net::HttpRequestHeaders::Iterator it(request_headers_); it.GetNext();) {
|
|
additional_headers.push_back(
|
|
network::mojom::HttpHeader::New(it.name(), it.value()));
|
|
used_header_names.insert(base::ToLowerASCII(it.name()));
|
|
}
|
|
for (const auto& header : additional_headers_) {
|
|
if (!used_header_names.contains(base::ToLowerASCII(header->name))) {
|
|
additional_headers.push_back(
|
|
network::mojom::HttpHeader::New(header->name, header->value));
|
|
}
|
|
}
|
|
|
|
mojo::PendingRemote<network::mojom::TrustedHeaderClient>
|
|
trusted_header_client = mojo::NullRemote();
|
|
if (has_extra_headers_) {
|
|
trusted_header_client =
|
|
receiver_as_header_client_.BindNewPipeAndPassRemote();
|
|
}
|
|
|
|
std::move(factory_).Run(
|
|
info_.url, std::move(additional_headers),
|
|
receiver_as_handshake_client_.BindNewPipeAndPassRemote(),
|
|
receiver_as_auth_handler_.BindNewPipeAndPassRemote(),
|
|
std::move(trusted_header_client));
|
|
|
|
// Here we detect mojo connection errors on |receiver_as_handshake_client_|.
|
|
// See also CreateWebSocket in
|
|
// //network/services/public/mojom/network_context.mojom.
|
|
receiver_as_handshake_client_.set_disconnect_with_reason_handler(
|
|
base::BindOnce(&ProxyingWebSocket::OnMojoConnectionErrorWithCustomReason,
|
|
base::Unretained(this)));
|
|
forwarding_handshake_client_.set_disconnect_handler(base::BindOnce(
|
|
&ProxyingWebSocket::OnMojoConnectionError, base::Unretained(this)));
|
|
}
|
|
|
|
void ProxyingWebSocket::OnHeadersReceivedComplete(int error_code) {
|
|
if (error_code != net::OK) {
|
|
OnError(error_code);
|
|
return;
|
|
}
|
|
|
|
if (on_headers_received_callback_) {
|
|
std::optional<std::string> headers;
|
|
if (override_headers_)
|
|
headers = override_headers_->raw_headers();
|
|
std::move(on_headers_received_callback_)
|
|
.Run(net::OK, headers, std::nullopt);
|
|
}
|
|
|
|
if (override_headers_) {
|
|
response_->headers = override_headers_;
|
|
override_headers_ = nullptr;
|
|
}
|
|
|
|
ResumeIncomingMethodCallProcessing();
|
|
info_.AddResponseInfoFromResourceResponse(*response_);
|
|
web_request_api_->OnResponseStarted(&info_, request_);
|
|
|
|
if (!receiver_as_header_client_.is_bound())
|
|
ContinueToCompleted();
|
|
}
|
|
|
|
void ProxyingWebSocket::OnAuthRequiredComplete(AuthRequiredResponse rv) {
|
|
CHECK(auth_required_callback_);
|
|
ResumeIncomingMethodCallProcessing();
|
|
switch (rv) {
|
|
case AuthRequiredResponse::kNoAction:
|
|
case AuthRequiredResponse::kCancelAuth:
|
|
std::move(auth_required_callback_).Run(std::nullopt);
|
|
break;
|
|
|
|
case AuthRequiredResponse::kSetAuth:
|
|
std::move(auth_required_callback_).Run(auth_credentials_);
|
|
break;
|
|
case AuthRequiredResponse::kIoPending:
|
|
NOTREACHED();
|
|
}
|
|
}
|
|
|
|
void ProxyingWebSocket::OnHeadersReceivedCompleteForAuth(
|
|
const net::AuthChallengeInfo& auth_info,
|
|
int rv) {
|
|
if (rv != net::OK) {
|
|
OnError(rv);
|
|
return;
|
|
}
|
|
ResumeIncomingMethodCallProcessing();
|
|
info_.AddResponseInfoFromResourceResponse(*response_);
|
|
|
|
auto continuation = base::BindRepeating(
|
|
&ProxyingWebSocket::OnAuthRequiredComplete, weak_factory_.GetWeakPtr());
|
|
auto auth_rv = AuthRequiredResponse::kIoPending;
|
|
PauseIncomingMethodCallProcessing();
|
|
|
|
OnAuthRequiredComplete(auth_rv);
|
|
}
|
|
|
|
void ProxyingWebSocket::PauseIncomingMethodCallProcessing() {
|
|
receiver_as_handshake_client_.Pause();
|
|
receiver_as_auth_handler_.Pause();
|
|
if (receiver_as_header_client_.is_bound())
|
|
receiver_as_header_client_.Pause();
|
|
}
|
|
|
|
void ProxyingWebSocket::ResumeIncomingMethodCallProcessing() {
|
|
receiver_as_handshake_client_.Resume();
|
|
receiver_as_auth_handler_.Resume();
|
|
if (receiver_as_header_client_.is_bound())
|
|
receiver_as_header_client_.Resume();
|
|
}
|
|
|
|
void ProxyingWebSocket::OnError(int error_code) {
|
|
if (!is_done_) {
|
|
is_done_ = true;
|
|
web_request_api_->OnErrorOccurred(&info_, request_, error_code);
|
|
}
|
|
|
|
// Deletes |this|.
|
|
delete this;
|
|
}
|
|
|
|
void ProxyingWebSocket::OnMojoConnectionErrorWithCustomReason(
|
|
uint32_t custom_reason,
|
|
const std::string& description) {
|
|
// Here we want to notify the custom reason to the client, which is why
|
|
// we reset |forwarding_handshake_client_| manually.
|
|
forwarding_handshake_client_.ResetWithReason(custom_reason, description);
|
|
OnError(net::ERR_FAILED);
|
|
// Deletes |this|.
|
|
}
|
|
|
|
void ProxyingWebSocket::OnMojoConnectionError() {
|
|
OnError(net::ERR_FAILED);
|
|
// Deletes |this|.
|
|
}
|
|
|
|
} // namespace electron
|