mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: upgrade to chromium 89.0.4336.0 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * update patches * update patches * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: update patches * chore: update patches * clear out cache * Revert "clear out cache" This reverts commit 6e811fae4b7f4eeb736225ce2460857922763b66. * Update to 89.0.4342.2 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 (cherry picked from commit 102a2a3b8d57b6cddb85e9d24e44de77730c81c3) * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true (cherry picked from commit 7a2510a9f68339a252a25df3839e9e215a476d4b) * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 (cherry picked from commit b67d89155d87c86aa295cda645fdee591dacd512) * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 (cherry picked from commit 8cd4ee013eec12205832d0f763ab4480cdb10c28) * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 (cherry picked from commit 56a4a87dec21c1332e508adae4638bf00371dc73) * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 (cherry picked from commit 338d4304bc9c0abcd24306aa4901558b9db9368b) * Actually apply nan patch (cherry picked from commit bf20236386f83229ec09c434d21aca4712d0d53b) * update patches * update to 89.0.4348.1 see if this resolves Windows crashes * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum (cherry picked from commit 36accef04a9047da4f31f214f133866e48f7942c) * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 (cherry picked from commit cab78df863acfb6ca24830eac8f9df11d7d877fd) * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 (cherry picked from commit d0ba1ec443e5ea234706ee93b5b413ed6c9095d7) * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 (cherry picked from commit 1ca2fa5a3c7bd39419b50a439eb9eec4582ced28) * Remove deprecated performFileOperation usage (cherry picked from commit d2dca0c24950cbc81cec80beac9ba640e200d6fa) * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 (cherry picked from commit 944da70791253e9a564317f93814ab544c944a8e) * fixup: Add disconnect logic to ElectronBrowserHandlerImpl (cherry picked from commit e4582a10bbdd20d08d94389953cad8a4ea2b7a1d) * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 (cherry picked from commit ef1d0164bdd8b730c51d46c3099d7d4efea0133b) * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html (cherry picked from commit f4a0b5834b78d189acb03d3b43b2160dcc749a7e) * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 (cherry picked from commitcf09a792f0) * Update patches after rebase * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl (cherry picked from commitbe270753e1) * Remove unneeded BindTo (cherry picked from commitca3287895a) * Don't assign ElectronBrowserHandlerImpl at all (cherry picked from commit899ef067ed) * update patches Co-authored-by: Electron Bot <electron@github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
180 lines
7.0 KiB
C++
180 lines
7.0 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 <memory>
|
|
#include <set>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/optional.h"
|
|
#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 "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::AuthenticationHandler,
|
|
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::AuthenticationHandler 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 GURL& site_for_cookies,
|
|
const base::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::AuthenticationHandler>
|
|
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_
|