mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
778 lines
30 KiB
C++
778 lines
30 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/net/electron_url_loader_factory.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/containers/fixed_flat_map.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "base/values.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/storage_partition.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
#include "mojo/public/cpp/bindings/receiver.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
|
#include "mojo/public/cpp/system/string_data_source.h"
|
|
#include "net/base/filename_util.h"
|
|
#include "net/http/http_request_headers.h"
|
|
#include "net/http/http_status_code.h"
|
|
#include "net/url_request/redirect_util.h"
|
|
#include "services/network/public/cpp/resource_request.h"
|
|
#include "services/network/public/cpp/shared_url_loader_factory.h"
|
|
#include "services/network/public/cpp/simple_url_loader.h"
|
|
#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
|
|
#include "services/network/public/cpp/url_loader_completion_status.h"
|
|
#include "services/network/public/mojom/url_loader.mojom.h"
|
|
#include "services/network/public/mojom/url_loader_factory.mojom.h"
|
|
#include "services/network/public/mojom/url_response_head.mojom.h"
|
|
#include "shell/browser/api/electron_api_session.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/net/asar/asar_url_loader.h"
|
|
#include "shell/browser/net/node_stream_loader.h"
|
|
#include "shell/common/electron_constants.h"
|
|
#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"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "third_party/abseil-cpp/absl/strings/str_format.h"
|
|
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
|
|
|
|
#include "shell/common/node_includes.h"
|
|
|
|
using content::BrowserThread;
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<electron::ProtocolType> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
electron::ProtocolType* out) {
|
|
using Val = electron::ProtocolType;
|
|
static constexpr auto Lookup =
|
|
base::MakeFixedFlatMap<std::string_view, Val>({
|
|
// note "free" is internal type, not allowed to be passed from user
|
|
{"buffer", Val::kBuffer},
|
|
{"file", Val::kFile},
|
|
{"http", Val::kHttp},
|
|
{"stream", Val::kStream},
|
|
{"string", Val::kString},
|
|
});
|
|
return FromV8WithLookup(isolate, val, Lookup, out);
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
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;
|
|
}
|
|
}
|
|
|
|
bool LooksLikeStream(v8::Isolate* isolate, v8::Local<v8::Value> v) {
|
|
// the stream loader can handle null and undefined as "empty body". Could
|
|
// probably be more efficient here but this works.
|
|
if (v->IsNullOrUndefined())
|
|
return true;
|
|
if (!v->IsObject())
|
|
return false;
|
|
gin_helper::Dictionary dict(isolate, v.As<v8::Object>());
|
|
v8::Local<v8::Value> method;
|
|
return dict.Get("on", &method) && method->IsFunction() &&
|
|
dict.Get("removeListener", &method) && method->IsFunction();
|
|
}
|
|
|
|
// Helper to convert value to Dictionary.
|
|
gin::Dictionary ToDict(v8::Isolate* isolate, v8::Local<v8::Value> value) {
|
|
if (!value->IsFunction() && value->IsObject())
|
|
return gin::Dictionary(
|
|
isolate,
|
|
value->ToObject(isolate->GetCurrentContext()).ToLocalChecked());
|
|
else
|
|
return gin::Dictionary(isolate);
|
|
}
|
|
|
|
// Parse headers from response object.
|
|
network::mojom::URLResponseHeadPtr ToResponseHead(
|
|
const gin_helper::Dictionary& dict) {
|
|
auto head = network::mojom::URLResponseHead::New();
|
|
head->mime_type = "text/html";
|
|
head->charset = "utf-8";
|
|
if (dict.IsEmpty()) {
|
|
head->headers =
|
|
base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/1.1 200 OK");
|
|
return head;
|
|
}
|
|
|
|
const int status_code =
|
|
dict.ValueOrDefault("statusCode", static_cast<int>(net::HTTP_OK));
|
|
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(
|
|
absl::StrFormat("HTTP/1.1 %d %s", status_code,
|
|
net::GetHttpReasonPhrase(
|
|
static_cast<net::HttpStatusCode>(status_code))));
|
|
|
|
dict.Get("charset", &head->charset);
|
|
bool has_mime_type = dict.Get("mimeType", &head->mime_type);
|
|
bool has_content_type = false;
|
|
|
|
base::DictValue headers;
|
|
if (dict.Get("headers", &headers)) {
|
|
for (const auto iter : headers) {
|
|
if (iter.second.is_string()) {
|
|
// key, value
|
|
head->headers->AddHeader(iter.first, iter.second.GetString());
|
|
} else if (iter.second.is_list()) {
|
|
// key: [values...]
|
|
for (const auto& item : iter.second.GetList()) {
|
|
if (item.is_string())
|
|
head->headers->AddHeader(iter.first, item.GetString());
|
|
}
|
|
} else {
|
|
continue;
|
|
}
|
|
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.
|
|
head->headers->GetMimeTypeAndCharset(&head->mime_type, &head->charset);
|
|
has_content_type = true;
|
|
} else if (header_name_lowercase == "content-length" &&
|
|
iter.second.is_string()) {
|
|
base::StringToInt64(iter.second.GetString(), &head->content_length);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Setting |head->mime_type| does not automatically set the "content-type"
|
|
// header in NetworkService.
|
|
if (has_mime_type && !has_content_type)
|
|
head->headers->AddHeader("content-type", head->mime_type);
|
|
return head;
|
|
}
|
|
|
|
// Helper to write string to pipe.
|
|
struct WriteData {
|
|
mojo::Remote<network::mojom::URLLoaderClient> client;
|
|
std::string data;
|
|
std::unique_ptr<mojo::DataPipeProducer> producer;
|
|
};
|
|
|
|
void OnWrite(std::unique_ptr<WriteData> write_data, MojoResult result) {
|
|
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();
|
|
}
|
|
write_data->client->OnComplete(status);
|
|
}
|
|
|
|
// Read data from URL and pipe it to NetworkService.
|
|
//
|
|
// Different from creating a new loader for the URL directly, protocol handlers
|
|
// using this loader can work around CORS restrictions.
|
|
//
|
|
// This class manages its own lifetime and should delete itself when the
|
|
// connection is lost or finished.
|
|
class URLPipeLoader : public network::mojom::URLLoader,
|
|
public network::SimpleURLLoaderStreamConsumer {
|
|
public:
|
|
URLPipeLoader(scoped_refptr<network::SharedURLLoaderFactory> factory,
|
|
std::unique_ptr<network::ResourceRequest> request,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
const net::NetworkTrafficAnnotationTag& annotation,
|
|
base::DictValue upload_data)
|
|
: url_loader_(this, std::move(loader)), client_(std::move(client)) {
|
|
url_loader_.set_disconnect_handler(
|
|
base::BindOnce(&URLPipeLoader::NotifyComplete, base::Unretained(this),
|
|
net::ERR_FAILED));
|
|
|
|
// PostTask since it might destruct.
|
|
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(&URLPipeLoader::Start, weak_factory_.GetWeakPtr(),
|
|
factory, std::move(request), annotation,
|
|
std::move(upload_data)));
|
|
}
|
|
|
|
// disable copy
|
|
URLPipeLoader(const URLPipeLoader&) = delete;
|
|
URLPipeLoader& operator=(const URLPipeLoader&) = delete;
|
|
|
|
private:
|
|
~URLPipeLoader() override = default;
|
|
|
|
void Start(scoped_refptr<network::SharedURLLoaderFactory> factory,
|
|
std::unique_ptr<network::ResourceRequest> request,
|
|
const net::NetworkTrafficAnnotationTag& annotation,
|
|
base::DictValue upload_data) {
|
|
loader_ = network::SimpleURLLoader::Create(std::move(request), annotation);
|
|
loader_->SetOnResponseStartedCallback(base::BindOnce(
|
|
&URLPipeLoader::OnResponseStarted, weak_factory_.GetWeakPtr()));
|
|
|
|
// TODO(zcbenz): The old protocol API only supports string as upload data,
|
|
// we should seek to support more types in future.
|
|
std::string* content_type = upload_data.FindString("contentType");
|
|
std::string* data = upload_data.FindString("data");
|
|
if (content_type && data)
|
|
loader_->AttachStringForUpload(*data, *content_type);
|
|
|
|
loader_->DownloadAsStream(factory.get(), this);
|
|
}
|
|
|
|
void NotifyComplete(int result) {
|
|
client_->OnComplete(network::URLLoaderCompletionStatus(result));
|
|
delete this;
|
|
}
|
|
|
|
void OnResponseStarted(const GURL& final_url,
|
|
const network::mojom::URLResponseHead& response_head) {
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
|
MojoResult rv = mojo::CreateDataPipe(nullptr, producer, consumer);
|
|
if (rv != MOJO_RESULT_OK) {
|
|
NotifyComplete(net::ERR_INSUFFICIENT_RESOURCES);
|
|
return;
|
|
}
|
|
|
|
producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
|
|
|
|
client_->OnReceiveResponse(response_head.Clone(), std::move(consumer),
|
|
std::nullopt);
|
|
}
|
|
|
|
void OnWrite(base::OnceClosure resume, MojoResult result) {
|
|
if (result == MOJO_RESULT_OK)
|
|
std::move(resume).Run();
|
|
else
|
|
NotifyComplete(net::ERR_FAILED);
|
|
}
|
|
|
|
// SimpleURLLoaderStreamConsumer:
|
|
void OnDataReceived(std::string_view string_view,
|
|
base::OnceClosure resume) override {
|
|
producer_->Write(
|
|
std::make_unique<mojo::StringDataSource>(
|
|
string_view, mojo::StringDataSource::AsyncWritingMode::
|
|
STRING_MAY_BE_INVALIDATED_BEFORE_COMPLETION),
|
|
base::BindOnce(&URLPipeLoader::OnWrite, weak_factory_.GetWeakPtr(),
|
|
std::move(resume)));
|
|
}
|
|
|
|
void OnComplete(bool success) override {
|
|
NotifyComplete(loader_->NetError());
|
|
}
|
|
void OnRetry(base::OnceClosure start_retry) override { NOTREACHED(); }
|
|
|
|
// URLLoader:
|
|
void FollowRedirect(
|
|
const std::vector<std::string>& removed_headers,
|
|
const net::HttpRequestHeaders& modified_headers,
|
|
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
|
const std::optional<GURL>& new_url) override {}
|
|
void SetPriority(net::RequestPriority priority,
|
|
int32_t intra_priority_value) override {}
|
|
|
|
mojo::Receiver<network::mojom::URLLoader> url_loader_;
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_;
|
|
|
|
std::unique_ptr<mojo::DataPipeProducer> producer_;
|
|
std::unique_ptr<network::SimpleURLLoader> loader_;
|
|
|
|
base::WeakPtrFactory<URLPipeLoader> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace
|
|
|
|
ElectronURLLoaderFactory::RedirectedRequest::RedirectedRequest(
|
|
const net::RedirectInfo& redirect_info,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader_receiver,
|
|
int32_t request_id,
|
|
uint32_t options,
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_remote)
|
|
: redirect_info_(redirect_info),
|
|
request_id_(request_id),
|
|
options_(options),
|
|
request_(request),
|
|
client_(std::move(client)),
|
|
traffic_annotation_(traffic_annotation) {
|
|
loader_receiver_.Bind(std::move(loader_receiver));
|
|
loader_receiver_.set_disconnect_handler(
|
|
base::BindOnce(&ElectronURLLoaderFactory::RedirectedRequest::DeleteThis,
|
|
base::Unretained(this)));
|
|
target_factory_remote_.Bind(std::move(target_factory_remote));
|
|
target_factory_remote_.set_disconnect_handler(base::BindOnce(
|
|
&ElectronURLLoaderFactory::RedirectedRequest::OnTargetFactoryError,
|
|
base::Unretained(this)));
|
|
}
|
|
|
|
ElectronURLLoaderFactory::RedirectedRequest::~RedirectedRequest() = default;
|
|
|
|
void ElectronURLLoaderFactory::RedirectedRequest::FollowRedirect(
|
|
const std::vector<std::string>& removed_headers,
|
|
const net::HttpRequestHeaders& modified_headers,
|
|
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
|
const std::optional<GURL>& new_url) {
|
|
// Update |request_| with info from the redirect, so that it's accurate
|
|
// The following references code in WorkerScriptLoader::FollowRedirect
|
|
bool should_clear_upload = false;
|
|
net::RedirectUtil::UpdateHttpRequest(
|
|
request_.url, request_.method, redirect_info_, removed_headers,
|
|
modified_headers, &request_.headers, &should_clear_upload);
|
|
request_.cors_exempt_headers.MergeFrom(modified_cors_exempt_headers);
|
|
for (const std::string& name : removed_headers)
|
|
request_.cors_exempt_headers.RemoveHeader(name);
|
|
|
|
if (should_clear_upload)
|
|
request_.request_body = nullptr;
|
|
|
|
request_.url = redirect_info_.new_url;
|
|
request_.method = redirect_info_.new_method;
|
|
request_.site_for_cookies = redirect_info_.new_site_for_cookies;
|
|
request_.referrer = GURL(redirect_info_.new_referrer);
|
|
request_.referrer_policy = redirect_info_.new_referrer_policy;
|
|
|
|
// Create a new loader to process the redirect and destroy this one
|
|
target_factory_remote_->CreateLoaderAndStart(
|
|
loader_receiver_.Unbind(), request_id_, options_, request_,
|
|
std::move(client_), traffic_annotation_);
|
|
|
|
DeleteThis();
|
|
}
|
|
|
|
void ElectronURLLoaderFactory::RedirectedRequest::OnTargetFactoryError() {
|
|
// Can't create a new loader at this point, so the request can't continue
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client_));
|
|
client_remote->OnComplete(
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
client_remote.reset();
|
|
|
|
DeleteThis();
|
|
}
|
|
|
|
void ElectronURLLoaderFactory::RedirectedRequest::DeleteThis() {
|
|
loader_receiver_.reset();
|
|
target_factory_remote_.reset();
|
|
|
|
delete this;
|
|
}
|
|
|
|
// 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 SelfDeletingURLLoaderFactory::OnDisconnect method.
|
|
new ElectronURLLoaderFactory(type, handler,
|
|
pending_remote.InitWithNewPipeAndPassReceiver());
|
|
|
|
return pending_remote;
|
|
}
|
|
|
|
ElectronURLLoaderFactory::ElectronURLLoaderFactory(
|
|
ProtocolType type,
|
|
const ProtocolHandler& handler,
|
|
mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
|
|
: network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
|
|
type_(type),
|
|
handler_(handler) {}
|
|
|
|
ElectronURLLoaderFactory::~ElectronURLLoaderFactory() = default;
|
|
|
|
void ElectronURLLoaderFactory::CreateLoaderAndStart(
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
int32_t request_id,
|
|
uint32_t options,
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
// |StartLoading| is used for both intercepted and registered protocols,
|
|
// and on redirects it needs a factory to use to create a loader for the
|
|
// new request. So in this case, this factory is the target factory.
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory;
|
|
this->Clone(target_factory.InitWithNewPipeAndPassReceiver());
|
|
|
|
handler_.Run(
|
|
request,
|
|
base::BindOnce(&ElectronURLLoaderFactory::StartLoading, std::move(loader),
|
|
request_id, options, request, std::move(client),
|
|
traffic_annotation, std::move(target_factory), type_));
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::OnComplete(
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
int32_t request_id,
|
|
const network::URLLoaderCompletionStatus& status) {
|
|
if (client.is_valid()) {
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client));
|
|
client_remote->OnComplete(status);
|
|
}
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::StartLoading(
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
int32_t request_id,
|
|
uint32_t options,
|
|
const network::ResourceRequest& request,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
|
|
mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory,
|
|
ProtocolType type,
|
|
gin::Arguments* args) {
|
|
// 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)) {
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_NOT_IMPLEMENTED));
|
|
return;
|
|
}
|
|
|
|
// Parse {error} object.
|
|
gin_helper::Dictionary dict = ToDict(args->isolate(), response);
|
|
if (!dict.IsEmpty()) {
|
|
int error_code;
|
|
if (dict.Get("error", &error_code)) {
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(error_code));
|
|
return;
|
|
}
|
|
}
|
|
|
|
network::mojom::URLResponseHeadPtr head = ToResponseHead(dict);
|
|
|
|
// 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;
|
|
if (head->headers->IsRedirect(&location)) {
|
|
// 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(), request.request_initiator,
|
|
head->headers->response_code(), request.url.Resolve(location),
|
|
net::RedirectUtil::GetReferrerPolicyHeader(head->headers.get()), false);
|
|
|
|
DCHECK(client.is_valid());
|
|
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client));
|
|
|
|
client_remote->OnReceiveRedirect(redirect_info, std::move(head));
|
|
|
|
// Bind the URLLoader receiver and wait for a FollowRedirect request, or for
|
|
// the remote to disconnect, which will happen if the request is aborted.
|
|
// That may happen when the redirect is to a different scheme, which will
|
|
// cause the URL loader to be destroyed and a new one created using the
|
|
// factory for that scheme.
|
|
new RedirectedRequest(redirect_info, std::move(loader), request_id, options,
|
|
request, client_remote.Unbind(), traffic_annotation,
|
|
std::move(target_factory));
|
|
|
|
return;
|
|
}
|
|
|
|
// Some protocol accepts non-object responses.
|
|
if (dict.IsEmpty() && ResponseMustBeObject(type)) {
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_NOT_IMPLEMENTED));
|
|
return;
|
|
}
|
|
|
|
switch (type) {
|
|
// DEPRECATED: Soon only |kFree| will be supported!
|
|
case ProtocolType::kBuffer:
|
|
if (response->IsArrayBufferView())
|
|
StartLoadingBuffer(std::move(client), std::move(head),
|
|
response.As<v8::ArrayBufferView>());
|
|
else if (v8::Local<v8::Value> data; !dict.IsEmpty() &&
|
|
dict.Get("data", &data) &&
|
|
data->IsArrayBufferView())
|
|
StartLoadingBuffer(std::move(client), std::move(head),
|
|
data.As<v8::ArrayBufferView>());
|
|
else
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
break;
|
|
case ProtocolType::kString: {
|
|
std::string data;
|
|
if (gin::ConvertFromV8(args->isolate(), response, &data))
|
|
SendContents(std::move(client), std::move(head), data);
|
|
else if (!dict.IsEmpty() && dict.Get("data", &data))
|
|
SendContents(std::move(client), std::move(head), data);
|
|
else
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
break;
|
|
}
|
|
case ProtocolType::kFile: {
|
|
base::FilePath path;
|
|
if (gin::ConvertFromV8(args->isolate(), response, &path))
|
|
StartLoadingFile(std::move(client), std::move(loader), std::move(head),
|
|
request, path, dict);
|
|
else if (!dict.IsEmpty() && dict.Get("path", &path))
|
|
StartLoadingFile(std::move(client), std::move(loader), std::move(head),
|
|
request, path, dict);
|
|
else
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
break;
|
|
}
|
|
case ProtocolType::kHttp:
|
|
if (GURL url; !dict.IsEmpty() && dict.Get("url", &url) && url.is_valid())
|
|
StartLoadingHttp(std::move(client), std::move(loader), request,
|
|
traffic_annotation, dict);
|
|
else
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
break;
|
|
case ProtocolType::kStream:
|
|
StartLoadingStream(std::move(client), std::move(loader), std::move(head),
|
|
dict);
|
|
break;
|
|
|
|
case ProtocolType::kFree: {
|
|
// Infer the type based on the object given
|
|
v8::Local<v8::Value> data;
|
|
if (!dict.IsEmpty() && dict.Has("data"))
|
|
dict.Get("data", &data);
|
|
else
|
|
data = response;
|
|
|
|
// |data| can be either a string, a buffer or a stream.
|
|
if (data->IsArrayBufferView()) {
|
|
StartLoadingBuffer(std::move(client), std::move(head),
|
|
data.As<v8::ArrayBufferView>());
|
|
} else if (data->IsString()) {
|
|
SendContents(std::move(client), std::move(head),
|
|
gin::V8ToString(args->isolate(), data));
|
|
} else if (LooksLikeStream(args->isolate(), data)) {
|
|
StartLoadingStream(std::move(client), std::move(loader),
|
|
std::move(head), dict);
|
|
} else if (!dict.IsEmpty()) {
|
|
// |data| wasn't specified, so look for |response.url| or
|
|
// |response.path|.
|
|
if (GURL url; dict.Get("url", &url))
|
|
StartLoadingHttp(std::move(client), std::move(loader), request,
|
|
traffic_annotation, dict);
|
|
else if (base::FilePath path; dict.Get("path", &path))
|
|
StartLoadingFile(std::move(client), std::move(loader),
|
|
std::move(head), request, path, dict);
|
|
else
|
|
// Don't know what kind of response this is, so fail.
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
} else {
|
|
OnComplete(std::move(client), request_id,
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::StartLoadingBuffer(
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
network::mojom::URLResponseHeadPtr head,
|
|
v8::Local<v8::ArrayBufferView> buffer) {
|
|
SendContents(std::move(client), std::move(head),
|
|
std::string(node::Buffer::Data(buffer.As<v8::Value>()),
|
|
node::Buffer::Length(buffer.As<v8::Value>())));
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::StartLoadingFile(
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
network::mojom::URLResponseHeadPtr head,
|
|
const network::ResourceRequest& original_request,
|
|
const base::FilePath& path,
|
|
const gin_helper::Dictionary& opts) {
|
|
network::ResourceRequest request = original_request;
|
|
request.url = net::FilePathToFileURL(path);
|
|
if (!opts.IsEmpty()) {
|
|
opts.Get("referrer", &request.referrer);
|
|
opts.Get("method", &request.method);
|
|
}
|
|
|
|
// Add header to ignore CORS.
|
|
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
|
|
asar::CreateAsarURLLoader(request, std::move(loader), std::move(client),
|
|
head->headers);
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::StartLoadingHttp(
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
const network::ResourceRequest& original_request,
|
|
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
|
|
const gin_helper::Dictionary& dict) {
|
|
auto request = std::make_unique<network::ResourceRequest>();
|
|
request->headers = original_request.headers;
|
|
request->cors_exempt_headers = original_request.cors_exempt_headers;
|
|
|
|
dict.Get("url", &request->url);
|
|
dict.Get("referrer", &request->referrer);
|
|
if (!dict.Get("method", &request->method))
|
|
request->method = original_request.method;
|
|
|
|
base::DictValue upload_data;
|
|
if (request->method != net::HttpRequestHeaders::kGetMethod &&
|
|
request->method != net::HttpRequestHeaders::kHeadMethod)
|
|
dict.Get("uploadData", &upload_data);
|
|
|
|
gin_helper::Handle<api::Session> session;
|
|
auto* browser_context =
|
|
dict.Get("session", &session) && !session.IsEmpty()
|
|
? session->browser_context()
|
|
: ElectronBrowserContext::GetDefaultBrowserContext();
|
|
|
|
new URLPipeLoader(
|
|
browser_context->GetURLLoaderFactory(), std::move(request),
|
|
std::move(loader), std::move(client),
|
|
static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
|
|
std::move(upload_data));
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::StartLoadingStream(
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
network::mojom::URLResponseHeadPtr head,
|
|
const gin_helper::Dictionary& dict) {
|
|
v8::Local<v8::Value> stream;
|
|
if (!dict.Get("data", &stream)) {
|
|
// Assume the opts is already a stream.
|
|
stream = dict.GetHandle();
|
|
} else if (stream->IsNullOrUndefined()) {
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client));
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
|
if (mojo::CreateDataPipe(nullptr, producer, consumer) != MOJO_RESULT_OK) {
|
|
client_remote->OnComplete(
|
|
network::URLLoaderCompletionStatus(net::ERR_INSUFFICIENT_RESOURCES));
|
|
return;
|
|
}
|
|
// "data" was explicitly passed as null or undefined, assume the user wants
|
|
// to send an empty body.
|
|
//
|
|
// Note that We must submit a empty body otherwise NetworkService would
|
|
// crash.
|
|
client_remote->OnReceiveResponse(std::move(head), std::move(consumer),
|
|
std::nullopt);
|
|
producer.reset(); // The data pipe is empty.
|
|
client_remote->OnComplete(network::URLLoaderCompletionStatus(net::OK));
|
|
return;
|
|
} else if (!stream->IsObject()) {
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client));
|
|
client_remote->OnComplete(
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
return;
|
|
}
|
|
|
|
gin_helper::Dictionary data = ToDict(dict.isolate(), stream);
|
|
v8::Local<v8::Value> method;
|
|
if (!data.Get("on", &method) || !method->IsFunction() ||
|
|
!data.Get("removeListener", &method) || !method->IsFunction()) {
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client));
|
|
client_remote->OnComplete(
|
|
network::URLLoaderCompletionStatus(net::ERR_FAILED));
|
|
return;
|
|
}
|
|
|
|
new NodeStreamLoader(std::move(head), std::move(loader), std::move(client),
|
|
data.isolate(), data.GetHandle());
|
|
}
|
|
|
|
// static
|
|
void ElectronURLLoaderFactory::SendContents(
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
network::mojom::URLResponseHeadPtr head,
|
|
std::string data) {
|
|
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
|
std::move(client));
|
|
|
|
// Add header to ignore CORS.
|
|
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
|
|
|
|
// Code below follows the pattern of data_url_loader_factory.cc.
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
|
if (mojo::CreateDataPipe(nullptr, producer, consumer) != MOJO_RESULT_OK) {
|
|
client_remote->OnComplete(
|
|
network::URLLoaderCompletionStatus(net::ERR_INSUFFICIENT_RESOURCES));
|
|
return;
|
|
}
|
|
|
|
client_remote->OnReceiveResponse(std::move(head), std::move(consumer),
|
|
std::nullopt);
|
|
|
|
auto write_data = std::make_unique<WriteData>();
|
|
write_data->client = std::move(client_remote);
|
|
write_data->data = std::move(data);
|
|
write_data->producer =
|
|
std::make_unique<mojo::DataPipeProducer>(std::move(producer));
|
|
auto* producer_ptr = write_data->producer.get();
|
|
|
|
std::string_view string_view(write_data->data);
|
|
producer_ptr->Write(
|
|
std::make_unique<mojo::StringDataSource>(
|
|
string_view, mojo::StringDataSource::AsyncWritingMode::
|
|
STRING_STAYS_VALID_UNTIL_COMPLETION),
|
|
base::BindOnce(OnWrite, std::move(write_data)));
|
|
}
|
|
|
|
} // namespace electron
|