Prevent execution of WKUserScript from beyond main frame and allowed hosts#4469
Merged
Prevent execution of WKUserScript from beyond main frame and allowed hosts#4469
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR tightens WebKit script injection and message handling so that injected WKUserScripts and received WKScriptMessages are restricted to the main frame, reducing the risk of subframe/iframe content invoking the app’s WebView bridge.
Changes:
- Set
forMainFrameOnly: truefor the injected WebSocket bridge script. - Set
forMainFrameOnly: truefor the injected JS error listener script. - Drop any
WKScriptMessagereceived from non-main frames inSafeScriptMessageHandler.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| Sources/App/Frontend/WebView/WebViewController.swift | Restricts injected user scripts to the main frame only. |
| Sources/App/Frontend/ExternalMessageBus/SafeScriptMessageHandler.swift | Filters script messages to main-frame origin before delegating. |
bgoncal
changed the title
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4469 +/- ##
======================================
Coverage ? 0
======================================
Files ? 0
Lines ? 0
Branches ? 0
======================================
Hits ? 0
Misses ? 0
Partials ? 0 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
TimoPtr
reviewed
Apr 2, 2026
TimoPtr
reviewed
Apr 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Screenshots
Link to pull request in Documentation repository
Documentation: home-assistant/companion.home-assistant#
Any other notes