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

[iOS] - Fix securing message handlers on iOS-18 #26014

Merged
merged 2 commits into from
Oct 17, 2024

Conversation

Brandon-T
Copy link
Contributor

Resolves brave/brave-browser#41653

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@Brandon-T Brandon-T added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-teamcity Do not run builds in TeamCity labels Oct 15, 2024
@Brandon-T Brandon-T self-assigned this Oct 15, 2024
@Brandon-T Brandon-T marked this pull request as ready for review October 15, 2024 21:11
@Brandon-T Brandon-T requested a review from a team as a code owner October 15, 2024 21:11
@stoletheminerals
Copy link
Contributor

Nice catch @Brandon-T

delete window['webkit'];

// WebKit no longer restores the handler immediately! So we poll for when that happens and resolve the promise accordingly.
const timeout = 5000;
Copy link
Contributor

@stoletheminerals stoletheminerals Oct 16, 2024

Choose a reason for hiding this comment

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

A few concerns I have.

  1. Does it wait 5 seconds before trying to postMessage? Isn't it a lot for some use cases?
  2. Also a web page can race during this time out and modify window.webkit once it is restored (or before it is restored, I'm not sure what happens in this case)

Copy link
Contributor Author

@Brandon-T Brandon-T Oct 16, 2024

Choose a reason for hiding this comment

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

  1. Fixed.
  2. Fixed.

I tested with:

let interval = setInterval(function() {
  console.log("Replace window.webkit with hacked version");
}, 0);

setTimeout(function() {
   let startTime = Date.now();
    while(true) {
        console.log("Polling for window.webkit legit version");
        if (Date.now() - startTime >= 5000) {
          clearInterval(interval);
          break;
        }
    }
}, 0);

To see if the loop will block the setInterval. So even if a page tries to replace the window.webkit inside of setInterval or something similar, the while loop is synchronous and it blocks ALL other operations (async included).

Only once the while loop completes, everything else executes :) so I changed the code to use a while loop with a timeout. I checked performance and there's no issue as webkit replaces it internally asynchronously, in the next execution frame, while the loop blocks the page from executing anything else.

@Brandon-T Brandon-T merged commit da2cbcf into master Oct 17, 2024
17 checks passed
@Brandon-T Brandon-T deleted the bugfix/iOS18-Message-Handlers branch October 17, 2024 14:57
@github-actions github-actions bot added this to the 1.73.x - Nightly milestone Oct 17, 2024
brave-builds added a commit that referenced this pull request Oct 17, 2024
brave-builds added a commit that referenced this pull request Oct 17, 2024
@brave-builds
Copy link
Collaborator

Released in v1.73.22

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-teamcity Do not run builds in TeamCity CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[iOS] - MessageHandlers don't exist immediately after deleting them
4 participants