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.

Sign up for GitHub

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

Jump to bottom

disable initialization script injection into subframes on macOS #1251

Merged
merged 4 commits into from
May 13, 2024
Merged

disable initialization script injection into subframes on macOS #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82210ff
disable injecting init scripts into subframes on macOS
chippers May 9, 2024
1345a8f
formatting
chippers May 9, 2024
4aee669
formatting
chippers May 9, 2024
fbdfef7
formatting
chippers May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/webview/webkitgtk/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,7 @@ impl InnerWebView {
if let Some(manager) = self.webview.user_content_manager() {
let script = UserScript::new(
js,
// FIXME: We allow subframe injection because webview2 does and cannot be disabled (currently).
// once webview2 allows disabling all-frame script injection, TopFrame should be set
// if it does not break anything. (originally added for isolation pattern).
// TODO: feature to allow injecting into subframes
UserContentInjectedFrames::TopFrame,
UserScriptInjectionTime::Start,
&[],
Expand Down
1 change: 1 addition & 0 deletions src/webview/webview2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,7 @@ window.addEventListener('mousemove', (e) => window.chrome.webview.postMessage('_
Ok(webview)
}

// TODO: feature to allow injecting into (specific) subframes
fn add_script_to_execute_on_document_created(
webview: &ICoreWebView2,
js: String,
Expand Down
6 changes: 2 additions & 4 deletions src/webview/wkwebview/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,11 +898,9 @@ r#"Object.defineProperty(window, 'ipc', {
// [manager addUserScript:[[WKUserScript alloc] initWithSource:[NSString stringWithUTF8String:js.c_str()] injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES]]
unsafe {
let userscript: id = msg_send![class!(WKUserScript), alloc];
// TODO: feature to allow injecting into subframes
let script: id =
// FIXME: We allow subframe injection because webview2 does and cannot be disabled (currently).
// once webview2 allows disabling all-frame script injection, forMainFrameOnly should be enabled
// if it does not break anything. (originally added for isolation pattern).
msg_send![userscript, initWithSource:NSString::new(js) injectionTime:0 forMainFrameOnly:0];
msg_send![userscript, initWithSource:NSString::new(js) injectionTime:0 forMainFrameOnly:1];
let _: () = msg_send![self.manager, addUserScript: script];
}
}
Expand Down