mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
Main changes: - Refactor connect/auth flows around a single OS profile and host identity model, including gateway fallback and cookie-on-stdin handling. - Align request parameters, HIP host-id propagation, SAML webview user-agent behavior, and portal default-browser handling with observed official client behavior. - Add opt-in cookie cache support and Microsoft Defender HIP reporting while keeping host-id validation explicit. - Add BSD build, packaging, release artifact, and provenance support with FreeBSD/OpenBSD path and dependency cleanup. - Update NixOS install documentation and dependency compatibility fixes.
121 lines
3.2 KiB
Rust
121 lines
3.2 KiB
Rust
use tauri::WebviewWindow;
|
|
|
|
pub trait WindowExt {
|
|
fn raise(&self) -> anyhow::Result<()>;
|
|
}
|
|
|
|
impl WindowExt for WebviewWindow {
|
|
#[cfg(any(target_os = "macos", target_os = "windows"))]
|
|
fn raise(&self) -> anyhow::Result<()> {
|
|
self.show()?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
|
|
fn raise(&self) -> anyhow::Result<()> {
|
|
unix::raise_window(self)
|
|
}
|
|
}
|
|
|
|
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
|
|
mod unix {
|
|
use std::{process::ExitStatus, time::Duration};
|
|
|
|
use anyhow::bail;
|
|
use gtk::{
|
|
EventBox,
|
|
glib::{self, Cast},
|
|
traits::{EventBoxExt, GtkWindowExt, WidgetExt},
|
|
};
|
|
use log::info;
|
|
use tauri::WebviewWindow;
|
|
use tokio::process::Command;
|
|
|
|
/// Wrapper to mark a non-Send closure as Send for dispatch to the GTK main thread.
|
|
///
|
|
/// SAFETY: The caller must ensure the closure is only executed on the GTK main
|
|
/// thread. This is guaranteed by `glib::MainContext::default().invoke()`.
|
|
struct SendFn(Box<dyn FnOnce()>);
|
|
unsafe impl Send for SendFn {}
|
|
|
|
impl SendFn {
|
|
fn invoke(self) {
|
|
(self.0)();
|
|
}
|
|
}
|
|
|
|
pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
|
|
let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
|
|
|
|
if is_wayland {
|
|
let gtk_win = win.gtk_window()?;
|
|
|
|
// GTK operations must run on the main thread. When this function is called
|
|
// from a background thread (e.g., rspc handler on a tokio worker), calling
|
|
// GTK widget methods directly causes crashes in GTK's CSS subsystem
|
|
// (gtk_css_value_inherit_free assertion failure). Dispatch to the main
|
|
// thread via glib::MainContext to ensure thread safety.
|
|
let send_fn = SendFn(Box::new(move || {
|
|
if let Some(header) = gtk_win.titlebar() {
|
|
let _ = header.downcast::<EventBox>().map(|event_box| {
|
|
event_box.set_above_child(false);
|
|
});
|
|
}
|
|
|
|
gtk_win.hide();
|
|
gtk_win.show_all();
|
|
}));
|
|
|
|
glib::MainContext::default().invoke(move || send_fn.invoke());
|
|
} else {
|
|
if !win.is_visible()? {
|
|
win.show()?;
|
|
}
|
|
let title = win.title()?;
|
|
tokio::spawn(async move {
|
|
if let Err(err) = wmctrl_raise_window(&title).await {
|
|
info!("Window not raised: {}", err);
|
|
}
|
|
});
|
|
}
|
|
|
|
// Calling window.show() on window object will cause the menu to be shown.
|
|
// We need to hide it again.
|
|
win.hide_menu()?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn wmctrl_raise_window(title: &str) -> anyhow::Result<()> {
|
|
let mut counter = 0;
|
|
|
|
loop {
|
|
if let Ok(exit_status) = wmctrl_try_raise_window(title).await {
|
|
if exit_status.success() {
|
|
info!("Window raised after {} attempts", counter + 1);
|
|
return Ok(());
|
|
}
|
|
}
|
|
|
|
if counter >= 10 {
|
|
bail!("Failed to raise window: {}", title)
|
|
}
|
|
|
|
counter += 1;
|
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
|
}
|
|
}
|
|
|
|
async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
|
|
let exit_status = Command::new("wmctrl")
|
|
.arg("-F")
|
|
.arg("-a")
|
|
.arg(title)
|
|
.spawn()?
|
|
.wait()
|
|
.await?;
|
|
|
|
Ok(exit_status)
|
|
}
|
|
}
|