cc01272a8d
* chore: bump chromium in DEPS to 95.0.4630.0 * 3133701: Fix chrome root store codegen for cross-compile builds. https://chromium-review.googlesource.com/c/chromium/src/+/3133701 * 49125: Include SHA512-256 in EVP_get_digestbyname and EVP_MD_do_all. https://boringssl-review.googlesource.com/c/boringssl/+/49125 * chore: fixup patch indices * 3131662: [Code Health] Remove ListValue::Append(Integer|Boolean) https://chromium-review.googlesource.com/c/chromium/src/+/3131662 * chore: bump chromium in DEPS to 95.0.4631.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4635.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4636.0 * chore: bump chromium in DEPS to 95.0.4637.0 * chore: update patches * refactor: move PlatformNotificationService into BrowserContext Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3137256 * refactor: ListValue::GetSize and ListValue::AppendString were removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3144540 * chore: bump chromium in DEPS to 95.0.4638.0 * chore: bump chromium in DEPS to 95.0.4638.4 * chore: bump chromium in DEPS to 96.0.4640.0 * chore: bump chromium in DEPS to 96.0.4641.0 * chore: bump chromium in DEPS to 96.0.4642.0 * chore: update patches Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org> * 3134756: Move extensions/browser/value_store to components/value_store. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3134756 * 3150092: [Autofill] Allow aligning Autofill suggestions to the field's center Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3150092 * chore: bump chromium in DEPS to 96.0.4643.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4644.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4645.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4646.0 * chore: bump chromium in DEPS to 96.0.4647.0 * chore: update patches Ref (for chromium): https://chromium-review.googlesource.com/c/chromium/src/+/3165772 * 3162087: Reland "Ensure Branch Target Identification is enabled for executable pages." Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3162087 * chore: update evert_add_inline_and_inline_origin_records_to_symbol_file.patch Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166678 Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166674 * chore: update Allocator construction Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3135195 Change RefCount::kAllowed/Disallowed semantics into BackupRefPtr::kEnabled/Disabled * chore: add UseConfigurablePool to v8::ArrayBuffer::Allocator invocation Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3090845 * chore: do not set network_context_params.context_name Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3155743 Remove name field from mojom::NetworkContext * fix: use ForEachRenderFrameHost to iterate frames. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3163336 New implementation partially cribbed from https://source.chromium.org/chromium/chromium/src/+/main:extensions/browser/script_executor.cc;drc=f894f106c6d5fac8e0b75158f622256e0f34f593;l=109 * [Blink Cleanup] Remove WebLocalFrame::RequestExecuteScriptAndReturnValue() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3149699 ExecuteJavaScript's RequestExecuteScript() new params are cribbed from https://chromium-review.googlesource.com/c/chromium/src/+/3149699/4/third_party/blink/renderer/core/frame/web_local_frame_impl.cc * Remove IsDescendantOf API on RenderFrameHost. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3165357 function is trivial to implement, so make a local copy in anon namespace * Rewrite IsDescendantOf check to check GetParentOrOuterDocument. https://chromium-review.googlesource.com/c/chromium/src/+/3160061 * Remove GetFramesInSubtree from RenderFrameHost https://chromium-review.googlesource.com/c/chromium/src/+/3163336 * fix: dump_syms for macOS * chore: update patches * [Code Health] Remove ListValue::AppendString and ListValue::GetSize https://chromium-review.googlesource.com/c/chromium/src/+/3144540 * fix: gn check https://chromium-review.googlesource.com/c/chromium/src/+/3163890 * fix: crash with Isolate::GetHeapCodeAndMetadataStatistics https://chromium-review.googlesource.com/c/v8/v8/+/3175820 * chore: update patches * chore: fix windows build * Add kPrintWithPostScriptType42Fonts feature. https://chromium-review.googlesource.com/c/chromium/src/+/3150776 * chore: update patches * chore: fix tests * ozone/x11: fix VA-API. https://chromium-review.googlesource.com/c/chromium/src/+/3141878 * Revert "ozone/x11: fix VA-API." This reverts commit 23e742acb1032bf4afc1a45e4bed38e42184fd01. * Reland "Make Ozone/X11 default." https://chromium-review.googlesource.com/c/chromium/src/+/3114071 * fixup Reland "Make Ozone/X11 default." * fixup Reland "Make Ozone/X11 default." for clipboard Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
407 lines
14 KiB
C++
407 lines
14 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/common/gin_converters/net_converter.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/containers/span.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "base/values.h"
|
|
#include "gin/converter.h"
|
|
#include "gin/dictionary.h"
|
|
#include "net/cert/x509_certificate.h"
|
|
#include "net/cert/x509_util.h"
|
|
#include "net/http/http_response_headers.h"
|
|
#include "net/http/http_version.h"
|
|
#include "net/url_request/redirect_info.h"
|
|
#include "services/network/public/cpp/resource_request.h"
|
|
#include "shell/browser/api/electron_api_data_pipe_holder.h"
|
|
#include "shell/common/gin_converters/gurl_converter.h"
|
|
#include "shell/common/gin_converters/std_converter.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace gin {
|
|
|
|
namespace {
|
|
|
|
bool CertFromData(const std::string& data,
|
|
scoped_refptr<net::X509Certificate>* out) {
|
|
auto cert_list = net::X509Certificate::CreateCertificateListFromBytes(
|
|
base::as_bytes(base::make_span(data)),
|
|
net::X509Certificate::FORMAT_SINGLE_CERTIFICATE);
|
|
if (cert_list.empty())
|
|
return false;
|
|
|
|
auto leaf_cert = cert_list.front();
|
|
if (!leaf_cert)
|
|
return false;
|
|
|
|
*out = leaf_cert;
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<net::AuthChallengeInfo>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const net::AuthChallengeInfo& val) {
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("isProxy", val.is_proxy);
|
|
dict.Set("scheme", val.scheme);
|
|
dict.Set("host", val.challenger.host());
|
|
dict.Set("port", static_cast<uint32_t>(val.challenger.port()));
|
|
dict.Set("realm", val.realm);
|
|
return gin::ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const scoped_refptr<net::X509Certificate>& val) {
|
|
gin::Dictionary dict(isolate, v8::Object::New(isolate));
|
|
std::string encoded_data;
|
|
net::X509Certificate::GetPEMEncoded(val->cert_buffer(), &encoded_data);
|
|
|
|
dict.Set("data", encoded_data);
|
|
dict.Set("issuer", val->issuer());
|
|
dict.Set("issuerName", val->issuer().GetDisplayName());
|
|
dict.Set("subject", val->subject());
|
|
dict.Set("subjectName", val->subject().GetDisplayName());
|
|
dict.Set("serialNumber", base::HexEncode(val->serial_number().data(),
|
|
val->serial_number().size()));
|
|
dict.Set("validStart", val->valid_start().ToDoubleT());
|
|
dict.Set("validExpiry", val->valid_expiry().ToDoubleT());
|
|
dict.Set("fingerprint",
|
|
net::HashValue(val->CalculateFingerprint256(val->cert_buffer()))
|
|
.ToString());
|
|
|
|
const auto& intermediate_buffers = val->intermediate_buffers();
|
|
if (!intermediate_buffers.empty()) {
|
|
std::vector<bssl::UniquePtr<CRYPTO_BUFFER>> issuer_intermediates;
|
|
issuer_intermediates.reserve(intermediate_buffers.size() - 1);
|
|
for (size_t i = 1; i < intermediate_buffers.size(); ++i) {
|
|
issuer_intermediates.push_back(
|
|
bssl::UpRef(intermediate_buffers[i].get()));
|
|
}
|
|
const scoped_refptr<net::X509Certificate>& issuer_cert =
|
|
net::X509Certificate::CreateFromBuffer(
|
|
bssl::UpRef(intermediate_buffers[0].get()),
|
|
std::move(issuer_intermediates));
|
|
dict.Set("issuerCert", issuer_cert);
|
|
}
|
|
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
bool Converter<scoped_refptr<net::X509Certificate>>::FromV8(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
scoped_refptr<net::X509Certificate>* out) {
|
|
gin::Dictionary dict(nullptr);
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
return false;
|
|
|
|
std::string data;
|
|
dict.Get("data", &data);
|
|
scoped_refptr<net::X509Certificate> leaf_cert;
|
|
if (!CertFromData(data, &leaf_cert))
|
|
return false;
|
|
|
|
scoped_refptr<net::X509Certificate> issuer_cert;
|
|
if (dict.Get("issuerCert", &issuer_cert)) {
|
|
std::vector<bssl::UniquePtr<CRYPTO_BUFFER>> intermediates;
|
|
intermediates.push_back(bssl::UpRef(issuer_cert->cert_buffer()));
|
|
auto cert = net::X509Certificate::CreateFromBuffer(
|
|
bssl::UpRef(leaf_cert->cert_buffer()), std::move(intermediates));
|
|
if (!cert)
|
|
return false;
|
|
|
|
*out = cert;
|
|
} else {
|
|
*out = leaf_cert;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<net::CertPrincipal>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const net::CertPrincipal& val) {
|
|
gin::Dictionary dict(isolate, v8::Object::New(isolate));
|
|
|
|
dict.Set("commonName", val.common_name);
|
|
dict.Set("organizations", val.organization_names);
|
|
dict.Set("organizationUnits", val.organization_unit_names);
|
|
dict.Set("locality", val.locality_name);
|
|
dict.Set("state", val.state_or_province_name);
|
|
dict.Set("country", val.country_name);
|
|
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<net::HttpResponseHeaders*>::ToV8(
|
|
v8::Isolate* isolate,
|
|
net::HttpResponseHeaders* headers) {
|
|
base::DictionaryValue response_headers;
|
|
if (headers) {
|
|
size_t iter = 0;
|
|
std::string key;
|
|
std::string value;
|
|
while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
|
|
key = base::ToLowerASCII(key);
|
|
base::Value* values = response_headers.FindListKey(key);
|
|
if (!values)
|
|
values = response_headers.SetKey(key, base::ListValue());
|
|
values->Append(value);
|
|
}
|
|
}
|
|
return ConvertToV8(isolate, response_headers);
|
|
}
|
|
|
|
bool Converter<net::HttpResponseHeaders*>::FromV8(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
net::HttpResponseHeaders* out) {
|
|
if (!val->IsObject()) {
|
|
return false;
|
|
}
|
|
|
|
auto addHeaderFromValue = [&isolate, &out](
|
|
const std::string& key,
|
|
const v8::Local<v8::Value>& localVal) {
|
|
auto context = isolate->GetCurrentContext();
|
|
v8::Local<v8::String> localStrVal;
|
|
if (!localVal->ToString(context).ToLocal(&localStrVal)) {
|
|
return false;
|
|
}
|
|
std::string value;
|
|
gin::ConvertFromV8(isolate, localStrVal, &value);
|
|
out->AddHeader(key, value);
|
|
return true;
|
|
};
|
|
|
|
auto context = isolate->GetCurrentContext();
|
|
auto headers = val.As<v8::Object>();
|
|
auto keys = headers->GetOwnPropertyNames(context).ToLocalChecked();
|
|
for (uint32_t i = 0; i < keys->Length(); i++) {
|
|
v8::Local<v8::Value> keyVal;
|
|
if (!keys->Get(context, i).ToLocal(&keyVal)) {
|
|
return false;
|
|
}
|
|
std::string key;
|
|
gin::ConvertFromV8(isolate, keyVal, &key);
|
|
|
|
auto localVal = headers->Get(context, keyVal).ToLocalChecked();
|
|
if (localVal->IsArray()) {
|
|
auto values = localVal.As<v8::Array>();
|
|
for (uint32_t j = 0; j < values->Length(); j++) {
|
|
if (!addHeaderFromValue(key,
|
|
values->Get(context, j).ToLocalChecked())) {
|
|
return false;
|
|
}
|
|
}
|
|
} else {
|
|
if (!addHeaderFromValue(key, localVal)) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<net::HttpRequestHeaders>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const net::HttpRequestHeaders& val) {
|
|
gin::Dictionary headers(isolate, v8::Object::New(isolate));
|
|
for (net::HttpRequestHeaders::Iterator it(val); it.GetNext();)
|
|
headers.Set(it.name(), it.value());
|
|
return ConvertToV8(isolate, headers);
|
|
}
|
|
|
|
// static
|
|
bool Converter<net::HttpRequestHeaders>::FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
net::HttpRequestHeaders* out) {
|
|
base::DictionaryValue dict;
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
return false;
|
|
for (base::DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) {
|
|
if (it.value().is_string()) {
|
|
std::string value = it.value().GetString();
|
|
out->SetHeader(it.key(), value);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<network::ResourceRequestBody>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const network::ResourceRequestBody& val) {
|
|
const auto& elements = *val.elements();
|
|
v8::Local<v8::Array> arr = v8::Array::New(isolate, elements.size());
|
|
for (size_t i = 0; i < elements.size(); ++i) {
|
|
const auto& element = elements[i];
|
|
gin::Dictionary upload_data(isolate, v8::Object::New(isolate));
|
|
switch (element.type()) {
|
|
case network::mojom::DataElement::Tag::kFile: {
|
|
const auto& element_file = element.As<network::DataElementFile>();
|
|
upload_data.Set("type", "file");
|
|
upload_data.Set("file", element_file.path().value());
|
|
upload_data.Set("filePath",
|
|
base::Value(element_file.path().AsUTF8Unsafe()));
|
|
upload_data.Set("offset", static_cast<int>(element_file.offset()));
|
|
upload_data.Set("length", static_cast<int>(element_file.length()));
|
|
upload_data.Set("modificationTime",
|
|
element_file.expected_modification_time().ToDoubleT());
|
|
break;
|
|
}
|
|
case network::mojom::DataElement::Tag::kBytes: {
|
|
upload_data.Set("type", "rawData");
|
|
const auto& bytes = element.As<network::DataElementBytes>().bytes();
|
|
const char* data = reinterpret_cast<const char*>(bytes.data());
|
|
upload_data.Set(
|
|
"bytes",
|
|
node::Buffer::Copy(isolate, data, bytes.size()).ToLocalChecked());
|
|
break;
|
|
}
|
|
case network::mojom::DataElement::Tag::kDataPipe: {
|
|
upload_data.Set("type", "blob");
|
|
// TODO(zcbenz): After the NetworkService refactor, the old blobUUID API
|
|
// becomes unnecessarily complex, we should deprecate the getBlobData
|
|
// API and return the DataPipeHolder wrapper directly.
|
|
auto holder = electron::api::DataPipeHolder::Create(isolate, element);
|
|
upload_data.Set("blobUUID", holder->id());
|
|
// The lifetime of data pipe is bound to the uploadData object.
|
|
upload_data.Set("dataPipe", holder);
|
|
break;
|
|
}
|
|
default:
|
|
NOTREACHED() << "Found unsupported data element";
|
|
}
|
|
arr->Set(isolate->GetCurrentContext(), static_cast<uint32_t>(i),
|
|
ConvertToV8(isolate, upload_data))
|
|
.Check();
|
|
}
|
|
return arr;
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value>
|
|
Converter<scoped_refptr<network::ResourceRequestBody>>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const scoped_refptr<network::ResourceRequestBody>& val) {
|
|
if (!val)
|
|
return v8::Null(isolate);
|
|
return ConvertToV8(isolate, *val);
|
|
}
|
|
|
|
// static
|
|
bool Converter<scoped_refptr<network::ResourceRequestBody>>::FromV8(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
scoped_refptr<network::ResourceRequestBody>* out) {
|
|
auto list = std::make_unique<base::ListValue>();
|
|
if (!ConvertFromV8(isolate, val, list.get()))
|
|
return false;
|
|
*out = base::MakeRefCounted<network::ResourceRequestBody>();
|
|
for (size_t i = 0; i < list->GetList().size(); ++i) {
|
|
base::DictionaryValue* dict = nullptr;
|
|
std::string type;
|
|
if (!list->GetDictionary(i, &dict))
|
|
return false;
|
|
dict->GetString("type", &type);
|
|
if (type == "rawData") {
|
|
base::Value* bytes = nullptr;
|
|
dict->GetBinary("bytes", &bytes);
|
|
(*out)->AppendBytes(
|
|
reinterpret_cast<const char*>(bytes->GetBlob().data()),
|
|
base::checked_cast<int>(bytes->GetBlob().size()));
|
|
} else if (type == "file") {
|
|
const std::string* file = dict->FindStringKey("filePath");
|
|
if (file == nullptr) {
|
|
return false;
|
|
}
|
|
int offset = 0, length = -1;
|
|
double modification_time = 0.0;
|
|
dict->GetInteger("offset", &offset);
|
|
dict->GetInteger("file", &length);
|
|
dict->GetDouble("modificationTime", &modification_time);
|
|
(*out)->AppendFileRange(base::FilePath::FromUTF8Unsafe(*file),
|
|
static_cast<uint64_t>(offset),
|
|
static_cast<uint64_t>(length),
|
|
base::Time::FromDoubleT(modification_time));
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<network::ResourceRequest>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const network::ResourceRequest& val) {
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("method", val.method);
|
|
dict.Set("url", val.url.spec());
|
|
dict.Set("referrer", val.referrer.spec());
|
|
dict.Set("headers", val.headers);
|
|
if (val.request_body)
|
|
dict.Set("uploadData", ConvertToV8(isolate, *val.request_body));
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<electron::VerifyRequestParams>::ToV8(
|
|
v8::Isolate* isolate,
|
|
electron::VerifyRequestParams val) {
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("hostname", val.hostname);
|
|
dict.Set("certificate", val.certificate);
|
|
dict.Set("validatedCertificate", val.validated_certificate);
|
|
dict.Set("isIssuedByKnownRoot", val.is_issued_by_known_root);
|
|
dict.Set("verificationResult", val.default_result);
|
|
dict.Set("errorCode", val.error_code);
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<net::HttpVersion>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const net::HttpVersion& val) {
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("major", static_cast<uint32_t>(val.major_value()));
|
|
dict.Set("minor", static_cast<uint32_t>(val.minor_value()));
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<net::RedirectInfo>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const net::RedirectInfo& val) {
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
|
|
dict.Set("statusCode", val.status_code);
|
|
dict.Set("newMethod", val.new_method);
|
|
dict.Set("newUrl", val.new_url);
|
|
dict.Set("newSiteForCookies", val.new_site_for_cookies.RepresentativeUrl());
|
|
dict.Set("newReferrer", val.new_referrer);
|
|
dict.Set("insecureSchemeWasUpgraded", val.insecure_scheme_was_upgraded);
|
|
dict.Set("isSignedExchangeFallbackRedirect",
|
|
val.is_signed_exchange_fallback_redirect);
|
|
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
|
|
} // namespace gin
|