2019-04-23 21:39:21 +00:00
|
|
|
// Copyright (c) 2019 GitHub, Inc.
|
|
|
|
// Use of this source code is governed by the MIT license that can be
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
#include "shell/browser/net/electron_url_loader_factory.h"
|
2019-04-23 21:39:21 +00:00
|
|
|
|
2019-05-07 02:33:05 +00:00
|
|
|
#include <memory>
|
2019-04-23 21:39:21 +00:00
|
|
|
#include <string>
|
|
|
|
#include <utility>
|
|
|
|
|
2019-04-30 00:47:04 +00:00
|
|
|
#include "base/guid.h"
|
2020-10-06 00:53:13 +00:00
|
|
|
#include "base/strings/string_number_conversions.h"
|
2021-05-04 03:13:46 +00:00
|
|
|
#include "base/strings/stringprintf.h"
|
2019-04-23 21:39:21 +00:00
|
|
|
#include "content/public/browser/browser_thread.h"
|
2019-04-30 00:47:04 +00:00
|
|
|
#include "content/public/browser/storage_partition.h"
|
2019-07-24 22:58:51 +00:00
|
|
|
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
|
|
|
#include "mojo/public/cpp/system/string_data_source.h"
|
2019-04-29 02:37:45 +00:00
|
|
|
#include "net/base/filename_util.h"
|
2019-05-03 00:48:51 +00:00
|
|
|
#include "net/http/http_status_code.h"
|
2021-01-19 10:06:14 +00:00
|
|
|
#include "net/url_request/redirect_util.h"
|
2019-04-23 21:39:21 +00:00
|
|
|
#include "services/network/public/cpp/url_loader_completion_status.h"
|
2019-05-03 00:48:51 +00:00
|
|
|
#include "services/network/public/mojom/url_loader_factory.mojom.h"
|
2020-02-04 20:19:40 +00:00
|
|
|
#include "shell/browser/api/electron_api_session.h"
|
|
|
|
#include "shell/browser/electron_browser_context.h"
|
2019-06-19 20:46:59 +00:00
|
|
|
#include "shell/browser/net/asar/asar_url_loader.h"
|
|
|
|
#include "shell/browser/net/node_stream_loader.h"
|
|
|
|
#include "shell/browser/net/url_pipe_loader.h"
|
2020-02-04 20:19:40 +00:00
|
|
|
#include "shell/common/electron_constants.h"
|
2019-10-15 01:15:23 +00:00
|
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
|
|
#include "shell/common/gin_converters/gurl_converter.h"
|
|
|
|
#include "shell/common/gin_converters/net_converter.h"
|
2019-10-31 07:56:00 +00:00
|
|
|
#include "shell/common/gin_converters/value_converter.h"
|
2021-01-19 10:06:14 +00:00
|
|
|
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
|
2019-04-23 21:39:21 +00:00
|
|
|
|
2019-06-19 20:46:59 +00:00
|
|
|
#include "shell/common/node_includes.h"
|
2019-04-29 02:37:45 +00:00
|
|
|
|
2019-04-23 21:39:21 +00:00
|
|
|
using content::BrowserThread;
|
|
|
|
|
2019-10-15 01:15:23 +00:00
|
|
|
namespace gin {
|
2019-05-03 00:48:51 +00:00
|
|
|
|
|
|
|
template <>
|
2019-06-19 21:23:04 +00:00
|
|
|
struct Converter<electron::ProtocolType> {
|
2019-05-03 00:48:51 +00:00
|
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> val,
|
2019-06-19 21:23:04 +00:00
|
|
|
electron::ProtocolType* out) {
|
2019-05-03 00:48:51 +00:00
|
|
|
std::string type;
|
|
|
|
if (!ConvertFromV8(isolate, val, &type))
|
|
|
|
return false;
|
|
|
|
if (type == "buffer")
|
2019-06-19 21:23:04 +00:00
|
|
|
*out = electron::ProtocolType::kBuffer;
|
2019-05-03 00:48:51 +00:00
|
|
|
else if (type == "string")
|
2019-06-19 21:23:04 +00:00
|
|
|
*out = electron::ProtocolType::kString;
|
2019-05-03 00:48:51 +00:00
|
|
|
else if (type == "file")
|
2019-06-19 21:23:04 +00:00
|
|
|
*out = electron::ProtocolType::kFile;
|
2019-05-03 00:48:51 +00:00
|
|
|
else if (type == "http")
|
2019-06-19 21:23:04 +00:00
|
|
|
*out = electron::ProtocolType::kHttp;
|
2019-05-03 00:48:51 +00:00
|
|
|
else if (type == "stream")
|
2019-06-19 21:23:04 +00:00
|
|
|
*out = electron::ProtocolType::kStream;
|
2019-05-03 00:48:51 +00:00
|
|
|
else // note "free" is internal type, not allowed to be passed from user
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-10-15 01:15:23 +00:00
|
|
|
} // namespace gin
|
2019-05-03 00:48:51 +00:00
|
|
|
|
2019-06-19 21:23:04 +00:00
|
|
|
namespace electron {
|
2019-04-23 21:39:21 +00:00
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
// Determine whether a protocol type can accept non-object response.
|
|
|
|
bool ResponseMustBeObject(ProtocolType type) {
|
|
|
|
switch (type) {
|
|
|
|
case ProtocolType::kString:
|
|
|
|
case ProtocolType::kFile:
|
|
|
|
case ProtocolType::kFree:
|
|
|
|
return false;
|
|
|
|
default:
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Helper to convert value to Dictionary.
|
2019-10-15 01:15:23 +00:00
|
|
|
gin::Dictionary ToDict(v8::Isolate* isolate, v8::Local<v8::Value> value) {
|
2019-08-02 23:56:46 +00:00
|
|
|
if (!value->IsFunction() && value->IsObject())
|
2019-10-15 01:15:23 +00:00
|
|
|
return gin::Dictionary(
|
2019-05-03 00:48:51 +00:00
|
|
|
isolate,
|
|
|
|
value->ToObject(isolate->GetCurrentContext()).ToLocalChecked());
|
|
|
|
else
|
2019-10-15 01:15:23 +00:00
|
|
|
return gin::Dictionary(isolate);
|
2019-05-03 00:48:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Parse headers from response object.
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr ToResponseHead(
|
2019-10-15 01:15:23 +00:00
|
|
|
const gin_helper::Dictionary& dict) {
|
2019-12-13 20:13:12 +00:00
|
|
|
auto head = network::mojom::URLResponseHead::New();
|
|
|
|
head->mime_type = "text/html";
|
|
|
|
head->charset = "utf-8";
|
2019-05-07 02:33:05 +00:00
|
|
|
if (dict.IsEmpty()) {
|
2019-12-13 20:13:12 +00:00
|
|
|
head->headers = new net::HttpResponseHeaders("HTTP/1.1 200 OK");
|
2019-05-03 00:48:51 +00:00
|
|
|
return head;
|
2019-05-07 02:33:05 +00:00
|
|
|
}
|
2019-05-03 00:48:51 +00:00
|
|
|
|
|
|
|
int status_code = 200;
|
|
|
|
dict.Get("statusCode", &status_code);
|
2019-12-13 20:13:12 +00:00
|
|
|
head->headers = new net::HttpResponseHeaders(base::StringPrintf(
|
2019-05-03 00:48:51 +00:00
|
|
|
"HTTP/1.1 %d %s", status_code,
|
|
|
|
net::GetHttpReasonPhrase(static_cast<net::HttpStatusCode>(status_code))));
|
|
|
|
|
2019-12-13 20:13:12 +00:00
|
|
|
dict.Get("charset", &head->charset);
|
|
|
|
bool has_mime_type = dict.Get("mimeType", &head->mime_type);
|
2019-05-24 02:28:00 +00:00
|
|
|
bool has_content_type = false;
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
base::DictionaryValue headers;
|
|
|
|
if (dict.Get("headers", &headers)) {
|
|
|
|
for (const auto& iter : headers.DictItems()) {
|
2019-05-11 06:15:01 +00:00
|
|
|
if (iter.second.is_string()) {
|
2020-04-30 20:20:44 +00:00
|
|
|
// key, value
|
|
|
|
head->headers->AddHeader(iter.first, iter.second.GetString());
|
2019-05-11 06:15:01 +00:00
|
|
|
} else if (iter.second.is_list()) {
|
|
|
|
// key: [values...]
|
|
|
|
for (const auto& item : iter.second.GetList()) {
|
|
|
|
if (item.is_string())
|
2020-04-30 20:20:44 +00:00
|
|
|
head->headers->AddHeader(iter.first, item.GetString());
|
2019-05-11 06:15:01 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
continue;
|
|
|
|
}
|
2020-10-06 00:53:13 +00:00
|
|
|
auto header_name_lowercase = base::ToLowerASCII(iter.first);
|
|
|
|
|
|
|
|
if (header_name_lowercase == "content-type") {
|
|
|
|
// Some apps are passing content-type via headers, which is not accepted
|
|
|
|
// in NetworkService.
|
2019-12-13 20:13:12 +00:00
|
|
|
head->headers->GetMimeTypeAndCharset(&head->mime_type, &head->charset);
|
2019-05-24 02:28:00 +00:00
|
|
|
has_content_type = true;
|
2020-10-06 00:53:13 +00:00
|
|
|
} else if (header_name_lowercase == "content-length" &&
|
|
|
|
iter.second.is_string()) {
|
|
|
|
base::StringToInt64(iter.second.GetString(), &head->content_length);
|
2019-05-24 02:28:00 +00:00
|
|
|
}
|
2019-05-03 00:48:51 +00:00
|
|
|
}
|
|
|
|
}
|
2019-05-24 02:28:00 +00:00
|
|
|
|
2019-12-13 20:13:12 +00:00
|
|
|
// Setting |head->mime_type| does not automatically set the "content-type"
|
2019-05-24 02:28:00 +00:00
|
|
|
// header in NetworkService.
|
|
|
|
if (has_mime_type && !has_content_type)
|
2020-04-30 20:20:44 +00:00
|
|
|
head->headers->AddHeader("content-type", head->mime_type);
|
2019-05-03 00:48:51 +00:00
|
|
|
return head;
|
|
|
|
}
|
|
|
|
|
2019-05-07 02:33:05 +00:00
|
|
|
// Helper to write string to pipe.
|
|
|
|
struct WriteData {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client;
|
2019-05-07 02:33:05 +00:00
|
|
|
std::string data;
|
2019-07-24 22:58:51 +00:00
|
|
|
std::unique_ptr<mojo::DataPipeProducer> producer;
|
2019-05-07 02:33:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
void OnWrite(std::unique_ptr<WriteData> write_data, MojoResult result) {
|
2020-11-03 12:11:40 +00:00
|
|
|
network::URLLoaderCompletionStatus status(net::ERR_FAILED);
|
|
|
|
if (result == MOJO_RESULT_OK) {
|
|
|
|
status = network::URLLoaderCompletionStatus(net::OK);
|
|
|
|
status.encoded_data_length = write_data->data.size();
|
|
|
|
status.encoded_body_length = write_data->data.size();
|
|
|
|
status.decoded_body_length = write_data->data.size();
|
2019-05-07 02:33:05 +00:00
|
|
|
}
|
|
|
|
write_data->client->OnComplete(status);
|
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
} // namespace
|
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
// static
|
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory>
|
|
|
|
ElectronURLLoaderFactory::Create(ProtocolType type,
|
|
|
|
const ProtocolHandler& handler) {
|
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
|
|
|
|
|
|
|
|
// The ElectronURLLoaderFactory will delete itself when there are no more
|
|
|
|
// receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
|
|
|
|
new ElectronURLLoaderFactory(type, handler,
|
|
|
|
pending_remote.InitWithNewPipeAndPassReceiver());
|
|
|
|
|
|
|
|
return pending_remote;
|
|
|
|
}
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
ElectronURLLoaderFactory::ElectronURLLoaderFactory(
|
|
|
|
ProtocolType type,
|
2020-09-21 08:00:36 +00:00
|
|
|
const ProtocolHandler& handler,
|
|
|
|
mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
|
2021-03-04 17:27:05 +00:00
|
|
|
: network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
|
2020-09-21 08:00:36 +00:00
|
|
|
type_(type),
|
|
|
|
handler_(handler) {}
|
2019-04-23 21:39:21 +00:00
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
ElectronURLLoaderFactory::~ElectronURLLoaderFactory() = default;
|
2019-04-23 21:39:21 +00:00
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::CreateLoaderAndStart(
|
2019-11-05 23:41:20 +00:00
|
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
2019-04-23 21:39:21 +00:00
|
|
|
int32_t request_id,
|
|
|
|
uint32_t options,
|
|
|
|
const network::ResourceRequest& request,
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-04-23 21:39:21 +00:00
|
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
|
2019-04-29 02:37:45 +00:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2020-10-06 07:20:56 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory> proxy_factory;
|
chore: bump chromium to 92.0.4475.0 (master) (#28462)
* chore: bump chromium in DEPS to 91.0.4464.0
* chore: rebuild chromium/dcheck.patch with import-patches -3
Mechanical only; no code changes
* 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.
* chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch
Mechanical only; no code changes
* chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/ui_gtk_public_header.patch manually
no code changes
* chore: rebuild chromium/web_contents.patch with import-patches -3
Mechanical only; no code changes
* 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
* chore: export patches
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_
* 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
* 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
* 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
* 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
* 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.
* 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
* 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"
* 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.
* 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().
* refactor: stop using CallbackList; it has been removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973
* 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.
* 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.
* refactor: sync to upstream ParittionOptions churn
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
PartitionOptions' enums have changed.
* refactor: update Manifest::Location usage
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
tldr: s/Manifest::FOO/ManifestLocation::kFoo/
* chore: bump chromium in DEPS to 91.0.4465.0
* update patches
* refactor: update extensions::Manifest to upstream
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
- extensions::Manifest::COMPONENT
+ extensions::mojom::ManifestLocation::kExternalComponent
* 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
* 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.
* chore: use extensions::mojom::APIPermissionID
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122
tldr:
- extensions::APIPermission::kFoo
+ extensions::mojom::APIPermissionID::kFoo
* 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
* fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
* 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).
* 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.
* chore: use PartitionOptions's new Cookies field
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
* Revert "refactor: remove routing_id from CreateLoaderAndStart"
This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245.
8c9773b was only a partial fix; reverting to start & try again.
* update patches
* chore: bump chromium in DEPS to 91.0.4466.0
* chore: update chromium/accelerator.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472
tldr: sync patch with upstream renamed variable & macro names.
* 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!
* 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.
* 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.
* chore: export_all_patches
* 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.
* 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<>.
* 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
* refactor: remove routing_id from CreateLoaderAndStart pt 1
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
Part 1: the easiest ones
* 2796724: Support Python3
https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724
* chore: bump chromium in DEPS to 91.0.4468.0
* 2668974: WebShare: Implement SharingServicePicker
https://chromium-review.googlesource.com/c/chromium/src/+/2668974
* 2802766: Apply modernize-make-unique to media/
https://chromium-review.googlesource.com/c/chromium/src/+/2802766
* 2802823: Apply modernize-make-unique to gpu/
https://chromium-review.googlesource.com/c/chromium/src/+/2802823
* 2803041: Apply modernize-make-unique to remaining files
https://chromium-review.googlesource.com/c/chromium/src/+/2803041
* 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks
https://chromium-review.googlesource.com/c/chromium/src/+/2798873
* 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
* chore: update patch indices
* 2795107: Remove unused PermissionRequest IDs.
https://chromium-review.googlesource.com/c/chromium/src/+/2795107
* chore: bump chromium in DEPS to 91.0.4469.0
* chore: fixup patch indices
* chore: bump chromium in DEPS to 91.0.4469.5
* PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window
https://chromium-review.googlesource.com/c/chromium/src/+/2710023
* fixup! refactor: remove routing_id from CreateLoaderAndStart
* refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader
* fixup! chore: fixup patch indices
* 2724817: Expand scope of wasm-eval to all URLs
https://chromium-review.googlesource.com/c/chromium/src/+/2724817
* Fixup patch after rebase
* chore: bump chromium in DEPS to 91.0.4472.0
* 2797341: [ozone/x11] Enabled the global shortcut listener.
https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* 2805553: Reland Add GTK ColorMixers to ColorPipeline P1
https://chromium-review.googlesource.com/c/chromium/src/+/2805553
* 2804366: PiP 1.5: Label back to tab button with origin and center it
https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* 2784730: Fix crash on AX mode change in NativeViewHost without a Widget
https://chromium-review.googlesource.com/c/chromium/src/+/2784730
* chore: update patch indices
* 2810174: Add PdfAnnotationsEnabled policy.
https://chromium-review.googlesource.com/c/chromium/src/+/2810174
* 2807829: Allow capturers to indicate if they want a WakeLock or not.
https://chromium-review.googlesource.com/c/chromium/src/+/2807829
* chore: bump chromium in DEPS to 92.0.4473.0
* chore: bump chromium in DEPS to 92.0.4474.0
* chore: bump chromium in DEPS to 92.0.4475.0
* chore: update patches
* chore: updates patches
* chore: update is_media_key patch to handle new ozone impl
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* fix: ExecuteJavascript requests now need to be flagged as non-bf-aware
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195
* chore: icon_util_x11 is now icon_util_linux
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362
* build: update sysroots
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496
* 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
* chore: fix broken gtk_util color patch
* chore: remove patch conflict
* build: update linux manifests
* chore: build bttlb on all platforms for pip
* chore: add thread_pool include for views delegate win
* chore: fix lint
* chore: add node patches for V8 changes
* build: add missing base include on windows
* fix: update frame host manager patch for new state transitions
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464
* chore: update windows zip manifests
* chore: update mac zip manifests
* chore: fix patch linting
* refactor: implement missing URLLoaderNetworkServiceObserver methods
It is against The Mojo Rules to leave hanging callbacks. These always
have to be called.
Refs: https://github.com/electron/electron/commit/186528aab9f8e29d658f07d220bb7f627980edda
* spec: fix locale test on local linux
* fix: pass the exit code correctly in new PreMainMessageLoopRun
Refs: https://github.com/electron/electron/commit/2622e91c4493ceb032e2f80cb484885bb8f97475
* fix: ensure we early-exit when request_handler_ is not provided
Refs: https://github.com/electron/electron/commit/93077afbfb6db248a0c0cc447d7ad2c9ccfda1d5
* fix: strongly set result_code in the BrowserMainLoop
* 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: https://github.com/electron/electron/pull/28462/commits/4e33ee0ad35a710bd34641cb0376bdee6aea2d1f
* chore: fix gn check
* chore: remove stray .rej files in patch
* chore: add mojo error code to url loader failure
* build: ensure CI is truthy in arm test env
* fix: handle windowCaptureMacV2 being enabled when fetching media source id
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931
Co-authored-by: Charles Kerr <charles@charleskerr.com>
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>
2021-04-15 17:44:35 +00:00
|
|
|
handler_.Run(
|
|
|
|
request,
|
|
|
|
base::BindOnce(&ElectronURLLoaderFactory::StartLoading, std::move(loader),
|
|
|
|
request_id, options, request, std::move(client),
|
|
|
|
traffic_annotation, std::move(proxy_factory), type_));
|
2020-10-06 07:20:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// static
|
|
|
|
void ElectronURLLoaderFactory::OnComplete(
|
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
|
|
int32_t request_id,
|
|
|
|
const network::URLLoaderCompletionStatus& status) {
|
2020-10-27 19:20:41 +00:00
|
|
|
if (client.is_valid()) {
|
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
client_remote->OnComplete(status);
|
|
|
|
}
|
2019-05-03 00:48:51 +00:00
|
|
|
}
|
2019-04-29 02:37:45 +00:00
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::StartLoading(
|
2019-11-05 23:41:20 +00:00
|
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
2019-05-03 00:48:51 +00:00
|
|
|
int32_t request_id,
|
|
|
|
uint32_t options,
|
|
|
|
const network::ResourceRequest& request,
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-05-03 00:48:51 +00:00
|
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
|
2020-10-06 07:20:56 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory> proxy_factory,
|
2019-05-03 00:48:51 +00:00
|
|
|
ProtocolType type,
|
2019-10-15 01:15:23 +00:00
|
|
|
gin::Arguments* args) {
|
2019-05-24 02:28:00 +00:00
|
|
|
// Send network error when there is no argument passed.
|
|
|
|
//
|
|
|
|
// Note that we should not throw JS error in the callback no matter what is
|
|
|
|
// passed, to keep compatibility with old code.
|
|
|
|
v8::Local<v8::Value> response;
|
|
|
|
if (!args->GetNext(&response)) {
|
2020-10-06 07:20:56 +00:00
|
|
|
OnComplete(std::move(client), request_id,
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_NOT_IMPLEMENTED));
|
2019-05-24 02:28:00 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// Parse {error} object.
|
2019-10-15 01:15:23 +00:00
|
|
|
gin_helper::Dictionary dict = ToDict(args->isolate(), response);
|
2019-05-03 00:48:51 +00:00
|
|
|
if (!dict.IsEmpty()) {
|
|
|
|
int error_code;
|
|
|
|
if (dict.Get("error", &error_code)) {
|
2020-10-06 07:20:56 +00:00
|
|
|
OnComplete(std::move(client), request_id,
|
|
|
|
network::URLLoaderCompletionStatus(error_code));
|
2019-05-03 00:48:51 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr head = ToResponseHead(dict);
|
2019-05-28 06:08:50 +00:00
|
|
|
|
|
|
|
// Handle redirection.
|
|
|
|
//
|
|
|
|
// Note that with NetworkService, sending the "Location" header no longer
|
|
|
|
// automatically redirects the request, we have explicitly create a new loader
|
|
|
|
// to implement redirection. This is also what Chromium does with WebRequest
|
|
|
|
// API in WebRequestProxyingURLLoaderFactory.
|
|
|
|
std::string location;
|
2019-12-13 20:13:12 +00:00
|
|
|
if (head->headers->IsRedirect(&location)) {
|
2021-01-19 10:06:14 +00:00
|
|
|
// If the request is a MAIN_FRAME request, the first-party URL gets
|
|
|
|
// updated on redirects.
|
|
|
|
const net::RedirectInfo::FirstPartyURLPolicy first_party_url_policy =
|
|
|
|
request.resource_type ==
|
|
|
|
static_cast<int>(blink::mojom::ResourceType::kMainFrame)
|
|
|
|
? net::RedirectInfo::FirstPartyURLPolicy::UPDATE_URL_ON_REDIRECT
|
|
|
|
: net::RedirectInfo::FirstPartyURLPolicy::NEVER_CHANGE_URL;
|
|
|
|
|
|
|
|
net::RedirectInfo redirect_info = net::RedirectInfo::ComputeRedirectInfo(
|
|
|
|
request.method, request.url, request.site_for_cookies,
|
|
|
|
first_party_url_policy, request.referrer_policy,
|
|
|
|
request.referrer.GetAsReferrer().spec(), head->headers->response_code(),
|
|
|
|
request.url.Resolve(location),
|
|
|
|
net::RedirectUtil::GetReferrerPolicyHeader(head->headers.get()), false);
|
|
|
|
|
2019-05-28 06:08:50 +00:00
|
|
|
network::ResourceRequest new_request = request;
|
2021-01-19 10:06:14 +00:00
|
|
|
new_request.method = redirect_info.new_method;
|
|
|
|
new_request.url = redirect_info.new_url;
|
|
|
|
new_request.site_for_cookies = redirect_info.new_site_for_cookies;
|
|
|
|
new_request.referrer = GURL(redirect_info.new_referrer);
|
|
|
|
new_request.referrer_policy = redirect_info.new_referrer_policy;
|
|
|
|
|
|
|
|
DCHECK(client.is_valid());
|
|
|
|
|
2020-06-02 05:20:34 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
|
|
|
|
client_remote->OnReceiveRedirect(redirect_info, std::move(head));
|
|
|
|
|
2020-10-13 17:25:21 +00:00
|
|
|
// Unbound client, so it an be passed to sub-methods
|
2020-06-02 05:20:34 +00:00
|
|
|
client = client_remote.Unbind();
|
2019-05-28 06:08:50 +00:00
|
|
|
// When the redirection comes from an intercepted scheme (which has
|
2020-10-13 17:25:21 +00:00
|
|
|
// |proxy_factory| passed), we ask the proxy factory to create a loader
|
2019-05-28 06:08:50 +00:00
|
|
|
// for new URL, otherwise we call |StartLoadingHttp|, which creates
|
|
|
|
// loader with default factory.
|
|
|
|
//
|
|
|
|
// Note that when handling requests for intercepted scheme, creating loader
|
|
|
|
// with default factory (i.e. calling StartLoadingHttp) would bypass the
|
|
|
|
// ProxyingURLLoaderFactory, we have to explicitly use the proxy factory to
|
|
|
|
// create loader so it is possible to have handlers of intercepted scheme
|
|
|
|
// getting called recursively, which is a behavior expected in protocol
|
|
|
|
// module.
|
|
|
|
//
|
|
|
|
// I'm not sure whether this is an intended behavior in Chromium.
|
2020-10-27 19:20:41 +00:00
|
|
|
if (proxy_factory.is_valid()) {
|
|
|
|
mojo::Remote<network::mojom::URLLoaderFactory> proxy_factory_remote(
|
|
|
|
std::move(proxy_factory));
|
2020-10-06 07:20:56 +00:00
|
|
|
|
|
|
|
proxy_factory_remote->CreateLoaderAndStart(
|
chore: bump chromium to 92.0.4475.0 (master) (#28462)
* chore: bump chromium in DEPS to 91.0.4464.0
* chore: rebuild chromium/dcheck.patch with import-patches -3
Mechanical only; no code changes
* 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.
* chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch
Mechanical only; no code changes
* chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/ui_gtk_public_header.patch manually
no code changes
* chore: rebuild chromium/web_contents.patch with import-patches -3
Mechanical only; no code changes
* 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
* chore: export patches
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_
* 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
* 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
* 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
* 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
* 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.
* 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
* 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"
* 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.
* 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().
* refactor: stop using CallbackList; it has been removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973
* 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.
* 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.
* refactor: sync to upstream ParittionOptions churn
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
PartitionOptions' enums have changed.
* refactor: update Manifest::Location usage
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
tldr: s/Manifest::FOO/ManifestLocation::kFoo/
* chore: bump chromium in DEPS to 91.0.4465.0
* update patches
* refactor: update extensions::Manifest to upstream
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
- extensions::Manifest::COMPONENT
+ extensions::mojom::ManifestLocation::kExternalComponent
* 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
* 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.
* chore: use extensions::mojom::APIPermissionID
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122
tldr:
- extensions::APIPermission::kFoo
+ extensions::mojom::APIPermissionID::kFoo
* 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
* fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
* 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).
* 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.
* chore: use PartitionOptions's new Cookies field
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
* Revert "refactor: remove routing_id from CreateLoaderAndStart"
This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245.
8c9773b was only a partial fix; reverting to start & try again.
* update patches
* chore: bump chromium in DEPS to 91.0.4466.0
* chore: update chromium/accelerator.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472
tldr: sync patch with upstream renamed variable & macro names.
* 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!
* 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.
* 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.
* chore: export_all_patches
* 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.
* 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<>.
* 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
* refactor: remove routing_id from CreateLoaderAndStart pt 1
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
Part 1: the easiest ones
* 2796724: Support Python3
https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724
* chore: bump chromium in DEPS to 91.0.4468.0
* 2668974: WebShare: Implement SharingServicePicker
https://chromium-review.googlesource.com/c/chromium/src/+/2668974
* 2802766: Apply modernize-make-unique to media/
https://chromium-review.googlesource.com/c/chromium/src/+/2802766
* 2802823: Apply modernize-make-unique to gpu/
https://chromium-review.googlesource.com/c/chromium/src/+/2802823
* 2803041: Apply modernize-make-unique to remaining files
https://chromium-review.googlesource.com/c/chromium/src/+/2803041
* 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks
https://chromium-review.googlesource.com/c/chromium/src/+/2798873
* 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
* chore: update patch indices
* 2795107: Remove unused PermissionRequest IDs.
https://chromium-review.googlesource.com/c/chromium/src/+/2795107
* chore: bump chromium in DEPS to 91.0.4469.0
* chore: fixup patch indices
* chore: bump chromium in DEPS to 91.0.4469.5
* PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window
https://chromium-review.googlesource.com/c/chromium/src/+/2710023
* fixup! refactor: remove routing_id from CreateLoaderAndStart
* refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader
* fixup! chore: fixup patch indices
* 2724817: Expand scope of wasm-eval to all URLs
https://chromium-review.googlesource.com/c/chromium/src/+/2724817
* Fixup patch after rebase
* chore: bump chromium in DEPS to 91.0.4472.0
* 2797341: [ozone/x11] Enabled the global shortcut listener.
https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* 2805553: Reland Add GTK ColorMixers to ColorPipeline P1
https://chromium-review.googlesource.com/c/chromium/src/+/2805553
* 2804366: PiP 1.5: Label back to tab button with origin and center it
https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* 2784730: Fix crash on AX mode change in NativeViewHost without a Widget
https://chromium-review.googlesource.com/c/chromium/src/+/2784730
* chore: update patch indices
* 2810174: Add PdfAnnotationsEnabled policy.
https://chromium-review.googlesource.com/c/chromium/src/+/2810174
* 2807829: Allow capturers to indicate if they want a WakeLock or not.
https://chromium-review.googlesource.com/c/chromium/src/+/2807829
* chore: bump chromium in DEPS to 92.0.4473.0
* chore: bump chromium in DEPS to 92.0.4474.0
* chore: bump chromium in DEPS to 92.0.4475.0
* chore: update patches
* chore: updates patches
* chore: update is_media_key patch to handle new ozone impl
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* fix: ExecuteJavascript requests now need to be flagged as non-bf-aware
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195
* chore: icon_util_x11 is now icon_util_linux
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362
* build: update sysroots
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496
* 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
* chore: fix broken gtk_util color patch
* chore: remove patch conflict
* build: update linux manifests
* chore: build bttlb on all platforms for pip
* chore: add thread_pool include for views delegate win
* chore: fix lint
* chore: add node patches for V8 changes
* build: add missing base include on windows
* fix: update frame host manager patch for new state transitions
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464
* chore: update windows zip manifests
* chore: update mac zip manifests
* chore: fix patch linting
* refactor: implement missing URLLoaderNetworkServiceObserver methods
It is against The Mojo Rules to leave hanging callbacks. These always
have to be called.
Refs: https://github.com/electron/electron/commit/186528aab9f8e29d658f07d220bb7f627980edda
* spec: fix locale test on local linux
* fix: pass the exit code correctly in new PreMainMessageLoopRun
Refs: https://github.com/electron/electron/commit/2622e91c4493ceb032e2f80cb484885bb8f97475
* fix: ensure we early-exit when request_handler_ is not provided
Refs: https://github.com/electron/electron/commit/93077afbfb6db248a0c0cc447d7ad2c9ccfda1d5
* fix: strongly set result_code in the BrowserMainLoop
* 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: https://github.com/electron/electron/pull/28462/commits/4e33ee0ad35a710bd34641cb0376bdee6aea2d1f
* chore: fix gn check
* chore: remove stray .rej files in patch
* chore: add mojo error code to url loader failure
* build: ensure CI is truthy in arm test env
* fix: handle windowCaptureMacV2 being enabled when fetching media source id
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931
Co-authored-by: Charles Kerr <charles@charleskerr.com>
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>
2021-04-15 17:44:35 +00:00
|
|
|
std::move(loader), request_id, options, new_request,
|
2019-05-28 06:08:50 +00:00
|
|
|
std::move(client), traffic_annotation);
|
|
|
|
} else {
|
2019-06-11 05:07:58 +00:00
|
|
|
StartLoadingHttp(std::move(loader), new_request, std::move(client),
|
|
|
|
traffic_annotation,
|
2019-10-15 01:15:23 +00:00
|
|
|
gin::Dictionary::CreateEmpty(args->isolate()));
|
2019-05-28 06:08:50 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// Some protocol accepts non-object responses.
|
|
|
|
if (dict.IsEmpty() && ResponseMustBeObject(type)) {
|
2020-10-06 07:20:56 +00:00
|
|
|
OnComplete(std::move(client), request_id,
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_NOT_IMPLEMENTED));
|
2019-05-03 00:48:51 +00:00
|
|
|
return;
|
|
|
|
}
|
2019-04-29 02:37:45 +00:00
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
switch (type) {
|
2019-04-29 02:37:45 +00:00
|
|
|
case ProtocolType::kBuffer:
|
2019-05-28 06:08:50 +00:00
|
|
|
StartLoadingBuffer(std::move(client), std::move(head), dict);
|
2019-04-29 02:37:45 +00:00
|
|
|
break;
|
|
|
|
case ProtocolType::kString:
|
2019-05-28 06:08:50 +00:00
|
|
|
StartLoadingString(std::move(client), std::move(head), dict,
|
|
|
|
args->isolate(), response);
|
2019-04-29 02:37:45 +00:00
|
|
|
break;
|
|
|
|
case ProtocolType::kFile:
|
2019-05-28 06:08:50 +00:00
|
|
|
StartLoadingFile(std::move(loader), request, std::move(client),
|
|
|
|
std::move(head), dict, args->isolate(), response);
|
2019-04-29 02:37:45 +00:00
|
|
|
break;
|
2019-04-30 00:47:04 +00:00
|
|
|
case ProtocolType::kHttp:
|
2019-06-11 05:07:58 +00:00
|
|
|
StartLoadingHttp(std::move(loader), request, std::move(client),
|
|
|
|
traffic_annotation, dict);
|
2019-05-03 00:48:51 +00:00
|
|
|
break;
|
|
|
|
case ProtocolType::kStream:
|
2019-05-28 06:08:50 +00:00
|
|
|
StartLoadingStream(std::move(loader), std::move(client), std::move(head),
|
|
|
|
dict);
|
2019-05-03 00:48:51 +00:00
|
|
|
break;
|
|
|
|
case ProtocolType::kFree:
|
|
|
|
ProtocolType type;
|
2019-10-15 01:15:23 +00:00
|
|
|
if (!gin::ConvertFromV8(args->isolate(), response, &type)) {
|
2020-10-06 07:20:56 +00:00
|
|
|
OnComplete(std::move(client), request_id,
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
2019-05-03 00:48:51 +00:00
|
|
|
return;
|
|
|
|
}
|
chore: bump chromium to 92.0.4475.0 (master) (#28462)
* chore: bump chromium in DEPS to 91.0.4464.0
* chore: rebuild chromium/dcheck.patch with import-patches -3
Mechanical only; no code changes
* 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.
* chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch
Mechanical only; no code changes
* chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/ui_gtk_public_header.patch manually
no code changes
* chore: rebuild chromium/web_contents.patch with import-patches -3
Mechanical only; no code changes
* 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
* chore: export patches
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_
* 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
* 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
* 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
* 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
* 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.
* 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
* 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"
* 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.
* 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().
* refactor: stop using CallbackList; it has been removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973
* 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.
* 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.
* refactor: sync to upstream ParittionOptions churn
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
PartitionOptions' enums have changed.
* refactor: update Manifest::Location usage
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
tldr: s/Manifest::FOO/ManifestLocation::kFoo/
* chore: bump chromium in DEPS to 91.0.4465.0
* update patches
* refactor: update extensions::Manifest to upstream
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
- extensions::Manifest::COMPONENT
+ extensions::mojom::ManifestLocation::kExternalComponent
* 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
* 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.
* chore: use extensions::mojom::APIPermissionID
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122
tldr:
- extensions::APIPermission::kFoo
+ extensions::mojom::APIPermissionID::kFoo
* 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
* fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
* 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).
* 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.
* chore: use PartitionOptions's new Cookies field
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
* Revert "refactor: remove routing_id from CreateLoaderAndStart"
This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245.
8c9773b was only a partial fix; reverting to start & try again.
* update patches
* chore: bump chromium in DEPS to 91.0.4466.0
* chore: update chromium/accelerator.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472
tldr: sync patch with upstream renamed variable & macro names.
* 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!
* 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.
* 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.
* chore: export_all_patches
* 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.
* 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<>.
* 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
* refactor: remove routing_id from CreateLoaderAndStart pt 1
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
Part 1: the easiest ones
* 2796724: Support Python3
https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724
* chore: bump chromium in DEPS to 91.0.4468.0
* 2668974: WebShare: Implement SharingServicePicker
https://chromium-review.googlesource.com/c/chromium/src/+/2668974
* 2802766: Apply modernize-make-unique to media/
https://chromium-review.googlesource.com/c/chromium/src/+/2802766
* 2802823: Apply modernize-make-unique to gpu/
https://chromium-review.googlesource.com/c/chromium/src/+/2802823
* 2803041: Apply modernize-make-unique to remaining files
https://chromium-review.googlesource.com/c/chromium/src/+/2803041
* 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks
https://chromium-review.googlesource.com/c/chromium/src/+/2798873
* 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
* chore: update patch indices
* 2795107: Remove unused PermissionRequest IDs.
https://chromium-review.googlesource.com/c/chromium/src/+/2795107
* chore: bump chromium in DEPS to 91.0.4469.0
* chore: fixup patch indices
* chore: bump chromium in DEPS to 91.0.4469.5
* PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window
https://chromium-review.googlesource.com/c/chromium/src/+/2710023
* fixup! refactor: remove routing_id from CreateLoaderAndStart
* refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader
* fixup! chore: fixup patch indices
* 2724817: Expand scope of wasm-eval to all URLs
https://chromium-review.googlesource.com/c/chromium/src/+/2724817
* Fixup patch after rebase
* chore: bump chromium in DEPS to 91.0.4472.0
* 2797341: [ozone/x11] Enabled the global shortcut listener.
https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* 2805553: Reland Add GTK ColorMixers to ColorPipeline P1
https://chromium-review.googlesource.com/c/chromium/src/+/2805553
* 2804366: PiP 1.5: Label back to tab button with origin and center it
https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* 2784730: Fix crash on AX mode change in NativeViewHost without a Widget
https://chromium-review.googlesource.com/c/chromium/src/+/2784730
* chore: update patch indices
* 2810174: Add PdfAnnotationsEnabled policy.
https://chromium-review.googlesource.com/c/chromium/src/+/2810174
* 2807829: Allow capturers to indicate if they want a WakeLock or not.
https://chromium-review.googlesource.com/c/chromium/src/+/2807829
* chore: bump chromium in DEPS to 92.0.4473.0
* chore: bump chromium in DEPS to 92.0.4474.0
* chore: bump chromium in DEPS to 92.0.4475.0
* chore: update patches
* chore: updates patches
* chore: update is_media_key patch to handle new ozone impl
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* fix: ExecuteJavascript requests now need to be flagged as non-bf-aware
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195
* chore: icon_util_x11 is now icon_util_linux
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362
* build: update sysroots
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496
* 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
* chore: fix broken gtk_util color patch
* chore: remove patch conflict
* build: update linux manifests
* chore: build bttlb on all platforms for pip
* chore: add thread_pool include for views delegate win
* chore: fix lint
* chore: add node patches for V8 changes
* build: add missing base include on windows
* fix: update frame host manager patch for new state transitions
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464
* chore: update windows zip manifests
* chore: update mac zip manifests
* chore: fix patch linting
* refactor: implement missing URLLoaderNetworkServiceObserver methods
It is against The Mojo Rules to leave hanging callbacks. These always
have to be called.
Refs: https://github.com/electron/electron/commit/186528aab9f8e29d658f07d220bb7f627980edda
* spec: fix locale test on local linux
* fix: pass the exit code correctly in new PreMainMessageLoopRun
Refs: https://github.com/electron/electron/commit/2622e91c4493ceb032e2f80cb484885bb8f97475
* fix: ensure we early-exit when request_handler_ is not provided
Refs: https://github.com/electron/electron/commit/93077afbfb6db248a0c0cc447d7ad2c9ccfda1d5
* fix: strongly set result_code in the BrowserMainLoop
* 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: https://github.com/electron/electron/pull/28462/commits/4e33ee0ad35a710bd34641cb0376bdee6aea2d1f
* chore: fix gn check
* chore: remove stray .rej files in patch
* chore: add mojo error code to url loader failure
* build: ensure CI is truthy in arm test env
* fix: handle windowCaptureMacV2 being enabled when fetching media source id
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931
Co-authored-by: Charles Kerr <charles@charleskerr.com>
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>
2021-04-15 17:44:35 +00:00
|
|
|
StartLoading(std::move(loader), request_id, options, request,
|
2020-10-06 07:20:56 +00:00
|
|
|
std::move(client), traffic_annotation,
|
|
|
|
std::move(proxy_factory), type, args);
|
2019-04-30 00:47:04 +00:00
|
|
|
break;
|
2019-04-29 02:37:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::StartLoadingBuffer(
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr head,
|
2019-10-15 01:15:23 +00:00
|
|
|
const gin_helper::Dictionary& dict) {
|
2019-05-03 00:48:51 +00:00
|
|
|
v8::Local<v8::Value> buffer = dict.GetHandle();
|
|
|
|
dict.Get("data", &buffer);
|
|
|
|
if (!node::Buffer::HasInstance(buffer)) {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
client_remote->OnComplete(
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
2019-04-29 02:37:45 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-07 02:33:05 +00:00
|
|
|
SendContents(
|
2019-05-28 06:08:50 +00:00
|
|
|
std::move(client), std::move(head),
|
2019-05-07 02:33:05 +00:00
|
|
|
std::string(node::Buffer::Data(buffer), node::Buffer::Length(buffer)));
|
2019-04-29 02:37:45 +00:00
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::StartLoadingString(
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr head,
|
2019-10-15 01:15:23 +00:00
|
|
|
const gin_helper::Dictionary& dict,
|
2019-04-29 02:37:45 +00:00
|
|
|
v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> response) {
|
|
|
|
std::string contents;
|
2019-08-02 23:56:46 +00:00
|
|
|
if (response->IsString()) {
|
2019-04-29 02:37:45 +00:00
|
|
|
contents = gin::V8ToString(isolate, response);
|
2019-08-02 23:56:46 +00:00
|
|
|
} else if (!dict.IsEmpty()) {
|
2019-04-29 02:37:45 +00:00
|
|
|
dict.Get("data", &contents);
|
2019-08-02 23:56:46 +00:00
|
|
|
} else {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
client_remote->OnComplete(
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
2019-08-02 23:56:46 +00:00
|
|
|
return;
|
|
|
|
}
|
2019-05-03 00:48:51 +00:00
|
|
|
|
2019-05-28 06:08:50 +00:00
|
|
|
SendContents(std::move(client), std::move(head), std::move(contents));
|
2019-04-29 02:37:45 +00:00
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::StartLoadingFile(
|
2019-11-05 23:41:20 +00:00
|
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
2019-04-29 02:37:45 +00:00
|
|
|
network::ResourceRequest request,
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr head,
|
2019-10-15 01:15:23 +00:00
|
|
|
const gin_helper::Dictionary& dict,
|
2019-04-29 02:37:45 +00:00
|
|
|
v8::Isolate* isolate,
|
|
|
|
v8::Local<v8::Value> response) {
|
|
|
|
base::FilePath path;
|
2019-10-15 01:15:23 +00:00
|
|
|
if (gin::ConvertFromV8(isolate, response, &path)) {
|
2019-04-30 00:47:04 +00:00
|
|
|
request.url = net::FilePathToFileURL(path);
|
2019-05-03 00:48:51 +00:00
|
|
|
} else if (!dict.IsEmpty()) {
|
2019-04-30 00:47:04 +00:00
|
|
|
dict.Get("referrer", &request.referrer);
|
|
|
|
dict.Get("method", &request.method);
|
|
|
|
if (dict.Get("path", &path))
|
|
|
|
request.url = net::FilePathToFileURL(path);
|
|
|
|
} else {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
client_remote->OnComplete(
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
2019-04-29 02:37:45 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-04-30 20:20:44 +00:00
|
|
|
// Add header to ignore CORS.
|
|
|
|
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
|
2019-05-14 23:29:58 +00:00
|
|
|
asar::CreateAsarURLLoader(request, std::move(loader), std::move(client),
|
2019-12-13 20:13:12 +00:00
|
|
|
head->headers);
|
2019-04-30 00:47:04 +00:00
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::StartLoadingHttp(
|
2019-11-05 23:41:20 +00:00
|
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
2019-04-30 00:47:04 +00:00
|
|
|
const network::ResourceRequest& original_request,
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-04-30 00:47:04 +00:00
|
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
|
2019-10-15 01:15:23 +00:00
|
|
|
const gin_helper::Dictionary& dict) {
|
2019-06-11 05:07:58 +00:00
|
|
|
auto request = std::make_unique<network::ResourceRequest>();
|
|
|
|
request->headers = original_request.headers;
|
|
|
|
request->cors_exempt_headers = original_request.cors_exempt_headers;
|
2019-04-30 00:47:04 +00:00
|
|
|
|
2019-06-11 05:07:58 +00:00
|
|
|
dict.Get("url", &request->url);
|
|
|
|
dict.Get("referrer", &request->referrer);
|
|
|
|
if (!dict.Get("method", &request->method))
|
|
|
|
request->method = original_request.method;
|
2019-04-30 00:47:04 +00:00
|
|
|
|
2019-06-11 23:37:06 +00:00
|
|
|
base::DictionaryValue upload_data;
|
|
|
|
if (request->method != "GET" && request->method != "HEAD")
|
|
|
|
dict.Get("uploadData", &upload_data);
|
|
|
|
|
2020-08-17 20:21:53 +00:00
|
|
|
ElectronBrowserContext* browser_context =
|
2020-02-04 20:19:40 +00:00
|
|
|
ElectronBrowserContext::From("", false);
|
2019-04-30 00:47:04 +00:00
|
|
|
v8::Local<v8::Value> value;
|
|
|
|
if (dict.Get("session", &value)) {
|
|
|
|
if (value->IsNull()) {
|
2020-02-04 20:19:40 +00:00
|
|
|
browser_context =
|
|
|
|
ElectronBrowserContext::From(base::GenerateGUID(), true);
|
2019-04-30 00:47:04 +00:00
|
|
|
} else {
|
2019-10-25 13:03:28 +00:00
|
|
|
gin::Handle<api::Session> session;
|
|
|
|
if (gin::ConvertFromV8(dict.isolate(), value, &session) &&
|
2019-05-03 00:48:51 +00:00
|
|
|
!session.IsEmpty()) {
|
2019-04-30 00:47:04 +00:00
|
|
|
browser_context = session->browser_context();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-11 05:07:58 +00:00
|
|
|
new URLPipeLoader(
|
2019-08-29 06:07:46 +00:00
|
|
|
browser_context->GetURLLoaderFactory(), std::move(request),
|
|
|
|
std::move(loader), std::move(client),
|
2019-06-11 23:37:06 +00:00
|
|
|
static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
|
|
|
|
std::move(upload_data));
|
2019-04-29 02:37:45 +00:00
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::StartLoadingStream(
|
2019-11-05 23:41:20 +00:00
|
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr head,
|
2019-10-15 01:15:23 +00:00
|
|
|
const gin_helper::Dictionary& dict) {
|
2019-05-03 00:48:51 +00:00
|
|
|
v8::Local<v8::Value> stream;
|
|
|
|
if (!dict.Get("data", &stream)) {
|
|
|
|
// Assume the opts is already a stream.
|
|
|
|
stream = dict.GetHandle();
|
|
|
|
} else if (stream->IsNullOrUndefined()) {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
2019-05-03 00:48:51 +00:00
|
|
|
// "data" was explicitly passed as null or undefined, assume the user wants
|
|
|
|
// to send an empty body.
|
2019-05-11 06:15:01 +00:00
|
|
|
//
|
|
|
|
// Note that We must submit a empty body otherwise NetworkService would
|
|
|
|
// crash.
|
2019-12-13 20:13:12 +00:00
|
|
|
client_remote->OnReceiveResponse(std::move(head));
|
2019-05-11 06:15:01 +00:00
|
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
2021-03-06 00:42:15 +00:00
|
|
|
if (mojo::CreateDataPipe(nullptr, producer, consumer) != MOJO_RESULT_OK) {
|
2019-12-11 00:22:35 +00:00
|
|
|
client_remote->OnComplete(
|
2019-05-11 06:15:01 +00:00
|
|
|
network::URLLoaderCompletionStatus(net::ERR_INSUFFICIENT_RESOURCES));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
producer.reset(); // The data pipe is empty.
|
2019-12-11 00:22:35 +00:00
|
|
|
client_remote->OnStartLoadingResponseBody(std::move(consumer));
|
|
|
|
client_remote->OnComplete(network::URLLoaderCompletionStatus(net::OK));
|
2019-05-03 00:48:51 +00:00
|
|
|
return;
|
|
|
|
} else if (!stream->IsObject()) {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
client_remote->OnComplete(
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
2019-05-03 00:48:51 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-15 01:15:23 +00:00
|
|
|
gin_helper::Dictionary data = ToDict(dict.isolate(), stream);
|
2019-05-03 00:48:51 +00:00
|
|
|
v8::Local<v8::Value> method;
|
|
|
|
if (!data.Get("on", &method) || !method->IsFunction() ||
|
|
|
|
!data.Get("removeListener", &method) || !method->IsFunction()) {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
|
|
|
client_remote->OnComplete(
|
|
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
2019-05-03 00:48:51 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
new NodeStreamLoader(std::move(head), std::move(loader), std::move(client),
|
|
|
|
data.isolate(), data.GetHandle());
|
2019-04-29 02:37:45 +00:00
|
|
|
}
|
|
|
|
|
2019-05-03 00:48:51 +00:00
|
|
|
// static
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronURLLoaderFactory::SendContents(
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
2019-12-13 20:13:12 +00:00
|
|
|
network::mojom::URLResponseHeadPtr head,
|
2019-05-07 02:33:05 +00:00
|
|
|
std::string data) {
|
2019-12-11 00:22:35 +00:00
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
|
|
std::move(client));
|
2020-04-30 20:20:44 +00:00
|
|
|
|
|
|
|
// Add header to ignore CORS.
|
|
|
|
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
|
2019-12-13 20:13:12 +00:00
|
|
|
client_remote->OnReceiveResponse(std::move(head));
|
2019-05-07 02:33:05 +00:00
|
|
|
|
|
|
|
// Code bellow follows the pattern of data_url_loader_factory.cc.
|
|
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
2021-03-06 00:42:15 +00:00
|
|
|
if (mojo::CreateDataPipe(nullptr, producer, consumer) != MOJO_RESULT_OK) {
|
2019-12-11 00:22:35 +00:00
|
|
|
client_remote->OnComplete(
|
2019-05-07 02:33:05 +00:00
|
|
|
network::URLLoaderCompletionStatus(net::ERR_INSUFFICIENT_RESOURCES));
|
2019-04-23 21:39:21 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-12-11 00:22:35 +00:00
|
|
|
client_remote->OnStartLoadingResponseBody(std::move(consumer));
|
2019-05-07 02:33:05 +00:00
|
|
|
|
|
|
|
auto write_data = std::make_unique<WriteData>();
|
2019-12-11 00:22:35 +00:00
|
|
|
write_data->client = std::move(client_remote);
|
2019-05-07 02:33:05 +00:00
|
|
|
write_data->data = std::move(data);
|
|
|
|
write_data->producer =
|
2019-07-24 22:58:51 +00:00
|
|
|
std::make_unique<mojo::DataPipeProducer>(std::move(producer));
|
2020-10-26 18:56:08 +00:00
|
|
|
auto* producer_ptr = write_data->producer.get();
|
2019-05-07 02:33:05 +00:00
|
|
|
|
|
|
|
base::StringPiece string_piece(write_data->data);
|
2020-10-26 18:56:08 +00:00
|
|
|
producer_ptr->Write(
|
2019-07-24 22:58:51 +00:00
|
|
|
std::make_unique<mojo::StringDataSource>(
|
|
|
|
string_piece, mojo::StringDataSource::AsyncWritingMode::
|
|
|
|
STRING_STAYS_VALID_UNTIL_COMPLETION),
|
|
|
|
base::BindOnce(OnWrite, std::move(write_data)));
|
2019-04-23 21:39:21 +00:00
|
|
|
}
|
|
|
|
|
2019-06-19 21:23:04 +00:00
|
|
|
} // namespace electron
|