Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: restrict sendToFrame to same-process frames by default #26875

Merged
merged 10 commits into from Dec 9, 2020

Conversation

nornagon
Copy link
Member

@nornagon nornagon commented Dec 7, 2020

Description of Change

Fixes an issue where event.reply would sometimes not deliver a reply when
OOPIFs were present on a page.

This also changes webContents.sendToFrame to only send to same-process frames
by default. Out-of-process frames can be specified by passing a pair of numbers
[processId, frameId].

Checklist

Release Notes

Notes: Fixed an issue where event.reply could sometimes not deliver a reply to an IPC message when cross-site iframes were present.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Dec 7, 2020
Copy link
Member

@deepak1556 deepak1556 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

shell/browser/api/electron_api_web_contents.cc Outdated Show resolved Hide resolved
@nornagon nornagon added the semver/minor backwards-compatible functionality label Dec 8, 2020
@nornagon nornagon added the fast-track 🚅 Indicates that this PR is intended to bypass the 24 hour rule. Needs approval from Releases label Dec 9, 2020
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Dec 9, 2020
@nornagon
Copy link
Member Author

nornagon commented Dec 9, 2020

CI failures are flakes.

@nornagon nornagon merged commit 07a1c2a into master Dec 9, 2020
@release-clerk
Copy link

release-clerk bot commented Dec 9, 2020

Release Notes Persisted

Fixed an issue where event.reply could sometimes not deliver a reply to an IPC message when cross-site iframes were present.

@nornagon nornagon deleted the fix-sendtoframe branch December 9, 2020 20:48
@trop
Copy link
Contributor

trop bot commented Dec 9, 2020

I was unable to backport this PR to "10-x-y" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Dec 10, 2020

@nornagon has manually backported this PR to "9-x-y", please check out #26928

@trop trop bot removed the in-flight/10-x-y label Dec 11, 2020
MarshallOfSound pushed a commit that referenced this pull request Dec 11, 2020
…26927)

* fix: restrict sendToFrame to same-process frames by default (#26875)

* missed a conflict

* fix build

* fix build again

* fix usage of defer
MarshallOfSound pushed a commit that referenced this pull request Dec 11, 2020
* fix: restrict sendToFrame to same-process frames by default (#26875)

* missed a conflict

* fix build

* fix build again
@trop trop bot added the merged/9-x-y label Dec 11, 2020
belenko pushed a commit that referenced this pull request Dec 14, 2020
* fix: restrict sendToFrame to same-process frames by default (#26875)

* missed a conflict

* fix build

* fix build again
belenko pushed a commit that referenced this pull request Dec 14, 2020
…26927)

* fix: restrict sendToFrame to same-process frames by default (#26875)

* missed a conflict

* fix build

* fix build again

* fix usage of defer
@nornagon nornagon mentioned this pull request Dec 17, 2020
2 tasks
@trop
Copy link
Contributor

trop bot commented Dec 17, 2020

@nornagon has manually backported this PR to "master", please check out #27072

jkleinsc pushed a commit that referenced this pull request Feb 4, 2021
* chore: chromium backports M87-1

Contains applicable backports from M87-1 release
CVE-2020-16037
CVE-2020-16041
CVE-2020-16042

* chore: cherry-pick 381c4b5679 from chromium. (#26832)

* fix: message box missing an "OK" button in GTK (#26915)

Co-authored-by: Mimi <1119186082@qq.com>

* chore: cherry-pick d8d64b7cd244 from chromium (#26892)

* chore: cherry-pick 290fe9c6e245 from v8 (#26896)

* docs: add missing deprecated systemPreferences APIs to breaking-changes (#26934)

Co-authored-by: Milan Burda <milan.burda@gmail.com>

* chore: cherry-pick 3abc372c9c00 from chromium (#26894)

* chore: cherry-pick 3abc372c9c00 from chromium

* resolve conflict

* fix: Avoid crashing in NativeViewHost::SetParentAccessible on Windows 10 (#26949)

* fix: Avoid crashing in NativeViewHost::SetParentAccessible on Windows

This fixes #26905. The patch was obtained from @deepak1556, who in turn
got it from the Microsoft Teams folks.

I believe the crash started happening due to the changes in
https://chromium.googlesource.com/chromium/src.git/+/5c6c8e994bce2bfb867279ae5068e9f9134e70c3%5E!/#F15

This affects Electron 9 and later.

Notes: Fix occasional crash on Windows

* Update .patches

* update patches

Co-authored-by: Biru Mohanathas <birunthan@mohanathas.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Electron Bot <electron@github.com>

* fix: Upload all *.dll.pdb to symbol server (#26964)

Fixes #26961.

Notes: Add Electron DLLs like libGLESv2.dll to symbol server

Co-authored-by: Biru Mohanathas <birunthan@mohanathas.com>

* fix: restrict sendToFrame to same-process frames by default (#26875) (#26927)

* fix: restrict sendToFrame to same-process frames by default (#26875)

* missed a conflict

* fix build

* fix build again

* fix usage of defer

* Bump v10.2.0

* chore: cherry-pick 6763a713f957 from skia (#26956)

* chore: chromium backports M87-1

PR feedback: add links to changes in the upstream

Co-authored-by: Andrey Belenko <anbelen@microsoft.com>
Co-authored-by: Pedro Pontes <pepontes@microsoft.com>
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Mimi <1119186082@qq.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
Co-authored-by: Biru Mohanathas <birunthan@mohanathas.com>
Co-authored-by: Electron Bot <electron@github.com>
Co-authored-by: Michaela Laurencin <35157522+mlaurencin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api-review/requested 🗳 fast-track 🚅 Indicates that this PR is intended to bypass the 24 hour rule. Needs approval from Releases semver/minor backwards-compatible functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants