Desktop: Open links in default browser and prevent popups (#3006)
* Deny all browser popups * Open links with default browser * Fix review comments
This commit is contained in:
parent
0462d0ea2f
commit
5f2432cacf
|
|
@ -2114,6 +2114,7 @@ dependencies = [
|
||||||
"graphene-std",
|
"graphene-std",
|
||||||
"graphite-editor",
|
"graphite-editor",
|
||||||
"include_dir",
|
"include_dir",
|
||||||
|
"open",
|
||||||
"rfd",
|
"rfd",
|
||||||
"ron",
|
"ron",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
|
|
@ -2725,6 +2726,15 @@ dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "is-docker"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
|
||||||
|
dependencies = [
|
||||||
|
"once_cell",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is-terminal"
|
name = "is-terminal"
|
||||||
version = "0.4.16"
|
version = "0.4.16"
|
||||||
|
|
@ -2736,6 +2746,16 @@ dependencies = [
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "is-wsl"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
|
||||||
|
dependencies = [
|
||||||
|
"is-docker",
|
||||||
|
"once_cell",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is_terminal_polyfill"
|
name = "is_terminal_polyfill"
|
||||||
version = "1.70.1"
|
version = "1.70.1"
|
||||||
|
|
@ -3647,6 +3667,17 @@ version = "11.1.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
|
checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "open"
|
||||||
|
version = "5.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95"
|
||||||
|
dependencies = [
|
||||||
|
"is-wsl",
|
||||||
|
"libc",
|
||||||
|
"pathdiff",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl"
|
name = "openssl"
|
||||||
version = "0.10.73"
|
version = "0.10.73"
|
||||||
|
|
@ -3802,6 +3833,12 @@ dependencies = [
|
||||||
"svg",
|
"svg",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pathdiff"
|
||||||
|
version = "0.2.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "peniko"
|
name = "peniko"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
|
|
|
||||||
|
|
@ -164,6 +164,7 @@ include_dir = "0.7.4"
|
||||||
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
|
||||||
tracing = "0.1.41"
|
tracing = "0.1.41"
|
||||||
rfd = "0.15.4"
|
rfd = "0.15.4"
|
||||||
|
open = "5.3.2"
|
||||||
|
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
opt-level = 1
|
opt-level = 1
|
||||||
|
|
|
||||||
|
|
@ -38,3 +38,4 @@ glam = { workspace = true }
|
||||||
vello = { workspace = true }
|
vello = { workspace = true }
|
||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
rfd = { workspace = true }
|
rfd = { workspace = true }
|
||||||
|
open = { workspace = true }
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,15 @@ impl WinitApp {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for message in responses.extract_if(.., |m| matches!(m, FrontendMessage::TriggerVisitLink { .. })) {
|
||||||
|
let _ = thread::spawn(move || {
|
||||||
|
let FrontendMessage::TriggerVisitLink { url } = message else { unreachable!() };
|
||||||
|
if let Err(e) = open::that(&url) {
|
||||||
|
tracing::error!("Failed to open URL: {}: {}", url, e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if responses.is_empty() {
|
if responses.is_empty() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
mod browser_process_app;
|
mod browser_process_app;
|
||||||
mod browser_process_client;
|
mod browser_process_client;
|
||||||
mod browser_process_handler;
|
mod browser_process_handler;
|
||||||
|
mod browser_process_life_span_handler;
|
||||||
mod render_handler;
|
mod render_handler;
|
||||||
mod render_process_app;
|
mod render_process_app;
|
||||||
mod render_process_handler;
|
mod render_process_handler;
|
||||||
mod render_process_v8_handler;
|
mod render_process_v8_handler;
|
||||||
|
|
||||||
pub(crate) use browser_process_app::BrowserProcessAppImpl;
|
pub(super) use browser_process_app::BrowserProcessAppImpl;
|
||||||
pub(crate) use browser_process_client::BrowserProcessClientImpl;
|
pub(super) use browser_process_client::BrowserProcessClientImpl;
|
||||||
pub(crate) use render_handler::RenderHandlerImpl;
|
pub(super) use render_handler::RenderHandlerImpl;
|
||||||
pub(crate) use render_process_app::RenderProcessAppImpl;
|
pub(super) use render_process_app::RenderProcessAppImpl;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,12 @@
|
||||||
use cef::rc::{Rc, RcImpl};
|
use cef::rc::{Rc, RcImpl};
|
||||||
use cef::sys::{_cef_client_t, cef_base_ref_counted_t};
|
use cef::sys::{_cef_client_t, cef_base_ref_counted_t};
|
||||||
use cef::{ImplClient, RenderHandler, WrapClient};
|
use cef::{ImplClient, LifeSpanHandler, RenderHandler, WrapClient};
|
||||||
|
|
||||||
use crate::cef::CefEventHandler;
|
use crate::cef::CefEventHandler;
|
||||||
use crate::cef::ipc::{MessageType, UnpackMessage, UnpackedMessage};
|
use crate::cef::ipc::{MessageType, UnpackMessage, UnpackedMessage};
|
||||||
|
|
||||||
|
use super::browser_process_life_span_handler::BrowserProcessLifeSpanHandlerImpl;
|
||||||
|
|
||||||
pub(crate) struct BrowserProcessClientImpl<H: CefEventHandler> {
|
pub(crate) struct BrowserProcessClientImpl<H: CefEventHandler> {
|
||||||
object: *mut RcImpl<_cef_client_t, Self>,
|
object: *mut RcImpl<_cef_client_t, Self>,
|
||||||
render_handler: RenderHandler,
|
render_handler: RenderHandler,
|
||||||
|
|
@ -47,6 +49,10 @@ impl<H: CefEventHandler> ImplClient for BrowserProcessClientImpl<H> {
|
||||||
Some(self.render_handler.clone())
|
Some(self.render_handler.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn life_span_handler(&self) -> Option<cef::LifeSpanHandler> {
|
||||||
|
Some(LifeSpanHandler::new(BrowserProcessLifeSpanHandlerImpl::new()))
|
||||||
|
}
|
||||||
|
|
||||||
fn get_raw(&self) -> *mut _cef_client_t {
|
fn get_raw(&self) -> *mut _cef_client_t {
|
||||||
self.object.cast()
|
self.object.cast()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,64 @@
|
||||||
|
use cef::rc::{Rc, RcImpl};
|
||||||
|
use cef::sys::{_cef_life_span_handler_t, cef_base_ref_counted_t};
|
||||||
|
use cef::{ImplLifeSpanHandler, WrapLifeSpanHandler};
|
||||||
|
|
||||||
|
pub(crate) struct BrowserProcessLifeSpanHandlerImpl {
|
||||||
|
object: *mut RcImpl<_cef_life_span_handler_t, Self>,
|
||||||
|
}
|
||||||
|
impl BrowserProcessLifeSpanHandlerImpl {
|
||||||
|
pub(crate) fn new() -> Self {
|
||||||
|
Self { object: std::ptr::null_mut() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ImplLifeSpanHandler for BrowserProcessLifeSpanHandlerImpl {
|
||||||
|
fn on_before_popup(
|
||||||
|
&self,
|
||||||
|
_browser: Option<&mut cef::Browser>,
|
||||||
|
_frame: Option<&mut cef::Frame>,
|
||||||
|
_popup_id: ::std::os::raw::c_int,
|
||||||
|
target_url: Option<&cef::CefString>,
|
||||||
|
_target_frame_name: Option<&cef::CefString>,
|
||||||
|
_target_disposition: cef::WindowOpenDisposition,
|
||||||
|
_user_gesture: ::std::os::raw::c_int,
|
||||||
|
_popup_features: Option<&cef::PopupFeatures>,
|
||||||
|
_window_info: Option<&mut cef::WindowInfo>,
|
||||||
|
_client: Option<&mut Option<impl cef::ImplClient>>,
|
||||||
|
_settings: Option<&mut cef::BrowserSettings>,
|
||||||
|
_extra_info: Option<&mut Option<cef::DictionaryValue>>,
|
||||||
|
_no_javascript_access: Option<&mut ::std::os::raw::c_int>,
|
||||||
|
) -> ::std::os::raw::c_int {
|
||||||
|
let target = target_url.map(|url| url.to_string()).unwrap_or("unknown".to_string());
|
||||||
|
tracing::error!("Browser tried to open a popup at URL: {}", target);
|
||||||
|
|
||||||
|
// Deny any popup by returning 1
|
||||||
|
1
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_raw(&self) -> *mut _cef_life_span_handler_t {
|
||||||
|
self.object.cast()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Clone for BrowserProcessLifeSpanHandlerImpl {
|
||||||
|
fn clone(&self) -> Self {
|
||||||
|
unsafe {
|
||||||
|
let rc_impl = &mut *self.object;
|
||||||
|
rc_impl.interface.add_ref();
|
||||||
|
}
|
||||||
|
Self { object: self.object }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Rc for BrowserProcessLifeSpanHandlerImpl {
|
||||||
|
fn as_base(&self) -> &cef_base_ref_counted_t {
|
||||||
|
unsafe {
|
||||||
|
let base = &*self.object;
|
||||||
|
std::mem::transmute(&base.cef_object)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl WrapLifeSpanHandler for BrowserProcessLifeSpanHandlerImpl {
|
||||||
|
fn wrap_rc(&mut self, object: *mut RcImpl<_cef_life_span_handler_t, Self>) {
|
||||||
|
self.object = object;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue