mirror of
https://github.com/electron/electron.git
synced 2026-02-26 03:01:17 -05:00
* chore: bump chromium in DEPS to 91.0.4472.5 * chore: rebuild chromium/dcheck.patch with import-patches -3 Mechanical only; no code changes (cherry picked from commit68e369c945) * chore: remove content_browser_main_loop.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 The function being patched (BrowserMainLoop::MainMessageLoopRun()) no longer exists. NB: if removing this introduces regressions the likely fix will be to add a similar patch for ShellBrowserMainParts::WillRunMainMessageLoop() which has similar code and was added at the same time this was removed. (cherry picked from commit5220829748) * chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3 Mechanical only; no code changes (cherry picked from commit7613ca268e) * chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3 Mechanical only; no code changes (cherry picked from commitc0c5f45195) * chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch Mechanical only; no code changes (cherry picked from commitea6f3e096e) * chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3 Mechanical only; no code changes (cherry picked from commit8d9aa4f1f2) * chore: rebuild chromium/ui_gtk_public_header.patch manually no code changes (cherry picked from commit79e84fb72b) * chore: rebuild chromium/web_contents.patch with import-patches -3 Mechanical only; no code changes (cherry picked from commit543fb6dae7) * chore: remove v8/skip_global_registration_of_shared_arraybuffer_backing_stores.patch Refs: https://chromium-review.googlesource.com/c/v8/v8/+/2763874 This patch has been merged upstream (cherry picked from commitd36de6e2d6) * chore: export patches (cherry picked from commit7c148e9102) * chore: update add_trustedauthclient_to_urlloaderfactory.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969 Sync with removal of render_frame_id_ (cherry picked from commitfd954aefd4) * chore: sync chromium/put_back_deleted_colors_for_autofill.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785841 SkColorFromColorId() no longer takes theme, scheme args (cherry picked from commitf676453fb8) * chore: sync chromium/put_back_deleted_colors_for_autofill.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2772143 Change new calls to GetDarkSchemeColor to fit our patched call signature (cherry picked from commit27c5d9da5e) * chore: update add_trustedauthclient_to_urlloaderfactory.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969 Sync with removal of render_frame_id_ in our mojom (cherry picked from commit285db29015) * chore: update chromium/frame_host_manager.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008 UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool (cherry picked from commit06ac6c5d6a) * chore: update chromium/revert_remove_contentrendererclient_shouldfork.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2755314 Upstream has removed `history_list_length_` which we were comparing to 0 to calculate our `is_initial_navigation` bool when calling ShouldFork(). ShouldFork() is ours and none of the code paths actually use that param, so this commit removes it altogether. (cherry picked from commit2b0cb2ca2a) * chore: update permissions_to_register Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2789074 Replace all uses of APIPermission::ID enum with Mojo type (cherry picked from commitbfe55a9c68) * refactor: update return type of PreMainMessageLoopRun() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 Used to return void; now returns an int errorcode. Note: 2725153 also has some nice doc updates about Browser's "stages" (cherry picked from commit2622e91c44) * refactor: sync ElectronBrowserMainParts to MainParts changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 RunMainMessageLoopParts has been replaced with WillRunMainMessageLoop so `BrowserMainLoop::result_code_` is no longer available to us for our exit_code_ pointer. This variable held a dual role: (1) of course, hold the exit code, but also (2) was a nullptr before the message loop was ready, indicating to anyone calling SetExitCode() that we were still in startup and could just exit() without any extra steps. exit_code_ still fulfills these two roles but is now a base::Optional. (cherry picked from commit0497272fab) * chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153 BrowserMainParts::BrowsePreDefaultMainMesssageLoopRun() has been removed; move that work to the new WillRunMainMessageLoop(). (cherry picked from commit77eacd8073) * refactor: stop using CallbackList; it has been removed. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973 (cherry picked from commit4bcf9d58b0) * refactor: update use of threadpools. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2773408 The upstream code is still in flux (e.g. reverts and re-lands) but the tl;dr for this commit is (1) include thread_pool.h if you're using it and (2) don't instantiate pools directly. (cherry picked from commit4e33ee0ad3) * refactor: remove routing_id from CreateLoaderAndStart Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858 NB: One logic branch in ProxyingURLLoaderFactory::CreateLoaderAndStart calls std::make_unique<InProgressRequest>, which needs a routing_id. This PR uses the member field `routing_id_` since there's no longer one being passed into CreateLoaderAndStart. (cherry picked from commit70759ad342) * refactor: sync to upstream ParittionOptions churn Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318 PartitionOptions' enums have changed. (cherry picked from commit48f437b478) * refactor: update Manifest::Location usage Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320 tldr: s/Manifest::FOO/ManifestLocation::kFoo/ (cherry picked from commit866e02999a) * update patches (cherry picked from commit4444596af5) * refactor: update extensions::Manifest to upstream Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320 - extensions::Manifest::COMPONENT + extensions::mojom::ManifestLocation::kExternalComponent (cherry picked from commitc97cef7059) * refactor: sync with upstream UrlInfo ctor changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008 UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool (cherry picked from commit7effb909b6) * chore: update invocation of convert_protocol_to_json.py Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2792623 python3 is being used in parts of the upstream build, but the copy of convert_protocol_to_json.py invoked in v8/third_party/inspector_protocol is not python3-friendly. Node has a py2+3-friendly version of it in its tools directory, so call it instead. (cherry picked from commita237fc9aff) * chore: use extensions::mojom::APIPermissionID Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122 tldr: - extensions::APIPermission::kFoo + extensions::mojom::APIPermissionID::kFoo (cherry picked from commitbf9ef3b636) * chore: Remove support for TLS1.0/1.1 in SSLVersionMin policy Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2765737 Remove TLS v1.0 & 1.1 from our SSLProtocolVersionFromString() function. This is the same change made upstream at https://chromium-review.googlesource.com/c/chromium/src/+/2765737/8/chrome/browser/ssl/ssl_config_service_manager_pref.cc (cherry picked from commitc4558b031d) * fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun (cherry picked from commitf509f1b8cc) * chore: Use IDType for permission change subscriptions. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791431 tldr: {Subscribe,Unsubscribe}PermissionStatusChange's tag type used to be an int; now it's the new SubscriptionId type (which is an IdType64). (cherry picked from commit11608d2745) * chore: sync PowerMonitor code to upstream refactor Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2752635 tldr: PowerMonitor has been split into PowerStateObserver, PowerSuspendObserver, and PowerThermalObserver to reduce number of tasks posted to consumers who only need notifications for one of those things instead of all of them. (cherry picked from commit2d4c79413b) * chore: use PartitionOptions's new Cookies field Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318 (cherry picked from commitf69e95824f) * Revert "refactor: remove routing_id from CreateLoaderAndStart" This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245. 8c9773b was only a partial fix; reverting to start & try again. (cherry picked from commit96195f845b) * update patches (cherry picked from commit5d64fa28d5) * chore: update chromium/accelerator.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472 tldr: sync patch with upstream renamed variable & macro names. (cherry picked from commitce541697e5) * chore: update chromium/gtk_visibility.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796200 tldr: no code changes; just updating the diff to apply cleanly. note: ooh upstream Wayland hacking! (cherry picked from commit6ec5c72878) * chore: update chromium/picture-in-picture.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710023 tldr: no code changes; just updating the diff to apply cleanly. (cherry picked from commit8ae0b0d740) * chore: update chromium/worker_feat_add_hook_to_notify_script_ready.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2775573 tldr: no code changes; just updating the diff to apply cleanly. (cherry picked from commitd5b017208b) * chore: export_all_patches (cherry picked from commit218952ec9d) * chore: update chromium/feat_add_set_theme_source_to_allow_apps_to.patch Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796511 tldr: NotifyObservers has been renamed to NotifyOnNativeThemeUpdated, so update the invocation in our patch. (cherry picked from commit6fe734f5ca) * chore: update ElectronBrowserClient w/upstream API Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797454 tldr: GetDevToolsManagerDelegate() was returning an owned raw pointer. Replaced it with CreateDevToolsManagerDelegate() which uses unique_ptr<>. (cherry picked from commitb760f7162b) * chore: handle new content::PermissionType::FILE_HANDLING in toV8() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762201 `file-handling` string confirmed in https://chromium-review.googlesource.com/c/chromium/src/+/2762201/18/chrome/browser/ui/webui/settings/site_settings_helper.cc (cherry picked from commitd9cdb18eb7) * refactor: remove routing_id from CreateLoaderAndStart pt 1 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858 Part 1: the easiest ones (cherry picked from commit6ee282b27a) * 2796724: Support Python3 https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724 (cherry picked from commitfbf5c04716) * 2668974: WebShare: Implement SharingServicePicker https://chromium-review.googlesource.com/c/chromium/src/+/2668974 (cherry picked from commit74577f2156) * 2802766: Apply modernize-make-unique to media/ https://chromium-review.googlesource.com/c/chromium/src/+/2802766 (cherry picked from commit409328fc38) * 2802823: Apply modernize-make-unique to gpu/ https://chromium-review.googlesource.com/c/chromium/src/+/2802823 (cherry picked from commit43658b0ed3) * 2803041: Apply modernize-make-unique to remaining files https://chromium-review.googlesource.com/c/chromium/src/+/2803041 (cherry picked from commit01f514f537) * 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks https://chromium-review.googlesource.com/c/chromium/src/+/2798873 (cherry picked from commit5384398823) * 2733595: [ch-r] Parse ACCEPT_CH H2/3 frame and restart with new headers if needed https://chromium-review.googlesource.com/c/chromium/src/+/2733595 (cherry picked from commitf6cf612ee3) * chore: update patch indices (cherry picked from commitf078eddc2b) * 2795107: Remove unused PermissionRequest IDs. https://chromium-review.googlesource.com/c/chromium/src/+/2795107 (cherry picked from commit93077afbfb) * chore: fixup patch indices (cherry picked from commit8f2abcee38) * PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window https://chromium-review.googlesource.com/c/chromium/src/+/2710023 (cherry picked from commit4a4da7ad6a) * fixup! refactor: remove routing_id from CreateLoaderAndStart (cherry picked from commita1f0bbb0b5) * refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader (cherry picked from commit186528aab9) * fixup! chore: fixup patch indices (cherry picked from commit3129ea403d) * 2724817: Expand scope of wasm-eval to all URLs https://chromium-review.googlesource.com/c/chromium/src/+/2724817 (cherry picked from commitdacbf3d60d) * 2797341: [ozone/x11] Enabled the global shortcut listener. https://chromium-review.googlesource.com/c/chromium/src/+/2797341 (cherry picked from commit945890fcf9) * 2805553: Reland Add GTK ColorMixers to ColorPipeline P1 https://chromium-review.googlesource.com/c/chromium/src/+/2805553 (cherry picked from commitdb74b380fd) *2804366: PiP 1.5: Label back to tab button with origin and center it https://chromium-review.googlesource.com/c/chromium/src/+/2804366 (cherry picked from commitdeca961382) * 2784730: Fix crash on AX mode change in NativeViewHost without a Widget https://chromium-review.googlesource.com/c/chromium/src/+/2784730 (cherry picked from commit0fac051a0c) * chore: update patch indices (cherry picked from commit01235ba336) * 2810174: Add PdfAnnotationsEnabled policy. https://chromium-review.googlesource.com/c/chromium/src/+/2810174 (cherry picked from commitc8a7225cac) * 2807829: Allow capturers to indicate if they want a WakeLock or not. https://chromium-review.googlesource.com/c/chromium/src/+/2807829 (cherry picked from commit39f0c263d7) * update patches after cherry picks * chore: icon_util_x11 is now icon_util_linux Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362 (cherry picked from commitfa0d3a0f75) * build: fix missing symbols on linux build * use_ozone and use_x11 are not exclusive * new button view to build for pip Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2804366 (cherry picked from commit28253c6ccc) * chore: remove patch conflict (cherry picked from commit19c9e94014) * chore: build bttlb on all platforms for pip (cherry picked from commitae70252e09) * build: update linux manifests (cherry picked from commit88baf8835c) * chore: update windows zip manifests (cherry picked from commit01a1c37999) * chore: update mac zip manifests (cherry picked from commita203347075) * chore: update is_media_key patch to handle new ozone impl Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341 (cherry picked from commit9d31092db8) * build: update sysroots Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496 (cherry picked from commit4985c57685) * build: add missing base include on windows (cherry picked from commitec782c1bde) * fix: update frame host manager patch for new state transitions Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464 (cherry picked from commit2772241a2c) * refactor: implement missing URLLoaderNetworkServiceObserver methods It is against The Mojo Rules to leave hanging callbacks. These always have to be called. Refs:186528aab9(cherry picked from commit2ce2f73a0c) * spec: fix locale test on local linux (cherry picked from commit898f8448f8) * fix: pass the exit code correctly in new PreMainMessageLoopRun Refs:2622e91c44(cherry picked from commitf8f388573c) * fix: ensure we early-exit when request_handler_ is not provided Refs:93077afbfb(cherry picked from commit20cd4cb875) * fix: strongly set result_code in the BrowserMainLoop (cherry picked from commita1d19bc212) * fix: invalid usage of non-targetted PostTask You must always either use a host threadpool or specify a target thread. In this case we did neither after this refactor. Refs:4e33ee0ad3(cherry picked from commit3632067c10) * build: ensure CI is truthy in arm test env (cherry picked from commite455f68b64) * chore: add mojo error code to url loader failure (cherry picked from commit60cc150a17) * fix: handle windowCaptureMacV2 being enabled when fetching media source id Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931 (cherry picked from commitf835dd1c2a) * chore: fix broken gtk_util color patch (cherry picked from commite0720df6d4) * chore: fix gn check (cherry picked from commit72ca89b311) * chore: add node patches for V8 changes (cherry picked from commit96027e0186) * chore: add thread_pool include for views delegate win (cherry picked from commit62faa304df) * chore: remove stray .rej files in patch (cherry picked from commit52562150ca) * chore: bump chromium in DEPS to 91.0.4472.10 * update patches * Merge branch '13-x-y' into roller/chromium/13-x-y * update patches * try to track down WOA failures * see if this helps websql failure * chore: debug websql error on WOA * Revert "chore: debug websql error on WOA" This reverts commit572987a15f. * Revert "see if this helps websql failure" This reverts commitf771dfe0ab. * Revert "try to track down WOA failures" This reverts commitd4eb5efdb3. * chore: no long disable CalculateNativeWinOcclusion on WOA This was resolved in https://chromium-review.googlesource.com/c/chromium/src/+/2478082 * run specs separately on WOA * Update comment * escape % * specify files properly * revert WOA testing changes * chore: bump chromium in DEPS to 91.0.4472.33 * chore: update patches * Trigger CI Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com>
618 lines
23 KiB
C++
618 lines
23 KiB
C++
// Copyright (c) 2019 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_url_loader.h"
|
|
|
|
#include <algorithm>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/no_destructor.h"
|
|
#include "gin/handle.h"
|
|
#include "gin/object_template_builder.h"
|
|
#include "gin/wrappable.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
|
#include "net/base/load_flags.h"
|
|
#include "services/network/public/cpp/resource_request.h"
|
|
#include "services/network/public/cpp/simple_url_loader.h"
|
|
#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
|
|
#include "services/network/public/mojom/url_loader_factory.mojom.h"
|
|
#include "shell/browser/api/electron_api_session.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/gurl_converter.h"
|
|
#include "shell/common/gin_converters/net_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<network::mojom::HttpRawHeaderPairPtr> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const network::mojom::HttpRawHeaderPairPtr& pair) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("key", base::ToLowerASCII(pair->key));
|
|
dict.Set("value", pair->value);
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Converter<network::mojom::CredentialsMode> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
network::mojom::CredentialsMode* out) {
|
|
std::string mode;
|
|
if (!ConvertFromV8(isolate, val, &mode))
|
|
return false;
|
|
if (mode == "omit")
|
|
*out = network::mojom::CredentialsMode::kOmit;
|
|
else if (mode == "include")
|
|
*out = network::mojom::CredentialsMode::kInclude;
|
|
else
|
|
// "same-origin" is technically a member of this enum as well, but it
|
|
// doesn't make sense in the context of `net.request()`, so don't convert
|
|
// it.
|
|
return false;
|
|
return true;
|
|
}
|
|
}; // namespace gin
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
namespace {
|
|
|
|
class BufferDataSource : public mojo::DataPipeProducer::DataSource {
|
|
public:
|
|
explicit BufferDataSource(base::span<char> buffer) {
|
|
buffer_.resize(buffer.size());
|
|
memcpy(buffer_.data(), buffer.data(), buffer_.size());
|
|
}
|
|
~BufferDataSource() override = default;
|
|
|
|
private:
|
|
// mojo::DataPipeProducer::DataSource:
|
|
uint64_t GetLength() const override { return buffer_.size(); }
|
|
ReadResult Read(uint64_t offset, base::span<char> buffer) override {
|
|
ReadResult result;
|
|
if (offset <= buffer_.size()) {
|
|
size_t readable_size = buffer_.size() - offset;
|
|
size_t writable_size = buffer.size();
|
|
size_t copyable_size = std::min(readable_size, writable_size);
|
|
if (copyable_size > 0) {
|
|
memcpy(buffer.data(), &buffer_[offset], copyable_size);
|
|
}
|
|
result.bytes_read = copyable_size;
|
|
} else {
|
|
NOTREACHED();
|
|
result.result = MOJO_RESULT_OUT_OF_RANGE;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
std::vector<char> buffer_;
|
|
};
|
|
|
|
class JSChunkedDataPipeGetter : public gin::Wrappable<JSChunkedDataPipeGetter>,
|
|
public network::mojom::ChunkedDataPipeGetter {
|
|
public:
|
|
static gin::Handle<JSChunkedDataPipeGetter> Create(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Function> body_func,
|
|
mojo::PendingReceiver<network::mojom::ChunkedDataPipeGetter>
|
|
chunked_data_pipe_getter) {
|
|
return gin::CreateHandle(
|
|
isolate, new JSChunkedDataPipeGetter(
|
|
isolate, body_func, std::move(chunked_data_pipe_getter)));
|
|
}
|
|
|
|
// gin::Wrappable
|
|
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) override {
|
|
return gin::Wrappable<JSChunkedDataPipeGetter>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetMethod("write", &JSChunkedDataPipeGetter::WriteChunk)
|
|
.SetMethod("done", &JSChunkedDataPipeGetter::Done);
|
|
}
|
|
|
|
static gin::WrapperInfo kWrapperInfo;
|
|
~JSChunkedDataPipeGetter() override = default;
|
|
|
|
private:
|
|
JSChunkedDataPipeGetter(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Function> body_func,
|
|
mojo::PendingReceiver<network::mojom::ChunkedDataPipeGetter>
|
|
chunked_data_pipe_getter)
|
|
: isolate_(isolate), body_func_(isolate, body_func) {
|
|
receiver_.Bind(std::move(chunked_data_pipe_getter));
|
|
}
|
|
|
|
// network::mojom::ChunkedDataPipeGetter:
|
|
void GetSize(GetSizeCallback callback) override {
|
|
size_callback_ = std::move(callback);
|
|
}
|
|
|
|
void StartReading(mojo::ScopedDataPipeProducerHandle pipe) override {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
if (body_func_.IsEmpty()) {
|
|
LOG(ERROR) << "Tried to read twice from a JSChunkedDataPipeGetter";
|
|
// Drop the handle on the floor.
|
|
return;
|
|
}
|
|
data_producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(pipe));
|
|
|
|
v8::HandleScope handle_scope(isolate_);
|
|
auto maybe_wrapper = GetWrapper(isolate_);
|
|
v8::Local<v8::Value> wrapper;
|
|
if (!maybe_wrapper.ToLocal(&wrapper)) {
|
|
return;
|
|
}
|
|
v8::Local<v8::Value> argv[] = {wrapper};
|
|
node::Environment* env = node::Environment::GetCurrent(isolate_);
|
|
auto global = env->context()->Global();
|
|
node::MakeCallback(isolate_, global, body_func_.Get(isolate_),
|
|
node::arraysize(argv), argv, {0, 0});
|
|
}
|
|
|
|
v8::Local<v8::Promise> WriteChunk(v8::Local<v8::Value> buffer_val) {
|
|
gin_helper::Promise<void> promise(isolate_);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
if (!buffer_val->IsArrayBufferView()) {
|
|
promise.RejectWithErrorMessage("Expected an ArrayBufferView");
|
|
return handle;
|
|
}
|
|
if (is_writing_) {
|
|
promise.RejectWithErrorMessage("Only one write can be pending at a time");
|
|
return handle;
|
|
}
|
|
if (!size_callback_) {
|
|
promise.RejectWithErrorMessage("Can't write after calling done()");
|
|
return handle;
|
|
}
|
|
auto buffer = buffer_val.As<v8::ArrayBufferView>();
|
|
is_writing_ = true;
|
|
bytes_written_ += buffer->ByteLength();
|
|
auto backing_store = buffer->Buffer()->GetBackingStore();
|
|
auto buffer_span = base::make_span(
|
|
static_cast<char*>(backing_store->Data()) + buffer->ByteOffset(),
|
|
buffer->ByteLength());
|
|
auto buffer_source = std::make_unique<BufferDataSource>(buffer_span);
|
|
data_producer_->Write(
|
|
std::move(buffer_source),
|
|
base::BindOnce(&JSChunkedDataPipeGetter::OnWriteChunkComplete,
|
|
// We're OK to use Unretained here because we own
|
|
// |data_producer_|.
|
|
base::Unretained(this), std::move(promise)));
|
|
return handle;
|
|
}
|
|
|
|
void OnWriteChunkComplete(gin_helper::Promise<void> promise,
|
|
MojoResult result) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
is_writing_ = false;
|
|
if (result == MOJO_RESULT_OK) {
|
|
promise.Resolve();
|
|
} else {
|
|
promise.RejectWithErrorMessage("mojo result not ok: " +
|
|
std::to_string(result));
|
|
Finished();
|
|
}
|
|
}
|
|
|
|
// TODO(nornagon): accept a net error here to allow the data provider to
|
|
// cancel the request with an error.
|
|
void Done() {
|
|
if (size_callback_) {
|
|
std::move(size_callback_).Run(net::OK, bytes_written_);
|
|
Finished();
|
|
}
|
|
}
|
|
|
|
void Finished() {
|
|
body_func_.Reset();
|
|
data_producer_.reset();
|
|
receiver_.reset();
|
|
size_callback_.Reset();
|
|
}
|
|
|
|
GetSizeCallback size_callback_;
|
|
mojo::Receiver<network::mojom::ChunkedDataPipeGetter> receiver_{this};
|
|
std::unique_ptr<mojo::DataPipeProducer> data_producer_;
|
|
bool is_writing_ = false;
|
|
uint64_t bytes_written_ = 0;
|
|
|
|
v8::Isolate* isolate_;
|
|
v8::Global<v8::Function> body_func_;
|
|
};
|
|
|
|
gin::WrapperInfo JSChunkedDataPipeGetter::kWrapperInfo = {
|
|
gin::kEmbedderNativeGin};
|
|
|
|
const net::NetworkTrafficAnnotationTag kTrafficAnnotation =
|
|
net::DefineNetworkTrafficAnnotation("electron_net_module", R"(
|
|
semantics {
|
|
sender: "Electron Net module"
|
|
description:
|
|
"Issue HTTP/HTTPS requests using Chromium's native networking "
|
|
"library."
|
|
trigger: "Using the Net module"
|
|
data: "Anything the user wants to send."
|
|
destination: OTHER
|
|
}
|
|
policy {
|
|
cookies_allowed: YES
|
|
cookies_store: "user"
|
|
setting: "This feature cannot be disabled."
|
|
})");
|
|
|
|
} // namespace
|
|
|
|
gin::WrapperInfo SimpleURLLoaderWrapper::kWrapperInfo = {
|
|
gin::kEmbedderNativeGin};
|
|
|
|
SimpleURLLoaderWrapper::SimpleURLLoaderWrapper(
|
|
std::unique_ptr<network::ResourceRequest> request,
|
|
network::mojom::URLLoaderFactory* url_loader_factory,
|
|
int options) {
|
|
if (!request->trusted_params)
|
|
request->trusted_params = network::ResourceRequest::TrustedParams();
|
|
mojo::PendingRemote<network::mojom::URLLoaderNetworkServiceObserver>
|
|
url_loader_network_observer_remote;
|
|
url_loader_network_observer_receivers_.Add(
|
|
this,
|
|
url_loader_network_observer_remote.InitWithNewPipeAndPassReceiver());
|
|
request->trusted_params->url_loader_network_observer =
|
|
std::move(url_loader_network_observer_remote);
|
|
// SimpleURLLoader wants to control the request body itself. We have other
|
|
// ideas.
|
|
auto request_body = std::move(request->request_body);
|
|
auto* request_ref = request.get();
|
|
loader_ =
|
|
network::SimpleURLLoader::Create(std::move(request), kTrafficAnnotation);
|
|
if (request_body) {
|
|
request_ref->request_body = std::move(request_body);
|
|
}
|
|
|
|
loader_->SetAllowHttpErrorResults(true);
|
|
loader_->SetURLLoaderFactoryOptions(options);
|
|
loader_->SetOnResponseStartedCallback(base::BindOnce(
|
|
&SimpleURLLoaderWrapper::OnResponseStarted, base::Unretained(this)));
|
|
loader_->SetOnRedirectCallback(base::BindRepeating(
|
|
&SimpleURLLoaderWrapper::OnRedirect, base::Unretained(this)));
|
|
loader_->SetOnUploadProgressCallback(base::BindRepeating(
|
|
&SimpleURLLoaderWrapper::OnUploadProgress, base::Unretained(this)));
|
|
loader_->SetOnDownloadProgressCallback(base::BindRepeating(
|
|
&SimpleURLLoaderWrapper::OnDownloadProgress, base::Unretained(this)));
|
|
|
|
loader_->DownloadAsStream(url_loader_factory, this);
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::Pin() {
|
|
// Prevent ourselves from being GC'd until the request is complete. Must be
|
|
// called after gin::CreateHandle, otherwise the wrapper isn't initialized.
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
pinned_wrapper_.Reset(isolate, GetWrapper(isolate).ToLocalChecked());
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::PinBodyGetter(v8::Local<v8::Value> body_getter) {
|
|
pinned_chunk_pipe_getter_.Reset(JavascriptEnvironment::GetIsolate(),
|
|
body_getter);
|
|
}
|
|
|
|
SimpleURLLoaderWrapper::~SimpleURLLoaderWrapper() = default;
|
|
|
|
void SimpleURLLoaderWrapper::OnAuthRequired(
|
|
const base::Optional<base::UnguessableToken>& window_id,
|
|
uint32_t request_id,
|
|
const GURL& url,
|
|
bool first_auth_attempt,
|
|
const net::AuthChallengeInfo& auth_info,
|
|
const scoped_refptr<net::HttpResponseHeaders>& head_headers,
|
|
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
|
|
auth_challenge_responder) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
mojo::Remote<network::mojom::AuthChallengeResponder> auth_responder(
|
|
std::move(auth_challenge_responder));
|
|
// WeakPtr because if we're Cancel()ed while waiting for auth, and the
|
|
// network service also decides to cancel at the same time and kill this
|
|
// pipe, we might end up trying to call Cancel again on dead memory.
|
|
auth_responder.set_disconnect_handler(base::BindOnce(
|
|
&SimpleURLLoaderWrapper::Cancel, weak_factory_.GetWeakPtr()));
|
|
auto cb = base::BindOnce(
|
|
[](mojo::Remote<network::mojom::AuthChallengeResponder> auth_responder,
|
|
gin::Arguments* args) {
|
|
std::u16string username_str, password_str;
|
|
if (!args->GetNext(&username_str) || !args->GetNext(&password_str)) {
|
|
auth_responder->OnAuthCredentials(base::nullopt);
|
|
return;
|
|
}
|
|
auth_responder->OnAuthCredentials(
|
|
net::AuthCredentials(username_str, password_str));
|
|
},
|
|
std::move(auth_responder));
|
|
Emit("login", auth_info, base::AdaptCallbackForRepeating(std::move(cb)));
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnSSLCertificateError(
|
|
const GURL& url,
|
|
int net_error,
|
|
const net::SSLInfo& ssl_info,
|
|
bool fatal,
|
|
OnSSLCertificateErrorCallback response) {
|
|
std::move(response).Run(net_error);
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnClearSiteData(const GURL& url,
|
|
const std::string& header_value,
|
|
int32_t load_flags,
|
|
OnClearSiteDataCallback callback) {
|
|
std::move(callback).Run();
|
|
}
|
|
void SimpleURLLoaderWrapper::OnLoadingStateUpdate(
|
|
network::mojom::LoadInfoPtr info,
|
|
OnLoadingStateUpdateCallback callback) {
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::Clone(
|
|
mojo::PendingReceiver<network::mojom::URLLoaderNetworkServiceObserver>
|
|
observer) {
|
|
url_loader_network_observer_receivers_.Add(this, std::move(observer));
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::Cancel() {
|
|
loader_.reset();
|
|
pinned_wrapper_.Reset();
|
|
pinned_chunk_pipe_getter_.Reset();
|
|
// This ensures that no further callbacks will be called, so there's no need
|
|
// for additional guards.
|
|
}
|
|
|
|
// static
|
|
gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
|
|
gin::Arguments* args) {
|
|
gin_helper::Dictionary opts;
|
|
if (!args->GetNext(&opts)) {
|
|
args->ThrowTypeError("Expected a dictionary");
|
|
return gin::Handle<SimpleURLLoaderWrapper>();
|
|
}
|
|
auto request = std::make_unique<network::ResourceRequest>();
|
|
opts.Get("method", &request->method);
|
|
opts.Get("url", &request->url);
|
|
request->site_for_cookies = net::SiteForCookies::FromUrl(request->url);
|
|
opts.Get("referrer", &request->referrer);
|
|
std::string origin;
|
|
opts.Get("origin", &origin);
|
|
if (!origin.empty()) {
|
|
request->request_initiator = url::Origin::Create(GURL(origin));
|
|
}
|
|
bool has_user_activation;
|
|
if (opts.Get("hasUserActivation", &has_user_activation)) {
|
|
request->trusted_params = network::ResourceRequest::TrustedParams();
|
|
request->trusted_params->has_user_activation = has_user_activation;
|
|
}
|
|
|
|
std::string mode;
|
|
if (opts.Get("mode", &mode) && !mode.empty()) {
|
|
if (mode == "navigate") {
|
|
request->mode = network::mojom::RequestMode::kNavigate;
|
|
} else if (mode == "cors") {
|
|
request->mode = network::mojom::RequestMode::kCors;
|
|
} else if (mode == "no-cors") {
|
|
request->mode = network::mojom::RequestMode::kNoCors;
|
|
} else if (mode == "same-origin") {
|
|
request->mode = network::mojom::RequestMode::kSameOrigin;
|
|
}
|
|
}
|
|
|
|
std::string destination;
|
|
if (opts.Get("destination", &destination) && !destination.empty()) {
|
|
if (destination == "empty") {
|
|
request->destination = network::mojom::RequestDestination::kEmpty;
|
|
} else if (destination == "audio") {
|
|
request->destination = network::mojom::RequestDestination::kAudio;
|
|
} else if (destination == "audioworklet") {
|
|
request->destination = network::mojom::RequestDestination::kAudioWorklet;
|
|
} else if (destination == "document") {
|
|
request->destination = network::mojom::RequestDestination::kDocument;
|
|
} else if (destination == "embed") {
|
|
request->destination = network::mojom::RequestDestination::kEmbed;
|
|
} else if (destination == "font") {
|
|
request->destination = network::mojom::RequestDestination::kFont;
|
|
} else if (destination == "frame") {
|
|
request->destination = network::mojom::RequestDestination::kFrame;
|
|
} else if (destination == "iframe") {
|
|
request->destination = network::mojom::RequestDestination::kIframe;
|
|
} else if (destination == "image") {
|
|
request->destination = network::mojom::RequestDestination::kImage;
|
|
} else if (destination == "manifest") {
|
|
request->destination = network::mojom::RequestDestination::kManifest;
|
|
} else if (destination == "object") {
|
|
request->destination = network::mojom::RequestDestination::kObject;
|
|
} else if (destination == "paintworklet") {
|
|
request->destination = network::mojom::RequestDestination::kPaintWorklet;
|
|
} else if (destination == "report") {
|
|
request->destination = network::mojom::RequestDestination::kReport;
|
|
} else if (destination == "script") {
|
|
request->destination = network::mojom::RequestDestination::kScript;
|
|
} else if (destination == "serviceworker") {
|
|
request->destination = network::mojom::RequestDestination::kServiceWorker;
|
|
} else if (destination == "style") {
|
|
request->destination = network::mojom::RequestDestination::kStyle;
|
|
} else if (destination == "track") {
|
|
request->destination = network::mojom::RequestDestination::kTrack;
|
|
} else if (destination == "video") {
|
|
request->destination = network::mojom::RequestDestination::kVideo;
|
|
} else if (destination == "worker") {
|
|
request->destination = network::mojom::RequestDestination::kWorker;
|
|
} else if (destination == "xslt") {
|
|
request->destination = network::mojom::RequestDestination::kXslt;
|
|
}
|
|
}
|
|
|
|
bool credentials_specified =
|
|
opts.Get("credentials", &request->credentials_mode);
|
|
std::vector<std::pair<std::string, std::string>> extra_headers;
|
|
if (opts.Get("extraHeaders", &extra_headers)) {
|
|
for (const auto& it : extra_headers) {
|
|
if (!net::HttpUtil::IsValidHeaderName(it.first) ||
|
|
!net::HttpUtil::IsValidHeaderValue(it.second)) {
|
|
args->ThrowTypeError("Invalid header name or value");
|
|
return gin::Handle<SimpleURLLoaderWrapper>();
|
|
}
|
|
request->headers.SetHeader(it.first, it.second);
|
|
}
|
|
}
|
|
|
|
bool use_session_cookies = false;
|
|
opts.Get("useSessionCookies", &use_session_cookies);
|
|
int options = 0;
|
|
if (!credentials_specified && !use_session_cookies) {
|
|
// This is the default case, as well as the case when credentials is not
|
|
// specified and useSessionCoookies is false. credentials_mode will be
|
|
// kInclude, but cookies will be blocked.
|
|
request->credentials_mode = network::mojom::CredentialsMode::kInclude;
|
|
options |= network::mojom::kURLLoadOptionBlockAllCookies;
|
|
}
|
|
|
|
// Chromium filters headers using browser rules, while for net module we have
|
|
// every header passed.
|
|
request->report_raw_headers = true;
|
|
|
|
v8::Local<v8::Value> body;
|
|
v8::Local<v8::Value> chunk_pipe_getter;
|
|
if (opts.Get("body", &body)) {
|
|
if (body->IsArrayBufferView()) {
|
|
auto buffer_body = body.As<v8::ArrayBufferView>();
|
|
auto backing_store = buffer_body->Buffer()->GetBackingStore();
|
|
request->request_body = network::ResourceRequestBody::CreateFromBytes(
|
|
static_cast<char*>(backing_store->Data()) + buffer_body->ByteOffset(),
|
|
buffer_body->ByteLength());
|
|
} else if (body->IsFunction()) {
|
|
auto body_func = body.As<v8::Function>();
|
|
|
|
mojo::PendingRemote<network::mojom::ChunkedDataPipeGetter>
|
|
data_pipe_getter;
|
|
chunk_pipe_getter = JSChunkedDataPipeGetter::Create(
|
|
args->isolate(), body_func,
|
|
data_pipe_getter.InitWithNewPipeAndPassReceiver())
|
|
.ToV8();
|
|
request->request_body =
|
|
base::MakeRefCounted<network::ResourceRequestBody>();
|
|
request->request_body->SetToChunkedDataPipe(
|
|
std::move(data_pipe_getter),
|
|
network::ResourceRequestBody::ReadOnlyOnce(false));
|
|
}
|
|
}
|
|
|
|
std::string partition;
|
|
gin::Handle<Session> session;
|
|
if (!opts.Get("session", &session)) {
|
|
if (opts.Get("partition", &partition))
|
|
session = Session::FromPartition(args->isolate(), partition);
|
|
else // default session
|
|
session = Session::FromPartition(args->isolate(), "");
|
|
}
|
|
|
|
auto url_loader_factory = session->browser_context()->GetURLLoaderFactory();
|
|
|
|
auto ret = gin::CreateHandle(
|
|
args->isolate(),
|
|
new SimpleURLLoaderWrapper(std::move(request), url_loader_factory.get(),
|
|
options));
|
|
ret->Pin();
|
|
if (!chunk_pipe_getter.IsEmpty()) {
|
|
ret->PinBodyGetter(chunk_pipe_getter);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnDataReceived(base::StringPiece string_piece,
|
|
base::OnceClosure resume) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
auto array_buffer = v8::ArrayBuffer::New(isolate, string_piece.size());
|
|
auto backing_store = array_buffer->GetBackingStore();
|
|
memcpy(backing_store->Data(), string_piece.data(), string_piece.size());
|
|
Emit("data", array_buffer,
|
|
base::AdaptCallbackForRepeating(std::move(resume)));
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnComplete(bool success) {
|
|
if (success) {
|
|
Emit("complete");
|
|
} else {
|
|
Emit("error", net::ErrorToString(loader_->NetError()));
|
|
}
|
|
loader_.reset();
|
|
pinned_wrapper_.Reset();
|
|
pinned_chunk_pipe_getter_.Reset();
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnRetry(base::OnceClosure start_retry) {}
|
|
|
|
void SimpleURLLoaderWrapper::OnResponseStarted(
|
|
const GURL& final_url,
|
|
const network::mojom::URLResponseHead& response_head) {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("statusCode", response_head.headers->response_code());
|
|
dict.Set("statusMessage", response_head.headers->GetStatusText());
|
|
dict.Set("httpVersion", response_head.headers->GetHttpVersion());
|
|
// Note that |response_head.headers| are filtered by Chromium and should not
|
|
// be used here.
|
|
DCHECK(response_head.raw_request_response_info);
|
|
dict.Set("rawHeaders",
|
|
response_head.raw_request_response_info->response_headers);
|
|
Emit("response-started", final_url, dict);
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnRedirect(
|
|
const net::RedirectInfo& redirect_info,
|
|
const network::mojom::URLResponseHead& response_head,
|
|
std::vector<std::string>* removed_headers) {
|
|
Emit("redirect", redirect_info, response_head.headers.get());
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnUploadProgress(uint64_t position,
|
|
uint64_t total) {
|
|
Emit("upload-progress", position, total);
|
|
}
|
|
|
|
void SimpleURLLoaderWrapper::OnDownloadProgress(uint64_t current) {
|
|
Emit("download-progress", current);
|
|
}
|
|
|
|
// static
|
|
gin::ObjectTemplateBuilder SimpleURLLoaderWrapper::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<
|
|
SimpleURLLoaderWrapper>::GetObjectTemplateBuilder(isolate)
|
|
.SetMethod("cancel", &SimpleURLLoaderWrapper::Cancel);
|
|
}
|
|
|
|
const char* SimpleURLLoaderWrapper::GetTypeName() {
|
|
return "SimpleURLLoaderWrapper";
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|