mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
* chore: bump chromium in DEPS to 131.0.6763.0 * chore: bump chromium in DEPS to 131.0.6764.0 * update patches * chore: bump chromium in DEPS to 131.0.6766.0 * chore: update patches * Use PathInfo in FileSystemAccess code Refs https://chromium-review.googlesource.com/c/chromium/src/+/5872329 * Modernize image utilities. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5905226 * [DevTools] move feature flags to the devtools directory Refs https://chromium-review.googlesource.com/c/chromium/src/+/5913878 * chore: bump chromium in DEPS to 131.0.6768.0 * chore: update patches * Remove experimental credshelper flags Refs4017a6c8b4* Change gfx::[PNG|JPEG]Codec::Decode to return a SkBitmap Refs https://chromium-review.googlesource.com/c/chromium/src/+/5917286 Refs https://chromium-review.googlesource.com/c/chromium/src/+/5905621 * chore: script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 131.0.6770.0 * chore: update patches * chore: bump chromium in DEPS to 131.0.6772.0 * chore: update patches * [UI] Add alias for mojo version of `MenuSourceType` Refs https://chromium-review.googlesource.com/c/chromium/src/+/5803393 * Update Background Color for Task Manager Refresh Refs https://chromium-review.googlesource.com/c/chromium/src/+/5875259 * chore: bump chromium in DEPS to 131.0.6774.0 * chore: bump chromium in DEPS to 131.0.6776.0 * chore: update patches * chore: update filenames.libcxx.gni * esm: remove --no-import-harmony-assertions https://github.com/nodejs/node/pull/54890 * 5507047: [import-attributes] Remove support for import assertions | https://chromium-review.googlesource.com/c/v8/v8/+/5507047 * fixup: Change gfx::[PNG|JPEG]Codec::Decode to return a SkBitmap * chore: bump chromium in DEPS to 131.0.6778.0 * Revert "chore: bump chromium in DEPS to 131.0.6778.0" This reverts commitfb9092fc51. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
68 lines
3.5 KiB
Diff
68 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 29 Aug 2022 11:44:57 +0200
|
|
Subject: fix: crash loading non-standard schemes in iframes
|
|
|
|
This fixes a crash that occurs when loading non-standard schemes from
|
|
iframes or webviews. This was happening because
|
|
ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin contains explicit
|
|
exceptions to allow built-in non-standard schemes, but does not check
|
|
for non-standard schemes registered by the embedder.
|
|
|
|
This patch adjusts the origin calculation for non-standard schemes in
|
|
- browser process at `NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo`
|
|
- render process at `DocumentLoader::CalculateOrigin`
|
|
|
|
When top level frame navigates to non-standard scheme url, the origin is calculated
|
|
as `null` without any derivation. It is only in cases where there is a `initiator_origin`
|
|
then the origin is derived from it, which is usually the case for renderer initiated
|
|
navigations and iframes are no exceptions from this rule.
|
|
|
|
Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
|
|
|
|
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
|
|
|
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
|
index 53bba48293111e74daba50dde617fb78f1bcc7ee..67083fb13db2020f432ec488a784bcfb9570d737 100644
|
|
--- a/content/browser/renderer_host/navigation_request.cc
|
|
+++ b/content/browser/renderer_host/navigation_request.cc
|
|
@@ -10788,6 +10788,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
|
|
"blob");
|
|
}
|
|
|
|
+ if (!common_params().url.IsStandard()) {
|
|
+ return std::make_pair(url::Origin::Resolve(common_params().url,
|
|
+ url::Origin()),
|
|
+ "url_non_standard");
|
|
+ }
|
|
+
|
|
// In cases not covered above, URLLoaderFactory should be associated with the
|
|
// origin of |common_params.url| and/or |common_params.initiator_origin|.
|
|
url::Origin resolved_origin = url::Origin::Resolve(
|
|
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
|
|
index 547a483db71e2980cc040fe853775fbc07723979..85c6d240a68e52b9d59fae7bbe36603e627b2893 100644
|
|
--- a/third_party/blink/renderer/core/loader/document_loader.cc
|
|
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
|
|
@@ -2264,6 +2264,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
|
|
scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
|
|
Document* owner_document) {
|
|
scoped_refptr<SecurityOrigin> origin;
|
|
+ bool is_standard = false;
|
|
+ std::string protocol = url_.Protocol().Ascii();
|
|
+ is_standard = url::IsStandard(
|
|
+ protocol.data(), url::Component(0, static_cast<int>(protocol.size())));
|
|
StringBuilder debug_info_builder;
|
|
// Whether the origin is newly created within this call, instead of copied
|
|
// from an existing document's origin or from `origin_to_commit_`. If this is
|
|
@@ -2317,6 +2321,10 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
|
|
// the end of this function.
|
|
origin = origin_to_commit_;
|
|
debug_info_builder.Append("use_origin_to_commit");
|
|
+ } else if (!SecurityOrigin::ShouldUseInnerURL(url_) &&
|
|
+ !is_standard) {
|
|
+ debug_info_builder.Append("use_url_with_non_standard_scheme");
|
|
+ origin = SecurityOrigin::Create(url_);
|
|
} else {
|
|
debug_info_builder.Append("use_url_with_precursor");
|
|
// Otherwise, create an origin that propagates precursor information
|