diff --git a/.gitignore b/.gitignore index b4f26ac..fb67353 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ result # Packages & test assets *.ipa + +__pycache__ diff --git a/Cargo.lock b/Cargo.lock index 4135727..bf55386 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,7 +292,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "block2", @@ -322,7 +322,7 @@ dependencies = [ "webview2-com", "windows", "windows-sys 0.61.2", - "winreg 0.55.0", + "winreg", ] [[package]] @@ -554,14 +554,14 @@ dependencies = [ [[package]] name = "browser-launcher" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "log", "open", "webbrowser", "which", - "winreg 0.55.0", + "winreg", ] [[package]] @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "common" -version = "3.5.0" +version = "3.6.0" dependencies = [ "tempfile", ] @@ -1559,7 +1559,7 @@ dependencies = [ "rustc_version", "toml 1.1.8+spec-1.1.0", "vswhom", - "winreg 0.56.0", + "winreg", ] [[package]] @@ -1629,7 +1629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2133,7 +2133,7 @@ dependencies = [ [[package]] name = "gp-xml" -version = "3.5.0" +version = "3.6.0" dependencies = [ "url", "xmltree", @@ -2141,7 +2141,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "base64 0.23.1", @@ -2205,7 +2205,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "auth", @@ -2223,7 +2223,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "clap", @@ -2254,7 +2254,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "clap", @@ -2275,7 +2275,7 @@ dependencies = [ [[package]] name = "gphip" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "askama", @@ -2294,7 +2294,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "3.5.0" +version = "3.6.0" dependencies = [ "anyhow", "axum", @@ -2332,7 +2332,7 @@ dependencies = [ [[package]] name = "gptunnel" -version = "3.5.0" +version = "3.6.0" dependencies = [ "gpapi", "log", @@ -2344,7 +2344,7 @@ dependencies = [ [[package]] name = "gpvpnc" -version = "3.5.0" +version = "3.6.0" dependencies = [ "base64 0.23.1", "ipnet", @@ -2354,7 +2354,7 @@ dependencies = [ "tempfile", "uuid", "windows-sys 0.61.2", - "winreg 0.56.0", + "winreg", ] [[package]] @@ -3860,7 +3860,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "3.5.0" +version = "3.6.0" dependencies = [ "autotools", "cc", @@ -4713,7 +4713,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4778,7 +4778,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5648,9 +5648,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.12.5" +version = "2.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb0244332cfb9cee7e2a568bf5da29a36ed8fdbd717f6f47a66b6b7b358c072" +checksum = "30fbfbb9dc9a2697b0e96d909ddc295fb18d2d82a58ed542ab8d9eba2edbe6da" dependencies = [ "anyhow", "bytes", @@ -5699,9 +5699,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adddb0e648752aaac5da9c3c3c6a68e1e87cab55e3b757b18a9441ef8c3ac614" +checksum = "73d80784e874fa117b9b00a6680cf2f9b8a51bbd14406bea980cf8f328b00646" dependencies = [ "anyhow", "cargo_toml", @@ -5722,9 +5722,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37631cf71dab5e8ab55e1bdd701e18a52653d90b78e71d0e5598b1e0a61316" +checksum = "c5dc6caab4da5646f57648f39b794bae118f0dd4a4305eeb8c892966171f4852" dependencies = [ "base64 0.23.1", "brotli", @@ -5737,7 +5737,7 @@ dependencies = [ "semver", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.1", "syn 2.0.119", "tauri-utils", "thiserror 2.0.21", @@ -5749,9 +5749,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc38db58854c10fb5f91a887ed8bf82d3239bb92b5d8db86eda09e96d9963d1" +checksum = "2831c5da8603a96b1efc0b650c2cb6decc69b6cda257d815fe70c7f5be53818e" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5763,9 +5763,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.12.2" +version = "2.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c55766d99cea69055904d1735b93c2049302b2e09effd462120deb5581d78e9" +checksum = "60c2b14bd5265b63993cdc34ad526fb836e0fd0cf64a4634a895db0784844d5e" dependencies = [ "cookie", "dpi", @@ -5788,9 +5788,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.12.3" +version = "2.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1aa9d8b7a120f879f44fdc1053f7b7dbf416bf0bbc6a72b714dec46b782b52f" +checksum = "b8c14a025255cc9816d401635035075b09b6cc9973b7b8fd7b8fcb8753f30f92" dependencies = [ "gtk", "http", @@ -5813,9 +5813,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.10.2" +version = "2.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "362ab21cd4cc713f2a02b1a9b5688198b1541cfb6907c4281e9190e0f0ef4aa3" +checksum = "28d1d33d4453c5df0bf1672dbc7ada69d8ed74f56a4316d964a4aa73d4ecd3ad" dependencies = [ "anyhow", "brotli", @@ -5870,7 +5870,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6413,9 +6413,9 @@ checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" [[package]] name = "uuid" -version = "1.29.0" +version = "1.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" +checksum = "3c14b15dffa2f4bd712103e857140aa04a4f2ff6e955c77d7eb8e53ee02a3b64" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -6795,7 +6795,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6961,15 +6961,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -7136,16 +7127,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" -dependencies = [ - "cfg-if", - "windows-sys 0.59.0", -] - [[package]] name = "winreg" version = "0.56.0" @@ -7361,9 +7342,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +checksum = "85ccff8a4805aba1eaa4cd4afcd49f7557dd2cf5fd79ffc37f8959466effc5aa" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 21f2664..f677fb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.91" -version = "3.5.0" +version = "3.6.0" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" diff --git a/apps/gpauth/src/cli.rs b/apps/gpauth/src/cli.rs index c5dc36b..c4b14bf 100644 --- a/apps/gpauth/src/cli.rs +++ b/apps/gpauth/src/cli.rs @@ -270,7 +270,21 @@ fn init_logger(cli: &Cli) { } pub async fn run() { + #[cfg(not(windows))] let cli = Cli::parse(); + #[cfg(windows)] + let cli = match gpapi::process::auth_bootstrap::receive_arguments().await { + Ok(Some(args)) => Cli::parse_from( + std::env::args_os() + .take(1) + .chain(args.into_iter().map(std::ffi::OsString::from)), + ), + Ok(None) => Cli::parse(), + Err(error) => { + eprintln!("Could not read Windows authentication launch arguments: {error}"); + std::process::exit(1); + } + }; #[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] if let Some(CliCommand::AuthCallback { callback }) = &cli.command { diff --git a/apps/gpclient/Cargo.toml b/apps/gpclient/Cargo.toml index 9bae06d..1780d8d 100644 --- a/apps/gpclient/Cargo.toml +++ b/apps/gpclient/Cargo.toml @@ -18,25 +18,27 @@ clap.workspace = true env_logger.workspace = true inquire = "0.9" log.workspace = true +tokio = { workspace = true, features = ["rt-multi-thread"] } +tokio-util.workspace = true +serde.workspace = true +serde_json.workspace = true +compile-time.workspace = true + +[target.'cfg(unix)'.dependencies] +directories.workspace = true nix = { version = "0.31", features = ["fs", "signal", "process", "poll", "term"] } ratatui = { version = "=0.30.2", default-features = false, features = ["crossterm", "unstable-rendered-line-info"] } crossterm = { version = "0.29", features = ["use-dev-tty"] } strip-ansi-escapes = "0.2" -tokio = { workspace = true, features = ["rt-multi-thread"] } -tokio-util.workspace = true sysinfo.workspace = true -serde.workspace = true -serde_json.workspace = true -whoami.workspace = true -directories.workspace = true -compile-time.workspace = true uzers.workspace = true +whoami.workspace = true [features] default = ["webview-auth"] webview-auth = ["gpapi/webview-auth"] -[target.'cfg(target_os = "macos")'.dependencies] +[target.'cfg(any(target_os = "macos", windows))'.dependencies] gpvpnc = { path = "../../crates/gpvpnc" } [dev-dependencies] diff --git a/apps/gpclient/src/cli.rs b/apps/gpclient/src/cli.rs index 8233674..3b01619 100644 --- a/apps/gpclient/src/cli.rs +++ b/apps/gpclient/src/cli.rs @@ -1,8 +1,10 @@ +#[cfg(unix)] use std::{ path::{Path, PathBuf}, str::FromStr, }; +#[cfg(unix)] use anyhow::bail; use clap::{Parser, Subcommand}; use gpapi::{ @@ -10,17 +12,22 @@ use gpapi::{ log_format::{LogFormat, write_json_record}, }; use log::info; +#[cfg(unix)] use sysinfo::{Pid, System}; +#[cfg(unix)] use tokio::fs; +#[cfg(unix)] use crate::{ GP_CLIENT_LOCK_FILE, - connect::{ConnectArgs, ConnectHandler}, diagnostics::DiagnosticsArgs, disconnect::{DisconnectArgs, DisconnectHandler}, - hip::{HipArgs, HipHandler}, launch_gui::{LaunchGuiArgs, LaunchGuiHandler}, }; +use crate::{ + connect::{ConnectArgs, ConnectHandler}, + hip::{HipArgs, HipHandler}, +}; const VERSION: &str = concat!( env!("CARGO_PKG_VERSION"), @@ -33,7 +40,10 @@ const VERSION: &str = concat!( pub(crate) struct SharedArgs<'a> { pub(crate) ignore_tls_errors: bool, + #[cfg(unix)] pub(crate) lock_file: &'a Path, + #[cfg(windows)] + pub(crate) system_tunnel: std::cell::RefCell>, pub(crate) verbose: &'a InfoLevelVerbosity, pub(crate) log_format: LogFormat, } @@ -42,12 +52,15 @@ pub(crate) struct SharedArgs<'a> { enum CliCommand { #[command(about = "Connect to a portal server")] Connect(Box), + #[cfg(unix)] #[command(about = "Disconnect from the server")] Disconnect(DisconnectArgs), + #[cfg(unix)] #[command(about = "Launch the GUI")] LaunchGui(LaunchGuiArgs), #[command(about = "Generate HIP report")] Hip(HipArgs), + #[cfg(unix)] #[command(about = "Collect system diagnostics for a bug report without connecting to a VPN")] Diagnostics(DiagnosticsArgs), #[command(hide = true)] @@ -89,11 +102,12 @@ struct Cli { #[command(subcommand)] command: CliCommand, - #[cfg(not(target_os = "macos"))] + #[cfg(all(unix, not(target_os = "macos")))] #[arg(long, hide = true)] fix_openssl: bool, #[arg(long, help = "Ignore the TLS errors")] ignore_tls_errors: bool, + #[cfg(unix)] #[arg( long, global = true, @@ -102,6 +116,7 @@ struct Cli { )] lock_file: PathBuf, + #[cfg(unix)] #[arg(long, hide = true, global = true)] background_worker_fd: Option, @@ -128,6 +143,7 @@ impl Args for Cli { } impl Cli { + #[cfg(unix)] fn can_run_alongside_client(&self) -> bool { match &self.command { CliCommand::Connect(_) => false, @@ -136,6 +152,7 @@ impl Cli { } } + #[cfg(unix)] async fn is_running(&self) -> bool { let Ok(c) = fs::read_to_string(&self.lock_file).await else { return false; @@ -156,50 +173,67 @@ impl Cli { } async fn run(&self) -> anyhow::Result<()> { - #[cfg(not(target_os = "macos"))] + #[cfg(all(unix, not(target_os = "macos")))] if self.fix_openssl && !(matches!(&self.command, CliCommand::Connect(args) if args.background) && self.background_worker_fd.is_none()) { log::warn!("--fix-openssl is deprecated and has no effect. It will be removed in a future release."); } - if let CliCommand::Connect(args) = &self.command { - if args.dashboard { - crate::dashboard::validate(self.log_format)?; + #[cfg(unix)] + let background_worker = { + if let CliCommand::Connect(args) = &self.command { + if args.dashboard { + crate::dashboard::validate(self.log_format)?; + } + } + if self.background_worker_fd.is_some() && !matches!(&self.command, CliCommand::Connect(args) if args.background) { + bail!("Background worker requires connect --background"); + } + if let CliCommand::Diagnostics(args) = &self.command { + return args.run(VERSION).await; } - } - if self.background_worker_fd.is_some() && !matches!(&self.command, CliCommand::Connect(args) if args.background) { - bail!("Background worker requires connect --background"); - } - if let CliCommand::Diagnostics(args) = &self.command { - return args.run(VERSION).await; - } - // check if an instance is running - if !self.can_run_alongside_client() && self.is_running().await { - bail!("Another instance of the client is already running"); - } + // check if an instance is running + if !self.can_run_alongside_client() && self.is_running().await { + bail!("Another instance of the client is already running"); + } - let background_worker = if let CliCommand::Connect(args) = &self.command { - if args.background { - let log_file = args - .log_file - .as_deref() - .unwrap_or_else(|| Path::new("/var/log/gpclient.log")); - match self.background_worker_fd { - Some(fd) => Some(crate::background::BackgroundWorker::new(fd, log_file)?), - None => return crate::background::start(log_file, self.log_format).await, + if let CliCommand::Connect(args) = &self.command { + if args.background { + let log_file = args + .log_file + .as_deref() + .unwrap_or_else(|| Path::new("/var/log/gpclient.log")); + match self.background_worker_fd { + Some(fd) => Some(crate::background::BackgroundWorker::new(fd, log_file)?), + None => return crate::background::start(log_file, self.log_format).await, + } + } else { + None } } else { None } - } else { - None + }; + #[cfg(windows)] + let system_tunnel = match &self.command { + CliCommand::Connect(args) if !args.cookie_only => { + anyhow::ensure!( + gpapi::windows::is_elevated()?, + "Run gpclient connect from an administrator terminal" + ); + Some(gpvpnc::windows::SystemTunnel::acquire()?) + } + _ => None, }; let shared_args = SharedArgs { ignore_tls_errors: self.ignore_tls_errors, + #[cfg(unix)] lock_file: &self.lock_file, + #[cfg(windows)] + system_tunnel: system_tunnel.into(), verbose: &self.verbose, log_format: self.log_format, }; @@ -210,14 +244,17 @@ impl Cli { match &self.command { CliCommand::Connect(args) => { - ConnectHandler::new(args, &shared_args) - .with_background(background_worker) - .handle() - .await + let handler = ConnectHandler::new(args, &shared_args); + #[cfg(unix)] + let handler = handler.with_background(background_worker); + handler.handle().await } + #[cfg(unix)] CliCommand::Disconnect(args) => DisconnectHandler::new(args, shared_args.lock_file).handle().await, + #[cfg(unix)] CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await, CliCommand::Hip(args) => HipHandler::new(args).handle().await, + #[cfg(unix)] CliCommand::Diagnostics(_) => unreachable!("diagnostics is dispatched before VPN setup"), CliCommand::DetectInternalHost { address, hostname } => { let internal = gpapi::session::desktop::network::native::detect_in_helper(*address, hostname)?; @@ -250,17 +287,20 @@ fn build_logger(cli: &Cli) -> env_logger::Builder { builder } -pub(crate) async fn run() { - let cli = Cli::parse(); - +fn initialize_logger(cli: &Cli) { + #[cfg(unix)] if matches!(&cli.command, CliCommand::Connect(args) if args.dashboard) { - let logger = build_logger(&cli).build(); + let logger = build_logger(cli).build(); log::set_max_level(logger.filter()); log::set_boxed_logger(Box::new(crate::dashboard::NoticeLogger::new(logger))).expect("failed to initialize logger"); - } else { - build_logger(&cli).init(); + return; } + build_logger(cli).init(); +} +pub(crate) async fn run() { + let cli = Cli::parse(); + initialize_logger(&cli); info!("gpclient started: {}", VERSION); if let Err(err) = cli.run().await { @@ -269,7 +309,7 @@ pub(crate) async fn run() { } } -#[cfg(test)] +#[cfg(all(test, unix))] mod tests { use std::{ io::Write, @@ -360,7 +400,7 @@ mod tests { fn diagnostics_accepts_output_options_and_runs_alongside_the_client() { let cli = Cli::try_parse_from([ "gpclient", - #[cfg(not(target_os = "macos"))] + #[cfg(all(unix, not(target_os = "macos")))] "--fix-openssl", "diagnostics", "--json", @@ -593,3 +633,31 @@ mod tests { ); } } + +#[cfg(all(test, windows))] +mod windows_tests { + use super::*; + + #[test] + fn terminal_auth_and_generated_hip_are_available() { + assert!(Cli::try_parse_from(["gpclient", "connect", "vpn.example.com", "--cookie-only", "--hip"]).is_ok()); + } + + #[test] + fn unix_only_workflows_are_unavailable() { + for flag in [ + "--background", + "--dashboard", + "--lock-file", + "--script", + "--hip-user", + "--script-tun", + ] { + assert!( + Cli::try_parse_from(["gpclient", "connect", "vpn.example.com", flag]).is_err(), + "{flag}" + ); + } + assert!(Cli::try_parse_from(["gpclient", "disconnect"]).is_err()); + } +} diff --git a/apps/gpclient/src/connect/args.rs b/apps/gpclient/src/connect/args.rs index 0d5de04..6b6e4c1 100644 --- a/apps/gpclient/src/connect/args.rs +++ b/apps/gpclient/src/connect/args.rs @@ -13,6 +13,7 @@ pub(crate) struct ConnectArgs { #[arg(help = "The portal server to connect to")] pub(super) server: String, + #[cfg(unix)] #[arg( long, conflicts_with = "cookie_only", @@ -20,6 +21,7 @@ pub(crate) struct ConnectArgs { )] pub(crate) background: bool, + #[cfg(unix)] #[arg( long, conflicts_with_all = ["background", "cookie_only"], @@ -27,6 +29,7 @@ pub(crate) struct ConnectArgs { )] pub(crate) dashboard: bool, + #[cfg(unix)] #[arg( long, requires = "background", @@ -61,18 +64,21 @@ pub(crate) struct ConnectArgs { )] pub(super) cookie_cache: Option, + #[cfg(unix)] #[arg(long, short, help = "The VPNC script to use", required_if_eq("script_tun", "true"))] pub(super) script: Option, #[arg(long, short, help = "The IFNAME for tunnel interface")] pub(super) interface: Option, + #[cfg(unix)] #[arg(long, short = 'S', help = "Pass traffic to '--script' program, not tun")] pub(super) script_tun: bool, #[arg(long, help = "Connect the server as a gateway, instead of a portal")] pub(super) as_gateway: bool, + #[cfg(unix)] #[arg( long, help = "Enable HIP (Host Information Profile), optionally specify a custom executable", @@ -81,6 +87,11 @@ pub(crate) struct ConnectArgs { )] pub(super) hip: Option, + #[cfg(windows)] + #[arg(long, help = "Generate a HIP (Host Information Profile) report")] + pub(super) hip: bool, + + #[cfg(unix)] #[arg( long, help = "Run a custom HIP executable as this user; otherwise inherit the process user" @@ -100,9 +111,11 @@ pub(crate) struct ConnectArgs { #[arg(short = 'p', long, help = "The key passphrase of the private key")] pub(super) key_password: Option, + #[cfg(unix)] #[arg(long, hide = true)] pub(super) csd_user: Option, + #[cfg(unix)] #[arg(long, hide = true)] pub(super) csd_wrapper: Option, @@ -188,7 +201,7 @@ pub(crate) struct ConnectArgs { VPN tunnel. Outputs two lines: COOKIE='' and HOST=''. Combine with \ --cookie-cache to avoid re-authenticating when the portal session is still valid." )] - pub(super) cookie_only: bool, + pub(crate) cookie_only: bool, } pub(super) fn build_os_profile(args: &ConnectArgs) -> OsProfile { @@ -207,17 +220,19 @@ pub(super) fn build_os_profile_with_host_id(args: &ConnectArgs, host_id: Option< } pub(super) fn cookie_cache_path(args: &ConnectArgs) -> Option { - args.cookie_cache.as_deref().map(|path| { + args.cookie_cache.as_deref().and_then(|path| { let custom = (!path.is_empty()).then_some(path); cookie_store::cookie_path(custom) }) } pub(super) fn warn_deprecated_connect_args(args: &ConnectArgs) { + #[cfg(unix)] if args.csd_user.is_some() { warn!("Deprecated option --csd-user will be removed; use --hip-user instead"); } + #[cfg(unix)] if args.csd_wrapper.is_some() { warn!("Deprecated option --csd-wrapper will be removed; use --hip instead"); } @@ -231,7 +246,7 @@ pub(super) fn warn_deprecated_connect_args(args: &ConnectArgs) { } } -#[cfg(test)] +#[cfg(all(test, unix))] mod tests { use super::*; diff --git a/apps/gpclient/src/connect/credential.rs b/apps/gpclient/src/connect/credential.rs index dc0b850..25f6fe6 100644 --- a/apps/gpclient/src/connect/credential.rs +++ b/apps/gpclient/src/connect/credential.rs @@ -178,6 +178,8 @@ impl ConnectHandler<'_> { } } + #[cfg(windows)] + let auth_launcher = auth_launcher.with_windows_cli_launch(); let cred = auth_launcher.cancellation(&self.cancellation).launch().await?; self.check_cancelled()?; Ok(cred) diff --git a/apps/gpclient/src/connect/gateway.rs b/apps/gpclient/src/connect/gateway.rs index ac097d3..82922cb 100644 --- a/apps/gpclient/src/connect/gateway.rs +++ b/apps/gpclient/src/connect/gateway.rs @@ -1,12 +1,12 @@ -use std::{ - fs, - path::Path, - sync::{ - Arc, Mutex, - atomic::{AtomicBool, Ordering}, - }, +use std::sync::{ + Arc, Mutex, + atomic::{AtomicBool, Ordering}, }; +#[cfg(unix)] +use std::{fs, path::Path}; +#[cfg(unix)] +use gpapi::process::users::get_user_by_name; use gpapi::{ clap::report, cookie_store, @@ -15,19 +15,22 @@ use gpapi::{ gp_params::GpParams, os_profile::OsProfile, portal::{PortalConfig, prelogin}, - process::users::get_user_by_name, session::{GatewayAuthentication, SessionMode}, }; use inquire::Text; use log::{Level, info, warn}; -use openconnect::{HipScript, HipSource, VpnBuilder}; +#[cfg(unix)] +use openconnect::HipScript; +use openconnect::{HipSource, VpnBuilder}; use tokio::{runtime::Handle, task::JoinHandle}; use crate::session::{ SessionContextInput, build_session_context, session_info_from_vpn, spawn_session_runtime_with_info, }; -use super::{ConnectHandler, args::cookie_cache_path, vpn_script}; +#[cfg(unix)] +use super::tunnel_output::TunnelOutput; +use super::{ConnectHandler, args::cookie_cache_path}; const OPENCONNECT_INTERRUPTED_EXIT_CODE: i32 = -4; @@ -452,7 +455,10 @@ impl ConnectHandler<'_> { disable_ipv6: self.args.disable_ipv6, extension_auth: Some(extension_auth), }); - let vpn_builder = vpn_script::builder(gateway, cookie, self.args) + let vpn_builder = self + .vpn_builder(gateway, cookie) + .map_err(GatewayConnectError::before_establishment)?; + let vpn_builder = vpn_builder .interface(self.args.interface.clone()) .certificate(certificate) .sslkey(sslkey) @@ -487,21 +493,8 @@ impl ConnectHandler<'_> { let disconnect_requested_on_signal = Arc::clone(&disconnect_requested); let cancellation = self.cancellation.clone(); - let mut background_stdio = self - .background - .as_ref() - .map(|background| background.redirect_stdio()) - .transpose() - .map_err(GatewayConnectError::before_establishment)?; - - let mut dashboard = if self.args.dashboard { - Some( - crate::dashboard::Dashboard::prepare(gateway.to_owned(), self.cancellation.clone()) - .map_err(GatewayConnectError::before_establishment)?, - ) - } else { - None - }; + #[cfg(unix)] + let mut output = TunnelOutput::prepare(self, gateway).map_err(GatewayConnectError::before_establishment)?; let monitor = gptunnel::TunnelMonitor::attach(vpn.clone()); let disconnect_task = tokio::spawn(async move { @@ -511,7 +504,9 @@ impl ConnectHandler<'_> { vpn_clone.disconnect(); }); + #[cfg(unix)] let lock_file_on_connect = self.shared_args.lock_file.to_path_buf(); + #[cfg(unix)] let pid_written = self.pid_written.clone(); let log_format = self.shared_args.log_format; let session_cancellation = self.cancellation.clone(); @@ -523,6 +518,7 @@ impl ConnectHandler<'_> { return; } tunnel_established_on_connect.store(true, Ordering::SeqCst); + #[cfg(unix)] pid_written.store(write_pid_file(&lock_file_on_connect), Ordering::SeqCst); let _ = established_tx.send(()); @@ -536,7 +532,6 @@ impl ConnectHandler<'_> { session_task_on_connect.lock().unwrap().replace(task); }) }); - let mut output_error = None; let connect_result = tokio::select! { result = &mut worker => result, established = established_rx => { @@ -550,23 +545,8 @@ impl ConnectHandler<'_> { self.logout_gateway(&server).await; } }, || { - if let Some(dashboard) = &mut dashboard { - if let Err(error) = dashboard.start_tunnel(monitor.clone()) { - self.cancellation.cancel(); - output_error = Some(error); - } - } - if let (Some(background), Some(stdio)) = (&self.background, &mut background_stdio) { - let detach = if self.pid_written.load(Ordering::SeqCst) { - background.detach(stdio) - } else { - Err(anyhow::anyhow!("Cannot detach without a writable PID lock file")) - }; - if let Err(error) = detach { - self.cancellation.cancel(); - output_error = Some(error); - } - } + #[cfg(unix)] + output.ready(monitor.clone()); }).await } else { (&mut worker).await @@ -574,11 +554,8 @@ impl ConnectHandler<'_> { } }; monitor.stop().await; - if let Some(dashboard) = &mut dashboard { - if let Err(error) = dashboard.finish() { - output_error = Some(error); - } - } + #[cfg(unix)] + let output_result = output.finish(); let tunnel_established = tunnel_established.load(Ordering::SeqCst); disconnect_task.abort(); let _ = disconnect_task.await; @@ -589,15 +566,15 @@ impl ConnectHandler<'_> { let _ = task.await; } - if let Some(error) = output_error { - return Err(GatewayConnectError::after_establishment(error)); - } + #[cfg(unix)] + output_result.map_err(GatewayConnectError::after_establishment)?; let disconnect_requested = disconnect_requested.load(Ordering::SeqCst); let connect_result = connect_result.map_err(|error| GatewayConnectError::after_establishment(error.into()))?; classify_openconnect_result(connect_result, tunnel_established, disconnect_requested) } + #[cfg(unix)] pub(super) fn hip_source(&self, profile: OsProfile) -> anyhow::Result { let user = self.determine_hip_user(); let script = self.args.hip.as_ref().or(self.args.csd_wrapper.as_ref()); @@ -605,19 +582,7 @@ impl ConnectHandler<'_> { Some(path) if !path.is_empty() => Ok(HipSource::Script(HipScript::new(path.clone(), get_uid(&user)?)?)), Some(_) => { anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script"); - Ok(HipSource::Generator(Arc::new(move |request, control| { - let input = gphip::ReportInput { - profile: profile.clone(), - context: gphip::ReportContext::Connected { - cookie: request.cookie.clone(), - client_ip: request.client_ip.clone(), - client_ipv6: request.client_ipv6.clone(), - md5: request.md5.clone(), - }, - }; - gphip::generate_report_with_control(&input, &|| control.check()) - .map_err(|error| error.downcast::().unwrap_or_else(std::io::Error::other)) - }))) + Ok(generated_hip(profile)) } None => { anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script"); @@ -626,6 +591,16 @@ impl ConnectHandler<'_> { } } + #[cfg(windows)] + pub(super) fn hip_source(&self, profile: OsProfile) -> anyhow::Result { + Ok(if self.args.hip { + generated_hip(profile) + } else { + HipSource::Disabled + }) + } + + #[cfg(unix)] fn determine_hip_user(&self) -> Option { if let Some(hip_user) = &self.args.hip_user { return Some(hip_user.clone()); @@ -635,6 +610,22 @@ impl ConnectHandler<'_> { } } +fn generated_hip(profile: OsProfile) -> HipSource { + HipSource::Generator(Arc::new(move |request, control| { + let input = gphip::ReportInput { + profile: profile.clone(), + context: gphip::ReportContext::Connected { + cookie: request.cookie.clone(), + client_ip: request.client_ip.clone(), + client_ipv6: request.client_ipv6.clone(), + md5: request.md5.clone(), + }, + }; + gphip::generate_report_with_control(&input, &|| control.check()) + .map_err(|error| error.downcast::().unwrap_or_else(std::io::Error::other)) + })) +} + async fn wait_for_tunnel_exit( worker: &mut JoinHandle, cleanup: impl std::future::Future, @@ -678,10 +669,17 @@ fn classify_openconnect_result( } } +#[cfg(unix)] fn direct_gateway_command(gateway: &str) -> String { format!("gpauth --gateway {gateway} | sudo gpclient connect {gateway} --as-gateway --cookie-on-stdin") } +#[cfg(windows)] +fn direct_gateway_command(gateway: &str) -> String { + format!("gpclient.exe connect {gateway} --as-gateway") +} + +#[cfg(unix)] pub(super) fn write_pid_file(lock_file: &Path) -> bool { let pid = std::process::id(); @@ -694,6 +692,7 @@ pub(super) fn write_pid_file(lock_file: &Path) -> bool { } } +#[cfg(unix)] fn get_uid(user: &Option) -> anyhow::Result> { user .as_ref() @@ -710,7 +709,7 @@ fn apply_os_profile(builder: VpnBuilder, profile: &OsProfile) -> VpnBuilder { .user_agent(Some(profile.user_agent().to_string())) } -#[cfg(test)] +#[cfg(all(test, unix))] mod tests { use super::*; diff --git a/apps/gpclient/src/connect/internal.rs b/apps/gpclient/src/connect/internal.rs index f928d0c..08b93d4 100644 --- a/apps/gpclient/src/connect/internal.rs +++ b/apps/gpclient/src/connect/internal.rs @@ -14,7 +14,7 @@ use gpapi::{ }; use log::{info, warn}; -use super::ConnectHandler; +use super::{ConnectHandler, internal_output::InternalOutput}; impl ConnectHandler<'_> { pub(super) async fn connect_internal_gateways( @@ -26,6 +26,7 @@ impl ConnectHandler<'_> { first_session: super::gateway::GatewayLoginSession, remaining: &[&Gateway], ) -> anyhow::Result<()> { + #[cfg(unix)] ensure!( self.background.is_none(), "--background requires a VPN tunnel; internal non-tunnel sessions must run in the foreground" @@ -70,11 +71,18 @@ impl ConnectHandler<'_> { } self.check_cancelled()?; let modes = authenticated.iter().map(|(_, session)| session.authentication.mode()); + self.enter_non_tunnel_mode(modes)?; + self.run_internal_session(config, &authenticated).await + } + + fn enter_non_tunnel_mode(&self, modes: impl Iterator) -> anyhow::Result<()> { ensure!( internal_session_mode(modes)? == SessionMode::NonTunnel, "Expected non-tunnel authentication" ); - self.run_internal_session(config, &authenticated).await + #[cfg(windows)] + drop(self.shared_args.system_tunnel.take()); + Ok(()) } async fn run_internal_session( @@ -112,18 +120,7 @@ impl ConnectHandler<'_> { let source = Arc::new(source); let validate_network = network.clone(); let validate_detection = detection.clone(); - let members = crate::dashboard::InternalMembers::default(); - let dashboard_members = members.clone(); - let (established_tx, established_rx) = tokio::sync::oneshot::channel(); - let established_tx = std::sync::Mutex::new(Some(established_tx)); - let mut dashboard = if self.args.dashboard { - Some(crate::dashboard::Dashboard::prepare( - authenticated[0].0.server().to_owned(), - cancellation.clone(), - )?) - } else { - None - }; + let (output, observe_status) = InternalOutput::prepare(self, authenticated[0].0.server())?; let callbacks = SessionCallbacks { produce_report: Arc::new(move |request, control| { control.check()?; @@ -165,16 +162,10 @@ impl ConnectHandler<'_> { "Internal network — authenticated: {} (IPv4: {:?}, IPv6: {:?})", member.gateway, member.client_ip, member.client_ipv6 ); - if let Some(established) = established_tx.lock().unwrap().take() { - let _ = established.send(()); - } } state => info!("Internal gateway {}: {state:?}", member.gateway), } - members.lock().unwrap().insert( - member.gateway.server().to_owned(), - format!("{}: {:?}", member.gateway, member.maintenance), - ); + observe_status(&member); }), validate_network: Arc::new(move |cancellation| { let network = validate_network.clone(); @@ -204,43 +195,20 @@ impl ConnectHandler<'_> { // The PID spans maintenance and cleanup, including initialization before the // first successful HIP exchange. The outer handler owns final session logout. + #[cfg(unix)] self.pid_written.store( super::gateway::write_pid_file(self.shared_args.lock_file), std::sync::atomic::Ordering::SeqCst, ); let mut sessions = self.sessions.take(); - let mut dashboard_error = None; - let result = { - let maintenance = maintain_non_tunnel_sessions(&mut sessions, policy, callbacks, cancellation, async move { - network_signal.await.unwrap_or(SessionEndReason::NetworkChanged) - }); - tokio::pin!(maintenance); - tokio::select! { - result = &mut maintenance => result, - established = established_rx => { - if established.is_ok() { - if let Some(dashboard) = &mut dashboard { - if let Err(error) = dashboard.start_internal(dashboard_members) { - self.cancellation.cancel(); - dashboard_error = Some(error); - } - } - } - maintenance.await - } - } - }; - if let Some(dashboard) = &mut dashboard { - if let Err(error) = dashboard.finish() { - dashboard_error = Some(error); - } - } + let maintenance = maintain_non_tunnel_sessions(&mut sessions, policy, callbacks, cancellation, async move { + network_signal.await.unwrap_or(SessionEndReason::NetworkChanged) + }); + let (result, output_result) = output.run(maintenance).await; self.sessions.replace(sessions); monitor_cancel.cancel(); monitor.await.context("Internal network monitor failed")?; - if let Some(error) = dashboard_error { - return Err(error); - } + output_result?; match result? { SessionExit::Disconnected => Ok(()), SessionExit::Failed(reason) => bail!("Internal session ended: {reason:?}. Connect again to authenticate."), @@ -254,8 +222,7 @@ impl ConnectHandler<'_> { } } -fn internal_session_mode(modes: impl Iterator) -> anyhow::Result { - let mut modes = modes; +fn internal_session_mode(mut modes: impl Iterator) -> anyhow::Result { let mode = modes.next().context("No internal gateway authenticated successfully")?; ensure!( modes.all(|candidate| candidate == mode), @@ -276,9 +243,39 @@ mod tests { internal_session_mode([SessionMode::NonTunnel, SessionMode::NonTunnel].into_iter()).unwrap(), SessionMode::NonTunnel ); - assert_eq!( - internal_session_mode([SessionMode::Tunnel].into_iter()).unwrap(), - SessionMode::Tunnel + } + + #[cfg(windows)] + #[test] + #[ignore = "requires the installed Windows machine tunnel directory and administrator privileges"] + fn internal_maintenance_releases_the_machine_tunnel() { + use crate::{cli::SharedArgs, connect::ConnectArgs}; + use clap::Parser; + use gpvpnc::windows::SystemTunnel; + + #[derive(Parser)] + struct TestArgs { + #[command(flatten)] + connect: ConnectArgs, + } + let args = TestArgs::parse_from(["test", "portal.example.com"]); + let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); + let shared = SharedArgs { + ignore_tls_errors: false, + system_tunnel: Some(SystemTunnel::acquire().unwrap()).into(), + verbose: &verbose, + log_format: gpapi::log_format::LogFormat::Text, + }; + let handler = ConnectHandler::new(&args.connect, &shared); + assert!( + handler + .enter_non_tunnel_mode([SessionMode::Tunnel].into_iter()) + .is_err() ); + assert!(SystemTunnel::try_acquire().unwrap().is_none()); + handler + .enter_non_tunnel_mode([SessionMode::NonTunnel].into_iter()) + .unwrap(); + assert!(SystemTunnel::try_acquire().unwrap().is_some()); } } diff --git a/apps/gpclient/src/connect/internal_output/unix.rs b/apps/gpclient/src/connect/internal_output/unix.rs new file mode 100644 index 0000000..4391270 --- /dev/null +++ b/apps/gpclient/src/connect/internal_output/unix.rs @@ -0,0 +1,73 @@ +use std::{future::Future, sync::Mutex}; + +use gpapi::session::{GatewaySessionSummary, MaintenanceState}; +use tokio::sync::oneshot; +use tokio_util::sync::CancellationToken; + +use crate::dashboard::{Dashboard, InternalMembers}; + +use super::ConnectHandler; + +pub(super) struct InternalOutput(Option); + +struct DashboardState { + dashboard: Dashboard, + members: InternalMembers, + established: oneshot::Receiver<()>, + cancellation: CancellationToken, +} + +impl InternalOutput { + pub(super) fn prepare( + handler: &ConnectHandler<'_>, + gateway: &str, + ) -> anyhow::Result<(Self, impl Fn(&GatewaySessionSummary) + Send + Sync + 'static + use<>)> { + let (sender, established) = oneshot::channel(); + let established_sender = Mutex::new(Some(sender)); + let members = InternalMembers::default(); + let dashboard_members = members.clone(); + let output = if handler.args.dashboard { + Some(DashboardState { + dashboard: Dashboard::prepare(gateway.to_owned(), handler.cancellation.clone())?, + members, + established, + cancellation: handler.cancellation.clone(), + }) + } else { + None + }; + let observe = move |member: &GatewaySessionSummary| { + if member.maintenance == MaintenanceState::Healthy + && let Some(ready) = established_sender.lock().unwrap().take() + { + let _ = ready.send(()); + } + dashboard_members.lock().unwrap().insert( + member.gateway.server().to_owned(), + format!("{}: {:?}", member.gateway, member.maintenance), + ); + }; + Ok((Self(output), observe)) + } + + pub(super) async fn run(self, maintenance: impl Future) -> (T, anyhow::Result<()>) { + let Some(mut output) = self.0 else { + return (maintenance.await, Ok(())); + }; + let mut start = Ok(()); + tokio::pin!(maintenance); + let result = tokio::select! { + result = &mut maintenance => result, + established = &mut output.established => { + if established.is_ok() { + start = output.dashboard.start_internal(output.members); + if start.is_err() { + output.cancellation.cancel(); + } + } + maintenance.await + } + }; + (result, output.dashboard.finish().and(start)) + } +} diff --git a/apps/gpclient/src/connect/internal_output/windows.rs b/apps/gpclient/src/connect/internal_output/windows.rs new file mode 100644 index 0000000..dfef22f --- /dev/null +++ b/apps/gpclient/src/connect/internal_output/windows.rs @@ -0,0 +1,20 @@ +use std::future::Future; + +use gpapi::session::GatewaySessionSummary; + +use super::ConnectHandler; + +pub(super) struct InternalOutput; + +impl InternalOutput { + pub(super) fn prepare( + _: &ConnectHandler<'_>, + _: &str, + ) -> anyhow::Result<(Self, impl Fn(&GatewaySessionSummary) + Send + Sync + 'static + use<>)> { + Ok((Self, |_: &GatewaySessionSummary| {})) + } + + pub(super) async fn run(self, maintenance: impl Future) -> (T, anyhow::Result<()>) { + (maintenance.await, Ok(())) + } +} diff --git a/apps/gpclient/src/connect/mod.rs b/apps/gpclient/src/connect/mod.rs index e738536..2ea56d4 100644 --- a/apps/gpclient/src/connect/mod.rs +++ b/apps/gpclient/src/connect/mod.rs @@ -1,12 +1,21 @@ mod args; mod credential; -#[cfg(test)] +#[cfg(all(test, unix))] mod flow_tests; mod gateway; mod internal; +#[cfg(unix)] +#[path = "internal_output/unix.rs"] +mod internal_output; +#[cfg(windows)] +#[path = "internal_output/windows.rs"] +mod internal_output; +#[cfg(unix)] +mod tunnel_output; mod vpn_script; use std::cell::RefCell; +#[cfg(unix)] use std::sync::{ Arc, atomic::{AtomicBool, Ordering}, @@ -46,7 +55,9 @@ pub(crate) struct ConnectHandler<'a> { auth_attempt_fixture: RefCell, auth_recovery: RefCell, sessions: RefCell, + #[cfg(unix)] pid_written: Arc, + #[cfg(unix)] background: Option, } @@ -72,11 +83,14 @@ impl<'a> ConnectHandler<'a> { auth_attempt_fixture: Default::default(), auth_recovery: RefCell::default(), sessions: RefCell::default(), + #[cfg(unix)] pid_written: Arc::default(), + #[cfg(unix)] background: None, } } + #[cfg(unix)] pub(crate) fn with_background(mut self, background: Option) -> Self { self.background = background; self @@ -134,6 +148,7 @@ impl<'a> ConnectHandler<'a> { } else { sessions.logout().await; } + #[cfg(unix)] if self.pid_written.load(Ordering::SeqCst) { if let Err(error) = std::fs::remove_file(self.shared_args.lock_file) { warn!("Failed to remove PID file: {error}"); diff --git a/apps/gpclient/src/connect/tunnel_output.rs b/apps/gpclient/src/connect/tunnel_output.rs new file mode 100644 index 0000000..5378130 --- /dev/null +++ b/apps/gpclient/src/connect/tunnel_output.rs @@ -0,0 +1,74 @@ +use std::sync::{ + Arc, + atomic::{AtomicBool, Ordering}, +}; + +use gptunnel::TunnelMonitor; +use tokio_util::sync::CancellationToken; + +use crate::{ + background::{BackgroundStdio, BackgroundWorker}, + dashboard::Dashboard, +}; + +use super::ConnectHandler; + +pub(super) struct TunnelOutput<'a> { + background: Option<(&'a BackgroundWorker, BackgroundStdio)>, + dashboard: Option, + pid_written: &'a AtomicBool, + cancellation: &'a CancellationToken, + error: Option, +} + +impl<'a> TunnelOutput<'a> { + pub(super) fn prepare(handler: &'a ConnectHandler<'_>, gateway: &str) -> anyhow::Result { + let background = handler + .background + .as_ref() + .map(|worker| worker.redirect_stdio().map(|stdio| (worker, stdio))) + .transpose()?; + let dashboard = handler + .args + .dashboard + .then(|| Dashboard::prepare(gateway.to_owned(), handler.cancellation.clone())) + .transpose()?; + Ok(Self { + background, + dashboard, + pid_written: &handler.pid_written, + cancellation: &handler.cancellation, + error: None, + }) + } + + pub(super) fn ready(&mut self, monitor: Arc) { + if let Some(dashboard) = &mut self.dashboard + && let Err(error) = dashboard.start_tunnel(monitor) + { + self.cancellation.cancel(); + self.error = Some(error); + } + if let Some((worker, stdio)) = &mut self.background { + let detach = if self.pid_written.load(Ordering::SeqCst) { + worker.detach(stdio) + } else { + Err(anyhow::anyhow!("Cannot detach without a writable PID lock file")) + }; + if let Err(error) = detach { + self.cancellation.cancel(); + self.error = Some(error); + } + } + } + + pub(super) fn finish(&mut self) -> anyhow::Result<()> { + if let Some(dashboard) = &mut self.dashboard { + dashboard.finish()?; + } + match self.error.take() { + Some(error) => Err(error), + None => Ok(()), + } + } +} diff --git a/apps/gpclient/src/connect/vpn_script/default.rs b/apps/gpclient/src/connect/vpn_script/default.rs index 3d1b702..7a6ed48 100644 --- a/apps/gpclient/src/connect/vpn_script/default.rs +++ b/apps/gpclient/src/connect/vpn_script/default.rs @@ -1,9 +1,13 @@ use openconnect::{Vpn, VpnBuilder}; -use crate::connect::ConnectArgs; +use crate::connect::ConnectHandler; -pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> VpnBuilder { - Vpn::builder(server, cookie) - .script(args.script.clone()) - .script_tun(args.script_tun) +impl ConnectHandler<'_> { + pub(in crate::connect) fn vpn_builder(&self, server: &str, cookie: &str) -> anyhow::Result { + Ok( + Vpn::builder(server, cookie) + .script(self.args.script.clone()) + .script_tun(self.args.script_tun), + ) + } } diff --git a/apps/gpclient/src/connect/vpn_script/macos.rs b/apps/gpclient/src/connect/vpn_script/macos.rs index e31c1db..65eae8d 100644 --- a/apps/gpclient/src/connect/vpn_script/macos.rs +++ b/apps/gpclient/src/connect/vpn_script/macos.rs @@ -2,11 +2,18 @@ use std::ffi::OsStr; use openconnect::{Vpn, VpnBuilder}; -use crate::connect::ConnectArgs; +use crate::connect::{ConnectArgs, ConnectHandler}; -pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> VpnBuilder { - let configured_script = std::env::var_os("GP_VPNC_SCRIPT"); - configure_builder(server, cookie, args, configured_script.as_deref()) +impl ConnectHandler<'_> { + pub(in crate::connect) fn vpn_builder(&self, server: &str, cookie: &str) -> anyhow::Result { + let configured_script = std::env::var_os("GP_VPNC_SCRIPT"); + Ok(configure_builder( + server, + cookie, + self.args, + configured_script.as_deref(), + )) + } } fn configure_builder(server: &str, cookie: &str, args: &ConnectArgs, configured_script: Option<&OsStr>) -> VpnBuilder { diff --git a/apps/gpclient/src/connect/vpn_script/mod.rs b/apps/gpclient/src/connect/vpn_script/mod.rs index 397255a..db37e2c 100644 --- a/apps/gpclient/src/connect/vpn_script/mod.rs +++ b/apps/gpclient/src/connect/vpn_script/mod.rs @@ -1,8 +1,10 @@ #[cfg(target_os = "macos")] #[path = "macos.rs"] mod platform; -#[cfg(not(target_os = "macos"))] +#[cfg(all(unix, not(target_os = "macos")))] #[path = "default.rs"] mod platform; -pub(super) use platform::builder; +#[cfg(windows)] +#[path = "windows.rs"] +mod platform; diff --git a/apps/gpclient/src/connect/vpn_script/windows.rs b/apps/gpclient/src/connect/vpn_script/windows.rs new file mode 100644 index 0000000..e080877 --- /dev/null +++ b/apps/gpclient/src/connect/vpn_script/windows.rs @@ -0,0 +1,23 @@ +use std::sync::Mutex; + +use openconnect::{Vpn, VpnBuilder}; + +use crate::connect::ConnectHandler; + +impl ConnectHandler<'_> { + pub(in crate::connect) fn vpn_builder(&self, server: &str, cookie: &str) -> anyhow::Result { + let owner = self.shared_args.system_tunnel.borrow(); + let tunnel = owner + .as_ref() + .ok_or_else(|| anyhow::anyhow!("System tunnel ownership is unavailable"))?; + let network = Mutex::new(tunnel.configurator()?); + Ok( + Vpn::builder(server, cookie).network_configuration_handler(move |configuration| { + network + .lock() + .map_err(|_| std::io::Error::other("Windows network state is unavailable"))? + .configure(&configuration.reason, &configuration.environment) + }), + ) + } +} diff --git a/apps/gpclient/src/main.rs b/apps/gpclient/src/main.rs index 571d0a8..b790d37 100644 --- a/apps/gpclient/src/main.rs +++ b/apps/gpclient/src/main.rs @@ -1,13 +1,19 @@ +#[cfg(unix)] mod background; mod cli; mod connect; +#[cfg(unix)] mod dashboard; +#[cfg(unix)] mod diagnostics; +#[cfg(unix)] mod disconnect; mod hip; +#[cfg(unix)] mod launch_gui; mod session; +#[cfg(unix)] pub(crate) const GP_CLIENT_LOCK_FILE: &str = "/var/run/gpclient.lock"; #[tokio::main] diff --git a/apps/gpclient/src/session.rs b/apps/gpclient/src/session.rs index 507bdd3..97f615a 100644 --- a/apps/gpclient/src/session.rs +++ b/apps/gpclient/src/session.rs @@ -75,8 +75,7 @@ async fn run_session_runtime(session_ctx: SessionContext, mut session_info: Sess tokio::time::sleep(schedule.delay).await; - crate::dashboard::session_notice(Level::Warn, &schedule.message); - report(log_format, Level::Warn, &format!("\nWARNING: {}", schedule.message)); + report_session_notice(log_format, Level::Warn, &schedule.message); if !schedule.should_auto_extend { info!("Session extension is not allowed by the gateway"); @@ -91,8 +90,7 @@ async fn run_session_runtime(session_ctx: SessionContext, mut session_info: Sess return; }; - crate::dashboard::session_notice(Level::Info, "Session extended."); - report(log_format, Level::Info, "Session extended."); + report_session_notice(log_format, Level::Info, "Session extended."); session_info = next_session_info; } Err(err) => { @@ -108,6 +106,16 @@ async fn run_session_runtime(session_ctx: SessionContext, mut session_info: Sess } } +fn report_session_notice(log_format: LogFormat, level: Level, message: &str) { + #[cfg(unix)] + crate::dashboard::session_notice(level, message); + if level == Level::Warn { + report(log_format, level, &format!("\nWARNING: {message}")); + } else { + report(log_format, level, message); + } +} + fn build_session_warning_schedule(session_info: &SessionInfo) -> Option { let warning = session_info.lifetime_warning.as_ref()?; let warning_secs = if let Some(user_expires) = session_info.user_expires { @@ -149,6 +157,48 @@ mod tests { } } + #[cfg(windows)] + #[test] + fn expiry_warning_is_reported_once() { + const CHILD: &str = "GP_TEST_SESSION_WARNING_CHILD"; + const WARNING: &str = "Session expires soon"; + if std::env::var_os(CHILD).is_some() { + env_logger::builder() + .filter_level(log::LevelFilter::Info) + .format(gpapi::log_format::write_json_record) + .init(); + let context = SessionContext::new( + "vpn.example.test".to_owned(), + "vpn.example.test".to_owned(), + SessionRequestArgs::new("synthetic".to_owned()), + ); + let session = sample_session_info(Some(unix_timestamp() + 30), false); + tokio::runtime::Builder::new_current_thread() + .enable_time() + .build() + .unwrap() + .block_on(run_session_runtime(context, session, LogFormat::Json)); + return; + } + + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args([ + "--exact", + "session::tests::expiry_warning_is_reported_once", + "--nocapture", + ]) + .env(CHILD, "1") + .output() + .unwrap(); + assert!(output.status.success()); + let stderr = String::from_utf8(output.stderr).unwrap(); + assert_eq!( + stderr.lines().filter(|line| line.contains(WARNING)).count(), + 1, + "{stderr}" + ); + } + #[test] fn builds_warning_schedule_for_auto_extend() { let session_info = sample_session_info(Some(unix_timestamp() + 1830), true); diff --git a/apps/gpclient/tests/deprecated_cli.rs b/apps/gpclient/tests/deprecated_cli.rs index fe615fe..54fd1f8 100644 --- a/apps/gpclient/tests/deprecated_cli.rs +++ b/apps/gpclient/tests/deprecated_cli.rs @@ -1,4 +1,4 @@ -#![cfg(not(target_os = "macos"))] +#![cfg(all(unix, not(target_os = "macos")))] use std::process::Command; diff --git a/apps/gpclient/tests/diagnostics.rs b/apps/gpclient/tests/diagnostics.rs index ddda1bb..4bc6122 100644 --- a/apps/gpclient/tests/diagnostics.rs +++ b/apps/gpclient/tests/diagnostics.rs @@ -1,3 +1,5 @@ +#![cfg(unix)] + use std::{os::unix::fs::PermissionsExt, process::Stdio, time::Duration}; use tokio::process::Command; diff --git a/apps/gpgui-helper/dist/assets/main-BJvLW_Ih.js b/apps/gpgui-helper/dist/assets/main-mZlQiCQA.js similarity index 98% rename from apps/gpgui-helper/dist/assets/main-BJvLW_Ih.js rename to apps/gpgui-helper/dist/assets/main-mZlQiCQA.js index 9f076c0..48428f1 100644 --- a/apps/gpgui-helper/dist/assets/main-BJvLW_Ih.js +++ b/apps/gpgui-helper/dist/assets/main-mZlQiCQA.js @@ -6,4 +6,4 @@ var e=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t,t.exports),e=null),t.exports) `+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(``)&&(u=u.replace(``,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{He=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?Ve(n):``}function We(e,t){switch(e.tag){case 26:case 27:case 5:return Ve(e.type);case 16:return Ve(`Lazy`);case 13:return e.child!==t&&t!==null?Ve(`Suspense Fallback`):Ve(`Suspense`);case 19:return Ve(`SuspenseList`);case 0:case 15:return Ue(e.type,!1);case 11:return Ue(e.type.render,!1);case 1:return Ue(e.type,!0);case 31:return Ve(`Activity`);case 30:return Ve(`ViewTransition`);default:return``}}function Ge(e){try{var t=``,n=null;do t+=We(e,n),n=e,e=e.return;while(e);return t}catch(e){return` Error generating stack: `+e.message+` `+e.stack}}var Ke=Object.prototype.hasOwnProperty,qe=t.unstable_scheduleCallback,Je=t.unstable_cancelCallback,Ye=t.unstable_shouldYield,Xe=t.unstable_requestPaint,Ze=t.unstable_now,Qe=t.unstable_getCurrentPriorityLevel,$e=t.unstable_ImmediatePriority,et=t.unstable_UserBlockingPriority,tt=t.unstable_NormalPriority,nt=t.unstable_LowPriority,rt=t.unstable_IdlePriority,it=t.log,at=t.unstable_setDisableYieldValue,ot=null,st=null;function ct(e){if(typeof it==`function`&&at(e),st&&typeof st.setStrictMode==`function`)try{st.setStrictMode(ot,e)}catch{}}var lt=Math.clz32?Math.clz32:ft,ut=Math.log,dt=Math.LN2;function ft(e){return e>>>=0,e===0?32:31-(ut(e)/dt|0)|0}var pt=256,mt=262144,ht=4194304;function gt(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&-e;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function _t(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=gt(n))):i=gt(o):i=gt(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=gt(n))):i=gt(o)):i=gt(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function vt(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function yt(e,t){t&8&&(t|=t&32);var n=e.entangledLanes;if(n!==0)for(e=e.entanglements,n&=t;0n;n++)t.push(e);return t}function Ct(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function wt(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0=Cr),Er=` `,Dr=!1;function Or(e,t){switch(e){case`keyup`:return xr.indexOf(t.keyCode)!==-1;case`keydown`:return t.keyCode!==229;case`keypress`:case`mousedown`:case`focusout`:return!0;default:return!1}}function kr(e){return e=e.detail,typeof e==`object`&&`data`in e?e.data:null}var Ar=!1;function jr(e,t){switch(e){case`compositionend`:return kr(t);case`keypress`:return t.which===32?(Dr=!0,Er):null;case`textInput`:return e=t.data,e===Er&&Dr?null:e;default:return null}}function Mr(e,t){if(Ar)return e===`compositionend`||!Sr&&Or(e,t)?(e=Wn(),Un=Hn=Vn=null,Ar=!1,e):null;switch(e){case`paste`:return null;case`keypress`:if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}a:{for(;n;){if(n.nextSibling){n=n.nextSibling;break a}n=n.parentNode}n=void 0}n=ti(n)}}function ri(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?ri(e,t.parentNode):`contains`in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function ii(e){e=e!=null&&e.ownerDocument!=null&&e.ownerDocument.defaultView!=null?e.ownerDocument.defaultView:window;for(var t=ei(e.document);t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href==`string`}catch{n=!1}if(n)e=t.contentWindow;else break;t=ei(e.document)}return t}function ai(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t===`input`&&(e.type===`text`||e.type===`search`||e.type===`tel`||e.type===`url`||e.type===`password`)||t===`textarea`||e.contentEditable===`true`)}var oi=Rn&&`documentMode`in document&&11>=document.documentMode,si=null,ci=null,li=null,ui=!1;function di(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;ui||si==null||si!==ei(r)||(r=si,`selectionStart`in r&&ai(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),li&&$r(li,r)||(li=r,r=Jf(ci,`onSelect`),0>=o,i-=o,sa=1<<32-lt(t)+i|n<h?(g=d,d=null):g=d.sibling;var _=p(i,d,s[h],c);if(_===null){d===null&&(d=g);break}e&&d&&_.alternate===null&&t(i,d),o=a(_,o,h),u===null?l=_:u.sibling=_,u=_,d=g}if(h===s.length)return n(i,d),A&&la(i,h),l;if(d===null){for(;hg?(_=h,h=null):_=h.sibling;var y=p(i,h,v.value,l);if(y===null){h===null&&(h=_);break}e&&h&&y.alternate===null&&t(i,h),o=a(y,o,g),d===null?u=y:d.sibling=y,d=y,h=_}if(v.done)return n(i,h),A&&la(i,g),u;if(h===null){for(;!v.done;g++,v=c.next())v=f(i,v.value,l),v!==null&&(o=a(v,o,g),d===null?u=v:d.sibling=v,d=v);return A&&la(i,g),u}for(h=r(h);!v.done;g++,v=c.next())v=m(h,i,g,v.value,l),v!==null&&(e&&(_=v.alternate,_!==null&&h.delete(_.key===null?g:_.key)),o=a(v,o,g),d===null?u=v:d.sibling=v,d=v);return e&&h.forEach(function(e){return t(i,e)}),A&&la(i,g),u}function _(e,r,a,c){if(typeof a==`object`&&a&&a.type===se&&a.key===null&&a.props.ref===void 0&&(a=a.props.children),typeof a==`object`&&a){switch(a.$$typeof){case ae:a:{for(var l=a.key;r!==null;){if(r.key===l){if(l=a.type,l===se){if(r.tag===7){n(e,r.sibling),c=i(r,a.props.children),vo(c,a),c.return=e,e=c;break a}}else if(r.elementType===l||typeof l==`object`&&l&&l.$$typeof===ge&&uo(l)===r.type){n(e,r.sibling),c=i(r,a.props),vo(c,a),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}a.type===se?(c=Ji(a.props.children,e.mode,c,a.key),vo(c,a),c.return=e,e=c):(c=qi(a.type,a.key,a.props,null,e.mode,c),vo(c,a),c.return=e,e=c)}return o(e);case oe:a:{for(l=a.key;r!==null;){if(r.key===l){if(r.tag===4&&r.stateNode.containerInfo===a.containerInfo&&r.stateNode.implementation===a.implementation){n(e,r.sibling),c=i(r,a.children||[]),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}c=Zi(a,e.mode,c),c.return=e,e=c}return o(e);case ge:return a=uo(a),_(e,r,a,c)}if(Te(a))return h(e,r,a,c);if(Se(a)){if(l=Se(a),typeof l!=`function`)throw Error(s(150));return a=l.call(a),g(e,r,a,c)}if(typeof a.then==`function`)return _(e,r,_o(a),c);if(a.$$typeof===de)return _(e,r,Ia(e,a),c);yo(e,a)}return typeof a==`string`&&a!==``||typeof a==`number`||typeof a==`bigint`?(a=``+a,r!==null&&r.tag===6?(n(e,r.sibling),c=i(r,a),c.return=e,e=c):(n(e,r),c=Yi(a,e.mode,c),c.return=e,e=c),o(e)):n(e,r)}return function(e,t,n,r){try{go=0;var i=_(e,t,n,r);return ho=null,i}catch(t){if(t===io||t===oo)throw t;var a=Ui(29,t,null,e.mode);return a.lanes=r,a.return=e,a}}}var xo=bo(!0),So=bo(!1),Co=!1;function wo(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function To(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,callbacks:null})}function Eo(e){return{lane:e,tag:0,payload:null,callback:null,next:null}}function Do(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,W&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,t=Bi(e),zi(e,null,n),t}return Ii(e,r,t,n),Bi(e)}function Oo(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,n&4194048)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Et(e,n)}}function ko(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,a=null;if(n=n.firstBaseUpdate,n!==null){do{var o={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};a===null?i=a=o:a=a.next=o,n=n.next}while(n!==null);a===null?i=a=t:a=a.next=t}else i=a=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:a,shared:r.shared,callbacks:r.callbacks},e.updateQueue=n}else e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}var Ao=!1;function jo(){if(Ao){var e=Ya;if(e!==null)throw e}}function Mo(e,t,n,r){Ao=!1;var i=e.updateQueue;Co=!1;var a=i.firstBaseUpdate,o=i.lastBaseUpdate,s=i.shared.pending;if(s!==null){i.shared.pending=null;var c=s,l=c.next;c.next=null,o===null?a=l:o.next=l,o=c;var u=e.alternate;u!==null&&(u=u.updateQueue,s=u.lastBaseUpdate,s!==o&&(s===null?u.firstBaseUpdate=l:s.next=l,u.lastBaseUpdate=c))}if(a!==null){var d=i.baseState;o=0,u=l=c=null,s=a;do{var f=s.lane&-536870913,p=f!==s.lane;if(p?(q&f)===f:(r&f)===f){f!==0&&f===Ja&&(Ao=!0),u!==null&&(u=u.next={lane:0,tag:s.tag,payload:s.payload,callback:null,next:null});a:{var m=e,h=s;f=t;var g=n;switch(h.tag){case 1:if(m=h.payload,typeof m==`function`){d=m.call(g,d,f);break a}d=m;break a;case 3:m.flags=m.flags&-65537|128;case 0:if(m=h.payload,f=typeof m==`function`?m.call(g,d,f):m,f==null)break a;d=C({},d,f);break a;case 2:Co=!0}}f=s.callback,f!==null&&(e.flags|=64,p&&(e.flags|=8192),p=i.callbacks,p===null?i.callbacks=[f]:p.push(f))}else p={lane:f,tag:s.tag,payload:s.payload,callback:s.callback,next:null},u===null?(l=u=p,c=d):u=u.next=p,o|=f;if(s=s.next,s===null){if(s=i.shared.pending,s===null)break;p=s,s=p.next,p.next=null,i.lastBaseUpdate=p,i.shared.pending=null}}while(1);u===null&&(c=d),i.baseState=c,i.firstBaseUpdate=l,i.lastBaseUpdate=u,a===null&&(i.shared.lanes=0),sd|=o,e.lanes=o,e.memoizedState=d}}function No(e,t){if(typeof e!=`function`)throw Error(s(191,e));e.call(t)}function Po(e,t){var n=e.callbacks;if(n!==null)for(e.callbacks=null,e=0;ea?a:8;var o=T.T,s={};s.types=o===null?null:o.types,T.T=s,_c(e,!1,t,n);try{var c=i(),l=T.S;l!==null&&l(s,c),typeof c==`object`&&c&&typeof c.then==`function`?gc(e,t,Qa(c,r),jd(e)):gc(e,t,r,jd(e))}catch(n){gc(e,t,{then:function(){},status:`rejected`,reason:n},jd())}finally{E.p=a,o!==null&&s.types!==null&&(o.types=s.types),T.T=o}}function oc(){}function sc(e,t,n,r){if(e.tag!==5)throw Error(s(476));var i=cc(e).queue;ac(e,i,t,Ee,n===null?oc:function(){return lc(e),n(r)})}function cc(e){var t=e.memoizedState;if(t!==null)return t;t={memoizedState:Ee,baseState:Ee,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:vs,lastRenderedState:Ee},next:null};var n={};return t.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:vs,lastRenderedState:n},next:null},e.memoizedState=t,e=e.alternate,e!==null&&(e.memoizedState=t),t}function lc(e){var t=cc(e);t.next===null&&(t=e.alternate.memoizedState),gc(e,t.next.queue,{},jd())}function uc(){return Fa(sh)}function dc(){return I().memoizedState}function fc(){return I().memoizedState}function pc(e){for(var t=e.return;t!==null;){switch(t.tag){case 24:case 3:var n=jd();e=Eo(n);var r=Do(t,e,n);r!==null&&(Pd(r,t,n),Oo(r,t,n)),t={cache:Va()},e.payload=t;return}t=t.return}}function mc(e,t,n){var r=jd();n={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},vc(e)?yc(t,n):(n=Li(e,t,n,r),n!==null&&(Pd(n,e,r),bc(n,t,r)))}function hc(e,t,n){gc(e,t,n,jd())}function gc(e,t,n,r){var i={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(vc(e))yc(t,i);else{var a=e.alternate;if(e.lanes===0&&(a===null||a.lanes===0)&&(a=t.lastRenderedReducer,a!==null))try{var o=t.lastRenderedState,s=a(o,n);if(i.hasEagerState=!0,i.eagerState=s,Qr(s,o))return Ii(e,t,i,0),G===null&&Fi(),!1}catch{}if(n=Li(e,t,i,r),n!==null)return Pd(n,e,r),bc(n,t,r),!0}return!1}function _c(e,t,n,r){if(r={lane:2,revertLane:Pf(),gesture:null,action:r,hasEagerState:!1,eagerState:null,next:null},vc(e)){if(t)throw Error(s(479))}else t=Li(e,n,r,2),t!==null&&Pd(t,e,2)}function vc(e){var t=e.alternate;return e===M||t!==null&&t===M}function yc(e,t){$o=Qo=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function bc(e,t,n){if(n&4194048){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Et(e,n)}}var xc={readContext:Fa,use:gs,useCallback:F,useContext:F,useEffect:F,useImperativeHandle:F,useLayoutEffect:F,useInsertionEffect:F,useMemo:F,useReducer:F,useRef:F,useState:F,useDebugValue:F,useDeferredValue:F,useTransition:F,useSyncExternalStore:F,useId:F,useHostTransitionStatus:F,useFormState:F,useActionState:F,useOptimistic:F,useMemoCache:F,useCacheRefresh:F,useEffectEvent:F},Sc={readContext:Fa,use:gs,useCallback:function(e,t){return ps().memoizedState=[e,t===void 0?null:t],e},useContext:Fa,useEffect:Ks,useImperativeHandle:function(e,t,n){n=n==null?null:n.concat([e]),Ws(4194308,4,Qs.bind(null,t,e),n)},useLayoutEffect:function(e,t){return Ws(4194308,4,e,t)},useInsertionEffect:function(e,t){Ws(4,2,e,t)},useMemo:function(e,t){var n=ps();t=t===void 0?null:t;var r=e();if(es){ct(!0);try{e()}finally{ct(!1)}}return n.memoizedState=[r,t],r},useReducer:function(e,t,n){var r=ps();if(n!==void 0){var i=n(t);if(es){ct(!0);try{n(t)}finally{ct(!1)}}}else i=t;return r.memoizedState=r.baseState=i,e={pending:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:i},r.queue=e,e=e.dispatch=mc.bind(null,M,e),[r.memoizedState,e]},useRef:function(e){var t=ps();return e={current:e},t.memoizedState=e},useState:function(e){e=Os(e);var t=e.queue,n=hc.bind(null,M,t);return t.dispatch=n,[e.memoizedState,n]},useDebugValue:ec,useDeferredValue:function(e,t){return rc(ps(),e,t)},useTransition:function(){var e=Os(!1);return e=ac.bind(null,M,e.queue,!0,!1),ps().memoizedState=e,[!1,e]},useSyncExternalStore:function(e,t,n){var r=M,i=ps();if(A){if(n===void 0)throw Error(s(407));n=n()}else{if(n=t(),G===null)throw Error(s(349));q&127||Cs(r,t,n)}i.memoizedState=n;var a={value:n,getSnapshot:t};return i.queue=a,Ks(Ts.bind(null,r,a,e),[e]),r.flags|=2048,Hs(9,{destroy:void 0},ws.bind(null,r,a,n,t),null),n},useId:function(){var e=ps(),t=G.identifierPrefix;if(A){var n=ca,r=sa;n=(r&~(1<<32-lt(r)-1)).toString(32)+n,t=`_`+t+`R_`+n,n=ts++,0<\/script>`,a=a.removeChild(a.firstChild);break;case`select`:a=typeof r.is==`string`?o.createElement(`select`,{is:r.is}):o.createElement(`select`),r.multiple?a.multiple=!0:r.size&&(a.size=r.size);break;default:a=typeof r.is==`string`?o.createElement(i,{is:r.is}):o.createElement(i)}}a[Nt]=t,a[Pt]=r;a:for(o=t.child;o!==null;){if(o.tag===5||o.tag===6)a.appendChild(o.stateNode);else if(o.tag!==4&&o.tag!==27&&o.child!==null){o.child.return=o,o=o.child;continue}if(o===t)break a;for(;o.sibling===null;){if(o.return===null||o.return===t)break a;o=o.return}o.sibling.return=o.return,o=o.sibling}t.stateNode=a;a:switch(np(a,i,r),i){case`button`:case`input`:case`select`:case`textarea`:r=!!r.autoFocus;break a;case`img`:r=!0;break a;default:r=!1}r&&vl(t)}}return z(t),t.subtreeFlags&=-33554433,yl(t,t.type,e===null?null:e.memoizedProps,t.pendingProps,n),null;case 6:if(e&&t.stateNode!=null)e.memoizedProps!==r&&vl(t);else{if(typeof r!=`string`&&t.stateNode===null)throw Error(s(166));if(e=Ne.current,xa(t)){if(e=t.stateNode,n=t.memoizedProps,r=null,i=ma,i!==null)switch(i.tag){case 27:case 5:r=i.memoizedProps}e[Nt]=t,e=!!(e.nodeValue===n||r!==null&&!0===r.suppressHydrationWarning||ep(e.nodeValue,n)),e||va(t,!0)}else e=lp(e).createTextNode(r),e[Nt]=t,t.stateNode=e}return z(t),null;case 31:if(n=t.memoizedState,e===null||e.memoizedState!==null){if(r=xa(t),n!==null){if(e===null){if(!r)throw Error(s(318));if(e=t.memoizedState,e=e===null?null:e.dehydrated,!e)throw Error(s(557));e[Nt]=t}else Sa(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;z(t),e=!1}else n=Ca(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=n),e=!0;if(!e)return t.flags&256?(Ko(t),t):(Ko(t),null);if(t.flags&128)throw Error(s(558))}return z(t),null;case 13:if(r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(i=xa(t),r!==null&&r.dehydrated!==null){if(e===null){if(!i)throw Error(s(318));if(i=t.memoizedState,i=i===null?null:i.dehydrated,!i)throw Error(s(317));i[Nt]=t}else Sa(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;z(t),i=!1}else i=Ca(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=i),i=!0;if(!i)return t.flags&256?(Ko(t),t):(Ko(t),null)}return Ko(t),t.flags&128?(t.lanes=n,t):(n=r!==null,e=e!==null&&e.memoizedState!==null,n&&(r=t.child,i=null,r.alternate!==null&&r.alternate.memoizedState!==null&&r.alternate.memoizedState.cachePool!==null&&(i=r.alternate.memoizedState.cachePool.pool),a=null,r.memoizedState!==null&&r.memoizedState.cachePool!==null&&(a=r.memoizedState.cachePool.pool),a!==i&&(r.flags|=2048)),n!==e&&n&&(t.child.flags|=8192),xl(t,t.updateQueue),z(t),null);case 4:return Ie(),e===null&&Wf(t.stateNode.containerInfo),t.flags|=67108864,z(t),null;case 10:return ka(t.type),z(t),null;case 19:if(Yo(t),r=t.memoizedState,r===null)return z(t),null;if(i=!!(t.flags&128),a=r.rendering,a===null){if(i)Sl(r,!1);else{if(Y!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(a=Xo(e),a!==null){for(t.flags|=128,Sl(r,!1),e=a.updateQueue,t.updateQueue=e,xl(t,e),t.subtreeFlags=0,e=n,n=t.child;n!==null;)Ki(n,e),n=n.sibling;return Jo(t,qo.current&1|2),A&&la(t,r.treeForkCount),t.child}e=e.sibling}r.tail!==null&&Ze()>_d&&(t.flags|=128,i=!0,Sl(r,!1),t.lanes=4194304)}}else{if(!i){if(e=Xo(a),e!==null){if(t.flags|=128,i=!0,e=e.updateQueue,t.updateQueue=e,xl(t,e),Sl(r,!0),r.tail===null&&r.tailMode!==`collapsed`&&r.tailMode!==`visible`&&!a.alternate&&!A)return z(t),null}else 2*Ze()-r.renderingStartTime>_d&&n!==536870912&&(t.flags|=128,i=!0,Sl(r,!1),t.lanes=4194304)}r.isBackwards?(a.sibling=t.child,t.child=a):(e=r.last,e===null?t.child=a:e.sibling=a,r.last=a)}if(r.tail!==null){e=r.tail;a:{for(n=e;n!==null;){if(n.alternate!==null){n=!1;break a}n=n.sibling}n=!0}return r.rendering=e,r.tail=e.sibling,r.renderingStartTime=Ze(),e.sibling=null,a=qo.current,a=i?a&1|2:a&1,r.tailMode===`visible`||r.tailMode===`collapsed`||!n||A?Jo(t,a):(n=a,D(Bo,t),D(qo,n),Vo===null&&(Vo=t)),A&&la(t,r.treeForkCount),e}return z(t),null;case 22:case 23:return Ko(t),zo(),r=t.memoizedState!==null,e===null?r&&(t.flags|=8192):e.memoizedState!==null!==r&&(t.flags|=8192),r?n&536870912&&!(t.flags&128)&&(z(t),t.subtreeFlags&6&&(t.flags|=8192)):z(t),n=t.updateQueue,n!==null&&xl(t,n.retryQueue),n=null,e!==null&&e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(n=e.memoizedState.cachePool.pool),r=null,t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(r=t.memoizedState.cachePool.pool),r!==n&&(t.flags|=2048),e!==null&&Ae(eo),null;case 24:return n=null,e!==null&&(n=e.memoizedState.cache),t.memoizedState.cache!==n&&(t.flags|=2048),ka(j),z(t),null;case 25:return null;case 30:return t.flags|=33554432,z(t),null}throw Error(s(156,t.tag))}function wl(e,t){switch(fa(t),t.tag){case 1:return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return ka(j),Ie(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 26:case 27:case 5:return Re(t),null;case 31:if(t.memoizedState!==null){if(Ko(t),t.alternate===null)throw Error(s(340));Sa()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 13:if(Ko(t),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(s(340));Sa()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return Yo(t),e=t.flags,e&65536?(t.flags=e&-65537|128,e=t.memoizedState,e!==null&&(e.rendering=null,e.tail=null),t.flags|=4,t):null;case 4:return Ie(),null;case 10:return ka(t.type),null;case 22:case 23:return Ko(t),zo(),e!==null&&Ae(eo),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 24:return ka(j),null;case 25:return null;default:return null}}function Tl(e,t){switch(fa(t),t.tag){case 3:ka(j),Ie();break;case 26:case 27:case 5:Re(t);break;case 4:Ie();break;case 31:t.memoizedState!==null&&Ko(t);break;case 13:Ko(t);break;case 19:Yo(t);break;case 10:ka(t.type);break;case 22:case 23:Ko(t),zo(),e!==null&&Ae(eo);break;case 24:ka(j)}}function El(e,t){try{var n=t.updateQueue,r=n===null?null:n.lastEffect;if(r!==null){var i=r.next;n=i;do{if((n.tag&e)===e){r=void 0;var a=n.create,o=n.inst;r=a(),o.destroy=r}n=n.next}while(n!==i)}}catch(e){Z(t,t.return,e)}}function Dl(e,t,n){try{var r=t.updateQueue,i=r===null?null:r.lastEffect;if(i!==null){var a=i.next;r=a;do{if((r.tag&e)===e){var o=r.inst,s=o.destroy;if(s!==void 0){o.destroy=void 0,i=t;var c=n,l=s;try{l()}catch(e){Z(i,c,e)}}}r=r.next}while(r!==a)}}catch(e){Z(t,t.return,e)}}function Ol(e){var t=e.updateQueue;if(t!==null){var n=e.stateNode;try{Po(t,n)}catch(t){Z(e,e.return,t)}}}function kl(e,t,n){n.props=kc(e.type,e.memoizedProps),n.state=e.memoizedState;try{n.componentWillUnmount()}catch(n){Z(e,t,n)}}function Al(e,t){try{var n=e.ref;if(n!==null){switch(e.tag){case 26:case 27:case 5:var r=e.stateNode;break;case 30:var i=e.stateNode,a=Oi(e.memoizedProps,i);(i.ref===null||i.ref.name!==a)&&(i.ref=Pp(a)),r=i.ref;break;case 7:if(e.stateNode===null){var o=new Fp(e);h(e.child,!1,Qp,o,void 0,void 0),e.stateNode=o}r=e.stateNode;break;default:r=e.stateNode}typeof n==`function`?e.refCleanup=n(r):n.current=r}}catch(n){Z(e,t,n)}}function jl(e,t){var n=e.ref,r=e.refCleanup;if(n!==null){if(typeof r==`function`)try{r()}catch(n){Z(e,t,n)}finally{e.refCleanup=null,e=e.alternate,e!=null&&(e.refCleanup=null)}else if(typeof n==`function`)try{n(null)}catch(n){Z(e,t,n)}else n.current=null}}function Ml(e,t){if((e.tag===5||e.tag===27||e.tag===6)&&e.alternate===null&&t!==null)for(var n=0;n title`))),np(r,t,n),r[Nt]=e,qt(r),t=r;break a;case`link`:if(a=Gm(`link`,`href`,i).get(t+(n.href||``))){for(o=0;og&&(o=g,g=h,h=o);var _=ni(s,h),v=ni(s,g);if(_&&v&&(p.rangeCount!==1||p.anchorNode!==_.node||p.anchorOffset!==_.offset||p.focusNode!==v.node||p.focusOffset!==v.offset)){var y=d.createRange();y.setStart(_.node,_.offset),p.removeAllRanges(),h>g?(p.addRange(y),p.extend(v.node,v.offset)):(y.setEnd(v.node,v.offset),p.addRange(y))}}}}for(d=[],p=s;p=p.parentNode;)p.nodeType===1&&d.push({element:p,left:p.scrollLeft,top:p.scrollTop});for(typeof s.focus==`function`&&s.focus(),s=0;sn?32:n,T.T=null,n=wd,wd=null;var a=bd,o=Sd;if(X=0,xd=bd=null,Sd=0,W&6)throw Error(s(331));var c=W;if(W|=4,Zu(a.current),Uu(a,a.current,o,n),W=c,Df(0,!1),st&&typeof st.onPostCommitFiberRoot==`function`)try{st.onPostCommitFiberRoot(ot,a)}catch{}return!0}finally{E.p=i,T.T=r,uf(e,t)}}function pf(e,t,n){t=$i(n,t),t=Fc(e.stateNode,t,2),e=Do(e,t,2),e!==null&&(Ct(e,2),Ef(e))}function Z(e,t,n){if(e.tag===3)pf(e,e,n);else for(;t!==null;){if(t.tag===3){pf(t,e,n);break}if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError==`function`||typeof r.componentDidCatch==`function`&&(yd===null||!yd.has(r))){e=$i(n,e),n=Ic(2),r=Do(t,n,2),r!==null&&(Lc(n,r,t,e),Ct(r,2),Ef(r));break}}t=t.return}}function mf(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new td;var i=new Set;r.set(t,i)}else i=r.get(t),i===void 0&&(i=new Set,r.set(t,i));i.has(n)||(ad=!0,i.add(n),e=hf.bind(null,e,t,n),t.then(e,e))}function hf(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),e.pingedLanes|=e.suspendedLanes&n,e.warmLanes&=~n,G===e&&(q&n)===n&&(Y===4||Y===3&&(q&62914560)===q&&300>Ze()-hd?W&2?ld|=n:Vd(e,0):ld|=n,dd===q&&(dd=0)),Ef(e)}function gf(e,t){t===0&&(t=xt()),e=Ri(e,t),e!==null&&(Ct(e,t),Ef(e))}function _f(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),gf(e,n)}function vf(e,t){var n=0;switch(e.tag){case 31:case 13:var r=e.stateNode,i=e.memoizedState;i!==null&&(n=i.retryLane);break;case 19:r=e.stateNode;break;case 22:r=e.stateNode._retryCache;break;default:throw Error(s(314))}r!==null&&r.delete(t),gf(e,n)}function yf(e,t){return qe(e,t)}var bf=null,xf=null,Sf=!1,Cf=!1,wf=!1,Tf=0;function Ef(e){e!==xf&&e.next===null&&(xf===null?bf=xf=e:xf=xf.next=e),Cf=!0,Sf||(Sf=!0,Nf())}function Df(e,t){if(!wf&&Cf){wf=!0;do for(var n=!1,r=bf;r!==null;){if(!t){if(e!==0){var i=r.pendingLanes;if(i===0)var a=0;else{var o=r.suspendedLanes,s=r.pingedLanes;a=(1<<31-lt(42|e)+1)-1,a&=i&~(o&~s),a=a&201326741?a&201326741|1:a?a|2:0}a!==0&&(n=!0,Mf(r,a))}else a=q,a=_t(r,r===G?a:0,r.cancelPendingCommit!==null||r.timeoutHandle!==-1),!(a&3)||vt(r,a)||(n=!0,Mf(r,a))}r=r.next}while(n);wf=!1}}function Of(){kf()}function kf(){Cf=Sf=!1;var e=0;Tf!==0&&hp()&&(e=Tf);for(var t=Ze(),n=null,r=bf;r!==null;){var i=r.next,a=Af(r,t);a===0?(r.next=null,n===null?bf=i:n.next=i,i===null&&(xf=n)):(n=r,(e!==0||a&3)&&(Cf=!0)),r=i}X!==0&&X!==5||Df(e,!1),Tf!==0&&(Tf=0)}function Af(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,i=e.expirationTimes,a=e.pendingLanes&-62914561;0s)break;var u=c.transferSize,d=c.initiatorType;u&&ap(d)&&(c=c.responseEnd,o+=u*(c$m){s.length=o;break}f=new Promise(jp.bind(f)),s.push(f)}}}if(0`u`?null:document;function Tm(e,t,n){var r=wm;if(r&&typeof t==`string`&&t){var i=mn(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),ym.has(i)||(ym.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),np(t,`link`,e),qt(t),r.head.appendChild(t)))}}function Em(e){xm.D(e),Tm(`dns-prefetch`,e,null)}function Dm(e,t){xm.C(e,t),Tm(`preconnect`,e,t)}function Om(e,t,n){xm.L(e,t,n);var r=wm;if(r&&e&&t){var i=`link[rel="preload"][as="`+mn(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+mn(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+mn(n.imageSizes)+`"]`)):i+=`[href="`+mn(e)+`"]`;var a=i;switch(t){case`style`:a=Pm(e);break;case`script`:a=Rm(e)}if(!(vm.has(a)||(e=C({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),vm.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(Fm(a))||t===`script`&&r.querySelector(zm(a))))){var o=r.createElement(`link`);np(o,`link`,e),t===`style`&&(o[Vt]=!0,o.onload=o.onerror=function(){Jt(o)}),qt(o),r.head.appendChild(o)}}}function km(e,t){xm.m(e,t);var n=wm;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+mn(r)+`"][href="`+mn(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Rm(e)}if(!vm.has(a)&&(e=C({rel:`modulepreload`,href:e},t),vm.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(zm(a)))return}r=n.createElement(`link`),np(r,`link`,e),qt(r),n.head.appendChild(r)}}}function Am(e,t,n){xm.S(e,t,n);var r=wm;if(r&&e){var i=Kt(r).hoistableStyles,a=Pm(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(Fm(a)))s.loading=5;else{e=C({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=vm.get(a))&&Hm(e,n);var c=o=r.createElement(`link`);qt(c),np(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Vm(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function jm(e,t){xm.X(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Mm(e,t){xm.M(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0,type:`module`},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Nm(e,t,n,r){var i=(i=Ne.current)?bm(i):null;if(!i)throw Error(s(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(n=Pm(n.href),t=Kt(i).hoistableStyles,r=t.get(n),r||(r={type:`style`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Pm(n.href);var a=Kt(i).hoistableStyles,o=a.get(e);if(o||(i=i.ownerDocument||i,o={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},a.set(e,o),(a=i.querySelector(Fm(e)))?a._p||(o.instance=a,o.state.loading=5):(a=vm.get(e),a||(a={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},vm.set(e,a)),Lm(i,e,a,o.state))),t&&r===null)throw Error(s(528,``));return o}if(t&&r!==null)throw Error(s(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(n=Rm(n),t=Kt(i).hoistableScripts,r=t.get(n),r||(r={type:`script`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(s(444,e))}}function Pm(e){return`href="`+mn(e)+`"`}function Fm(e){return`link[rel="stylesheet"][`+e+`]`}function Im(e){return C({},e,{"data-precedence":e.precedence,precedence:null})}function Lm(e,t,n,r){if(t=e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)){if(!0!==t[Vt]){r.loading=1;return}}else t=e.createElement(`link`),t[Vt]=!0,t.onload=t.onerror=Jt.bind(null,t),np(t,`link`,n),qt(t),e.head.appendChild(t);r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2})}function Rm(e){return`[src="`+mn(e)+`"]`}function zm(e){return`script[async]`+e}function Bm(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+mn(n.href)+`"]`);if(r)return t.instance=r,qt(r),r;var i=C({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),qt(r),np(r,`style`,i),Vm(r,n.precedence,e),t.instance=r;case`stylesheet`:i=Pm(n.href);var a=e.querySelector(Fm(i));if(a)return t.state.loading|=4,t.instance=a,qt(a),a;r=Im(n),(i=vm.get(i))&&Hm(r,i),a=(e.ownerDocument||e).createElement(`link`),qt(a);var o=a;return o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),t.state.loading|=4,Vm(a,n.precedence,e),t.instance=a;case`script`:return a=Rm(n.src),(i=e.querySelector(zm(a)))?(t.instance=i,qt(i),i):(r=n,(i=vm.get(a))&&(r=C({},n),Um(r,i)),e=e.ownerDocument||e,i=e.createElement(`script`),qt(i),np(i,`link`,r),e.head.appendChild(i),t.instance=i);case`void`:return null;default:throw Error(s(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Vm(r,n.precedence,e));return t.instance}function Vm(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function qm(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Jm(e,t){return e===`img`&&t.src!=null&&t.src!==``&&t.onLoad==null&&t.loading!==`lazy`}function Ym(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Xm(e){return(e.width||100)*(e.height||100)*(typeof devicePixelRatio==`number`?devicePixelRatio:1)*.25}function Zm(e,t){typeof t.decode==`function`&&(e.imgCount++,t.complete||(e.imgBytes+=Xm(t),e.suspenseyImages.push(t)),e=rh.bind(e),t.decode().then(e,e))}function Qm(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Pm(r.href),a=t.querySelector(Fm(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=nh.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,qt(a);return}a=t.ownerDocument||t,r=Im(r),(i=vm.get(i))&&Hm(r,i),a=a.createElement(`link`),qt(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=nh.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var $m=0;function eh(e,t){return e.stylesheets&&e.count===0&&ah(e,e.stylesheets),0$m?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function th(e){if(e.count===0&&(e.imgCount===0||!e.waitingForImages)){if(e.stylesheets)ah(e,e.stylesheets);else if(e.unsuspend){var t=e.unsuspend;e.unsuspend=null,t()}}}function nh(){this.count--,th(this)}function rh(){this.imgCount--,th(this)}var ih=null;function ah(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,ih=new Map,t.forEach(oh,e),ih=null,nh.call(e))}function oh(e,t){if(!(t.state.loading&4)){var n=ih.get(e);if(n)var r=n.get(null);else{n=new Map,ih.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<`u`&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE==`function`)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=s()}))();function l(e,t,n,r){if(n===`a`&&!r)throw TypeError(`Private accessor was defined without a getter`);if(typeof t==`function`?e!==t||!r:!t.has(e))throw TypeError(`Cannot read private member from an object whose class did not declare it`);return n===`m`?r:n===`a`?r.call(e):r?r.value:t.get(e)}function u(e,t,n,r,i){if(r===`m`)throw TypeError(`Private method is not writable`);if(r===`a`&&!i)throw TypeError(`Private accessor was defined without a setter`);if(typeof t==`function`?e!==t||!i:!t.has(e))throw TypeError(`Cannot write private member to an object whose class did not declare it`);return r===`a`?i.call(e,n):i?i.value=n:t.set(e,n),n}var d,f=`__TAURI_TO_IPC_KEY__`;function p(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function m(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}var h=class{get rid(){return l(this,d,`f`)}constructor(e){d.set(this,void 0),u(this,d,e,`f`)}async close(){return m(`plugin:resources|close`,{rid:this.rid})}async[(d=new WeakMap,Symbol.asyncDispose)](){await this.close()}},g=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.width=e[0].Logical.width,this.height=e[0].Logical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toPhysical(e){return new _(this.width*e,this.height*e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},_=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.width=e[0].Physical.width,this.height=e[0].Physical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toLogical(e){return new g(this.width/e,this.height/e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},v=class{constructor(e){this.size=e}toLogical(e){return this.size instanceof g?this.size:this.size.toLogical(e)}toPhysical(e){return this.size instanceof _?this.size:this.size.toPhysical(e)}[f](){return{[`${this.size.type}`]:{width:this.size.width,height:this.size.height}}}toJSON(){return this[f]()}},y=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.x=e[0].Logical.x,this.y=e[0].Logical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toPhysical(e){return new b(this.x*e,this.y*e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},b=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.x=e[0].Physical.x,this.y=e[0].Physical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toLogical(e){return new y(this.x/e,this.y/e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},ee=class{constructor(e){this.position=e}toLogical(e){return this.position instanceof y?this.position:this.position.toLogical(e)}toPhysical(e){return this.position instanceof b?this.position:this.position.toPhysical(e)}[f](){return{[`${this.position.type}`]:{x:this.position.x,y:this.position.y}}}toJSON(){return this[f]()}},x;(function(e){e.WINDOW_RESIZED=`tauri://resize`,e.WINDOW_MOVED=`tauri://move`,e.WINDOW_CLOSE_REQUESTED=`tauri://close-requested`,e.WINDOW_DESTROYED=`tauri://destroyed`,e.WINDOW_FOCUS=`tauri://focus`,e.WINDOW_BLUR=`tauri://blur`,e.WINDOW_SCALE_FACTOR_CHANGED=`tauri://scale-change`,e.WINDOW_THEME_CHANGED=`tauri://theme-changed`,e.WINDOW_CREATED=`tauri://window-created`,e.WINDOW_SUSPENDED=`tauri://suspended`,e.WINDOW_RESUMED=`tauri://resumed`,e.WEBVIEW_CREATED=`tauri://webview-created`,e.DRAG_ENTER=`tauri://drag-enter`,e.DRAG_OVER=`tauri://drag-over`,e.DRAG_DROP=`tauri://drag-drop`,e.DRAG_LEAVE=`tauri://drag-leave`})(x||={});async function te(e,t){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,t),await m(`plugin:event|unlisten`,{event:e,eventId:t})}async function ne(e,t,n){return m(`plugin:event|listen`,{event:e,target:typeof n?.target==`string`?{kind:`AnyLabel`,label:n.target}:n?.target??{kind:`Any`},handler:p(t)}).then(t=>async()=>te(e,t))}async function S(e,t,n){return ne(e,n=>{te(e,n.id),t(n)},n)}async function re(e,t){await m(`plugin:event|emit`,{event:e,payload:t})}async function C(e,t,n){await m(`plugin:event|emit_to`,{target:typeof e==`string`?{kind:`AnyLabel`,label:e}:e,event:t,payload:n})}var ie=class e extends h{constructor(e){super(e)}static async new(t,n,r){return m(`plugin:image|new`,{rgba:t,width:n,height:r}).then(t=>new e(t))}static async fromBytes(t){return m(`plugin:image|from_bytes`,{bytes:t}).then(t=>new e(t))}static async fromPath(t){return m(`plugin:image|from_path`,{path:t}).then(t=>new e(t))}async rgba(){return m(`plugin:image|rgba`,{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return m(`plugin:image|size`,{rid:this.rid})}};function ae(e){return e==null?null:typeof e==`string`?e:e instanceof ie?e.rid:e}var oe;(function(e){e[e.Critical=1]=`Critical`,e[e.Informational=2]=`Informational`})(oe||={});var se=class{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}},ce;(function(e){e.None=`none`,e.Normal=`normal`,e.Indeterminate=`indeterminate`,e.Paused=`paused`,e.Error=`error`})(ce||={});function le(){return new fe(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function ue(){return m(`plugin:window|get_all_windows`).then(e=>e.map(e=>new fe(e,{skip:!0})))}var de=[`tauri://created`,`tauri://error`],fe=class{constructor(e,t={}){this.label=e,this.listeners=Object.create(null),t?.skip||m(`plugin:window|create`,{options:{...t,parent:typeof t.parent==`string`?t.parent:t.parent?.label,label:e}}).then(async()=>this.emit(`tauri://created`)).catch(async e=>this.emit(`tauri://error`,e))}static async getByLabel(e){return(await ue()).find(t=>t.label===e)??null}static getCurrent(){return le()}static async getAll(){return ue()}static async getFocusedWindow(){for(let e of await ue())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:ne(e,t,{target:{kind:`Window`,label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:S(e,t,{target:{kind:`Window`,label:this.label}})}async emit(e,t){if(de.includes(e))for(let n of this.listeners[e]||[])n({event:e,id:-1,payload:t});else return re(e,t)}async emitTo(e,t,n){if(de.includes(t))for(let e of this.listeners[t]||[])e({event:t,id:-1,payload:n});else return C(e,t,n)}_handleTauriEvent(e,t){return de.includes(e)?(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0):!1}async scaleFactor(){return m(`plugin:window|scale_factor`,{label:this.label})}async innerPosition(){return m(`plugin:window|inner_position`,{label:this.label}).then(e=>new b(e))}async outerPosition(){return m(`plugin:window|outer_position`,{label:this.label}).then(e=>new b(e))}async innerSize(){return m(`plugin:window|inner_size`,{label:this.label}).then(e=>new _(e))}async outerSize(){return m(`plugin:window|outer_size`,{label:this.label}).then(e=>new _(e))}async isFullscreen(){return m(`plugin:window|is_fullscreen`,{label:this.label})}async isMinimized(){return m(`plugin:window|is_minimized`,{label:this.label})}async isMaximized(){return m(`plugin:window|is_maximized`,{label:this.label})}async isFocused(){return m(`plugin:window|is_focused`,{label:this.label})}async isDecorated(){return m(`plugin:window|is_decorated`,{label:this.label})}async isResizable(){return m(`plugin:window|is_resizable`,{label:this.label})}async isMaximizable(){return m(`plugin:window|is_maximizable`,{label:this.label})}async isMinimizable(){return m(`plugin:window|is_minimizable`,{label:this.label})}async isClosable(){return m(`plugin:window|is_closable`,{label:this.label})}async isVisible(){return m(`plugin:window|is_visible`,{label:this.label})}async title(){return m(`plugin:window|title`,{label:this.label})}async theme(){return m(`plugin:window|theme`,{label:this.label})}async isAlwaysOnTop(){return m(`plugin:window|is_always_on_top`,{label:this.label})}async activityName(){return m(`plugin:window|activity_name`,{label:this.label})}async sceneIdentifier(){return m(`plugin:window|scene_identifier`,{label:this.label})}async center(){return m(`plugin:window|center`,{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===oe.Critical?{type:`Critical`}:{type:`Informational`}),m(`plugin:window|request_user_attention`,{label:this.label,value:t})}async setResizable(e){return m(`plugin:window|set_resizable`,{label:this.label,value:e})}async setEnabled(e){return m(`plugin:window|set_enabled`,{label:this.label,value:e})}async isEnabled(){return m(`plugin:window|is_enabled`,{label:this.label})}async setMaximizable(e){return m(`plugin:window|set_maximizable`,{label:this.label,value:e})}async setMinimizable(e){return m(`plugin:window|set_minimizable`,{label:this.label,value:e})}async setClosable(e){return m(`plugin:window|set_closable`,{label:this.label,value:e})}async setTitle(e){return m(`plugin:window|set_title`,{label:this.label,value:e})}async maximize(){return m(`plugin:window|maximize`,{label:this.label})}async unmaximize(){return m(`plugin:window|unmaximize`,{label:this.label})}async toggleMaximize(){return m(`plugin:window|toggle_maximize`,{label:this.label})}async minimize(){return m(`plugin:window|minimize`,{label:this.label})}async unminimize(){return m(`plugin:window|unminimize`,{label:this.label})}async show(){return m(`plugin:window|show`,{label:this.label})}async hide(){return m(`plugin:window|hide`,{label:this.label})}async close(){return m(`plugin:window|close`,{label:this.label})}async destroy(){return m(`plugin:window|destroy`,{label:this.label})}async setDecorations(e){return m(`plugin:window|set_decorations`,{label:this.label,value:e})}async setShadow(e){return m(`plugin:window|set_shadow`,{label:this.label,value:e})}async setEffects(e){return m(`plugin:window|set_effects`,{label:this.label,value:e})}async clearEffects(){return m(`plugin:window|set_effects`,{label:this.label,value:null})}async setAlwaysOnTop(e){return m(`plugin:window|set_always_on_top`,{label:this.label,value:e})}async setAlwaysOnBottom(e){return m(`plugin:window|set_always_on_bottom`,{label:this.label,value:e})}async setContentProtected(e){return m(`plugin:window|set_content_protected`,{label:this.label,value:e})}async setSize(e){return m(`plugin:window|set_size`,{label:this.label,value:e instanceof v?e:new v(e)})}async setMinSize(e){return m(`plugin:window|set_min_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setMaxSize(e){return m(`plugin:window|set_max_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return m(`plugin:window|set_size_constraints`,{label:this.label,value:{minWidth:t(e?.minWidth),minHeight:t(e?.minHeight),maxWidth:t(e?.maxWidth),maxHeight:t(e?.maxHeight)}})}async setPosition(e){return m(`plugin:window|set_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setFullscreen(e){return m(`plugin:window|set_fullscreen`,{label:this.label,value:e})}async setFullscreenOnMonitor(e){return m(`plugin:window|set_fullscreen_on_monitor`,{label:this.label,value:e})}async setSimpleFullscreen(e){return m(`plugin:window|set_simple_fullscreen`,{label:this.label,value:e})}async setFocus(){return m(`plugin:window|set_focus`,{label:this.label})}async setFocusable(e){return m(`plugin:window|set_focusable`,{label:this.label,value:e})}async setIcon(e){return m(`plugin:window|set_icon`,{label:this.label,value:ae(e)})}async setSkipTaskbar(e){return m(`plugin:window|set_skip_taskbar`,{label:this.label,value:e})}async setCursorGrab(e){return m(`plugin:window|set_cursor_grab`,{label:this.label,value:e})}async setCursorVisible(e){return m(`plugin:window|set_cursor_visible`,{label:this.label,value:e})}async setCursorIcon(e){return m(`plugin:window|set_cursor_icon`,{label:this.label,value:e})}async setBackgroundColor(e){return m(`plugin:window|set_background_color`,{label:this.label,value:e})}async setCursorPosition(e){return m(`plugin:window|set_cursor_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setIgnoreCursorEvents(e){return m(`plugin:window|set_ignore_cursor_events`,{label:this.label,value:e})}async startDragging(){return m(`plugin:window|start_dragging`,{label:this.label})}async startResizeDragging(e){return m(`plugin:window|start_resize_dragging`,{label:this.label,value:e})}async setBadgeCount(e){return m(`plugin:window|set_badge_count`,{label:this.label,value:e})}async setBadgeLabel(e){return m(`plugin:window|set_badge_label`,{label:this.label,value:e})}async setOverlayIcon(e){return m(`plugin:window|set_overlay_icon`,{label:this.label,value:e?ae(e):void 0})}async setProgressBar(e){return m(`plugin:window|set_progress_bar`,{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return m(`plugin:window|set_visible_on_all_workspaces`,{label:this.label,value:e})}async setTitleBarStyle(e){return m(`plugin:window|set_title_bar_style`,{label:this.label,value:e})}async setTheme(e){return m(`plugin:window|set_theme`,{label:this.label,value:e})}async onResized(e){return this.listen(x.WINDOW_RESIZED,t=>{t.payload=new _(t.payload),e(t)})}async onMoved(e){return this.listen(x.WINDOW_MOVED,t=>{t.payload=new b(t.payload),e(t)})}async onCloseRequested(e){return this.listen(x.WINDOW_CLOSE_REQUESTED,async t=>{let n=new se(t);await e(n),n.isPreventDefault()||await this.destroy()})}async onDragDropEvent(e){let t=await this.listen(x.DRAG_ENTER,t=>{e({...t,payload:{type:`enter`,paths:t.payload.paths,position:new b(t.payload.position)}})}),n=await this.listen(x.DRAG_OVER,t=>{e({...t,payload:{type:`over`,position:new b(t.payload.position)}})}),r=await this.listen(x.DRAG_DROP,t=>{e({...t,payload:{type:`drop`,paths:t.payload.paths,position:new b(t.payload.position)}})}),i=await this.listen(x.DRAG_LEAVE,t=>{e({...t,payload:{type:`leave`}})});return async()=>{await Promise.all([t(),r(),n(),i()])}}async onFocusChanged(e){let t=await this.listen(x.WINDOW_FOCUS,t=>{e({...t,payload:!0})}),n=await this.listen(x.WINDOW_BLUR,t=>{e({...t,payload:!1})});return async()=>{await Promise.all([t(),n()])}}async onScaleChanged(e){return this.listen(x.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(x.WINDOW_THEME_CHANGED,e)}},pe;(function(e){e.Disabled=`disabled`,e.Throttle=`throttle`,e.Suspend=`suspend`})(pe||={});var me;(function(e){e.Default=`default`,e.FluentOverlay=`fluentOverlay`})(me||={});var he;(function(e){e.AppearanceBased=`appearanceBased`,e.Light=`light`,e.Dark=`dark`,e.MediumLight=`mediumLight`,e.UltraDark=`ultraDark`,e.Titlebar=`titlebar`,e.Selection=`selection`,e.Menu=`menu`,e.Popover=`popover`,e.Sidebar=`sidebar`,e.HeaderView=`headerView`,e.Sheet=`sheet`,e.WindowBackground=`windowBackground`,e.HudWindow=`hudWindow`,e.FullScreenUI=`fullScreenUI`,e.Tooltip=`tooltip`,e.ContentBackground=`contentBackground`,e.UnderWindowBackground=`underWindowBackground`,e.UnderPageBackground=`underPageBackground`,e.LiquidGlassRegular=`liquidGlassRegular`,e.LiquidGlassClear=`liquidGlassClear`,e.Mica=`mica`,e.Blur=`blur`,e.Acrylic=`acrylic`,e.Tabbed=`tabbed`,e.TabbedDark=`tabbedDark`,e.TabbedLight=`tabbedLight`})(he||={});var ge;(function(e){e.FollowsWindowActiveState=`followsWindowActiveState`,e.Active=`active`,e.Inactive=`inactive`})(ge||={});var _e=`/assets/icon-small-DFuJkDph.svg`,ve=i(),ye=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.fragment`);function r(e,n,r){var i=null;if(r!==void 0&&(i=``+r),n.key!==void 0&&(i=``+n.key),`key`in n)for(var a in r={},n)a!==`key`&&(r[a]=n[a]);else r=n;return n=r.ref,{$$typeof:t,type:e,key:i,ref:n===void 0?null:n,props:r}}e.Fragment=n,e.jsx=r,e.jsxs=r})),w=e(((e,t)=>{t.exports=ye()}))(),be=le();function xe(){let[e,t]=(0,ve.useState)(!1),[n,r]=(0,ve.useState)(null);return(0,ve.useEffect)(()=>{let e=[],n=!1;return(async()=>{let i=await be.listen(`app://update-progress`,e=>{r(e.payload)}),a=await be.listen(`app://update-error`,()=>{t(!0)});n?(i(),a()):(e.push(i,a),await be.emit(`app://update`))})(),()=>{n=!0,e.forEach(e=>e())}},[]),(0,w.jsxs)(`div`,{className:`update-window`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`img`,{src:_e,alt:``,className:`update-logo`,"data-tauri-drag-region":!0}),(0,w.jsx)(`div`,{className:`update-content`,"data-tauri-drag-region":!0,children:e?(0,w.jsx)(Ce,{onRetry:()=>{t(!1),r(null),be.emit(`app://update`)}}):(0,w.jsx)(Se,{progress:n})})]})}function Se({progress:e}){return(0,w.jsxs)(`div`,{className:`update-status`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Getting GP Connect ready`}),(0,w.jsx)(we,{value:e})]})}function Ce({onRetry:e}){return(0,w.jsxs)(`div`,{className:`update-status error-status`,"data-tauri-drag-region":!0,children:[(0,w.jsxs)(`div`,{className:`error-copy`,role:`alert`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Couldn’t get GP Connect ready`}),(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`Please try again.`})]}),(0,w.jsx)(`button`,{type:`button`,onClick:e,className:`retry-button`,children:`Retry`})]})}function we({value:e}){let t=e!==null;return(0,w.jsxs)(w.Fragment,{children:[(0,w.jsxs)(`div`,{className:`progress-summary`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`This should only take a moment.`}),(0,w.jsx)(`span`,{className:`progress-label`,"aria-hidden":`true`,children:t?`${Math.round(e)}%`:`In progress`})]}),(0,w.jsx)(`div`,{className:`progress-bar${t?``:` progress-bar-indeterminate`}`,role:`progressbar`,"aria-label":`Update progress`,"aria-valuemin":t?0:void 0,"aria-valuemax":t?100:void 0,"aria-valuenow":t?Math.round(e):void 0,children:(0,w.jsx)(`div`,{className:`progress-fill`,style:t?{width:`${e}%`}:void 0})})]})}(0,c.createRoot)(document.getElementById(`root`)).render((0,w.jsx)(xe,{})); \ No newline at end of file +`).replace(Qf,``)}function ep(e,t){return t=$f(t),$f(e)===t}function $(e,t,n,r,i,a){switch(n){case`children`:if(typeof r==`string`)t===`body`||t===`textarea`&&r===``||xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)t!==`body`&&xn(e,``+r);else return;break;case`className`:on(e,`class`,r);break;case`tabIndex`:on(e,`tabindex`,r);break;case`dir`:case`role`:case`viewBox`:case`width`:case`height`:on(e,n,r);break;case`style`:wn(e,r,a);return;case`data`:if(t!==`object`){on(e,`data`,r);break}case`src`:case`href`:if(r===``&&(t!==`a`||n!==`href`)||r==null||typeof r==`function`||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`action`:case`formAction`:if(typeof r==`function`){e.setAttribute(n,`javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')`);break}if(typeof a==`function`&&(n===`formAction`?(t!==`input`&&$(e,t,`name`,i.name,i,null),$(e,t,`formEncType`,i.formEncType,i,null),$(e,t,`formMethod`,i.formMethod,i,null),$(e,t,`formTarget`,i.formTarget,i,null)):($(e,t,`encType`,i.encType,i,null),$(e,t,`method`,i.method,i,null),$(e,t,`target`,i.target,i,null))),r==null||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`onClick`:r!=null&&(e.onclick=kn);return;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`dangerouslySetInnerHTML`:if(r!=null){if(typeof r!=`object`||!(`__html`in r))throw Error(s(61));if(n=r.__html,n!=null){if(i.children!=null)throw Error(s(60));a?.__html!==n&&(e.innerHTML=n)}}break;case`multiple`:e.multiple=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`muted`:e.muted=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`suppressContentEditableWarning`:case`suppressHydrationWarning`:case`defaultValue`:case`defaultChecked`:case`innerHTML`:case`ref`:break;case`autoFocus`:break;case`xlinkHref`:if(r==null||typeof r==`function`||typeof r==`boolean`||typeof r==`symbol`){e.removeAttribute(`xlink:href`);break}n=On(r),e.setAttributeNS(`http://www.w3.org/1999/xlink`,`xlink:href`,n);break;case`contentEditable`:case`spellCheck`:case`draggable`:case`value`:case`autoReverse`:case`externalResourcesRequired`:case`focusable`:case`preserveAlpha`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`inert`:case`allowFullScreen`:case`async`:case`autoPlay`:case`controls`:case`credentialless`:case`default`:case`defer`:case`disabled`:case`disablePictureInPicture`:case`disableRemotePlayback`:case`formNoValidate`:case`hidden`:case`loop`:case`noModule`:case`noValidate`:case`open`:case`playsInline`:case`readOnly`:case`required`:case`reversed`:case`scoped`:case`seamless`:case`itemScope`:r&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,``):e.removeAttribute(n);break;case`capture`:case`download`:!0===r?e.setAttribute(n,``):!1!==r&&r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`cols`:case`rows`:case`size`:case`span`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`&&!isNaN(r)&&1<=r?e.setAttribute(n,r):e.removeAttribute(n);break;case`rowSpan`:case`start`:r==null||typeof r==`function`||typeof r==`symbol`||isNaN(r)?e.removeAttribute(n):e.setAttribute(n,r);break;case`popover`:Q(`beforetoggle`,e),Q(`toggle`,e),an(e,`popover`,r);break;case`xlinkActuate`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:actuate`,r);break;case`xlinkArcrole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:arcrole`,r);break;case`xlinkRole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:role`,r);break;case`xlinkShow`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:show`,r);break;case`xlinkTitle`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:title`,r);break;case`xlinkType`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:type`,r);break;case`xmlBase`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:base`,r);break;case`xmlLang`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:lang`,r);break;case`xmlSpace`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:space`,r);break;case`is`:an(e,`is`,r);break;case`innerText`:case`textContent`:return;default:if(!(2s)break;var u=c.transferSize,d=c.initiatorType;u&&ap(d)&&(c=c.responseEnd,o+=u*(c$m){s.length=o;break}f=new Promise(jp.bind(f)),s.push(f)}}}if(0`u`?null:document;function Tm(e,t,n){var r=wm;if(r&&typeof t==`string`&&t){var i=mn(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),ym.has(i)||(ym.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),np(t,`link`,e),qt(t),r.head.appendChild(t)))}}function Em(e){xm.D(e),Tm(`dns-prefetch`,e,null)}function Dm(e,t){xm.C(e,t),Tm(`preconnect`,e,t)}function Om(e,t,n){xm.L(e,t,n);var r=wm;if(r&&e&&t){var i=`link[rel="preload"][as="`+mn(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+mn(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+mn(n.imageSizes)+`"]`)):i+=`[href="`+mn(e)+`"]`;var a=i;switch(t){case`style`:a=Pm(e);break;case`script`:a=Rm(e)}if(!(vm.has(a)||(e=C({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),vm.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(Fm(a))||t===`script`&&r.querySelector(zm(a))))){var o=r.createElement(`link`);np(o,`link`,e),t===`style`&&(o[Vt]=!0,o.onload=o.onerror=function(){Jt(o)}),qt(o),r.head.appendChild(o)}}}function km(e,t){xm.m(e,t);var n=wm;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+mn(r)+`"][href="`+mn(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Rm(e)}if(!vm.has(a)&&(e=C({rel:`modulepreload`,href:e},t),vm.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(zm(a)))return}r=n.createElement(`link`),np(r,`link`,e),qt(r),n.head.appendChild(r)}}}function Am(e,t,n){xm.S(e,t,n);var r=wm;if(r&&e){var i=Kt(r).hoistableStyles,a=Pm(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(Fm(a)))s.loading=5;else{e=C({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=vm.get(a))&&Hm(e,n);var c=o=r.createElement(`link`);qt(c),np(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Vm(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function jm(e,t){xm.X(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Mm(e,t){xm.M(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0,type:`module`},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Nm(e,t,n,r){var i=(i=Ne.current)?bm(i):null;if(!i)throw Error(s(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(n=Pm(n.href),t=Kt(i).hoistableStyles,r=t.get(n),r||(r={type:`style`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Pm(n.href);var a=Kt(i).hoistableStyles,o=a.get(e);if(o||(i=i.ownerDocument||i,o={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},a.set(e,o),(a=i.querySelector(Fm(e)))?a._p||(o.instance=a,o.state.loading=5):(a=vm.get(e),a||(a={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},vm.set(e,a)),Lm(i,e,a,o.state))),t&&r===null)throw Error(s(528,``));return o}if(t&&r!==null)throw Error(s(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(n=Rm(n),t=Kt(i).hoistableScripts,r=t.get(n),r||(r={type:`script`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(s(444,e))}}function Pm(e){return`href="`+mn(e)+`"`}function Fm(e){return`link[rel="stylesheet"][`+e+`]`}function Im(e){return C({},e,{"data-precedence":e.precedence,precedence:null})}function Lm(e,t,n,r){if(t=e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)){if(!0!==t[Vt]){r.loading=1;return}}else t=e.createElement(`link`),t[Vt]=!0,t.onload=t.onerror=Jt.bind(null,t),np(t,`link`,n),qt(t),e.head.appendChild(t);r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2})}function Rm(e){return`[src="`+mn(e)+`"]`}function zm(e){return`script[async]`+e}function Bm(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+mn(n.href)+`"]`);if(r)return t.instance=r,qt(r),r;var i=C({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),qt(r),np(r,`style`,i),Vm(r,n.precedence,e),t.instance=r;case`stylesheet`:i=Pm(n.href);var a=e.querySelector(Fm(i));if(a)return t.state.loading|=4,t.instance=a,qt(a),a;r=Im(n),(i=vm.get(i))&&Hm(r,i),a=(e.ownerDocument||e).createElement(`link`),qt(a);var o=a;return o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),t.state.loading|=4,Vm(a,n.precedence,e),t.instance=a;case`script`:return a=Rm(n.src),(i=e.querySelector(zm(a)))?(t.instance=i,qt(i),i):(r=n,(i=vm.get(a))&&(r=C({},n),Um(r,i)),e=e.ownerDocument||e,i=e.createElement(`script`),qt(i),np(i,`link`,r),e.head.appendChild(i),t.instance=i);case`void`:return null;default:throw Error(s(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Vm(r,n.precedence,e));return t.instance}function Vm(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function qm(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Jm(e,t){return e===`img`&&t.src!=null&&t.src!==``&&t.onLoad==null&&t.loading!==`lazy`}function Ym(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Xm(e){return(e.width||100)*(e.height||100)*(typeof devicePixelRatio==`number`?devicePixelRatio:1)*.25}function Zm(e,t){typeof t.decode==`function`&&(e.imgCount++,t.complete||(e.imgBytes+=Xm(t),e.suspenseyImages.push(t)),e=rh.bind(e),t.decode().then(e,e))}function Qm(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Pm(r.href),a=t.querySelector(Fm(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=nh.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,qt(a);return}a=t.ownerDocument||t,r=Im(r),(i=vm.get(i))&&Hm(r,i),a=a.createElement(`link`),qt(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=nh.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var $m=0;function eh(e,t){return e.stylesheets&&e.count===0&&ah(e,e.stylesheets),0$m?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function th(e){if(e.count===0&&(e.imgCount===0||!e.waitingForImages)){if(e.stylesheets)ah(e,e.stylesheets);else if(e.unsuspend){var t=e.unsuspend;e.unsuspend=null,t()}}}function nh(){this.count--,th(this)}function rh(){this.imgCount--,th(this)}var ih=null;function ah(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,ih=new Map,t.forEach(oh,e),ih=null,nh.call(e))}function oh(e,t){if(!(t.state.loading&4)){var n=ih.get(e);if(n)var r=n.get(null);else{n=new Map,ih.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<`u`&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE==`function`)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=s()}))();function l(e,t,n,r){if(n===`a`&&!r)throw TypeError(`Private accessor was defined without a getter`);if(typeof t==`function`?e!==t||!r:!t.has(e))throw TypeError(`Cannot read private member from an object whose class did not declare it`);return n===`m`?r:n===`a`?r.call(e):r?r.value:t.get(e)}function u(e,t,n,r,i){if(r===`m`)throw TypeError(`Private method is not writable`);if(r===`a`&&!i)throw TypeError(`Private accessor was defined without a setter`);if(typeof t==`function`?e!==t||!i:!t.has(e))throw TypeError(`Cannot write private member to an object whose class did not declare it`);return r===`a`?i.call(e,n):i?i.value=n:t.set(e,n),n}var d,f=`__TAURI_TO_IPC_KEY__`;function p(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function m(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}var h=class{get rid(){return l(this,d,`f`)}constructor(e){d.set(this,void 0),u(this,d,e,`f`)}async close(){return m(`plugin:resources|close`,{rid:this.rid})}async[(d=new WeakMap,Symbol.asyncDispose)](){await this.close()}},g=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.width=e[0].Logical.width,this.height=e[0].Logical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toPhysical(e){return new _(this.width*e,this.height*e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},_=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.width=e[0].Physical.width,this.height=e[0].Physical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toLogical(e){return new g(this.width/e,this.height/e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},v=class{constructor(e){this.size=e}toLogical(e){return this.size instanceof g?this.size:this.size.toLogical(e)}toPhysical(e){return this.size instanceof _?this.size:this.size.toPhysical(e)}[f](){return{[`${this.size.type}`]:{width:this.size.width,height:this.size.height}}}toJSON(){return this[f]()}},y=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.x=e[0].Logical.x,this.y=e[0].Logical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toPhysical(e){return new b(this.x*e,this.y*e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},b=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.x=e[0].Physical.x,this.y=e[0].Physical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toLogical(e){return new y(this.x/e,this.y/e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},ee=class{constructor(e){this.position=e}toLogical(e){return this.position instanceof y?this.position:this.position.toLogical(e)}toPhysical(e){return this.position instanceof b?this.position:this.position.toPhysical(e)}[f](){return{[`${this.position.type}`]:{x:this.position.x,y:this.position.y}}}toJSON(){return this[f]()}},x;(function(e){e.WINDOW_RESIZED=`tauri://resize`,e.WINDOW_MOVED=`tauri://move`,e.WINDOW_CLOSE_REQUESTED=`tauri://close-requested`,e.WINDOW_DESTROYED=`tauri://destroyed`,e.WINDOW_FOCUS=`tauri://focus`,e.WINDOW_BLUR=`tauri://blur`,e.WINDOW_SCALE_FACTOR_CHANGED=`tauri://scale-change`,e.WINDOW_THEME_CHANGED=`tauri://theme-changed`,e.WINDOW_CREATED=`tauri://window-created`,e.WINDOW_SUSPENDED=`tauri://suspended`,e.WINDOW_RESUMED=`tauri://resumed`,e.WEBVIEW_CREATED=`tauri://webview-created`,e.DRAG_ENTER=`tauri://drag-enter`,e.DRAG_OVER=`tauri://drag-over`,e.DRAG_DROP=`tauri://drag-drop`,e.DRAG_LEAVE=`tauri://drag-leave`})(x||={});async function te(e,t){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,t),await m(`plugin:event|unlisten`,{event:e,eventId:t})}async function ne(e,t,n){return m(`plugin:event|listen`,{event:e,target:typeof n?.target==`string`?{kind:`AnyLabel`,label:n.target}:n?.target??{kind:`Any`},handler:p(t)}).then(t=>async()=>te(e,t))}async function S(e,t,n){return ne(e,n=>{te(e,n.id),t(n)},n)}async function re(e,t){await m(`plugin:event|emit`,{event:e,payload:t})}async function C(e,t,n){await m(`plugin:event|emit_to`,{target:typeof e==`string`?{kind:`AnyLabel`,label:e}:e,event:t,payload:n})}var ie=class e extends h{constructor(e){super(e)}static async new(t,n,r){return m(`plugin:image|new`,{rgba:t,width:n,height:r}).then(t=>new e(t))}static async fromBytes(t){return m(`plugin:image|from_bytes`,{bytes:t}).then(t=>new e(t))}static async fromPath(t){return m(`plugin:image|from_path`,{path:t}).then(t=>new e(t))}async rgba(){return m(`plugin:image|rgba`,{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return m(`plugin:image|size`,{rid:this.rid})}};function ae(e){return e==null?null:typeof e==`string`?e:e instanceof ie?e.rid:e}var oe;(function(e){e[e.Critical=1]=`Critical`,e[e.Informational=2]=`Informational`})(oe||={});var se=class{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}},ce;(function(e){e.None=`none`,e.Normal=`normal`,e.Indeterminate=`indeterminate`,e.Paused=`paused`,e.Error=`error`})(ce||={});function le(){return new fe(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function ue(){return m(`plugin:window|get_all_windows`).then(e=>e.map(e=>new fe(e,{skip:!0})))}var de=[`tauri://created`,`tauri://error`],fe=class{constructor(e,t={}){this.label=e,this.listeners=Object.create(null),t?.skip||m(`plugin:window|create`,{options:{...t,parent:typeof t.parent==`string`?t.parent:t.parent?.label,label:e}}).then(async()=>this.emit(`tauri://created`)).catch(async e=>this.emit(`tauri://error`,e))}static async getByLabel(e){return(await ue()).find(t=>t.label===e)??null}static getCurrent(){return le()}static async getAll(){return ue()}static async getFocusedWindow(){for(let e of await ue())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:ne(e,t,{target:{kind:`Window`,label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:S(e,t,{target:{kind:`Window`,label:this.label}})}async emit(e,t){if(de.includes(e))for(let n of this.listeners[e]||[])n({event:e,id:-1,payload:t});else return re(e,t)}async emitTo(e,t,n){if(de.includes(t))for(let e of this.listeners[t]||[])e({event:t,id:-1,payload:n});else return C(e,t,n)}_handleTauriEvent(e,t){return de.includes(e)?(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0):!1}async scaleFactor(){return m(`plugin:window|scale_factor`,{label:this.label})}async innerPosition(){return m(`plugin:window|inner_position`,{label:this.label}).then(e=>new b(e))}async outerPosition(){return m(`plugin:window|outer_position`,{label:this.label}).then(e=>new b(e))}async innerSize(){return m(`plugin:window|inner_size`,{label:this.label}).then(e=>new _(e))}async outerSize(){return m(`plugin:window|outer_size`,{label:this.label}).then(e=>new _(e))}async isFullscreen(){return m(`plugin:window|is_fullscreen`,{label:this.label})}async isMinimized(){return m(`plugin:window|is_minimized`,{label:this.label})}async isMaximized(){return m(`plugin:window|is_maximized`,{label:this.label})}async isFocused(){return m(`plugin:window|is_focused`,{label:this.label})}async isDecorated(){return m(`plugin:window|is_decorated`,{label:this.label})}async isResizable(){return m(`plugin:window|is_resizable`,{label:this.label})}async isMaximizable(){return m(`plugin:window|is_maximizable`,{label:this.label})}async isMinimizable(){return m(`plugin:window|is_minimizable`,{label:this.label})}async isClosable(){return m(`plugin:window|is_closable`,{label:this.label})}async isVisible(){return m(`plugin:window|is_visible`,{label:this.label})}async title(){return m(`plugin:window|title`,{label:this.label})}async theme(){return m(`plugin:window|theme`,{label:this.label})}async isAlwaysOnTop(){return m(`plugin:window|is_always_on_top`,{label:this.label})}async activityName(){return m(`plugin:window|activity_name`,{label:this.label})}async sceneIdentifier(){return m(`plugin:window|scene_identifier`,{label:this.label})}async center(){return m(`plugin:window|center`,{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===oe.Critical?{type:`Critical`}:{type:`Informational`}),m(`plugin:window|request_user_attention`,{label:this.label,value:t})}async setResizable(e){return m(`plugin:window|set_resizable`,{label:this.label,value:e})}async setEnabled(e){return m(`plugin:window|set_enabled`,{label:this.label,value:e})}async isEnabled(){return m(`plugin:window|is_enabled`,{label:this.label})}async setMaximizable(e){return m(`plugin:window|set_maximizable`,{label:this.label,value:e})}async setMinimizable(e){return m(`plugin:window|set_minimizable`,{label:this.label,value:e})}async setClosable(e){return m(`plugin:window|set_closable`,{label:this.label,value:e})}async setTitle(e){return m(`plugin:window|set_title`,{label:this.label,value:e})}async maximize(){return m(`plugin:window|maximize`,{label:this.label})}async unmaximize(){return m(`plugin:window|unmaximize`,{label:this.label})}async toggleMaximize(){return m(`plugin:window|toggle_maximize`,{label:this.label})}async minimize(){return m(`plugin:window|minimize`,{label:this.label})}async unminimize(){return m(`plugin:window|unminimize`,{label:this.label})}async show(){return m(`plugin:window|show`,{label:this.label})}async hide(){return m(`plugin:window|hide`,{label:this.label})}async close(){return m(`plugin:window|close`,{label:this.label})}async destroy(){return m(`plugin:window|destroy`,{label:this.label})}async setDecorations(e){return m(`plugin:window|set_decorations`,{label:this.label,value:e})}async setShadow(e){return m(`plugin:window|set_shadow`,{label:this.label,value:e})}async setEffects(e){return m(`plugin:window|set_effects`,{label:this.label,value:e})}async clearEffects(){return m(`plugin:window|set_effects`,{label:this.label,value:null})}async setAlwaysOnTop(e){return m(`plugin:window|set_always_on_top`,{label:this.label,value:e})}async setAlwaysOnBottom(e){return m(`plugin:window|set_always_on_bottom`,{label:this.label,value:e})}async setContentProtected(e){return m(`plugin:window|set_content_protected`,{label:this.label,value:e})}async setSize(e){return m(`plugin:window|set_size`,{label:this.label,value:e instanceof v?e:new v(e)})}async setMinSize(e){return m(`plugin:window|set_min_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setMaxSize(e){return m(`plugin:window|set_max_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return m(`plugin:window|set_size_constraints`,{label:this.label,value:{minWidth:t(e?.minWidth),minHeight:t(e?.minHeight),maxWidth:t(e?.maxWidth),maxHeight:t(e?.maxHeight)}})}async setPosition(e){return m(`plugin:window|set_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setFullscreen(e){return m(`plugin:window|set_fullscreen`,{label:this.label,value:e})}async setFullscreenOnMonitor(e){return m(`plugin:window|set_fullscreen_on_monitor`,{label:this.label,value:e})}async setSimpleFullscreen(e){return m(`plugin:window|set_simple_fullscreen`,{label:this.label,value:e})}async setFocus(){return m(`plugin:window|set_focus`,{label:this.label})}async setFocusable(e){return m(`plugin:window|set_focusable`,{label:this.label,value:e})}async setIcon(e){return m(`plugin:window|set_icon`,{label:this.label,value:ae(e)})}async setSkipTaskbar(e){return m(`plugin:window|set_skip_taskbar`,{label:this.label,value:e})}async setCursorGrab(e){return m(`plugin:window|set_cursor_grab`,{label:this.label,value:e})}async setCursorVisible(e){return m(`plugin:window|set_cursor_visible`,{label:this.label,value:e})}async setCursorIcon(e){return m(`plugin:window|set_cursor_icon`,{label:this.label,value:e})}async setBackgroundColor(e){return m(`plugin:window|set_background_color`,{label:this.label,value:e})}async setCursorPosition(e){return m(`plugin:window|set_cursor_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setIgnoreCursorEvents(e){return m(`plugin:window|set_ignore_cursor_events`,{label:this.label,value:e})}async startDragging(){return m(`plugin:window|start_dragging`,{label:this.label})}async startResizeDragging(e){return m(`plugin:window|start_resize_dragging`,{label:this.label,value:e})}async setBadgeCount(e){return m(`plugin:window|set_badge_count`,{label:this.label,value:e})}async setBadgeLabel(e){return m(`plugin:window|set_badge_label`,{label:this.label,value:e})}async setOverlayIcon(e){return m(`plugin:window|set_overlay_icon`,{label:this.label,value:e?ae(e):void 0})}async setProgressBar(e){return m(`plugin:window|set_progress_bar`,{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return m(`plugin:window|set_visible_on_all_workspaces`,{label:this.label,value:e})}async setTitleBarStyle(e){return m(`plugin:window|set_title_bar_style`,{label:this.label,value:e})}async setTheme(e){return m(`plugin:window|set_theme`,{label:this.label,value:e})}async onResized(e){return this.listen(x.WINDOW_RESIZED,t=>{t.payload=new _(t.payload),e(t)})}async onMoved(e){return this.listen(x.WINDOW_MOVED,t=>{t.payload=new b(t.payload),e(t)})}async onCloseRequested(e){return this.listen(x.WINDOW_CLOSE_REQUESTED,async t=>{let n=new se(t);await e(n),n.isPreventDefault()||await this.destroy()})}async onDragDropEvent(e){let t=await this.listen(x.DRAG_ENTER,t=>{e({...t,payload:{type:`enter`,paths:t.payload.paths,position:new b(t.payload.position)}})}),n=await this.listen(x.DRAG_OVER,t=>{e({...t,payload:{type:`over`,position:new b(t.payload.position)}})}),r=await this.listen(x.DRAG_DROP,t=>{e({...t,payload:{type:`drop`,paths:t.payload.paths,position:new b(t.payload.position)}})}),i=await this.listen(x.DRAG_LEAVE,t=>{e({...t,payload:{type:`leave`}})});return async()=>{await Promise.all([t(),r(),n(),i()])}}async onFocusChanged(e){let t=await this.listen(x.WINDOW_FOCUS,t=>{e({...t,payload:!0})}),n=await this.listen(x.WINDOW_BLUR,t=>{e({...t,payload:!1})});return async()=>{await Promise.all([t(),n()])}}async onScaleChanged(e){return this.listen(x.WINDOW_SCALE_FACTOR_CHANGED,t=>{t.payload.size=new _(t.payload.size),e(t)})}async onThemeChanged(e){return this.listen(x.WINDOW_THEME_CHANGED,e)}},pe;(function(e){e.Disabled=`disabled`,e.Throttle=`throttle`,e.Suspend=`suspend`})(pe||={});var me;(function(e){e.Default=`default`,e.FluentOverlay=`fluentOverlay`})(me||={});var he;(function(e){e.AppearanceBased=`appearanceBased`,e.Light=`light`,e.Dark=`dark`,e.MediumLight=`mediumLight`,e.UltraDark=`ultraDark`,e.Titlebar=`titlebar`,e.Selection=`selection`,e.Menu=`menu`,e.Popover=`popover`,e.Sidebar=`sidebar`,e.HeaderView=`headerView`,e.Sheet=`sheet`,e.WindowBackground=`windowBackground`,e.HudWindow=`hudWindow`,e.FullScreenUI=`fullScreenUI`,e.Tooltip=`tooltip`,e.ContentBackground=`contentBackground`,e.UnderWindowBackground=`underWindowBackground`,e.UnderPageBackground=`underPageBackground`,e.LiquidGlassRegular=`liquidGlassRegular`,e.LiquidGlassClear=`liquidGlassClear`,e.Mica=`mica`,e.Blur=`blur`,e.Acrylic=`acrylic`,e.Tabbed=`tabbed`,e.TabbedDark=`tabbedDark`,e.TabbedLight=`tabbedLight`})(he||={});var ge;(function(e){e.FollowsWindowActiveState=`followsWindowActiveState`,e.Active=`active`,e.Inactive=`inactive`})(ge||={});var _e=`/assets/icon-small-DFuJkDph.svg`,ve=i(),ye=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.fragment`);function r(e,n,r){var i=null;if(r!==void 0&&(i=``+r),n.key!==void 0&&(i=``+n.key),`key`in n)for(var a in r={},n)a!==`key`&&(r[a]=n[a]);else r=n;return n=r.ref,{$$typeof:t,type:e,key:i,ref:n===void 0?null:n,props:r}}e.Fragment=n,e.jsx=r,e.jsxs=r})),w=e(((e,t)=>{t.exports=ye()}))(),be=le();function xe(){let[e,t]=(0,ve.useState)(!1),[n,r]=(0,ve.useState)(null);return(0,ve.useEffect)(()=>{let e=[],n=!1;return(async()=>{let i=await be.listen(`app://update-progress`,e=>{r(e.payload)}),a=await be.listen(`app://update-error`,()=>{t(!0)});n?(i(),a()):(e.push(i,a),await be.emit(`app://update`))})(),()=>{n=!0,e.forEach(e=>e())}},[]),(0,w.jsxs)(`div`,{className:`update-window`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`img`,{src:_e,alt:``,className:`update-logo`,"data-tauri-drag-region":!0}),(0,w.jsx)(`div`,{className:`update-content`,"data-tauri-drag-region":!0,children:e?(0,w.jsx)(Ce,{onRetry:()=>{t(!1),r(null),be.emit(`app://update`)}}):(0,w.jsx)(Se,{progress:n})})]})}function Se({progress:e}){return(0,w.jsxs)(`div`,{className:`update-status`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Getting GP Connect ready`}),(0,w.jsx)(we,{value:e})]})}function Ce({onRetry:e}){return(0,w.jsxs)(`div`,{className:`update-status error-status`,"data-tauri-drag-region":!0,children:[(0,w.jsxs)(`div`,{className:`error-copy`,role:`alert`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Couldn’t get GP Connect ready`}),(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`Please try again.`})]}),(0,w.jsx)(`button`,{type:`button`,onClick:e,className:`retry-button`,children:`Retry`})]})}function we({value:e}){let t=e!==null;return(0,w.jsxs)(w.Fragment,{children:[(0,w.jsxs)(`div`,{className:`progress-summary`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`This should only take a moment.`}),(0,w.jsx)(`span`,{className:`progress-label`,"aria-hidden":`true`,children:t?`${Math.round(e)}%`:`In progress`})]}),(0,w.jsx)(`div`,{className:`progress-bar${t?``:` progress-bar-indeterminate`}`,role:`progressbar`,"aria-label":`Update progress`,"aria-valuemin":t?0:void 0,"aria-valuemax":t?100:void 0,"aria-valuenow":t?Math.round(e):void 0,children:(0,w.jsx)(`div`,{className:`progress-fill`,style:t?{width:`${e}%`}:void 0})})]})}(0,c.createRoot)(document.getElementById(`root`)).render((0,w.jsx)(xe,{})); \ No newline at end of file diff --git a/apps/gpgui-helper/dist/index.html b/apps/gpgui-helper/dist/index.html index e8fe51e..c6cb495 100644 --- a/apps/gpgui-helper/dist/index.html +++ b/apps/gpgui-helper/dist/index.html @@ -15,7 +15,7 @@ GPGUI Downloader - + diff --git a/apps/gpgui-helper/package.json b/apps/gpgui-helper/package.json index 9da7fc8..bb32212 100644 --- a/apps/gpgui-helper/package.json +++ b/apps/gpgui-helper/package.json @@ -10,25 +10,25 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.12.4", + "@tauri-apps/api": "^2.12.5", "react": "^19.3.1", "react-dom": "^19.3.1" }, "devDependencies": { - "@tauri-apps/cli": "^2.12.4", + "@tauri-apps/cli": "^2.12.6", "@types/node": "^26.6.6", "@types/react": "^19.3.0", "@types/react-dom": "^19.3.0", - "@typescript-eslint/eslint-plugin": "^8.72.1", - "@typescript-eslint/parser": "^8.72.1", - "@vitejs/plugin-react": "^6.1.2", + "@typescript-eslint/eslint-plugin": "^8.73.0", + "@typescript-eslint/parser": "^8.73.0", + "@vitejs/plugin-react": "^6.3.0", "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^7.1.1", - "prettier": "3.9.10", + "prettier": "3.10.1", "typescript": "^6.0.3", - "vite": "^8.3.5" + "vite": "^8.3.8" }, "packageManager": "pnpm@9.15.1" } diff --git a/apps/gpgui-helper/pnpm-lock.yaml b/apps/gpgui-helper/pnpm-lock.yaml index 88e4566..249e834 100644 --- a/apps/gpgui-helper/pnpm-lock.yaml +++ b/apps/gpgui-helper/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@tauri-apps/api': - specifier: ^2.12.4 - version: 2.12.4 + specifier: ^2.12.5 + version: 2.12.5 react: specifier: ^19.3.1 version: 19.3.1 @@ -19,8 +19,8 @@ importers: version: 19.3.1(react@19.3.1) devDependencies: '@tauri-apps/cli': - specifier: ^2.12.4 - version: 2.12.4 + specifier: ^2.12.6 + version: 2.12.6 '@types/node': specifier: ^26.6.6 version: 26.6.6 @@ -31,14 +31,14 @@ importers: specifier: ^19.3.0 version: 19.3.0(@types/react@19.3.0) '@typescript-eslint/eslint-plugin': - specifier: ^8.72.1 - version: 8.72.1(@typescript-eslint/parser@8.72.1(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3) + specifier: ^8.73.0 + version: 8.73.0(@typescript-eslint/parser@8.73.0(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3) '@typescript-eslint/parser': - specifier: ^8.72.1 - version: 8.72.1(eslint@9.39.5)(typescript@6.0.3) + specifier: ^8.73.0 + version: 8.73.0(eslint@9.39.5)(typescript@6.0.3) '@vitejs/plugin-react': - specifier: ^6.1.2 - version: 6.1.2(vite@8.3.5(@types/node@26.6.6)(esbuild@0.27.2)) + specifier: ^6.3.0 + version: 6.3.0(vite@8.3.8(@types/node@26.6.6)(esbuild@0.27.2)) eslint: specifier: ^9.39.5 version: 9.39.5 @@ -52,14 +52,14 @@ importers: specifier: ^7.1.1 version: 7.1.1(eslint@9.39.5) prettier: - specifier: 3.9.10 - version: 3.9.10 + specifier: 3.10.1 + version: 3.10.1 typescript: specifier: ^6.0.3 version: 6.0.3 vite: - specifier: ^8.3.5 - version: 8.3.5(@types/node@26.6.6)(esbuild@0.27.2) + specifier: ^8.3.8 + version: 8.3.8(@types/node@26.6.6)(esbuild@0.27.2) packages: @@ -130,6 +130,15 @@ packages: resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} engines: {node: '>=6.9.0'} + '@emnapi/core@2.0.0-beta.2': + resolution: {integrity: sha512-MzCVoWtcg4Pm2B3je5mMvYMvj3MmBKw+fU7vbsJc9/iT8ip6/eYIHo/Dsm/mr+wsHB6SEyJDuxB09Yy6r/8+4A==} + + '@emnapi/runtime@2.0.0-beta.2': + resolution: {integrity: sha512-JcrSPzPvZuNZvJqPTF9Fw25LbOJ8avzFVlaf2grmH4Cku0oGP47tRgqPZadcfj3YoZMHkFVnCYFbQM8I+i5QEw==} + + '@emnapi/wasi-threads@2.2.0': + resolution: {integrity: sha512-JP7OYH38Q7+pyTAe14raZHLQIK7BDKbdwji+Xi3pcd/6QkJYQH3SX4wu6EplGrGJWRepoNzedfm0G3B9Z4e9Rw==} + '@esbuild/aix-ppc64@0.27.2': resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} engines: {node: '>=18'} @@ -344,6 +353,9 @@ packages: resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} engines: {node: '>=18.18'} + '@isaacs/nonrecursive-glob-match@1.1.0': + resolution: {integrity: sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw==} + '@jridgewell/gen-mapping@0.3.13': resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} @@ -360,95 +372,107 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} + '@napi-rs/wasm-runtime@1.2.6': + resolution: {integrity: sha512-mRyDmEw9/fCDXCGfL1sbgIw/GUK0PVxRW4YwgPN61F3LQ+fSyoBFarJVzgGyhF6kRzEQZ0FejDqm4WLXSeqQmw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} + peerDependencies: + '@emnapi/core': ^1.7.1 || 2.0.0-beta.2 + '@emnapi/runtime': ^1.7.1 || 2.0.0-beta.2 + '@oxc-project/types@0.156.0': resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} - '@rolldown/binding-android-arm-eabi@1.2.16': - resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==} + '@rolldown/binding-android-arm-eabi@1.2.19': + resolution: {integrity: sha512-e+Ebe0WT+9tbXmNKPIiC8YrWAHYwug3m6i4p3rZGGulfZri1jtI4HslT+OZnFf/OIHowWF71DTlHwXBP2SiA7A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@rolldown/binding-android-arm64@1.2.16': - resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==} + '@rolldown/binding-android-arm64@1.2.19': + resolution: {integrity: sha512-hOombrTJ+szt2ciEzS7oCA78lMPBgF5UMQWCJIyNfnrI7GLl8HYoFqCnpL2gcPOaXMqryGCU5ExdQKyDDcC+yA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.2.16': - resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==} + '@rolldown/binding-darwin-arm64@1.2.19': + resolution: {integrity: sha512-XoMA2pwCKGTQzUjPgtRwkedH4WmXhdIPKT6l6oOxd1PUbNodGI6DcBekgN7EC//+x3pfBYX/qL1gNmZAqivw5g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.2.16': - resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==} + '@rolldown/binding-darwin-x64@1.2.19': + resolution: {integrity: sha512-zo8EsSSwMZCY/e+fRnGaX02YGgvJD0yvhNi/9hpGPA2MJ9ZF8dPCw75UGfpI6OpQ/myR/dIYmogRvqiZD0TrXg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.2.16': - resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==} + '@rolldown/binding-freebsd-x64@1.2.19': + resolution: {integrity: sha512-O8ISAOfI1nj7AuBPd30FSF47z7f7lzlk5poQVGgiikvQuGEBFYvW8ki+UEnT+YJPnNGjQzn304klt4O9FUE7mA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.2.16': - resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.19': + resolution: {integrity: sha512-/lYCba5NO0yq4S0jGMH8QTBtkvQxoXjoQWzF5BcWp9MjB9jxVRD1GQDNofkVjcOj30DWyhLIN/4Oe60JKzaONw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.2.16': - resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==} + '@rolldown/binding-linux-arm64-gnu@1.2.19': + resolution: {integrity: sha512-pm/apFMBnSbFb3O6nG5pHO1iqHhZrjGDFEjSm+ot9J17XXPvH9L90y5h+jgfHCE+Qdlsvy8qKEcU4VKxgjD+vA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - '@rolldown/binding-linux-arm64-musl@1.2.16': - resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==} + '@rolldown/binding-linux-arm64-musl@1.2.19': + resolution: {integrity: sha512-K1SmQp3FFichn8oqrNIwvFoZ5wcvjC7goBzpaMNvLf9FZc+QB/QvLmnpJZgAAGHiD980tP8FZZnXk2K94rvlxg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - '@rolldown/binding-linux-ppc64-gnu@1.2.16': - resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==} + '@rolldown/binding-linux-ppc64-gnu@1.2.19': + resolution: {integrity: sha512-I0xwD57jP/3A7+5UPZin2w8Y7XHEmEM5zqpYZOcQ45MlNW6tUJUziymV3yRr7rL4vwyfEcRsRksC4a7Kc08p5Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] - '@rolldown/binding-linux-s390x-gnu@1.2.16': - resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==} + '@rolldown/binding-linux-s390x-gnu@1.2.19': + resolution: {integrity: sha512-BrtEHT24SNXj9HiXqy+s/kXiSiQGt6EKCPUlRirAoIioVxKGnbXBUEkbZASAei7iZJB0/Ynm+0JP00Ipx7AnSw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] - '@rolldown/binding-linux-x64-gnu@1.2.16': - resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==} + '@rolldown/binding-linux-x64-gnu@1.2.19': + resolution: {integrity: sha512-rm75/9DkHKeU2WnA8w4X94WGYgLlDCFCfkQC+4bguVJmC/jvDRv2B+2wLOYhyE0fVuv7//Ckk39OoOufyCu76Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - '@rolldown/binding-linux-x64-musl@1.2.16': - resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==} + '@rolldown/binding-linux-x64-musl@1.2.19': + resolution: {integrity: sha512-irh/4+iYFM4GAzpluDErgjz89bj6NDtqqMAG/6O1LG38Ed3NpyebzCpcVNkFW8uhy+/3/BocUvnXDR33CXWe9A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - '@rolldown/binding-openharmony-arm64@1.2.16': - resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==} + '@rolldown/binding-openharmony-arm64@1.2.19': + resolution: {integrity: sha512-+KWTWNoPt+CfSq94CiceWu3yPE+QzkaG+phPyz9G60tmZLwfQkcA4AeksafzvJAw4pvg1mcd5a1TkUqVv0s4JA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-win32-arm64-msvc@1.2.16': - resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==} + '@rolldown/binding-wasm32-wasi@1.2.19': + resolution: {integrity: sha512-7EH+skOsl5qpWnK0vzamgJFhOv1cwxQpsxm8tI883K9fur5c27p8q87fzEO6BbBPabA2/+s/zR63/pLc137iOg==} + engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} + cpu: [wasm32] + + '@rolldown/binding-win32-arm64-msvc@1.2.19': + resolution: {integrity: sha512-3Q1Yg1Q7tEvBWoZf5rFvG/GKZQPgwfru+p4wBajDfJFBs0SHCpL++dfTjW9gyAKd1T7ZpIYvdaUax7Pa/IhFVQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.2.16': - resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==} + '@rolldown/binding-win32-x64-msvc@1.2.19': + resolution: {integrity: sha512-y/sqRRc6d7hECzOFc5n3LSeqctmIp9mMjY1Kq4s14uLPd/LZ4z7i1zrW6fMtp2mPeuQIC4e6ULMcwQzMomqQag==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -456,80 +480,83 @@ packages: '@rolldown/pluginutils@1.0.1': resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} - '@tauri-apps/api@2.12.4': - resolution: {integrity: sha512-pVmfis+4zT8H0Qhp3xPZx9Ju7kpzvA6rr/PSJPyuwfvucTQ8sVt61NYU9KMkK703UFlYadFmjKA4HhybOtN0gg==} + '@tauri-apps/api@2.12.5': + resolution: {integrity: sha512-G9QIMt5fzED+aS4QhVK3w1HWLKpLIwH/MnpCr9z1ugGEHnS2ORmqrLkc0uALOjRK4qXJy+4Yiw8LDl/KicC1Hg==} - '@tauri-apps/cli-darwin-arm64@2.12.4': - resolution: {integrity: sha512-OxqKSckIkoJ6vX2AjifIJpTasFC0Hbdoo7gEiCmAjauABO3U8m2MRsLWe+QTiBwDx1mIrvgA+rvI7tvDnbnHVg==} + '@tauri-apps/cli-darwin-arm64@2.12.6': + resolution: {integrity: sha512-Uokwk1hFfJoG54+kD8iU0St33jAIkNvojnjEfBZ6UbL5rnM10AiFwUS/2DHTJ9R4/Kba4U44v7djfMuWFTQgeg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.12.4': - resolution: {integrity: sha512-fz76/77wMMJOaaUN6n3CybRG0P/MTEjjqYk81mGPyhi9m6Ue5T+LWBnJP/AkPooNatBPI2vtulGqomyMJ44lCQ==} + '@tauri-apps/cli-darwin-x64@2.12.6': + resolution: {integrity: sha512-WhahqzcyHCpCzh4Taf0ZbBm6nGkvuOSh5ffrgOO7EdYaYe+RBQK8LOlFu+bbjul5v9cdLDi3kco+0+7IlZtTVA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.12.4': - resolution: {integrity: sha512-K0w8Bof6Lt8QKLAYhRy0yy36ZH5iA/35VuSOvnxyjvCUZ+A3JKsUTlALviH/sVgAlisaPzzmeJSH8XOn4Q2HBA==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.12.6': + resolution: {integrity: sha512-GB6weN+iFHxiFZ9SOKW6fINis7gnxohoOldR7sryBe7uaavkFGaMCa0yQs5njeXPWvzlE9WTQ13z8oDjmqK+Ww==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.12.4': - resolution: {integrity: sha512-j5rOnjmRUwWrm1oosf0zBYl4D+fqydgUROFCk0hvKZxvbTT8SOERes0QB7rBV/XWNy+kM6pCKzb3oSm2sRglzg==} + '@tauri-apps/cli-linux-arm64-gnu@2.12.6': + resolution: {integrity: sha512-mdHoUFYKfztUtPKE0C2hhGkEo7j6swXjg+5yRRKSD7A2gLkRPQFIXWD/DAYhiJdeAkyA8MCP6nvvKvg/4YryWQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.12.4': - resolution: {integrity: sha512-aOue3Fy6Jb7+oWcfAVUsVHfeTybSCt2CZoU06aO4jv4d2Ks/KnaTPwMAK3CLEduGOvBLY1lbBBrIyomqLLH5Sg==} + '@tauri-apps/cli-linux-arm64-musl@2.12.6': + resolution: {integrity: sha512-2BxB+9a3JRN0eJ0t0qGe8IKJfgBLOZDE8a499OXH+yg4J9bMpSK1oHXBxnHuSHFWhby4QnQ/t+sBf7tRC0UZeA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-riscv64-gnu@2.12.4': - resolution: {integrity: sha512-Fx6GShY/RvST+t6LMlTHAwd66+1tEaAAGrnU7cysVfaiRP1BKng5Vl6rVmO6rSLOA1Sp1dRzNYM4f0OWQGb7qA==} + '@tauri-apps/cli-linux-riscv64-gnu@2.12.6': + resolution: {integrity: sha512-sb58RsNHex9QVqHdN1cf9MMlamUWAtk1NzuxTZalUnBUHfblIbe71hfmdI6whDZ84MufgOdeg/bzvhrbZS1r0w==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.12.4': - resolution: {integrity: sha512-tNzZSa79Z1nRpHxEpQ38lsAFpKlFlYvoXzjTV+lRRn/zSf3wrdUC3wnLcq2XEadchPu4ttK0zivhYzr+XGD19Q==} + '@tauri-apps/cli-linux-x64-gnu@2.12.6': + resolution: {integrity: sha512-ZAb4/CHRma3ErjL2RGfHjITTUBIs4zySf0hIli9BddOtEdSx0ze0hEgxl+HfBVc5OEW/QmbiZ2E2+CkkHc8Pcg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.12.4': - resolution: {integrity: sha512-jmZ1pr0xEqUhuEusWtt9Yt+GF6lCnGHUmIL+KIknpbjK/XQ2qkhDBhaxK/JMHM2A8dAacVXCxXJk2EXpwhQUfA==} + '@tauri-apps/cli-linux-x64-musl@2.12.6': + resolution: {integrity: sha512-ueSzM2Du6r4i1d/lby9kEvrhPnXw5zM/VYvcW1ldEWSpkUyVohsBXkmD+U7vMskEW5tXeCUenki7nYVxyGBGpQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.12.4': - resolution: {integrity: sha512-fGo8pgEHZxdSYgZ/J98m1usJ7NHKmKbq7k6uT0x1rpOq6Bg2YVzzpaAblWk710f5LHYBJIL5QIFS5IrD+4gmTg==} + '@tauri-apps/cli-win32-arm64-msvc@2.12.6': + resolution: {integrity: sha512-6bmOt2BQSe0Bba+5CJcTKSML7VOYDxyiAKyBrjo86VxMdC1usIQmklu3Xc83s3QoK1rOMwwbANlPF6i5R2mvIg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.12.4': - resolution: {integrity: sha512-ezl8sQIcjYsye3TUnTH5VcWmWzccZASlQm7hlZt0dYyj1XD0qpVW47u2xYVrIKui0F8uQv/7QGZixdWiClBsbg==} + '@tauri-apps/cli-win32-ia32-msvc@2.12.6': + resolution: {integrity: sha512-9q9ZFNuFreBczwyJuhhlrEOBzGClwWUYirQ2GBl66Y6EaNl17IdLH8TRqoY9wYB1LnctNBi+Fa/WMGtFA4BtFQ==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.12.4': - resolution: {integrity: sha512-DJhDeCqjLDNMWYFy7ZS8cfeAHX2RK0RbQMLiA3bMVVkXRDJ4NBYiHriGqsUhsr9iG41aTb+dJGkFPmPw1gWwVw==} + '@tauri-apps/cli-win32-x64-msvc@2.12.6': + resolution: {integrity: sha512-ion7Chbj21ROxMRpjQ7G8rz5sIOaI7IoBQum1oq5sl1V5zGWyc/oYnCrQhVqO2TxK/lBDWxt648BzLi02SY3Xg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.12.4': - resolution: {integrity: sha512-JI9bHfudSRJikGOrjbXEm6RjzzvmKuLc+JixB1NE8hNzQkNlCCIC3pTES3uypkR9lxHrsbxzcnSwhI2IxBQphw==} + '@tauri-apps/cli@2.12.6': + resolution: {integrity: sha512-/cOeQgqq8PBDPODOjjT0YHs4qxKCHcQMWMiBm4rLM3JNr9mZE+PHNKOK4zAkhIUtYMNL/0fweW48VNvzD1AbqA==} engines: {node: '>= 10'} hasBin: true + '@tybys/wasm-util@0.10.5': + resolution: {integrity: sha512-dOGOPxlaNV+G046mZzN+9C0dAcQZeSKcXiVaM0TYy/LM4ttTmgSBDxYfovcYI8Em3+eAbiAYpvWLOv8+ZVRJKA==} + '@types/estree@1.0.9': resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} @@ -547,72 +574,76 @@ packages: '@types/react@19.3.0': resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==} - '@typescript-eslint/eslint-plugin@8.72.1': - resolution: {integrity: sha512-5CokTWXpmbylfFabsbvHC0CAw3XLaGnoa+nFJX5FR592h/LoZsENUE6p/rg5xvkKrFEXz6pYmgI29AgXc2N3BQ==} + '@typescript-eslint/eslint-plugin@8.73.0': + resolution: {integrity: sha512-UkygMFer53Yzn29MCYFTHf34hGXf5KJhiDWfIm1tXtXRrym1CS6l5H9Y3yCtPWChpC0/f93H88gdj8tN0dd4kw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.72.1 + '@typescript-eslint/parser': ^8.73.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.72.1': - resolution: {integrity: sha512-ZGwZP4OCfyA0AQTpEAMWz+rtX01DRhQWW5hB0ucKDEIX5U7jdmPSaMx94rQfaPAQzIYz2BimOgKOJtjfpRFQ9g==} + '@typescript-eslint/parser@8.73.0': + resolution: {integrity: sha512-AuL45bVcmssHfZ3Di3cs9Q0l4gBm4ZFVrJOQEE7VpqW+PVgQaEwSwazz4TVIiFabXkk6U51EprYDwqw+HR8ePw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/project-service@8.72.1': - resolution: {integrity: sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==} + '@typescript-eslint/project-service@8.73.0': + resolution: {integrity: sha512-/pEf8Rc4Mjk+qJnY0uO1+Gadeal8uv50xpuic+srG2vIVatA0XxvWMUeMtFvs6OCHqftiQ7/+qH4aehG5stzIA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/scope-manager@8.72.1': - resolution: {integrity: sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==} + '@typescript-eslint/scope-manager@8.73.0': + resolution: {integrity: sha512-/TjD738Iq2rzj5z0ixVOi+TsvgjAzZPLPaH1yWdDBytR/HTR5gMpyYWZeCe5WTQZLwk3ho8AV7U3muoQCRtXBQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.72.1': - resolution: {integrity: sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==} + '@typescript-eslint/tsconfig-utils@8.73.0': + resolution: {integrity: sha512-lmtCFOfYaJfpqZywGuXi4FpNtE+NQ+YLe3T0K9rtEDcW8ZuGWvfI++pj8r05sYMI8vWT2CYK4rWyedmD6Rp4og==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.72.1': - resolution: {integrity: sha512-iY2wlmyrXJmx4yxUGP3aYCFF3cA/6ShddOKmLU2dx7LnEykbAM8WThlxZEfd1NddqceF6eJmZUayxx9oKIYNlg==} + '@typescript-eslint/type-utils@8.73.0': + resolution: {integrity: sha512-MOC9i4xy1F7KcDde7Ip8jf1SrRiALb2Km4UWxGNjUE2YlhjIEo1ayE27GHIwIQyfWuHTmEonQT14uyurlyC6aA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/types@8.72.1': - resolution: {integrity: sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==} + '@typescript-eslint/types@8.73.0': + resolution: {integrity: sha512-O/1ytYzflF16QDKXx4/qOXg1IuZp+n7hr9t+S0nv7N/2Tl8rJiNCshztV1gcSUvHbPtoX3+zmNbtSAyVbzxVfw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.72.1': - resolution: {integrity: sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==} + '@typescript-eslint/typescript-estree@8.73.0': + resolution: {integrity: sha512-InjlBkSdWceIwIBWSwS3ENUp+i0O02PGX3Zv2wnihWJC1WDVGvG7mTHuf8b57uAaITj94d6tRPDH+sUEtXdRQQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: + '@typescript/native': npm:typescript@>=7.1.0-dev.20261009.1 || >=7.1.0-beta <7.1.0-dev typescript: '>=4.8.4 <6.1.0' + peerDependenciesMeta: + '@typescript/native': + optional: true - '@typescript-eslint/utils@8.72.1': - resolution: {integrity: sha512-5v5liypurJBFHCBNqh/RjsymAD+VWcE0djuGY/BUqp5fC3Qn+luWDEksjuTtWjPn6i5zQlUtkZCRG/CYG0yCkA==} + '@typescript-eslint/utils@8.73.0': + resolution: {integrity: sha512-j2SVJJvVkXdUL0WcEzo4vEH1mO1vIi8KlVukcYA2MgMZvYN2LlZR4PmsW+GTSxSW24j6Q/EP7+MOifLtg5hmsA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/visitor-keys@8.72.1': - resolution: {integrity: sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==} + '@typescript-eslint/visitor-keys@8.73.0': + resolution: {integrity: sha512-k4lsFVpRZICbltkIEEH4hZRkwXkqDF1GHBpClKQOHQY+RkoZAAuyc1ci3I6p+CB6v3U4jaHIUshc4RzzQXZWLg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vitejs/plugin-react@6.1.2': - resolution: {integrity: sha512-fhJNGUdscQa4HkI0xFxwonWyhnVReCPDbXI7FH7jmzpnVCrFQI7PRrhWecO263610vOrs9tr2Y4xcf8uAdFxbw==} + '@vitejs/plugin-react@6.3.0': + resolution: {integrity: sha512-H9E955aVvD2F4zNHCw4eIZbIfF6xKldlh7MNu+hSU7xwQzh65lI/N+CJWqmfhi0PEjDXIt/H7T7J/4wU63KJiw==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 + '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 || ^0.3.0 babel-plugin-react-compiler: ^1.0.0 - oxc-transform-react: ^0.152.0 + oxc-transform-react: '>=0.152.0 <0.157.0' vite: ^8.0.0 peerDependenciesMeta: '@rolldown/plugin-babel': @@ -1282,9 +1313,9 @@ packages: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} - minimatch@10.2.6: - resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==} - engines: {node: 18 || 20 || >=22} + minimatch@11.0.9: + resolution: {integrity: sha512-KCFkfyjqerNlSstjlhIGNXIKZGA/6O4V4RlhZ+Dsr621SPPw0mzlypE9D9ZOoPiVefHID+j7/XuMMlqfD/F60Q==} + engines: {node: 20 || >=22} minimatch@3.1.5: resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} @@ -1386,8 +1417,8 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier@3.9.10: - resolution: {integrity: sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==} + prettier@3.10.1: + resolution: {integrity: sha512-70vp3ZUYoPlFbF9uiTdXHUUCGEIp7d4+6p+8DYbkm2jP7x/3i/paXVF6dopSI3zd/CEitrZN1rc4i85xWmmXlg==} engines: {node: '>=14'} hasBin: true @@ -1427,8 +1458,8 @@ packages: engines: {node: '>= 0.4'} hasBin: true - rolldown@1.2.16: - resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==} + rolldown@1.2.19: + resolution: {integrity: sha512-QIiV1J9d0pzN4jeeTH4sjPy0AZ6cAy2cG0ExeoE1+U8Rvj+hR3gYkokx0YbeUNGlZqiQJJ2utcETe0oKXwzsuA==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -1541,6 +1572,9 @@ packages: peerDependencies: typescript: '>=4.8.4' + tslib@2.9.1: + resolution: {integrity: sha512-a4Ux9VKuIMHsOS7ENbEq6hK2ZGYIT27Rtl0E4eD9KqwxhKiQeMZE/9xb3IdYwWaSOyIBQLExhQgXDTYoiCxnWA==} + type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -1582,8 +1616,8 @@ packages: uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - vite@8.3.5: - resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==} + vite@8.3.8: + resolution: {integrity: sha512-LzOn3h9rG/0vhLdXrV4yJ4QFA9eEoqCl+Yx+kGJd7aB9w6nfNgVHKSYwLPZUHrz4ZGa+t+kXjV9itvcHDLQouA==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: @@ -1768,6 +1802,22 @@ snapshots: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 + '@emnapi/core@2.0.0-beta.2': + dependencies: + '@emnapi/wasi-threads': 2.2.0 + tslib: 2.9.1 + optional: true + + '@emnapi/runtime@2.0.0-beta.2': + dependencies: + tslib: 2.9.1 + optional: true + + '@emnapi/wasi-threads@2.2.0': + dependencies: + tslib: 2.9.1 + optional: true + '@esbuild/aix-ppc64@0.27.2': optional: true @@ -1908,6 +1958,8 @@ snapshots: '@humanwhocodes/retry@0.4.3': {} + '@isaacs/nonrecursive-glob-match@1.1.0': {} + '@jridgewell/gen-mapping@0.3.13': dependencies: '@jridgewell/sourcemap-codec': 1.6.0 @@ -1927,103 +1979,122 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.6.0 + '@napi-rs/wasm-runtime@1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2)': + dependencies: + '@emnapi/core': 2.0.0-beta.2 + '@emnapi/runtime': 2.0.0-beta.2 + '@tybys/wasm-util': 0.10.5 + optional: true + '@oxc-project/types@0.156.0': {} - '@rolldown/binding-android-arm-eabi@1.2.16': + '@rolldown/binding-android-arm-eabi@1.2.19': optional: true - '@rolldown/binding-android-arm64@1.2.16': + '@rolldown/binding-android-arm64@1.2.19': optional: true - '@rolldown/binding-darwin-arm64@1.2.16': + '@rolldown/binding-darwin-arm64@1.2.19': optional: true - '@rolldown/binding-darwin-x64@1.2.16': + '@rolldown/binding-darwin-x64@1.2.19': optional: true - '@rolldown/binding-freebsd-x64@1.2.16': + '@rolldown/binding-freebsd-x64@1.2.19': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.2.16': + '@rolldown/binding-linux-arm-gnueabihf@1.2.19': optional: true - '@rolldown/binding-linux-arm64-gnu@1.2.16': + '@rolldown/binding-linux-arm64-gnu@1.2.19': optional: true - '@rolldown/binding-linux-arm64-musl@1.2.16': + '@rolldown/binding-linux-arm64-musl@1.2.19': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.2.16': + '@rolldown/binding-linux-ppc64-gnu@1.2.19': optional: true - '@rolldown/binding-linux-s390x-gnu@1.2.16': + '@rolldown/binding-linux-s390x-gnu@1.2.19': optional: true - '@rolldown/binding-linux-x64-gnu@1.2.16': + '@rolldown/binding-linux-x64-gnu@1.2.19': optional: true - '@rolldown/binding-linux-x64-musl@1.2.16': + '@rolldown/binding-linux-x64-musl@1.2.19': optional: true - '@rolldown/binding-openharmony-arm64@1.2.16': + '@rolldown/binding-openharmony-arm64@1.2.19': optional: true - '@rolldown/binding-win32-arm64-msvc@1.2.16': + '@rolldown/binding-wasm32-wasi@1.2.19': + dependencies: + '@emnapi/core': 2.0.0-beta.2 + '@emnapi/runtime': 2.0.0-beta.2 + '@napi-rs/wasm-runtime': 1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2) optional: true - '@rolldown/binding-win32-x64-msvc@1.2.16': + '@rolldown/binding-win32-arm64-msvc@1.2.19': + optional: true + + '@rolldown/binding-win32-x64-msvc@1.2.19': optional: true '@rolldown/pluginutils@1.0.1': {} - '@tauri-apps/api@2.12.4': {} + '@tauri-apps/api@2.12.5': {} - '@tauri-apps/cli-darwin-arm64@2.12.4': + '@tauri-apps/cli-darwin-arm64@2.12.6': optional: true - '@tauri-apps/cli-darwin-x64@2.12.4': + '@tauri-apps/cli-darwin-x64@2.12.6': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.12.4': + '@tauri-apps/cli-linux-arm-gnueabihf@2.12.6': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.12.4': + '@tauri-apps/cli-linux-arm64-gnu@2.12.6': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.12.4': + '@tauri-apps/cli-linux-arm64-musl@2.12.6': optional: true - '@tauri-apps/cli-linux-riscv64-gnu@2.12.4': + '@tauri-apps/cli-linux-riscv64-gnu@2.12.6': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.12.4': + '@tauri-apps/cli-linux-x64-gnu@2.12.6': optional: true - '@tauri-apps/cli-linux-x64-musl@2.12.4': + '@tauri-apps/cli-linux-x64-musl@2.12.6': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.12.4': + '@tauri-apps/cli-win32-arm64-msvc@2.12.6': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.12.4': + '@tauri-apps/cli-win32-ia32-msvc@2.12.6': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.12.4': + '@tauri-apps/cli-win32-x64-msvc@2.12.6': optional: true - '@tauri-apps/cli@2.12.4': + '@tauri-apps/cli@2.12.6': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.12.4 - '@tauri-apps/cli-darwin-x64': 2.12.4 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.4 - '@tauri-apps/cli-linux-arm64-gnu': 2.12.4 - '@tauri-apps/cli-linux-arm64-musl': 2.12.4 - '@tauri-apps/cli-linux-riscv64-gnu': 2.12.4 - '@tauri-apps/cli-linux-x64-gnu': 2.12.4 - '@tauri-apps/cli-linux-x64-musl': 2.12.4 - '@tauri-apps/cli-win32-arm64-msvc': 2.12.4 - '@tauri-apps/cli-win32-ia32-msvc': 2.12.4 - '@tauri-apps/cli-win32-x64-msvc': 2.12.4 + '@tauri-apps/cli-darwin-arm64': 2.12.6 + '@tauri-apps/cli-darwin-x64': 2.12.6 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.6 + '@tauri-apps/cli-linux-arm64-gnu': 2.12.6 + '@tauri-apps/cli-linux-arm64-musl': 2.12.6 + '@tauri-apps/cli-linux-riscv64-gnu': 2.12.6 + '@tauri-apps/cli-linux-x64-gnu': 2.12.6 + '@tauri-apps/cli-linux-x64-musl': 2.12.6 + '@tauri-apps/cli-win32-arm64-msvc': 2.12.6 + '@tauri-apps/cli-win32-ia32-msvc': 2.12.6 + '@tauri-apps/cli-win32-x64-msvc': 2.12.6 + + '@tybys/wasm-util@0.10.5': + dependencies: + tslib: 2.9.1 + optional: true '@types/estree@1.0.9': {} @@ -2041,74 +2112,77 @@ snapshots: dependencies: csstype: 3.2.3 - '@typescript-eslint/eslint-plugin@8.72.1(@typescript-eslint/parser@8.72.1(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/eslint-plugin@8.73.0(@typescript-eslint/parser@8.73.0(eslint@9.39.5)(typescript@6.0.3))(eslint@9.39.5)(typescript@6.0.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.72.1(eslint@9.39.5)(typescript@6.0.3) - '@typescript-eslint/scope-manager': 8.72.1 - '@typescript-eslint/type-utils': 8.72.1(eslint@9.39.5)(typescript@6.0.3) - '@typescript-eslint/utils': 8.72.1(eslint@9.39.5)(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.72.1 + '@typescript-eslint/parser': 8.73.0(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.73.0 + '@typescript-eslint/type-utils': 8.73.0(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/utils': 8.73.0(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.73.0 eslint: 9.39.5 ignore: 7.0.14 natural-compare: 1.4.0 ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 transitivePeerDependencies: + - '@typescript/native' - supports-color - '@typescript-eslint/parser@8.72.1(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/parser@8.73.0(eslint@9.39.5)(typescript@6.0.3)': dependencies: - '@typescript-eslint/scope-manager': 8.72.1 - '@typescript-eslint/types': 8.72.1 - '@typescript-eslint/typescript-estree': 8.72.1(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.72.1 + '@typescript-eslint/scope-manager': 8.73.0 + '@typescript-eslint/types': 8.73.0 + '@typescript-eslint/typescript-estree': 8.73.0(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.73.0 debug: 4.4.3 eslint: 9.39.5 typescript: 6.0.3 transitivePeerDependencies: + - '@typescript/native' - supports-color - '@typescript-eslint/project-service@8.72.1(typescript@6.0.3)': + '@typescript-eslint/project-service@8.73.0(typescript@6.0.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.72.1(typescript@6.0.3) - '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/tsconfig-utils': 8.73.0(typescript@6.0.3) + '@typescript-eslint/types': 8.73.0 debug: 4.4.3 typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.72.1': + '@typescript-eslint/scope-manager@8.73.0': dependencies: - '@typescript-eslint/types': 8.72.1 - '@typescript-eslint/visitor-keys': 8.72.1 + '@typescript-eslint/types': 8.73.0 + '@typescript-eslint/visitor-keys': 8.73.0 - '@typescript-eslint/tsconfig-utils@8.72.1(typescript@6.0.3)': + '@typescript-eslint/tsconfig-utils@8.73.0(typescript@6.0.3)': dependencies: typescript: 6.0.3 - '@typescript-eslint/type-utils@8.72.1(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/type-utils@8.73.0(eslint@9.39.5)(typescript@6.0.3)': dependencies: - '@typescript-eslint/types': 8.72.1 - '@typescript-eslint/typescript-estree': 8.72.1(typescript@6.0.3) - '@typescript-eslint/utils': 8.72.1(eslint@9.39.5)(typescript@6.0.3) + '@typescript-eslint/types': 8.73.0 + '@typescript-eslint/typescript-estree': 8.73.0(typescript@6.0.3) + '@typescript-eslint/utils': 8.73.0(eslint@9.39.5)(typescript@6.0.3) debug: 4.4.3 eslint: 9.39.5 ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 transitivePeerDependencies: + - '@typescript/native' - supports-color - '@typescript-eslint/types@8.72.1': {} + '@typescript-eslint/types@8.73.0': {} - '@typescript-eslint/typescript-estree@8.72.1(typescript@6.0.3)': + '@typescript-eslint/typescript-estree@8.73.0(typescript@6.0.3)': dependencies: - '@typescript-eslint/project-service': 8.72.1(typescript@6.0.3) - '@typescript-eslint/tsconfig-utils': 8.72.1(typescript@6.0.3) - '@typescript-eslint/types': 8.72.1 - '@typescript-eslint/visitor-keys': 8.72.1 + '@typescript-eslint/project-service': 8.73.0(typescript@6.0.3) + '@typescript-eslint/tsconfig-utils': 8.73.0(typescript@6.0.3) + '@typescript-eslint/types': 8.73.0 + '@typescript-eslint/visitor-keys': 8.73.0 debug: 4.4.3 - minimatch: 10.2.6 + minimatch: 11.0.9 semver: 7.8.5 tinyglobby: 0.2.17 ts-api-utils: 2.5.0(typescript@6.0.3) @@ -2116,26 +2190,27 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.72.1(eslint@9.39.5)(typescript@6.0.3)': + '@typescript-eslint/utils@8.73.0(eslint@9.39.5)(typescript@6.0.3)': dependencies: '@eslint-community/eslint-utils': 4.10.1(eslint@9.39.5) - '@typescript-eslint/scope-manager': 8.72.1 - '@typescript-eslint/types': 8.72.1 - '@typescript-eslint/typescript-estree': 8.72.1(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.73.0 + '@typescript-eslint/types': 8.73.0 + '@typescript-eslint/typescript-estree': 8.73.0(typescript@6.0.3) eslint: 9.39.5 typescript: 6.0.3 transitivePeerDependencies: + - '@typescript/native' - supports-color - '@typescript-eslint/visitor-keys@8.72.1': + '@typescript-eslint/visitor-keys@8.73.0': dependencies: - '@typescript-eslint/types': 8.72.1 + '@typescript-eslint/types': 8.73.0 eslint-visitor-keys: 5.0.1 - '@vitejs/plugin-react@6.1.2(vite@8.3.5(@types/node@26.6.6)(esbuild@0.27.2))': + '@vitejs/plugin-react@6.3.0(vite@8.3.8(@types/node@26.6.6)(esbuild@0.27.2))': dependencies: '@rolldown/pluginutils': 1.0.1 - vite: 8.3.5(@types/node@26.6.6)(esbuild@0.27.2) + vite: 8.3.8(@types/node@26.6.6)(esbuild@0.27.2) acorn-jsx@5.3.2(acorn@8.19.0): dependencies: @@ -2941,8 +3016,9 @@ snapshots: math-intrinsics@1.1.0: {} - minimatch@10.2.6: + minimatch@11.0.9: dependencies: + '@isaacs/nonrecursive-glob-match': 1.1.0 brace-expansion: 5.0.12 minimatch@3.1.5: @@ -3048,7 +3124,7 @@ snapshots: prelude-ls@1.2.1: {} - prettier@3.9.10: {} + prettier@3.10.1: {} prop-types@15.8.1: dependencies: @@ -3098,26 +3174,27 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - rolldown@1.2.16: + rolldown@1.2.19: dependencies: '@oxc-project/types': 0.156.0 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm-eabi': 1.2.16 - '@rolldown/binding-android-arm64': 1.2.16 - '@rolldown/binding-darwin-arm64': 1.2.16 - '@rolldown/binding-darwin-x64': 1.2.16 - '@rolldown/binding-freebsd-x64': 1.2.16 - '@rolldown/binding-linux-arm-gnueabihf': 1.2.16 - '@rolldown/binding-linux-arm64-gnu': 1.2.16 - '@rolldown/binding-linux-arm64-musl': 1.2.16 - '@rolldown/binding-linux-ppc64-gnu': 1.2.16 - '@rolldown/binding-linux-s390x-gnu': 1.2.16 - '@rolldown/binding-linux-x64-gnu': 1.2.16 - '@rolldown/binding-linux-x64-musl': 1.2.16 - '@rolldown/binding-openharmony-arm64': 1.2.16 - '@rolldown/binding-win32-arm64-msvc': 1.2.16 - '@rolldown/binding-win32-x64-msvc': 1.2.16 + '@rolldown/binding-android-arm-eabi': 1.2.19 + '@rolldown/binding-android-arm64': 1.2.19 + '@rolldown/binding-darwin-arm64': 1.2.19 + '@rolldown/binding-darwin-x64': 1.2.19 + '@rolldown/binding-freebsd-x64': 1.2.19 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.19 + '@rolldown/binding-linux-arm64-gnu': 1.2.19 + '@rolldown/binding-linux-arm64-musl': 1.2.19 + '@rolldown/binding-linux-ppc64-gnu': 1.2.19 + '@rolldown/binding-linux-s390x-gnu': 1.2.19 + '@rolldown/binding-linux-x64-gnu': 1.2.19 + '@rolldown/binding-linux-x64-musl': 1.2.19 + '@rolldown/binding-openharmony-arm64': 1.2.19 + '@rolldown/binding-wasm32-wasi': 1.2.19 + '@rolldown/binding-win32-arm64-msvc': 1.2.19 + '@rolldown/binding-win32-x64-msvc': 1.2.19 safe-array-concat@1.1.4: dependencies: @@ -3269,6 +3346,9 @@ snapshots: dependencies: typescript: 6.0.3 + tslib@2.9.1: + optional: true + type-check@0.4.0: dependencies: prelude-ls: 1.2.1 @@ -3326,12 +3406,12 @@ snapshots: dependencies: punycode: 2.3.1 - vite@8.3.5(@types/node@26.6.6)(esbuild@0.27.2): + vite@8.3.8(@types/node@26.6.6)(esbuild@0.27.2): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 postcss: 8.5.32 - rolldown: 1.2.16 + rolldown: 1.2.19 tinyglobby: 0.2.17 optionalDependencies: '@types/node': 26.6.6 diff --git a/apps/gpservice/Cargo.toml b/apps/gpservice/Cargo.toml index 6a9c5db..2b5efe8 100644 --- a/apps/gpservice/Cargo.toml +++ b/apps/gpservice/Cargo.toml @@ -23,8 +23,6 @@ serde_json.workspace = true env_logger.workspace = true log.workspace = true compile-time.workspace = true -xz2 = "0.1" -tar = "0.4" thiserror.workspace = true uuid = { workspace = true, features = ["v4"] } zeroize.workspace = true @@ -33,6 +31,8 @@ getrandom = "0.4" [target.'cfg(unix)'.dependencies] nix = { version = "0.31", features = ["fs", "socket", "user"] } +tar = "0.4" +xz2 = "0.1" [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))'.dependencies] mac_address = "1.2.1" diff --git a/apps/gpservice/src/vpn_script/windows.rs b/apps/gpservice/src/vpn_script/windows.rs index b6cd005..8afb1d5 100644 --- a/apps/gpservice/src/vpn_script/windows.rs +++ b/apps/gpservice/src/vpn_script/windows.rs @@ -1,10 +1,10 @@ use gpapi::service::request::ConnectArgs; +use gpvpnc::windows::SystemTunnel; use openconnect::{Vpn, VpnBuilder}; use std::sync::Mutex; -const RECOVERY_KEY: &str = r"SOFTWARE\GP Connect\NetworkRecovery"; - pub(crate) fn recover_network() -> std::io::Result<()> { - gpvpnc::windows::recover(RECOVERY_KEY) + let _tunnel = SystemTunnel::try_acquire()?; + Ok(()) } pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result { @@ -12,7 +12,7 @@ pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow: args.vpnc_script().is_none(), "Windows does not support custom VPN scripts" ); - let network = Mutex::new(gpvpnc::windows::NetworkConfigurator::new(RECOVERY_KEY)?); + let network = Mutex::new(SystemTunnel::acquire()?.configurator()?); Ok( Vpn::builder(server, cookie).network_configuration_handler(move |configuration| { network diff --git a/changelog.md b/changelog.md index 6e19284..fdd36d5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 3.6.0 + +- Added command-line VPN connections on Windows x64 and ARM64. +- Added support for Windows 10 1809 and Windows Server 2019 with Desktop Experience. +- Improved light and dark theme contrast and fixed the tray icon on older Windows versions. +- Simplified log access and feedback in Diagnostics. + ## 3.5.0 ### Added diff --git a/crates/auth/Cargo.toml b/crates/auth/Cargo.toml index 91eab63..73d5f92 100644 --- a/crates/auth/Cargo.toml +++ b/crates/auth/Cargo.toml @@ -108,5 +108,5 @@ tauri = { workspace = true, optional = true, features = ["unstable"] } webview2-com = { version = "0.39", optional = true } windows = { version = "0.62", optional = true, features = ["Win32_Foundation", "Win32_Graphics_Gdi", "Win32_System_Com", "Win32_UI_Controls", "Win32_UI_HiDpi", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] } dunce = "1" -winreg = "0.55" +winreg = "0.56" common = { path = "../common" } diff --git a/crates/browser-launcher/Cargo.toml b/crates/browser-launcher/Cargo.toml index 354f324..2a4e877 100644 --- a/crates/browser-launcher/Cargo.toml +++ b/crates/browser-launcher/Cargo.toml @@ -17,7 +17,7 @@ default = [] launcher = ["dep:open", "dep:webbrowser", "dep:which", "dep:winreg"] [target.'cfg(windows)'.dependencies] -winreg = { version = "0.55", optional = true } +winreg = { version = "0.56", optional = true } [target.'cfg(unix)'.dependencies] open = { version = "5", optional = true } diff --git a/crates/gpapi/Cargo.toml b/crates/gpapi/Cargo.toml index 475a0e7..5c316de 100644 --- a/crates/gpapi/Cargo.toml +++ b/crates/gpapi/Cargo.toml @@ -101,10 +101,7 @@ uzers = { workspace = true, optional = true } [target.'cfg(windows)'.dependencies] file-rotate = { version = "0.8.0", optional = true } -windows-sys = { version = "0.61", features = ["Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Pipes", "Win32_System_Threading", "Win32_System_Services", "Win32_Globalization", "Win32_System_Environment", "Win32_System_JobObjects", "Win32_System_IO", "Win32_System_Registry", "Win32_System_SystemInformation"] } - -[target.'cfg(windows)'.dev-dependencies] -windows-sys = { version = "0.61", features = ["Win32_UI_Shell"] } +windows-sys = { version = "0.61", features = ["Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Pipes", "Win32_System_Threading", "Win32_System_Services", "Win32_Globalization", "Win32_System_Environment", "Win32_System_JobObjects", "Win32_System_IO", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_Console", "Win32_System_RemoteDesktop", "Win32_System_SystemServices", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] } [[test]] name = "certificate_compatibility" diff --git a/crates/gpapi/src/cookie_store.rs b/crates/gpapi/src/cookie_store.rs index 7a9cfd3..e6848f5 100644 --- a/crates/gpapi/src/cookie_store.rs +++ b/crates/gpapi/src/cookie_store.rs @@ -8,6 +8,13 @@ use serde::{Deserialize, Serialize}; use crate::credential::AuthCookieCredential; +#[cfg(unix)] +#[path = "cookie_store/unix.rs"] +mod platform; +#[cfg(windows)] +#[path = "cookie_store/windows.rs"] +mod platform; + const STORE_VERSION: u32 = 1; #[derive(Serialize, Deserialize, Debug, Clone)] @@ -45,16 +52,15 @@ impl StoredCookie { } } -pub fn cookie_path(custom: Option<&str>) -> PathBuf { - if let Some(p) = custom { - return PathBuf::from(p); +pub fn cookie_path(custom: Option<&str>) -> Option { + match custom { + Some(path) => Some(PathBuf::from(path)), + None => platform::default_path(), } - let home = std::env::var("HOME").unwrap_or_else(|_| "/root".to_string()); - PathBuf::from(home).join(".config/gpclient/cookie.json") } pub fn load(path: &Path, server: &str, host_id: &str) -> Option { - let bytes = fs::read(path).ok()?; + let bytes = zeroize::Zeroizing::new(platform::decode(fs::read(path).ok()?).ok()?); let stored: StoredCookie = serde_json::from_slice(&bytes).ok()?; if stored.version != STORE_VERSION || stored.server != server || stored.host_id != host_id { return None; @@ -67,12 +73,12 @@ pub fn save(path: &Path, stored: &StoredCookie) -> anyhow::Result<()> { .parent() .ok_or_else(|| anyhow::anyhow!("cookie path has no parent directory"))?; fs::create_dir_all(parent)?; - set_private_dir_permissions(parent)?; + platform::prepare_directory(parent)?; let mut tmp = tempfile::NamedTempFile::new_in(parent)?; - tmp.write_all(&serde_json::to_vec(stored)?)?; + tmp.write_all(&platform::encode(serde_json::to_vec(stored)?)?)?; tmp.flush()?; - set_private_file_permissions(tmp.path())?; + platform::prepare_file(tmp.path())?; tmp.persist(path)?; Ok(()) } @@ -81,60 +87,6 @@ pub fn clear(path: &Path) { let _ = fs::remove_file(path); } -use permissions::{set_private_dir_permissions, set_private_file_permissions}; - -mod permissions { - use std::path::Path; - - #[cfg(unix)] - mod unix { - use std::{fs, os::unix::fs::PermissionsExt, path::Path}; - - pub(super) fn set_private_dir(path: &Path) -> anyhow::Result<()> { - fs::set_permissions(path, fs::Permissions::from_mode(0o700))?; - Ok(()) - } - - pub(super) fn set_private_file(path: &Path) -> anyhow::Result<()> { - fs::set_permissions(path, fs::Permissions::from_mode(0o600))?; - Ok(()) - } - - #[cfg(test)] - pub(super) fn file_mode(path: &Path) -> Option { - Some(fs::metadata(path).ok()?.permissions().mode() & 0o777) - } - } - - pub(super) fn set_private_dir_permissions(path: &Path) -> anyhow::Result<()> { - #[cfg(unix)] - unix::set_private_dir(path)?; - #[cfg(not(unix))] - let _ = path; - Ok(()) - } - - pub(super) fn set_private_file_permissions(path: &Path) -> anyhow::Result<()> { - #[cfg(unix)] - unix::set_private_file(path)?; - #[cfg(not(unix))] - let _ = path; - Ok(()) - } - - #[cfg(test)] - pub(super) fn file_mode(path: &Path) -> Option { - #[cfg(unix)] - return unix::file_mode(path); - - #[cfg(not(unix))] - { - let _ = path; - None - } - } -} - #[cfg(test)] mod tests { use super::*; @@ -149,6 +101,24 @@ mod tests { ) } + #[cfg(windows)] + #[test] + fn windows_cookie_cache_uses_profile_storage_and_protects_credentials() { + let default_path = cookie_path(None).unwrap(); + assert!(default_path.starts_with(PathBuf::from(std::env::var_os("LOCALAPPDATA").unwrap()))); + + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("cookie.json"); + save(&path, &sample()).unwrap(); + let bytes = fs::read(&path).unwrap(); + assert!( + !bytes + .windows(b"prelogon-auth".len()) + .any(|part| part == b"prelogon-auth") + ); + assert!(load(&path, "vpn.example.com", "host-1").is_some()); + } + #[test] fn roundtrip_and_mode_0600() { let dir = tempfile::tempdir().unwrap(); @@ -156,8 +126,10 @@ mod tests { let s = sample(); save(&path, &s).unwrap(); - if let Some(mode) = permissions::file_mode(&path) { - assert_eq!(mode, 0o600, "cookie file must be mode 0600, got {:o}", mode); + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + assert_eq!(fs::metadata(&path).unwrap().permissions().mode() & 0o777, 0o600); } let loaded = load(&path, "vpn.example.com", "host-1").unwrap(); diff --git a/crates/gpapi/src/cookie_store/unix.rs b/crates/gpapi/src/cookie_store/unix.rs new file mode 100644 index 0000000..87c7a8a --- /dev/null +++ b/crates/gpapi/src/cookie_store/unix.rs @@ -0,0 +1,24 @@ +use std::{ + fs, io, + os::unix::fs::PermissionsExt, + path::{Path, PathBuf}, +}; + +pub(super) fn default_path() -> Option { + let home = std::env::var("HOME").unwrap_or_else(|_| "/root".to_string()); + Some(PathBuf::from(home).join(".config/gpclient/cookie.json")) +} + +pub(super) fn encode(bytes: Vec) -> io::Result> { + Ok(bytes) +} + +pub(super) use encode as decode; + +pub(super) fn prepare_directory(path: &Path) -> io::Result<()> { + fs::set_permissions(path, fs::Permissions::from_mode(0o700)) +} + +pub(super) fn prepare_file(path: &Path) -> io::Result<()> { + fs::set_permissions(path, fs::Permissions::from_mode(0o600)) +} diff --git a/crates/gpapi/src/cookie_store/windows.rs b/crates/gpapi/src/cookie_store/windows.rs new file mode 100644 index 0000000..4aa9cf1 --- /dev/null +++ b/crates/gpapi/src/cookie_store/windows.rs @@ -0,0 +1,87 @@ +use std::{ + ffi::OsString, + io, + os::windows::ffi::OsStringExt, + path::{Path, PathBuf}, + ptr, slice, +}; +use windows_sys::Win32::{ + Foundation::LocalFree, + Security::Cryptography::{CRYPT_INTEGER_BLOB, CRYPTPROTECT_UI_FORBIDDEN, CryptProtectData, CryptUnprotectData}, + UI::Shell::{CSIDL_LOCAL_APPDATA, SHGetFolderPathW}, +}; +use zeroize::Zeroize; + +pub(super) fn default_path() -> Option { + let mut path = [0; 260]; + let result = unsafe { + SHGetFolderPathW( + ptr::null_mut(), + CSIDL_LOCAL_APPDATA as i32, + ptr::null_mut(), + 0, + path.as_mut_ptr(), + ) + }; + let length = path.iter().position(|&unit| unit == 0).filter(|&length| length > 0)?; + (result >= 0).then(|| PathBuf::from(OsString::from_wide(&path[..length])).join(r"GP Connect\gpclient\cookie.bin")) +} + +pub(super) fn encode(mut bytes: Vec) -> io::Result> { + let result = transform(&mut bytes, true); + bytes.zeroize(); + result +} + +pub(super) fn decode(mut bytes: Vec) -> io::Result> { + transform(&mut bytes, false) +} + +// DPAPI encrypts for the current Windows user, including at custom paths. +fn transform(bytes: &mut [u8], protect: bool) -> io::Result> { + let input = CRYPT_INTEGER_BLOB { + cbData: u32::try_from(bytes.len()).map_err(io::Error::other)?, + pbData: bytes.as_mut_ptr(), + }; + let mut output = CRYPT_INTEGER_BLOB::default(); + let success = unsafe { + if protect { + CryptProtectData( + &input, + ptr::null(), + ptr::null(), + ptr::null(), + ptr::null(), + CRYPTPROTECT_UI_FORBIDDEN, + &mut output, + ) + } else { + CryptUnprotectData( + &input, + ptr::null_mut(), + ptr::null(), + ptr::null(), + ptr::null(), + CRYPTPROTECT_UI_FORBIDDEN, + &mut output, + ) + } + }; + if success == 0 { + return Err(io::Error::last_os_error()); + } + if output.pbData.is_null() { + return Err(io::Error::other("Windows returned no cookie cache data")); + } + let buffer = unsafe { slice::from_raw_parts_mut(output.pbData, output.cbData as usize) }; + let result = buffer.to_vec(); + buffer.zeroize(); + unsafe { LocalFree(output.pbData.cast()) }; + Ok(result) +} + +pub(super) fn prepare_directory(_: &Path) -> io::Result<()> { + Ok(()) +} + +pub(super) use prepare_directory as prepare_file; diff --git a/crates/gpapi/src/process/auth_launcher.rs b/crates/gpapi/src/process/auth_launcher.rs index 02aa81a..1e2c761 100644 --- a/crates/gpapi/src/process/auth_launcher.rs +++ b/crates/gpapi/src/process/auth_launcher.rs @@ -32,6 +32,8 @@ pub struct SamlAuthLauncher<'a> { cancellation: CancellationToken, server: &'a str, auth_executable: Option<&'a str>, + #[cfg(windows)] + windows_cli: bool, gateway: bool, saml_request: Option<&'a str>, os: Option<&'a str>, @@ -65,6 +67,8 @@ impl<'a> SamlAuthLauncher<'a> { cancellation: CancellationToken::new(), server, auth_executable: None, + #[cfg(windows)] + windows_cli: false, gateway: false, saml_request: None, os: None, @@ -93,6 +97,12 @@ impl<'a> SamlAuthLauncher<'a> { } } + #[cfg(windows)] + pub fn with_windows_cli_launch(mut self) -> Self { + self.windows_cli = true; + self + } + pub fn desktop_compatibility_graphics(mut self) -> Self { self.desktop_compatibility_graphics = true; self @@ -297,6 +307,12 @@ impl<'a> SamlAuthLauncher<'a> { .auth_executable .map(PathBuf::from) .unwrap_or_else(binary_paths::gpauth); + #[cfg(windows)] + let program = if self.windows_cli { + crate::windows::application_directory()?.join("gpauth.exe") + } else { + program + }; let auth_cmd = self.build_command(&program); let mut command = auth_cmd.into_non_root()?.into_std(); @@ -317,6 +333,8 @@ impl<'a> SamlAuthLauncher<'a> { let detect_gbm_failure = can_use_shared_memory && !use_shared_memory; let stdin = auth_stdin(self.browser); let cancellation = self.cancellation.clone(); + #[cfg(windows)] + let windows_cli = self.windows_cli; let output = tokio::task::spawn_blocking(move || { #[cfg(feature = "logger")] let stderr = crate::logger::diagnostic_writer(); @@ -351,6 +369,8 @@ impl<'a> SamlAuthLauncher<'a> { }, &mut stderr, stdin, + #[cfg(windows)] + windows_cli, ); std::io::Write::flush(&mut stderr)?; if gbm_failed.get() && !cancellation.is_cancelled() { diff --git a/crates/gpapi/src/process/gui_launcher.rs b/crates/gpapi/src/process/gui_launcher.rs index 287bcc7..8bd825c 100644 --- a/crates/gpapi/src/process/gui_launcher.rs +++ b/crates/gpapi/src/process/gui_launcher.rs @@ -217,7 +217,7 @@ impl<'a> GuiLauncher<'a> { use super::rendering_recovery::{GbmBufferFailure, RecoveryState}; let mut recovery = RecoveryState::default(); let mut program = program; - let (mut child, start_result) = loop { + let (child, start_result) = loop { service_input.write_all(&[DESKTOP_SWITCH_BEGIN]).await?; pending = true; let credential = super::desktop_launcher::read_credential(service_output).await? diff --git a/crates/gpapi/src/process/mod.rs b/crates/gpapi/src/process/mod.rs index 2568c76..76331a6 100644 --- a/crates/gpapi/src/process/mod.rs +++ b/crates/gpapi/src/process/mod.rs @@ -39,3 +39,15 @@ pub mod rendering_recovery; #[cfg(windows)] #[path = "windows/user_process.rs"] pub mod user_process; + +#[cfg(windows)] +#[path = "windows/desktop_auth.rs"] +mod desktop_auth; + +#[cfg(windows)] +#[path = "windows/auth_bootstrap.rs"] +pub mod auth_bootstrap; + +#[cfg(windows)] +#[path = "windows/console_input.rs"] +mod console_input; diff --git a/crates/gpapi/src/process/windows/auth_bootstrap.rs b/crates/gpapi/src/process/windows/auth_bootstrap.rs new file mode 100644 index 0000000..b015109 --- /dev/null +++ b/crates/gpapi/src/process/windows/auth_bootstrap.rs @@ -0,0 +1,175 @@ +//! One-shot launch arguments for the installed Windows CLI authenticator. +use std::{env, ffi::OsStr, io, os::windows::io::AsRawHandle, process::Command, time::Duration}; +use tokio::{ + io::{AsyncReadExt, AsyncWriteExt}, + net::windows::named_pipe::{ClientOptions, NamedPipeServer}, + time, +}; +use windows_sys::Win32::System::Pipes::{GetNamedPipeClientProcessId, GetNamedPipeServerProcessId}; + +use super::auth_launcher::AUTH_PARENT_PROCESS_ID_ENV; +use crate::collection::CollectionControl; + +const FLAG: &str = "--windows-cli-bootstrap"; +const MAX_BYTES: usize = 256 * 1024; +const TIMEOUT: Duration = Duration::from_secs(15); +const RECEIVED: u8 = 1; + +pub(super) struct AuthBootstrap { + name: String, + pipe: NamedPipeServer, + request: Vec, +} + +impl AuthBootstrap { + pub(super) fn prepare(command: &Command) -> io::Result { + let args: Vec<_> = command + .get_args() + .map(|arg| { + arg + .to_str() + .ok_or_else(|| invalid("Invalid Windows authentication argument")) + }) + .collect::>()?; + let request = serde_json::to_vec(&args)?; + check_length(request.len())?; + let name = format!(r"\\.\pipe\GPConnect.Auth.{}", uuid::Uuid::new_v4()); + let pipe = crate::windows::create_user_pipe(&name, true)?; + Ok(Self { name, pipe, request }) + } + + pub(super) fn arguments(&self) -> [&OsStr; 2] { + [OsStr::new(FLAG), OsStr::new(&self.name)] + } + + /// Build the short command used when the CLI and authenticator share a token. + pub(super) fn command(&self, original: &Command) -> Command { + let mut command = Command::new(original.get_program()); + command.args(self.arguments()); + for (name, value) in original.get_envs() { + match value { + Some(value) => command.env(name, value), + None => command.env_remove(name), + }; + } + if let Some(directory) = original.get_current_dir() { + command.current_dir(directory); + } + command + } + + pub(super) fn send_to_child(self, pid: u32, control: &dyn CollectionControl) -> io::Result<()> { + tokio::runtime::Handle::current().block_on(self.send(pid, control)) + } + + async fn send(mut self, expected_pid: u32, control: &dyn CollectionControl) -> io::Result<()> { + let send = async { + self.pipe.connect().await?; + let mut pid = 0; + if unsafe { GetNamedPipeClientProcessId(self.pipe.as_raw_handle(), &mut pid) } == 0 { + return Err(io::Error::last_os_error()); + } + if pid != expected_pid { + return Err(io::Error::new( + io::ErrorKind::PermissionDenied, + "Unexpected authentication pipe client", + )); + } + self.pipe.write_u32(self.request.len() as u32).await?; + self.pipe.write_all(&self.request).await?; + if self.pipe.read_u8().await? != RECEIVED { + return Err(invalid("Windows authentication arguments were not accepted")); + } + Ok(()) + }; + let check = async { + loop { + control.check()?; + time::sleep(Duration::from_millis(25)).await; + } + }; + time::timeout(TIMEOUT, async { + tokio::select! { + result = send => result, + result = check => result, + } + }) + .await? + } +} + +/// Recognize the internal bootstrap before handing actual arguments to the normal parser. +pub async fn receive_arguments() -> io::Result>> { + let mut args = env::args_os().skip(1); + if args.next().as_deref() != Some(OsStr::new(FLAG)) { + return Ok(None); + } + let name = args + .next() + .ok_or_else(|| invalid("Missing Windows authentication pipe"))?; + if args.next().is_some() { + return Err(invalid("Unexpected Windows authentication bootstrap argument")); + } + let expected_pid: u32 = env::var(AUTH_PARENT_PROCESS_ID_ENV) + .ok() + .and_then(|value| value.parse().ok()) + .filter(|pid| *pid != 0) + .ok_or_else(|| invalid("Missing Windows authentication parent process"))?; + receive(&name, expected_pid).await.map(Some) +} + +async fn receive(name: &OsStr, expected_pid: u32) -> io::Result> { + time::timeout(TIMEOUT, async { + let mut pipe = ClientOptions::new().open(name)?; + let mut pid = 0; + if unsafe { GetNamedPipeServerProcessId(pipe.as_raw_handle(), &mut pid) } == 0 { + return Err(io::Error::last_os_error()); + } + if pid != expected_pid { + return Err(io::Error::new( + io::ErrorKind::PermissionDenied, + "Unexpected authentication pipe server", + )); + } + let length = pipe.read_u32().await? as usize; + check_length(length)?; + let mut request = vec![0; length]; + pipe.read_exact(&mut request).await?; + let args = serde_json::from_slice(&request)?; + pipe.write_u8(RECEIVED).await?; + Ok(args) + }) + .await? +} + +fn check_length(length: usize) -> io::Result<()> { + if length == 0 || length > MAX_BYTES { + return Err(invalid("Windows authentication launch arguments exceed their limit")); + } + Ok(()) +} + +fn invalid(message: &str) -> io::Error { + io::Error::new(io::ErrorKind::InvalidData, message) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[tokio::test] + async fn large_saml_request_round_trips_outside_the_os_command_line() { + let request = format!("{}", "🎵".repeat(20_000)); + let mut command = Command::new("gpauth.exe"); + command.args(["portal.example.test", "--saml-request", &request]); + let bootstrap = AuthBootstrap::prepare(&command).unwrap(); + assert!(request.encode_utf16().count() > 32_767); + let launch = bootstrap.command(&command); + assert_eq!(launch.get_args().collect::>(), bootstrap.arguments()); + let name = bootstrap.name.clone(); + let pid = std::process::id(); + let (sent, received) = tokio::join!(bootstrap.send(pid, &|| Ok(())), receive(OsStr::new(&name), pid)); + sent.unwrap(); + assert_eq!(received.unwrap(), ["portal.example.test", "--saml-request", &request]); + } +} diff --git a/crates/gpapi/src/process/windows/command_runner.rs b/crates/gpapi/src/process/windows/command_runner.rs index 5518afb..f72263b 100644 --- a/crates/gpapi/src/process/windows/command_runner.rs +++ b/crates/gpapi/src/process/windows/command_runner.rs @@ -1,9 +1,15 @@ //! Controlled Windows child execution. Pipe polling keeps cancellation responsive. +use super::{ + auth_bootstrap::AuthBootstrap, + console_input::{self, ConsoleInput}, + desktop_auth::DesktopChild, +}; use crate::collection::CollectionControl; use std::{ + fs::File, io::{self, Read, Write}, - os::windows::io::AsRawHandle, - process::{Child, Command, Output, Stdio}, + os::windows::io::{AsRawHandle, OwnedHandle}, + process::{Child, Command, ExitStatus, Output, Stdio}, thread, time::Duration, }; @@ -30,45 +36,35 @@ pub(crate) fn run_controlled(command: Command, control: &dyn CollectionControl, &mut |_| {}, &mut io::sink(), ChildInput::Null, + false, ) .map(|observed| observed.output) } pub(crate) fn run_observed( - mut command: Command, + command: Command, control: &dyn CollectionControl, output_limit: Option, observer: &mut dyn FnMut(&[u8]), stderr_sink: &mut dyn Write, stdin: ChildInput<'_>, + windows_cli_auth: bool, ) -> io::Result { control.check()?; - // Windows desktop processes must not open a console for each helper. - use std::os::windows::process::CommandExt; - if !matches!(stdin, ChildInput::Terminal) { - command.creation_flags(0x08000000); // CREATE_NO_WINDOW - } - command.stdout(if output_limit.is_some() { - Stdio::piped() - } else { - Stdio::inherit() - }); - command.stderr(Stdio::piped()); - command.stdin(match stdin { - ChildInput::Terminal => Stdio::inherit(), - ChildInput::Null => Stdio::null(), - ChildInput::Frame(_) => Stdio::piped(), - }); - let mut child = ControlledChild(command.spawn()?); - let input = if let ChildInput::Frame(frame) = stdin { - let mut pipe = child.0.stdin.take().expect("piped stdin"); + let bootstrap = windows_cli_auth.then(|| AuthBootstrap::prepare(&command)).transpose()?; + let (mut child, mut stdout, mut stderr, input) = match bootstrap { + Some(bootstrap) if crate::windows::is_elevated()? => { + let (child, stdout, stderr, input) = DesktopChild::spawn(&command, bootstrap, &stdin, control)?; + (ControlledChild::Desktop(child), Some(stdout), stderr, input) + } + bootstrap => spawn_command(command, &stdin, output_limit, bootstrap, control)?, + }; + let input = if let (ChildInput::Frame(frame), Some(mut pipe)) = (stdin, input) { let frame = frame.to_vec(); Some(thread::spawn(move || pipe.write_all(&frame))) } else { None }; - let mut stdout = child.0.stdout.take(); - let mut stderr = child.0.stderr.take().expect("piped stderr"); let mut output = Vec::new(); let mut buffer = [0u8; 8192]; loop { @@ -86,7 +82,7 @@ pub(crate) fn run_observed( let length = read_available(&mut stderr, &mut buffer)?; observer(&buffer[..length]); stderr_sink.write_all(&buffer[..length])?; - if let Some(status) = child.0.try_wait()? { + if let Some(status) = child.try_wait()? { // Drain the remaining buffered output after the process exits. if let Some(pipe) = &mut stdout { loop { @@ -126,6 +122,60 @@ pub(crate) fn run_observed( } } +fn spawn_command( + command: Command, + stdin: &ChildInput<'_>, + output_limit: Option, + bootstrap: Option, + control: &dyn CollectionControl, +) -> io::Result<(ControlledChild, Option, File, Option)> { + let mut command = match &bootstrap { + Some(bootstrap) => bootstrap.command(&command), + None => command, + }; + // Windows desktop processes must not open a console for each helper. + use std::os::windows::process::CommandExt; + if !matches!(stdin, ChildInput::Terminal) { + command.creation_flags(0x08000000); // CREATE_NO_WINDOW + } + command.stdout(if output_limit.is_some() { + Stdio::piped() + } else { + Stdio::inherit() + }); + command.stderr(Stdio::piped()); + let terminal = if bootstrap.is_some() && matches!(stdin, ChildInput::Terminal) { + let input = console_input::terminal_input()?; + console_input::is_console(&input).then_some(input) + } else { + None + }; + command.stdin(match stdin { + ChildInput::Terminal if terminal.is_none() => Stdio::inherit(), + ChildInput::Terminal => Stdio::piped(), + ChildInput::Null => Stdio::null(), + ChildInput::Frame(_) => Stdio::piped(), + }); + let mut child = StandardChild { + child: command.spawn()?, + console_input: None, + }; + if let Some(bootstrap) = bootstrap { + bootstrap.send_to_child(child.child.id(), control)?; + } + let stdout = child + .child + .stdout + .take() + .map(|pipe| File::from(OwnedHandle::from(pipe))); + let stderr = File::from(OwnedHandle::from(child.child.stderr.take().expect("piped stderr"))); + let mut input = child.child.stdin.take().map(|pipe| File::from(OwnedHandle::from(pipe))); + if let Some(terminal) = terminal { + child.console_input = Some(ConsoleInput::start(terminal, input.take().expect("piped stdin"))?); + } + Ok((ControlledChild::Standard(child), stdout, stderr, input)) +} + fn read_available(pipe: &mut (impl Read + AsRawHandle), buffer: &mut [u8]) -> io::Result { let mut available = 0; let success = unsafe { @@ -152,11 +202,34 @@ fn read_available(pipe: &mut (impl Read + AsRawHandle), buffer: &mut [u8]) -> io pipe.read(&mut buffer[..length]) } -struct ControlledChild(Child); -impl Drop for ControlledChild { +enum ControlledChild { + Standard(StandardChild), + Desktop(DesktopChild), +} + +impl ControlledChild { + fn try_wait(&mut self) -> io::Result> { + match self { + Self::Standard(child) => { + if let Some(input) = &mut child.console_input { + input.check()?; + } + child.child.try_wait() + } + Self::Desktop(child) => child.try_wait(), + } + } +} + +struct StandardChild { + child: Child, + console_input: Option, +} + +impl Drop for StandardChild { fn drop(&mut self) { - let _ = self.0.kill(); - let _ = self.0.wait(); + let _ = self.child.kill(); + let _ = self.child.wait(); } } diff --git a/crates/gpapi/src/process/windows/console_input.rs b/crates/gpapi/src/process/windows/console_input.rs new file mode 100644 index 0000000..3e1f7c4 --- /dev/null +++ b/crates/gpapi/src/process/windows/console_input.rs @@ -0,0 +1,142 @@ +//! Relay a pasted browser callback from the elevated CLI's own console. +use std::{ + fs::File, + io::{self, Write}, + os::windows::io::{AsRawHandle, BorrowedHandle, FromRawHandle, OwnedHandle}, + ptr, + sync::{ + Arc, + atomic::{AtomicBool, Ordering}, + }, + thread::{self, JoinHandle}, + time::Duration, +}; +use windows_sys::Win32::{ + Foundation::{DUPLICATE_SAME_ACCESS, DuplicateHandle, ERROR_OPERATION_ABORTED, INVALID_HANDLE_VALUE}, + System::{ + Console::{GetConsoleMode, GetStdHandle, ReadConsoleW, STD_INPUT_HANDLE}, + IO::CancelSynchronousIo, + Threading::GetCurrentProcess, + }, +}; + +const MAX_CALLBACK_CHARS: usize = 64 * 1024; + +pub(super) fn is_console(input: &OwnedHandle) -> bool { + let mut mode = 0; + unsafe { GetConsoleMode(input.as_raw_handle(), &mut mode) != 0 } +} + +pub(super) struct ConsoleInput { + stop: Arc, + worker: Option>>, +} + +impl ConsoleInput { + pub(super) fn start(input: OwnedHandle, output: File) -> io::Result { + let stop = Arc::new(AtomicBool::new(false)); + let worker_stop = stop.clone(); + let worker = thread::Builder::new().spawn(move || { + let line = read_line(input, &worker_stop)?; + if !worker_stop.load(Ordering::Relaxed) { + let mut output = output; + output.write_all(line.as_bytes())?; + } + Ok(()) + })?; + Ok(Self { + stop, + worker: Some(worker), + }) + } + + pub(super) fn check(&mut self) -> io::Result<()> { + if self.worker.as_ref().is_some_and(JoinHandle::is_finished) { + let worker = self.worker.take().expect("completed console reader"); + worker + .join() + .map_err(|_| io::Error::other("Console reader stopped unexpectedly"))??; + } + Ok(()) + } +} + +impl Drop for ConsoleInput { + fn drop(&mut self) { + if let Some(worker) = self.worker.take() { + self.stop.store(true, Ordering::Relaxed); + // Retry in case the worker was between checking stop and entering I/O. + // Join before returning so a failed sign-in cannot consume a later prompt. + while !worker.is_finished() { + unsafe { CancelSynchronousIo(worker.as_raw_handle()) }; + thread::sleep(Duration::from_millis(5)); + } + let _ = worker.join(); + } + } +} + +fn read_line(input: OwnedHandle, stop: &AtomicBool) -> io::Result { + let mut text = Vec::new(); + let mut buffer = [0u16; 4096]; + while !stop.load(Ordering::Relaxed) { + let mut count = 0; + if unsafe { + ReadConsoleW( + input.as_raw_handle(), + buffer.as_mut_ptr().cast(), + buffer.len() as u32, + &mut count, + ptr::null(), + ) + } == 0 + { + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(ERROR_OPERATION_ABORTED as i32) { + return Err(io::Error::new(io::ErrorKind::Interrupted, error)); + } + return Err(error); + } + if count == 0 { + break; + } + let chunk = &buffer[..count as usize]; + let newline = chunk.iter().position(|&ch| ch == b'\n' as u16); + text.extend_from_slice(&chunk[..newline.map_or(chunk.len(), |index| index + 1)]); + if text.len() > MAX_CALLBACK_CHARS { + return Err(io::Error::new( + io::ErrorKind::InvalidData, + "Browser callback is too long", + )); + } + if newline.is_some() { + break; + } + } + String::from_utf16(&text).map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error)) +} + +pub(super) fn terminal_input() -> io::Result { + let input = unsafe { GetStdHandle(STD_INPUT_HANDLE) }; + if input.is_null() || input == INVALID_HANDLE_VALUE { + return Err(io::Error::other("Manual browser sign-in requires terminal input")); + } + let input = unsafe { BorrowedHandle::borrow_raw(input) }; + let process = unsafe { GetCurrentProcess() }; + let mut duplicate = ptr::null_mut(); + if unsafe { + DuplicateHandle( + process, + input.as_raw_handle(), + process, + &mut duplicate, + 0, + 1, + DUPLICATE_SAME_ACCESS, + ) + } == 0 + { + return Err(io::Error::last_os_error()); + } + Ok(unsafe { OwnedHandle::from_raw_handle(duplicate) }) +} diff --git a/crates/gpapi/src/process/windows/desktop_auth.rs b/crates/gpapi/src/process/windows/desktop_auth.rs new file mode 100644 index 0000000..9507816 --- /dev/null +++ b/crates/gpapi/src/process/windows/desktop_auth.rs @@ -0,0 +1,238 @@ +//! Run the CLI's installed authenticator with the interactive user's standard token. +use std::{ + env, + fs::File, + io, + os::windows::{ + io::{AsHandle, AsRawHandle, FromRawHandle, OwnedHandle}, + process::ExitStatusExt, + }, + path::Path, + process::{Command, ExitStatus}, + ptr, +}; +use windows_sys::Win32::{ + Foundation::{HANDLE, HANDLE_FLAG_INHERIT, SetHandleInformation, WAIT_OBJECT_0, WAIT_TIMEOUT}, + Security::{ + DuplicateTokenEx, SECURITY_ATTRIBUTES, SecurityImpersonation, TOKEN_DUPLICATE, TOKEN_QUERY, TokenElevation, + TokenPrimary, TokenSessionId, + }, + System::{Pipes::CreatePipe, SystemServices::MAXIMUM_ALLOWED, Threading::*}, + UI::WindowsAndMessaging::{GetShellWindow, GetWindowThreadProcessId}, +}; + +use super::{ + auth_bootstrap::AuthBootstrap, + command_runner::ChildInput, + console_input::{self, ConsoleInput}, + user_process::{command_line, user_environment, wide}, +}; +use crate::{ + collection::CollectionControl, + windows::{current_user_sid, token_u32, token_user_sid}, +}; + +pub(super) struct DesktopChild { + process: OwnedHandle, + console_input: Option, +} + +impl DesktopChild { + pub(super) fn spawn( + command: &Command, + bootstrap: AuthBootstrap, + input: &ChildInput<'_>, + control: &dyn CollectionControl, + ) -> io::Result<(Self, File, File, Option)> { + let desktop = desktop_token()?; + let program = Path::new(command.get_program()); + if !program.is_absolute() { + return Err(io::Error::new( + io::ErrorKind::InvalidInput, + "The authenticator path must be absolute", + )); + } + let mut executable = wide(program.as_os_str())?; + let mut arguments = command_line(&executable, bootstrap.arguments())?; + executable.push(0); + let mut environment = user_environment( + desktop.as_handle(), + command + .get_envs() + .filter_map(|(name, value)| value.map(|value| (name, value))), + )?; + let working_directory = match command.get_current_dir() { + Some(directory) => directory.to_path_buf(), + None => env::current_dir()?, + }; + let mut directory = wide(working_directory.as_os_str())?; + directory.push(0); + let (stdout, child_out) = pipe(false)?; + let (stderr, child_err) = pipe(false)?; + let mut console = None; + let (child_in, input_pipe) = match input { + ChildInput::Terminal => { + let terminal = console_input::terminal_input()?; + if console_input::is_console(&terminal) { + let (writer, reader) = pipe(true)?; + console = Some((terminal, File::from(writer))); + (reader, None) + } else { + (terminal, None) + } + } + ChildInput::Null => { + let (writer, reader) = pipe(true)?; + drop(writer); + (reader, None) + } + ChildInput::Frame(_) => { + let (writer, reader) = pipe(true)?; + (reader, Some(File::from(writer))) + } + }; + let startup = STARTUPINFOW { + cb: std::mem::size_of::() as u32, + dwFlags: STARTF_USESTDHANDLES, + hStdInput: child_in.as_raw_handle(), + hStdOutput: child_out.as_raw_handle(), + hStdError: child_err.as_raw_handle(), + ..Default::default() + }; + let mut process = PROCESS_INFORMATION::default(); + let mut flags = CREATE_UNICODE_ENVIRONMENT; + if !matches!(input, ChildInput::Terminal) { + flags |= CREATE_NO_WINDOW; + } + if unsafe { + CreateProcessWithTokenW( + desktop.as_raw_handle(), + 0, + executable.as_ptr(), + arguments.as_mut_ptr(), + flags, + environment.as_mut_ptr().cast(), + directory.as_ptr(), + &startup, + &mut process, + ) + } == 0 + { + return Err(io::Error::last_os_error()); + } + let mut child = Self { + process: unsafe { OwnedHandle::from_raw_handle(process.hProcess) }, + console_input: None, + }; + drop(unsafe { OwnedHandle::from_raw_handle(process.hThread) }); + bootstrap.send_to_child(process.dwProcessId, control)?; + child.console_input = console + .map(|(terminal, writer)| ConsoleInput::start(terminal, writer)) + .transpose()?; + Ok((child, File::from(stdout), File::from(stderr), input_pipe)) + } + + pub(super) fn try_wait(&mut self) -> io::Result> { + if let Some(input) = &mut self.console_input { + input.check()?; + } + match unsafe { WaitForSingleObject(self.process.as_raw_handle(), 0) } { + WAIT_OBJECT_0 => { + let mut code = 0; + if unsafe { GetExitCodeProcess(self.process.as_raw_handle(), &mut code) } == 0 { + return Err(io::Error::last_os_error()); + } + Ok(Some(ExitStatus::from_raw(code))) + } + WAIT_TIMEOUT => Ok(None), + _ => Err(io::Error::last_os_error()), + } + } +} + +impl Drop for DesktopChild { + fn drop(&mut self) { + unsafe { + if WaitForSingleObject(self.process.as_raw_handle(), 0) == WAIT_TIMEOUT + && TerminateProcess(self.process.as_raw_handle(), 1) != 0 + { + WaitForSingleObject(self.process.as_raw_handle(), INFINITE); + } + } + } +} + +fn desktop_token() -> io::Result { + let mut pid = 0; + let window = unsafe { GetShellWindow() }; + if window.is_null() || unsafe { GetWindowThreadProcessId(window, &mut pid) } == 0 { + return Err(io::Error::other("Sign-in requires an interactive Windows desktop")); + } + let process = owned(unsafe { OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, 0, pid) })?; + let mut token = ptr::null_mut(); + if unsafe { OpenProcessToken(process.as_raw_handle(), TOKEN_QUERY | TOKEN_DUPLICATE, &mut token) } == 0 { + return Err(io::Error::last_os_error()); + } + let source = unsafe { OwnedHandle::from_raw_handle(token) }; + if unsafe { token_user_sid(token) }? != current_user_sid()? + || token_u32(source.as_handle(), TokenElevation)? != 0 + || token_u32(source.as_handle(), TokenSessionId)? != session_id()? + { + return Err(io::Error::other( + "Sign-in requires the terminal user's standard Windows desktop", + )); + } + let mut primary = ptr::null_mut(); + if unsafe { + // A linked token queried without SeTcbPrivilege may only be usable for identification. + // The shell already has the primary standard token in the interactive session. + DuplicateTokenEx( + token, + MAXIMUM_ALLOWED, + ptr::null(), + SecurityImpersonation, + TokenPrimary, + &mut primary, + ) + } == 0 + { + return Err(io::Error::last_os_error()); + } + owned(primary) +} + +fn session_id() -> io::Result { + let mut session = 0; + if unsafe { windows_sys::Win32::System::RemoteDesktop::ProcessIdToSessionId(std::process::id(), &mut session) } == 0 { + return Err(io::Error::last_os_error()); + } + Ok(session) +} + +fn owned(handle: HANDLE) -> io::Result { + if handle.is_null() || handle == windows_sys::Win32::Foundation::INVALID_HANDLE_VALUE { + return Err(io::Error::last_os_error()); + } + Ok(unsafe { OwnedHandle::from_raw_handle(handle) }) +} + +/// Returns the parent's non-inheritable end, then the child's end. +fn pipe(parent_writes: bool) -> io::Result<(OwnedHandle, OwnedHandle)> { + let attributes = SECURITY_ATTRIBUTES { + nLength: std::mem::size_of::() as u32, + bInheritHandle: 1, + lpSecurityDescriptor: ptr::null_mut(), + }; + let mut read = ptr::null_mut(); + let mut write = ptr::null_mut(); + if unsafe { CreatePipe(&mut read, &mut write, &attributes, 0) } == 0 { + return Err(io::Error::last_os_error()); + } + let read = unsafe { OwnedHandle::from_raw_handle(read) }; + let write = unsafe { OwnedHandle::from_raw_handle(write) }; + let (parent, child) = if parent_writes { (write, read) } else { (read, write) }; + if unsafe { SetHandleInformation(parent.as_raw_handle(), HANDLE_FLAG_INHERIT, 0) } == 0 { + return Err(io::Error::last_os_error()); + } + Ok((parent, child)) +} diff --git a/crates/gpapi/src/process/windows/user_process.rs b/crates/gpapi/src/process/windows/user_process.rs index abe94c0..ec09c97 100644 --- a/crates/gpapi/src/process/windows/user_process.rs +++ b/crates/gpapi/src/process/windows/user_process.rs @@ -36,7 +36,7 @@ impl Drop for Environment { fn invalid(message: &str) -> io::Error { io::Error::new(io::ErrorKind::InvalidInput, message) } -fn wide(value: &OsStr) -> io::Result> { +pub(super) fn wide(value: &OsStr) -> io::Result> { let value: Vec<_> = value.encode_wide().collect(); if value.contains(&0) { return Err(invalid("Windows process strings cannot contain NUL")); @@ -63,12 +63,15 @@ fn quote(argument: &[u16], output: &mut Vec) { output.extend(std::iter::repeat_n(b'\\' as u16, backslashes * 2)); output.push(b'"' as u16); } -fn command_line(program: &[u16], arguments: &[String]) -> io::Result> { +pub(super) fn command_line<'a>( + program: &[u16], + arguments: impl IntoIterator, +) -> io::Result> { let mut output = Vec::new(); quote(program, &mut output); for argument in arguments { output.push(b' ' as u16); - quote(&wide(OsStr::new(argument))?, &mut output); + quote(&wide(argument)?, &mut output); } output.push(0); if output.len() > 32767 { @@ -90,7 +93,10 @@ fn compare(left: &[u16], right: &[u16]) -> std::cmp::Ordering { unsafe { CompareStringOrdinal(left.as_ptr(), left.len() as i32, right.as_ptr(), right.len() as i32, 1) } .cmp(&CSTR_EQUAL) } -fn user_environment(token: BorrowedHandle<'_>, variables: &[(&str, &str)]) -> io::Result> { +pub(super) fn user_environment<'a>( + token: BorrowedHandle<'_>, + variables: impl IntoIterator, +) -> io::Result> { let mut pointer = ptr::null_mut(); if unsafe { CreateEnvironmentBlock(&mut pointer, token.as_raw_handle(), 0) } == 0 { return Err(io::Error::last_os_error()); @@ -109,11 +115,11 @@ fn user_environment(token: BorrowedHandle<'_>, variables: &[(&str, &str)]) -> io } } for (name, value) in variables { - if name.is_empty() || name.contains('=') { + let name = wide(name)?; + if name.is_empty() || name.contains(&(b'=' as u16)) { return Err(invalid("Invalid worker environment name")); } - let name = wide(OsStr::new(name))?; - let value = wide(OsStr::new(value))?; + let value = wide(value)?; entries.retain(|entry| compare(key(entry), &name) != std::cmp::Ordering::Equal); let mut entry = name; entry.push(b'=' as u16); @@ -145,9 +151,14 @@ impl UserProcess { return Err(invalid("Windows worker executable must be absolute")); } let mut executable = wide(program.as_os_str())?; - let mut command = command_line(&executable, arguments)?; + let mut command = command_line(&executable, arguments.iter().map(OsStr::new))?; executable.push(0); - let mut environment = user_environment(token, variables)?; + let mut environment = user_environment( + token, + variables + .iter() + .map(|(name, value)| (OsStr::new(name), OsStr::new(value))), + )?; let directory = program.parent().ok_or_else(|| invalid("Worker directory is missing"))?; let mut directory = wide(directory.as_os_str())?; directory.push(0); @@ -286,7 +297,7 @@ mod tests { "&|<>", ] .map(String::from); - let command = command_line(&program, &arguments).unwrap(); + let command = command_line(&program, arguments.iter().map(OsStr::new)).unwrap(); let mut count = 0; unsafe { let parsed = CommandLineToArgvW(command.as_ptr(), &mut count); diff --git a/crates/gpapi/src/session/desktop/network/native.rs b/crates/gpapi/src/session/desktop/network/native.rs index 8d5a175..25b4e28 100644 --- a/crates/gpapi/src/session/desktop/network/native.rs +++ b/crates/gpapi/src/session/desktop/network/native.rs @@ -8,6 +8,32 @@ use super::*; const MAX_ADDRESSES: usize = 64; +#[cfg(not(windows))] +fn native_helper() -> anyhow::Result { + Ok(common::binary_paths::gpclient()) +} + +#[cfg(windows)] +fn native_helper() -> anyhow::Result { + windows_native_helper(&crate::windows::application_directory()?) +} + +#[cfg(windows)] +fn windows_native_helper(directory: &std::path::Path) -> anyhow::Result { + let installed = directory.join(r"cli\gpclient.exe"); + if installed.is_file() { + return Ok(installed); + } + // Every Windows package includes build metadata. A missing bundled helper + // in that layout is a package error, even when a development override exists. + ensure!( + !directory.join("build-info.json").try_exists()?, + "The GP Connect package is missing its resolver helper: {}", + installed.display() + ); + Ok(common::binary_paths::gpclient()) +} + #[doc(hidden)] pub fn detect_in_helper(address: std::net::IpAddr, hostname: &str) -> anyhow::Result { super::detection::validate_target(address, hostname)?; @@ -27,7 +53,7 @@ pub(in crate::session) async fn detect( "--hostname".into(), hostname.into(), ]; - let output = run_helper(common::binary_paths::gpclient(), args, cancellation.clone()).await?; + let output = run_helper(native_helper()?, args, cancellation.clone()).await?; serde_json::from_slice(&output).context("Invalid internal detection helper response") } @@ -68,14 +94,7 @@ pub(super) async fn resolve( if disable_ipv6 { args.push("--disable-ipv6".into()); } - run_resolver( - common::binary_paths::gpclient(), - args, - port, - disable_ipv6, - cancellation.clone(), - ) - .await + run_resolver(native_helper()?, args, port, disable_ipv6, cancellation.clone()).await } async fn run_resolver( @@ -147,6 +166,26 @@ fn validate_addresses(addresses: &[SocketAddr], port: u16, disable_ipv6: bool) - mod tests { use super::*; + #[cfg(windows)] + #[test] + fn packaged_resolver_requires_the_bundled_cli() { + let package = tempfile::tempdir().unwrap(); + let directory = package.path(); + assert_eq!( + windows_native_helper(directory).unwrap(), + common::binary_paths::gpclient() + ); + + std::fs::write(directory.join("build-info.json"), "{}").unwrap(); + let helper = directory.join(r"cli\gpclient.exe"); + let error = windows_native_helper(directory).unwrap_err().to_string(); + assert!(error.contains(&helper.display().to_string()), "{error}"); + + std::fs::create_dir(directory.join("cli")).unwrap(); + std::fs::write(&helper, "").unwrap(); + assert_eq!(windows_native_helper(directory).unwrap(), helper); + } + #[tokio::test] async fn actual_helper_output_is_validated_before_admission() { let addresses = run_resolver( diff --git a/crates/gpapi/src/windows.rs b/crates/gpapi/src/windows.rs index f7d1681..13066ba 100644 --- a/crates/gpapi/src/windows.rs +++ b/crates/gpapi/src/windows.rs @@ -1,6 +1,10 @@ //! Windows user identity and private local IPC. use std::os::windows::io::{AsHandle, AsRawHandle, BorrowedHandle, FromRawHandle, OwnedHandle}; -use std::{io, ptr}; +use std::{ + env, io, + path::{Path, PathBuf}, + ptr, +}; mod pipes; pub use pipes::{PacketPipe, connect_service_admission, connect_service_worker, create_service_admission_pipe}; use tokio::net::windows::named_pipe::NamedPipeServer; @@ -22,6 +26,54 @@ pub fn current_user_sid() -> io::Result { } } +/// Locate bundled Windows helpers relative to the installed executable. +pub fn application_directory() -> std::io::Result { + let executable = env::current_exe()?; + let directory = executable + .parent() + .ok_or_else(|| std::io::Error::other("Application directory is unavailable"))?; + if directory + .file_name() + .is_some_and(|name| name.eq_ignore_ascii_case("cli")) + && executable + .file_name() + .is_some_and(|name| name.eq_ignore_ascii_case("gpclient.exe")) + { + return directory + .parent() + .map(Path::to_path_buf) + .ok_or_else(|| std::io::Error::other("GP Connect installation directory is unavailable")); + } + Ok(directory.to_path_buf()) +} + +pub fn is_elevated() -> io::Result { + let mut token = ptr::null_mut(); + if unsafe { OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token) } == 0 { + return Err(io::Error::last_os_error()); + } + let token = unsafe { OwnedHandle::from_raw_handle(token) }; + Ok(token_u32(token.as_handle(), windows_sys::Win32::Security::TokenElevation)? != 0) +} + +pub(crate) fn token_u32(token: BorrowedHandle<'_>, field: i32) -> io::Result { + let mut value = 0u32; + let mut length = 0; + if unsafe { + GetTokenInformation( + token.as_raw_handle(), + field, + (&mut value as *mut u32).cast(), + 4, + &mut length, + ) + } == 0 + { + return Err(io::Error::last_os_error()); + } + Ok(value) +} + /// An authenticated pipe client's primary token, retained for its user-session worker. /// Windows user identity is a SID and token; it is never represented as a Unix UID. pub struct PipeClientIdentity { @@ -111,7 +163,7 @@ pub fn process_user_sid(pid: u32) -> io::Result { } } -unsafe fn token_user_sid(token: windows_sys::Win32::Foundation::HANDLE) -> io::Result { +pub(crate) unsafe fn token_user_sid(token: windows_sys::Win32::Foundation::HANDLE) -> io::Result { unsafe { let mut length = 0; GetTokenInformation(token, TokenUser, ptr::null_mut(), 0, &mut length); diff --git a/crates/gphip/src/windows.rs b/crates/gphip/src/windows.rs index e53649f..d62abb1 100644 --- a/crates/gphip/src/windows.rs +++ b/crates/gphip/src/windows.rs @@ -4,11 +4,7 @@ use gpapi::{collection::CollectionControl, process::collection::CollectorCommand use std::io; pub(super) fn collect(commands: &CollectorCommands<'_>, control: &dyn CollectionControl) -> io::Result { - let executable = std::env::current_exe()?; - let helper = executable - .parent() - .ok_or_else(|| io::Error::other("Application directory is unavailable"))? - .join("gp-posture.exe"); + let helper = gpapi::windows::application_directory()?.join("gp-posture.exe"); let output = commands .run_executable(&helper, &[])? .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "Windows posture helper is not installed"))?; diff --git a/crates/gptunnel/src/monitor.rs b/crates/gptunnel/src/monitor.rs index 4f91bce..0323138 100644 --- a/crates/gptunnel/src/monitor.rs +++ b/crates/gptunnel/src/monitor.rs @@ -284,7 +284,7 @@ impl Observation { /// One native tunnel's negotiated state and optional sampler. The connection /// owner must join `Vpn::connect` before calling `stop`. pub struct TunnelMonitor { - vpn: Arc, + vpn: Mutex>>, observation: Mutex, updates: watch::Sender, wake: Arc, @@ -302,14 +302,14 @@ impl TunnelMonitor { let observation = Observation::new(); let (updates, _) = watch::channel(observation.project(Instant::now())); let monitor = Arc::new(Self { - vpn, + vpn: Mutex::new(Some(vpn.clone())), observation: Mutex::new(observation), updates, wake: Arc::new(Notify::new()), worker: Mutex::new(None), }); let observer = Arc::downgrade(&monitor); - monitor.vpn.set_tunnel_observer(move |event| { + vpn.set_tunnel_observer(move |event| { on_event(&event); if let Some(monitor) = observer.upgrade() { monitor.observe(event); @@ -347,7 +347,9 @@ impl TunnelMonitor { observation.finish(Instant::now()); self.publish(&observation); drop(observation); - self.vpn.clear_tunnel_observer(); + if let Some(vpn) = self.vpn.lock().unwrap().take() { + vpn.clear_tunnel_observer(); + } self.wake.notify_one(); } @@ -405,7 +407,11 @@ impl TunnelMonitor { } return true; } - match self.vpn.request_statistics() { + let vpn = self.vpn.lock().unwrap(); + let Some(vpn) = vpn.as_ref() else { + return false; + }; + match vpn.request_statistics() { Ok(true) => { observation.pending = Some(RequestStamp { generation: observation.generation, @@ -431,7 +437,9 @@ impl TunnelMonitor { impl Drop for TunnelMonitor { fn drop(&mut self) { - self.vpn.clear_tunnel_observer(); + if let Some(vpn) = self.vpn.get_mut().unwrap().take() { + vpn.clear_tunnel_observer(); + } if let Some(worker) = self.worker.get_mut().unwrap().take() { worker.abort(); } @@ -468,6 +476,29 @@ fn millis(duration: Duration) -> u64 { mod tests { use super::*; + #[tokio::test] + async fn finished_monitor_keeps_telemetry_without_owning_native_resources() { + let owner = Arc::new(()); + let lease = Arc::downgrade(&owner); + let vpn = Arc::new( + Vpn::builder("vpn.example.com", "cookie") + .network_configuration_handler(move |_| { + let _owner = &owner; + Ok(()) + }) + .build() + .unwrap(), + ); + let monitor = TunnelMonitor::attach(vpn.clone()); + monitor.stop().await; + drop(vpn); + assert!( + lease.upgrade().is_none(), + "finished telemetry retained the network owner" + ); + let _ = monitor.subscribe(); + } + fn connected(now: Instant) -> Observation { let mut observation = Observation::new(); observation.apply(Event::Established, now); diff --git a/crates/gpvpnc/Cargo.toml b/crates/gpvpnc/Cargo.toml index 1e2b9fd..7286e12 100644 --- a/crates/gpvpnc/Cargo.toml +++ b/crates/gpvpnc/Cargo.toml @@ -15,7 +15,7 @@ serde_json.workspace = true serde.workspace = true winreg = "0.56" uuid = { workspace = true, features = ["v4"] } -windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_System_Threading"] } +windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_System_Threading", "Win32_UI_Shell"] } [dev-dependencies] ipnet = "2" diff --git a/crates/gpvpnc/src/windows/dns.rs b/crates/gpvpnc/src/windows/dns.rs index 729d9dd..9fe5859 100644 --- a/crates/gpvpnc/src/windows/dns.rs +++ b/crates/gpvpnc/src/windows/dns.rs @@ -1,5 +1,5 @@ //! Adapter DNS settings and Windows name-resolution policy scoped to this connection. -use super::configuration::Configuration; +use super::{SystemTunnel, configuration::Configuration}; use base64::Engine; use serde_json::json; use std::{ @@ -23,6 +23,7 @@ pub(super) struct Installed { guid: GUID, snapshot: Option, tag: Option, + tunnel: Option, } fn check(status: u32) -> io::Result<()> { if status == 0 { @@ -77,7 +78,7 @@ impl Snapshot { } } impl Installed { - pub fn apply(configuration: &Configuration) -> io::Result { + pub fn apply(configuration: &Configuration, recovery_key: &str, tunnel: Option<&SystemTunnel>) -> io::Result { let mut luid = NET_LUID_LH::default(); let mut guid = GUID::default(); check(unsafe { ConvertInterfaceIndexToLuid(configuration.interface, &mut luid) })?; @@ -86,6 +87,7 @@ impl Installed { guid, snapshot: Some(Snapshot::capture(guid)?), tag: None, + tunnel: tunnel.cloned(), }; Snapshot { domain: configuration.domains.first().cloned().unwrap_or_default(), @@ -105,9 +107,13 @@ impl Installed { .map(|domain| format!(".{}", domain.trim_matches('.'))) .collect() }; - let tag = format!("GPConnect:{}", uuid::Uuid::new_v4()); + let tag = match tunnel { + Some(_) => format!("GPConnect:{}", uuid::Uuid::new_v4()), + None => journal_tag(recovery_key), + }; installed.tag = Some(tag.clone()); policy( + tunnel, json!({"operation":"add", "tag":tag, "namespaces":namespaces, "servers":configuration.servers.iter().map(ToString::to_string).collect::>()}), )?; } @@ -116,7 +122,7 @@ impl Installed { pub fn restore(&mut self) -> io::Result<()> { let mut failure = None; if let Some(tag) = self.tag.take() { - if let Err(error) = policy(json!({"operation":"remove", "tag":tag})) { + if let Err(error) = policy(self.tunnel.as_ref(), json!({"operation":"remove", "tag":tag})) { log::warn!("Could not remove VPN DNS policy: {error}"); failure = Some(error); } @@ -140,21 +146,36 @@ impl Drop for Installed { /// A crashed service cannot run Drop. Remove only GP Connect's tagged policies /// before accepting a new connection; adapter rows disappear with Wintun itself. -pub(super) fn clear_stale_policies() -> io::Result<()> { - policy(json!({"operation":"clear-stale"})) +pub(super) fn clear_stale_policies(tunnel: &SystemTunnel) -> io::Result<()> { + policy(Some(tunnel), json!({"operation":"clear-stale"})) } -fn policy(request: serde_json::Value) -> io::Result<()> { +// Keep isolated journals outside the GPConnect:* namespace used by system recovery. +fn journal_tag(recovery_key: &str) -> String { + format!("GPConnectJournal:{recovery_key}") +} + +pub(super) fn remove_journal_policy(recovery_key: &str) -> io::Result<()> { + policy(None, json!({"operation":"remove", "tag":journal_tag(recovery_key)})) +} + +fn policy(tunnel: Option<&SystemTunnel>, request: serde_json::Value) -> io::Result<()> { const SCRIPT: &str = include_str!("dns-policy.ps1"); let encoded = base64::engine::general_purpose::STANDARD .encode(SCRIPT.encode_utf16().flat_map(u16::to_le_bytes).collect::>()); let root = std::env::var_os("SystemRoot").ok_or_else(|| io::Error::other("Windows system directory is unavailable"))?; let executable = std::path::PathBuf::from(root).join("System32/WindowsPowerShell/v1.0/powershell.exe"); + // The script produces no standard output. Use that handle to give the worker + // a copy of the lease so it keeps ownership if the tunnel process dies. + let stdout = match tunnel { + Some(tunnel) => Stdio::from(tunnel.duplicate_lock()?), + None => Stdio::null(), + }; let mut child = Command::new(executable) .args(["-NoProfile", "-NonInteractive", "-EncodedCommand", &encoded]) .creation_flags(CREATE_NO_WINDOW) .stdin(Stdio::piped()) - .stdout(Stdio::null()) + .stdout(stdout) .stderr(Stdio::piped()) .spawn()?; let input = child diff --git a/crates/gpvpnc/src/windows/mod.rs b/crates/gpvpnc/src/windows/mod.rs index cc243ab..370be17 100644 --- a/crates/gpvpnc/src/windows/mod.rs +++ b/crates/gpvpnc/src/windows/mod.rs @@ -3,24 +3,32 @@ mod configuration; mod dns; mod ip_helper; mod recovery; +mod system_tunnel; use configuration::Configuration; use std::io; +pub use system_tunnel::SystemTunnel; pub struct NetworkConfigurator { connection: Option, recovery_key: String, + system_tunnel: Option, } struct Connection { dns: dns::Installed, network: ip_helper::Installed, } impl NetworkConfigurator { - /// The owner supplies an HKLM key under its administrator-controlled namespace. + /// Use a separate HKLM journal and DNS tag for an isolated network configuration. pub fn new(recovery_key: &str) -> io::Result { + Self::with_owner(recovery_key, None) + } + + fn with_owner(recovery_key: &str, system_tunnel: Option) -> io::Result { recovery::Journal::begin(recovery_key)?; Ok(Self { connection: None, recovery_key: recovery_key.into(), + system_tunnel, }) } pub fn configure(&mut self, reason: &str, environment: &[(String, Option)]) -> io::Result<()> { @@ -30,7 +38,7 @@ impl NetworkConfigurator { let configuration = Configuration::parse(environment)?; self.disconnect()?; let network = ip_helper::Installed::apply(&configuration, &self.recovery_key)?; - let dns = dns::Installed::apply(&configuration)?; + let dns = dns::Installed::apply(&configuration, &self.recovery_key, self.system_tunnel.as_ref())?; self.connection = Some(Connection { dns, network }); Ok(()) } @@ -52,13 +60,18 @@ impl NetworkConfigurator { } } -/// Restore process-owned physical routes and DNS policy before service admission. +/// Recover an isolated journal and only the DNS rules recorded under its name. pub fn recover(recovery_key: &str) -> io::Result<()> { + recover_routes(recovery_key)?; + dns::remove_journal_policy(recovery_key) +} + +fn recover_routes(recovery_key: &str) -> io::Result<()> { if let Some(journal) = recovery::Journal::open(recovery_key)? { for (name, route) in journal.routes()? { ip_helper::recover_route(&route)?; journal.forget(&name)?; } } - dns::clear_stale_policies() + Ok(()) } diff --git a/crates/gpvpnc/src/windows/system_tunnel.rs b/crates/gpvpnc/src/windows/system_tunnel.rs new file mode 100644 index 0000000..d79cae5 --- /dev/null +++ b/crates/gpvpnc/src/windows/system_tunnel.rs @@ -0,0 +1,85 @@ +use super::NetworkConfigurator; +use std::{ + ffi::OsString, + fs::{File, OpenOptions}, + io, + os::windows::{ffi::OsStringExt, fs::OpenOptionsExt}, + path::PathBuf, + ptr, + sync::Arc, +}; +use windows_sys::Win32::{ + Foundation::ERROR_SHARING_VIOLATION, + UI::Shell::{CSIDL_COMMON_APPDATA, SHGetFolderPathW}, +}; + +const RECOVERY_KEY: &str = r"SOFTWARE\GP Connect\NetworkRecovery"; + +/// Exclusive ownership of the installed Windows system tunnel, including recovery. +#[derive(Clone)] +pub struct SystemTunnel { + lock: Arc, +} + +impl SystemTunnel { + pub fn try_acquire() -> io::Result> { + let path = machine_data()?.join(r"GP Connect\Private\system-tunnel.lock"); + let file = match OpenOptions::new() + .read(true) + .write(true) + .create(true) + .truncate(false) + .share_mode(0) + .open(path) + { + Ok(file) => file, + Err(error) if error.raw_os_error() == Some(ERROR_SHARING_VIOLATION as i32) => return Ok(None), + Err(error) => return Err(error), + }; + let tunnel = Self { lock: Arc::new(file) }; + super::recover_routes(RECOVERY_KEY)?; + super::dns::clear_stale_policies(&tunnel)?; + Ok(Some(tunnel)) + } + + pub fn acquire() -> io::Result { + Self::try_acquire()?.ok_or_else(|| { + io::Error::new( + io::ErrorKind::WouldBlock, + "Another GP Connect system tunnel or installer is active. Disconnect the tunnel or wait for setup to finish.", + ) + }) + } + + pub fn configurator(&self) -> io::Result { + NetworkConfigurator::with_owner(RECOVERY_KEY, Some(self.clone())) + } + + pub(super) fn duplicate_lock(&self) -> io::Result { + self.lock.try_clone() + } +} + +fn machine_data() -> io::Result { + let mut path = [0; 260]; + let result = unsafe { + SHGetFolderPathW( + ptr::null_mut(), + CSIDL_COMMON_APPDATA as i32, + ptr::null_mut(), + 0, + path.as_mut_ptr(), + ) + }; + if result < 0 { + return Err(io::Error::other(format!( + "Windows ProgramData lookup failed ({result:#x})" + ))); + } + let length = path + .iter() + .position(|&c| c == 0) + .filter(|&n| n > 0) + .ok_or_else(|| io::Error::other("Windows ProgramData path is unavailable"))?; + Ok(PathBuf::from(OsString::from_wide(&path[..length]))) +} diff --git a/crates/gpvpnc/tests/windows_network.rs b/crates/gpvpnc/tests/windows_network.rs index 57bfe65..cce59cd 100644 --- a/crates/gpvpnc/tests/windows_network.rs +++ b/crates/gpvpnc/tests/windows_network.rs @@ -235,12 +235,18 @@ fn assert_dns_policy(active: bool) { $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' $expected = [int]$env:GP_TEST_EXPECTED_DNS_POLICIES -$configured = @(Get-DnsClientNrptRule | Where-Object { $_.Namespace -contains '.gp-connect-test.invalid' }) -$effective = @(Get-DnsClientNrptPolicy | Where-Object { $_.Namespace -contains '.gp-connect-test.invalid' }) -if ($configured.Count -ne $expected -or $effective.Count -ne $expected) { throw 'Unexpected configured or effective VPN DNS policy' } -if ($expected) { - $servers = @($configured[0].NameServers) - if ($servers -notcontains '198.18.0.53' -or $servers -notcontains 'fd42:1235::53') { throw 'VPN DNS server families are missing' } +$configured = @(Get-DnsClientNrptRule) +$effective = @(Get-DnsClientNrptPolicy) +foreach ($namespace in '.gp-connect-test.invalid', '.second-gp-connect-test.invalid') { + $rules = @($configured | Where-Object { $_.Namespace -contains $namespace }) + $policies = @($effective | Where-Object { $_.Namespace -contains $namespace }) + if ($rules.Count -ne $expected -or $policies.Count -ne $expected) { + throw "Unexpected configured or effective VPN DNS policy for $namespace" + } + if ($expected) { + $servers = @($rules[0].NameServers) + if ($servers -notcontains '198.18.0.53' -or $servers -notcontains 'fd42:1235::53') { throw "VPN DNS server families are missing for $namespace" } + } } "#; let powershell = @@ -253,6 +259,22 @@ if ($expected) { assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); } +fn global_search_list() -> Vec { + let powershell = + PathBuf::from(std::env::var_os("SystemRoot").unwrap()).join("System32/WindowsPowerShell/v1.0/powershell.exe"); + let output = std::process::Command::new(powershell) + .args([ + "-NoProfile", + "-NonInteractive", + "-Command", + "$ErrorActionPreference = 'Stop'; (Get-DnsClientGlobalSetting).SuffixSearchList | ConvertTo-Json -Compress", + ]) + .output() + .unwrap(); + assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); + output.stdout +} + #[test] #[ignore = "requires administrator privileges and GP_TEST_WINTUN_DLL"] fn installs_and_restores_native_network_configuration() -> Result<(), Box> { @@ -274,10 +296,17 @@ fn installs_and_restores_native_network_configuration() -> Result<(), Box Result<(), Box Result<(), Box Vec<(String, Option)> { ("CISCO_IPV6_SPLIT_INC_0_ADDR", "2001:db8:1234::".into()), ("CISCO_IPV6_SPLIT_INC_0_MASKLEN", "64".into()), ("INTERNAL_IP4_DNS", "198.18.0.53 fd42:1235::53".into()), - ("CISCO_DEF_DOMAIN", "gp-connect-test.invalid".into()), - ("CISCO_SPLIT_DNS", "gp-connect-test.invalid".into()), + ( + "CISCO_DEF_DOMAIN", + "gp-connect-test.invalid,second-gp-connect-test.invalid".into(), + ), + ( + "CISCO_SPLIT_DNS", + "gp-connect-test.invalid,second-gp-connect-test.invalid".into(), + ), ]; pairs .into_iter() diff --git a/flake.nix b/flake.nix index cbea844..62f1017 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,8 @@ cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); pname = "globalprotect-openconnect"; version = cargoToml.workspace.package.version; - releaseTag = "v3.5.0"; - releaseVersion = "3.5.0"; + releaseTag = "v3.6.0"; + releaseVersion = "3.6.0"; toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; @@ -55,8 +55,8 @@ cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name; gpguiHashes = { - x86_64 = "sha256-nA6+URV5FafIynXFQL7YmimhVU0sYEuaYqQ4I9YZ5eY="; - aarch64 = "sha256-gPuz6UV7Xir0WKZac8ZsEw8mjN92wRdidbHu5FjS1cw="; + x86_64 = "sha256-cWFOqjDpzGSWLZgiDVeEYJMGAMrdfiB15Q6geKSVEEg="; + aarch64 = "sha256-e66fokdJk6/vr1B/6hX37Lt+7OPnXZP+D2N5ht/yM4o="; }; gpguiArchive = pkgs.fetchurl { @@ -70,8 +70,8 @@ }; binaryHashes = { - x86_64 = "sha256-l8NrsyiLfYTcALybjOPVnJMLL8Qe2q1jGrwnDu4Grg8="; - aarch64 = "sha256-+vSsvbqXhoEnxz8dxm/Qq0P5Ve/0HDLs2WnLsTszsgw="; + x86_64 = "sha256-gK8VWHw1VbXE7wHU1wGYw4fQ0khk24JWUwAQk+47WF8="; + aarch64 = "sha256-nqSuIW1fz742+2rF0QpnN8hswFm5lezC9JEOMs/8OHM="; }; binaryArchive = pkgs.fetchurl { diff --git a/packaging/deb/control.in b/packaging/deb/control.in index a2773bf..1d79d49 100644 --- a/packaging/deb/control.in +++ b/packaging/deb/control.in @@ -34,5 +34,6 @@ Depends: libsecret-1-0, gnome-keyring, xdg-utils, -Description: A GUI client for GlobalProtect VPN - A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method. +Description: Graphical client for GlobalProtect VPN + GP Connect uses OpenConnect to connect to GlobalProtect VPN servers. + It supports single sign-on (SSO). diff --git a/packaging/windows/README.md b/packaging/windows/README.md index aeffb86..c0dff33 100644 --- a/packaging/windows/README.md +++ b/packaging/windows/README.md @@ -9,7 +9,10 @@ `TARGET_ARCH` is `x64` or `arm64` and must match every executable and DLL in the payload. Each installer accepts only its native Windows architecture. ARM64 -requires Windows 11; x64 requires Windows 10 build 19041 or newer. +requires Windows 11. x64 requires Windows 10 version 1809 (build 17763) or +later, or Windows Server 2019 or later with Desktop Experience. +On Windows N, install the [Media Feature Pack for your Windows version](https://support.microsoft.com/en-us/windows/experience/platform-variants/media-feature-pack-list-for-windows-n-editions) +before running setup. The native library build accepts `scripts/build-openconnect-windows.ps1 -TunnelType 'GP Connect'` (the default). This passes OpenConnect's `--with-wintun-tunnel-type` build option; @@ -20,7 +23,8 @@ selected type. The gateway-based connection name is unchanged. match the payload's `build-info.json`. `DISPLAY_VERSION` is the full release identity, including the snapshot build when applicable. The payload must contain matching `gpgui.exe`, `gpauth.exe`, `gpservice.exe`, their DLL dependency closure, the -vendor-signed `wintun.dll`, `licenses`, and `build-info.json`. The NSIS compiler +vendor-signed `wintun.dll`, `licenses`, and `build-info.json`. The `cli` folder +contains `gpclient.exe` and its application-local DLLs. The NSIS compiler adds the generated uninstaller; it is not a separately built executable. The installer, extraction progress and uninstaller use the shared Windows icon @@ -97,3 +101,13 @@ cannot host a Windows service. The latter must fail service startup, restore A's files and uninstall metadata, and leave A's service running. Also check held runtime files, active GUI/auth windows, Wintun-signature failure, and concurrent installer attempts. Do not run failure fixtures against a live company VPN. + +The installer includes `GP Connect\cli\gpclient.exe`. From an administrator +PowerShell, connect to your portal and press Ctrl+C to disconnect. + +```powershell +& "$env:ProgramFiles\GP Connect\cli\gpclient.exe" connect vpn.example.com +``` + +Embedded SAML sign-in from an elevated terminal requires an interactive Windows +desktop under the same account with UAC enabled and the WebView2 Runtime. diff --git a/packaging/windows/machine-install.ps1 b/packaging/windows/machine-install.ps1 index 1c53508..657334d 100644 --- a/packaging/windows/machine-install.ps1 +++ b/packaging/windows/machine-install.ps1 @@ -14,10 +14,13 @@ if ($PSVersionTable.PSEdition -eq 'Desktop') { } if (![Environment]::Is64BitProcess) { throw 'Run the GP Connect installer with 64-bit PowerShell.' } $destination = Join-Path ([Environment]::GetFolderPath('ProgramFiles')) 'GP Connect' -$state = Join-Path $env:ProgramData 'GP Connect' +$programData = [Environment]::GetFolderPath('CommonApplicationData') +$state = Join-Path $programData 'GP Connect' +$private = Join-Path $state 'Private' +$tunnelLock = $null $serviceName = 'GPConnect' $serviceBinary = Join-Path $destination 'gpservice.exe' -$shortcutPath = Join-Path $env:ProgramData 'Microsoft\Windows\Start Menu\Programs\GP Connect.lnk' +$shortcutPath = Join-Path $programData 'Microsoft\Windows\Start Menu\Programs\GP Connect.lnk' $uninstallKey = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPConnect' $recoveryKey = 'HKLM:\SOFTWARE\GP Connect\NetworkRecovery' $publicAcl = 'O:BAG:BAD:P(A;OICI;FA;;;SY)(A;OICI;FA;;;BA)(A;OICI;FRFX;;;BU)' @@ -52,8 +55,13 @@ function Set-DirectoryAcl([string]$Path, [string]$Descriptor) { function Wait-ForApplications { $deadline = [DateTime]::UtcNow.AddSeconds(30) do { - $running = @(Get-CimInstance Win32_Process -Filter "Name='gpgui.exe' OR Name='gpauth.exe'" | - Where-Object { $_.ExecutablePath -in @((Join-Path $destination 'gpgui.exe'), (Join-Path $destination 'gpauth.exe')) }) + $clientPath = Join-Path $destination 'cli\gpclient.exe' + $guiPaths = @((Join-Path $destination 'gpgui.exe'), (Join-Path $destination 'gpauth.exe')) + $running = @(Get-CimInstance Win32_Process -Filter "Name='gpgui.exe' OR Name='gpauth.exe' OR Name='gpclient.exe'") + if ($running.ExecutablePath -contains $clientPath) { + throw 'Close gpclient.exe before installing or removing GP Connect.' + } + $running = @($running | Where-Object { $_.ExecutablePath -in $guiPaths }) if (!$running.Count) { return } if ([DateTime]::UtcNow -ge $deadline) { throw 'Quit GP Connect and finish or cancel sign-in in all Windows sessions, then try again.' @@ -91,7 +99,8 @@ function Wait-ForRuntimeRelease { $deadline = [DateTime]::UtcNow.AddSeconds(30) do { $locked = $false - foreach ($file in Get-ChildItem -LiteralPath $destination -File | Where-Object { $_.Extension -in @('.exe', '.dll') }) { + $directories = @($destination, (Join-Path $destination 'cli')) | Where-Object { Test-Path -LiteralPath $_ -PathType Container } + foreach ($file in Get-ChildItem -LiteralPath $directories -File | Where-Object { $_.Extension -in @('.exe', '.dll') }) { try { $stream = [IO.File]::Open($file.FullName, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::None) $stream.Dispose() @@ -103,12 +112,24 @@ function Wait-ForRuntimeRelease { } while ($true) } +function Open-TunnelLock { + Set-DirectoryAcl $private $privateAcl + $path = Join-Path $private 'system-tunnel.lock' + try { return [IO.File]::Open($path, [IO.FileMode]::OpenOrCreate, [IO.FileAccess]::ReadWrite, [IO.FileShare]::None) } + catch [IO.IOException] { + if (($_.Exception.GetBaseException().HResult -band 0xffff) -eq 32) { + throw 'A GP Connect system tunnel is active. Disconnect it before running setup.' + } + throw + } +} + function Assert-NetworkClean { $records = @() if (Test-Path $recoveryKey) { $records = @((Get-Item $recoveryKey).GetValueNames() | Where-Object { $_ -like 'Route-*' }) } $policies = @(Get-DnsClientNrptRule | Where-Object { $_.Comment -like 'GPConnect:*' }) if ($records.Count -or $policies.Count) { - throw 'VPN network cleanup is incomplete. Restart GP Connect before trying again.' + throw 'VPN network cleanup is incomplete. Start or restart the GPConnect service before trying again.' } } @@ -119,7 +140,7 @@ function Invoke-ServiceCommand([string[]]$Arguments) { function Set-MachineState { Set-DirectoryAcl $state $publicAcl - Set-DirectoryAcl (Join-Path $state 'Private') $privateAcl + Set-DirectoryAcl $private $privateAcl foreach ($name in @('gpservice.lock', 'gpservice.log')) { $path = Join-Path $state $name if (Test-Path -LiteralPath $path) { @@ -281,7 +302,7 @@ try { if ($source -eq $destination -or $source.StartsWith($destination + '\', [StringComparison]::OrdinalIgnoreCase)) { throw 'Install from an extracted package outside the application folder.' } - foreach ($name in @('gpservice.exe', 'gpauth.exe', 'gpgui.exe', 'gp-posture.exe', 'libopenconnect-5.dll', 'wintun.dll', 'build-info.json')) { + foreach ($name in @('gpservice.exe', 'gpauth.exe', 'gpgui.exe', 'gp-posture.exe', 'libopenconnect-5.dll', 'wintun.dll', 'build-info.json', 'cli\gpclient.exe', 'cli\libopenconnect-5.dll', 'cli\wintun.dll')) { if (!(Test-Path -LiteralPath (Join-Path $source $name) -PathType Leaf)) { throw "Missing Windows package file: $name" } } $info = Get-Content -LiteralPath (Join-Path $source 'build-info.json') -Raw | ConvertFrom-Json @@ -294,14 +315,30 @@ try { if ($info.product -ne 'GP Connect' -or $info.architecture -notin @('x64','arm64') -or $info.architecture -ne $architecture -or !$Version -or $info.version -ne $Version) { throw 'The package version or architecture does not match this installer.' } - if (![Environment]::Is64BitProcess -or [Environment]::OSVersion.Version.Build -lt 19041) { - throw 'GP Connect requires Windows 10 build 19041 or newer.' - } - if ($architecture -eq 'arm64' -and [Environment]::OSVersion.Version.Build -lt 22000) { + $build = [Environment]::OSVersion.Version.Build + if ($architecture -eq 'arm64' -and $build -lt 22000) { throw 'GP Connect for ARM64 requires Windows 11.' } + if ($architecture -eq 'x64' -and $build -lt 17763) { + throw 'GP Connect for x64 requires Windows 10 version 1809 or later.' + } + if ((Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' -Name InstallationType) -eq 'Server Core') { + throw 'GP Connect requires Windows Server with Desktop Experience.' + } + foreach ($library in @('mfplat.dll', 'mfreadwrite.dll')) { + if (!(Test-Path -LiteralPath (Join-Path ([Environment]::SystemDirectory) $library) -PathType Leaf)) { + throw 'GP Connect requires Media Foundation. On Windows N, install the Media Feature Pack, then run setup again.' + } + } + $cliDirectory = Join-Path $source 'cli' + Assert-RegularDirectory $cliDirectory + foreach ($item in Get-ChildItem -LiteralPath $cliDirectory -Force) { + if ($item.PSIsContainer -or ($item.Name -ne 'gpclient.exe' -and $item.Extension -ne '.dll')) { + throw "Unexpected Windows CLI runtime file: $($item.Name)" + } + } $payload = @(Get-ChildItem -LiteralPath $source -Force | Where-Object { - ($_.PSIsContainer -and $_.Name -eq 'licenses') -or + ($_.PSIsContainer -and $_.Name -in @('licenses', 'cli')) -or (!$_.PSIsContainer -and ($_.Extension -eq '.dll' -or $_.Name -in @('gpservice.exe', 'gpauth.exe', 'gpgui.exe', 'gp-posture.exe', 'uninstall.exe', 'build-info.json'))) }) @@ -356,6 +393,12 @@ try { if ($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -notmatch 'WireGuard LLC') { throw 'The package requires the vendor-signed Wintun driver DLL.' } + foreach ($dll in Get-ChildItem (Join-Path $stage 'cli') -File -Filter '*.dll') { + $shared = Join-Path $stage $dll.Name + if ((Test-Path -LiteralPath $shared) -and (Get-FileHash $shared).Hash -ne (Get-FileHash $dll.FullName).Hash) { + throw "The Windows CLI runtime file differs from the application copy: $($dll.Name)" + } + } if ((Test-Path -LiteralPath $destination) -and !$existing) { throw 'The service is not registered. Repair the existing installation before updating.' } if ($existing -and !(Test-Path -LiteralPath $destination)) { throw 'The registered installation is missing. Restore its files before updating.' } if (Test-Path $uninstallKey) { @@ -368,6 +411,9 @@ try { if ($existing) { $serviceStopped = $true Stop-InstalledService + } + $tunnelLock = Open-TunnelLock + if ($existing) { Assert-NetworkClean Wait-ForRuntimeRelease } @@ -382,6 +428,7 @@ try { } else { Set-Service -Name $serviceName -StartupType Automatic } Invoke-ServiceCommand @('failure', $serviceName, 'reset=', '86400', 'actions=', 'restart/3000/restart/10000/none/0') Set-InstallationMetadata $Version + $tunnelLock.Dispose(); $tunnelLock = $null Start-InstalledService $committed = $true if ($oldMoved) { Remove-Item -LiteralPath $backup -Recurse -Force; $oldMoved = $false } @@ -395,6 +442,7 @@ try { Wait-ForApplications $serviceStopped = $true Stop-InstalledService + $tunnelLock = Open-TunnelLock Assert-NetworkClean Wait-ForRuntimeRelease # Move first: a locked runtime aborts while its registration and files are intact. @@ -418,6 +466,7 @@ try { if ($oldMoved) { Move-Item -LiteralPath $backup -Destination $destination; $oldMoved = $false } if ($createdService) { Invoke-ServiceCommand @('delete', $serviceName) } if ($newMoved) { Restore-InstallationMetadata } + if ($tunnelLock) { $tunnelLock.Dispose(); $tunnelLock = $null } if ($existing -and $serviceStopped -and $wasRunning) { Start-InstalledService } } catch { Write-Host "Could not restore GP Connect: $($_.Exception.Message)" @@ -428,6 +477,7 @@ try { Write-Host "Details: $(Join-Path $state 'installer.log')" throw $failure } finally { + if ($tunnelLock) { $tunnelLock.Dispose() } if ($stage -and (Test-Path -LiteralPath $stage)) { try { Remove-Item -LiteralPath $stage -Recurse -Force } catch { Write-Warning "Could not remove temporary files: $stage" } } diff --git a/scripts/test-windows-installer.ps1 b/scripts/test-windows-installer.ps1 index 4ad6d6a..7d8a71d 100644 --- a/scripts/test-windows-installer.ps1 +++ b/scripts/test-windows-installer.ps1 @@ -22,7 +22,7 @@ $info = Get-Content (Join-Path $destination 'build-info.json') -Raw | ConvertFro if ($info.architecture -ne $Architecture -or [string]$info.build_version -ne $Build) { throw 'The installed package identity does not match.' } if ($env:WINDOWS_SIGNING_PUBLISHER) { $signed = @($Installer) - foreach ($name in @('gpgui.exe', 'gpauth.exe', 'gpservice.exe', 'gp-posture.exe', 'libopenconnect-5.dll', 'uninstall.exe')) { + foreach ($name in @('gpgui.exe', 'gpauth.exe', 'gpservice.exe', 'gp-posture.exe', 'libopenconnect-5.dll', 'uninstall.exe', 'cli\gpclient.exe', 'cli\libopenconnect-5.dll')) { $signed += Join-Path $destination $name } & (Join-Path $PSScriptRoot 'test-windows-signature.ps1') -Files $signed -Publisher $env:WINDOWS_SIGNING_PUBLISHER @@ -41,6 +41,18 @@ foreach ($name in @('gpgui.exe', 'gpauth.exe')) { $process = Start-Process (Join-Path $destination $name) -ArgumentList '--version' -PassThru -Wait if ($process.ExitCode -ne 0) { throw "The installed $name cannot start." } } +$cli = Join-Path $destination 'cli\gpclient.exe' +Push-Location $env:TEMP +try { + $version = & $cli --version + if ($LASTEXITCODE -ne 0 -or $version -notmatch "^gpclient $([regex]::Escape($info.version))\s") { + throw 'The installed CLI failed its version check.' + } + $help = & $cli connect --help | Out-String + if ($LASTEXITCODE -ne 0 -or $help -notmatch '--cookie-only' -or $help -match '--background') { + throw 'The installed Windows CLI failed its connect help check.' + } +} finally { Pop-Location } $helper = Join-Path $destination 'gp-posture.exe' $output = Join-Path $env:TEMP 'gp-posture-install-test.json' $process = Start-Process $helper -PassThru -Wait -RedirectStandardOutput $output @@ -52,7 +64,8 @@ $state = Join-Path $env:LOCALAPPDATA 'GP Connect\config\protected-state' New-Item -ItemType Directory -Force $state | Out-Null $marker = Join-Path $state 'ci-install-retention' [IO.File]::WriteAllText($marker, 'retain user settings') -$process = Start-Process (Join-Path $destination 'uninstall.exe') -ArgumentList '/S' -PassThru -Wait +# Start-Process otherwise uses the executable's directory, which the uninstaller must move. +$process = Start-Process (Join-Path $destination 'uninstall.exe') -WorkingDirectory (Split-Path $destination) -ArgumentList '/S' -PassThru -Wait if ($process.ExitCode -ne 0) { throw 'The uninstaller failed.' } if ((Get-Service GPConnect -ErrorAction SilentlyContinue) -or (Test-Path $destination) -or (Test-Path ($destination + '.previous'))) { throw 'The uninstaller left service registration or runtime files.' @@ -62,4 +75,4 @@ if ((Test-Path $shortcut) -or (Test-Path 'HKLM:\SOFTWARE\Microsoft\Windows\Curre } if ([IO.File]::ReadAllText($marker) -ne 'retain user settings') { throw 'The uninstaller changed user state.' } Remove-Item $marker -Write-Host "Installed $Architecture runtime and service, launched both applications, and uninstalled successfully." +Write-Host "Installed $Architecture runtime and service, launched the desktop, authenticator and CLI, and uninstalled successfully." diff --git a/scripts/tests/test_windows_update_feed.py b/scripts/tests/test_windows_update_feed.py index c05161c..ce06ca5 100644 --- a/scripts/tests/test_windows_update_feed.py +++ b/scripts/tests/test_windows_update_feed.py @@ -66,7 +66,7 @@ class WindowsFeedTests(unittest.TestCase): self.assertEqual(enclosure.get(f"{{{feed.SPARKLE}}}os"), f"windows-{payload.architecture}") self.assertEqual(enclosure.get(f"{{{feed.SPARKLE}}}installerArguments"), "/UPDATE") self.assertEqual(enclosure.get(f"{{{feed.SPARKLE}}}version"), "3.4.0") - minimum = "10.0.22000" if payload.architecture == "arm64" else "10.0.19041" + minimum = "10.0.22000" if payload.architecture == "arm64" else "10.0.17763" self.assertEqual(item.findtext(f"{{{feed.SPARKLE}}}minimumSystemVersion"), minimum) self.assertEqual(json.loads((args.output / "latest.json").read_text())["stable"]["platforms"], ["windows"]) diff --git a/scripts/windows-update-feed.py b/scripts/windows-update-feed.py index d6b1e06..ba8831f 100644 --- a/scripts/windows-update-feed.py +++ b/scripts/windows-update-feed.py @@ -96,7 +96,7 @@ def generate(args: argparse.Namespace) -> None: item = ET.SubElement(channel, "item") ET.SubElement(item, "title").text = f"GP Connect {display_version}" ET.SubElement(item, "description").text = "\n".join(release["highlights"]) - minimum = "10.0.22000" if payload.architecture == "arm64" else "10.0.19041" + minimum = "10.0.22000" if payload.architecture == "arm64" else "10.0.17763" ET.SubElement(item, f"{{{SPARKLE}}}minimumSystemVersion").text = minimum ET.SubElement(item, "enclosure", { "url": payload.installer_url, "length": str(length), "type": "application/octet-stream",