Release 3.6.0

This commit is contained in:
Kevin Yue committed 2026-11-19 23:44:43 +08:00
1 parent 92c19c55a3
commit eb3cebf8a9
58 files changed
+2162 -613

No files matched your search

+2
View File
@@ -19,3 +19,5 @@ result
# Packages & test assets # Packages & test assets
*.ipa *.ipa
__pycache__
Generated
+41 -60
View File
@@ -292,7 +292,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "auth" name = "auth"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"block2", "block2",
@@ -322,7 +322,7 @@ dependencies = [
"webview2-com", "webview2-com",
"windows", "windows",
"windows-sys 0.61.2", "windows-sys 0.61.2",
"winreg 0.55.0", "winreg",
] ]
[[package]] [[package]]
@@ -554,14 +554,14 @@ dependencies = [
[[package]] [[package]]
name = "browser-launcher" name = "browser-launcher"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
"open", "open",
"webbrowser", "webbrowser",
"which", "which",
"winreg 0.55.0", "winreg",
] ]
[[package]] [[package]]
@@ -919,7 +919,7 @@ dependencies = [
[[package]] [[package]]
name = "common" name = "common"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"tempfile", "tempfile",
] ]
@@ -1559,7 +1559,7 @@ dependencies = [
"rustc_version", "rustc_version",
"toml 1.1.8+spec-1.1.0", "toml 1.1.8+spec-1.1.0",
"vswhom", "vswhom",
"winreg 0.56.0", "winreg",
] ]
[[package]] [[package]]
@@ -1629,7 +1629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@@ -2133,7 +2133,7 @@ dependencies = [
[[package]] [[package]]
name = "gp-xml" name = "gp-xml"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"url", "url",
"xmltree", "xmltree",
@@ -2141,7 +2141,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.23.1", "base64 0.23.1",
@@ -2205,7 +2205,7 @@ dependencies = [
[[package]] [[package]]
name = "gpauth" name = "gpauth"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auth", "auth",
@@ -2223,7 +2223,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -2254,7 +2254,7 @@ dependencies = [
[[package]] [[package]]
name = "gpgui-helper" name = "gpgui-helper"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -2275,7 +2275,7 @@ dependencies = [
[[package]] [[package]]
name = "gphip" name = "gphip"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"askama", "askama",
@@ -2294,7 +2294,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -2332,7 +2332,7 @@ dependencies = [
[[package]] [[package]]
name = "gptunnel" name = "gptunnel"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"gpapi", "gpapi",
"log", "log",
@@ -2344,7 +2344,7 @@ dependencies = [
[[package]] [[package]]
name = "gpvpnc" name = "gpvpnc"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"base64 0.23.1", "base64 0.23.1",
"ipnet", "ipnet",
@@ -2354,7 +2354,7 @@ dependencies = [
"tempfile", "tempfile",
"uuid", "uuid",
"windows-sys 0.61.2", "windows-sys 0.61.2",
"winreg 0.56.0", "winreg",
] ]
[[package]] [[package]]
@@ -3860,7 +3860,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "3.5.0" version = "3.6.0"
dependencies = [ dependencies = [
"autotools", "autotools",
"cc", "cc",
@@ -4713,7 +4713,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@@ -4778,7 +4778,7 @@ dependencies = [
"security-framework", "security-framework",
"security-framework-sys", "security-framework-sys",
"webpki-root-certs", "webpki-root-certs",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@@ -5648,9 +5648,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]] [[package]]
name = "tauri" name = "tauri"
version = "2.12.5" version = "2.12.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fb0244332cfb9cee7e2a568bf5da29a36ed8fdbd717f6f47a66b6b7b358c072" checksum = "30fbfbb9dc9a2697b0e96d909ddc295fb18d2d82a58ed542ab8d9eba2edbe6da"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@@ -5699,9 +5699,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-build" name = "tauri-build"
version = "2.7.4" version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adddb0e648752aaac5da9c3c3c6a68e1e87cab55e3b757b18a9441ef8c3ac614" checksum = "73d80784e874fa117b9b00a6680cf2f9b8a51bbd14406bea980cf8f328b00646"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo_toml", "cargo_toml",
@@ -5722,9 +5722,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-codegen" name = "tauri-codegen"
version = "2.7.4" version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb37631cf71dab5e8ab55e1bdd701e18a52653d90b78e71d0e5598b1e0a61316" checksum = "c5dc6caab4da5646f57648f39b794bae118f0dd4a4305eeb8c892966171f4852"
dependencies = [ dependencies = [
"base64 0.23.1", "base64 0.23.1",
"brotli", "brotli",
@@ -5737,7 +5737,7 @@ dependencies = [
"semver", "semver",
"serde", "serde",
"serde_json", "serde_json",
"sha2 0.10.9", "sha2 0.11.1",
"syn 2.0.119", "syn 2.0.119",
"tauri-utils", "tauri-utils",
"thiserror 2.0.21", "thiserror 2.0.21",
@@ -5749,9 +5749,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-macros" name = "tauri-macros"
version = "2.7.4" version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc38db58854c10fb5f91a887ed8bf82d3239bb92b5d8db86eda09e96d9963d1" checksum = "2831c5da8603a96b1efc0b650c2cb6decc69b6cda257d815fe70c7f5be53818e"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
@@ -5763,9 +5763,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime" name = "tauri-runtime"
version = "2.12.2" version = "2.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c55766d99cea69055904d1735b93c2049302b2e09effd462120deb5581d78e9" checksum = "60c2b14bd5265b63993cdc34ad526fb836e0fd0cf64a4634a895db0784844d5e"
dependencies = [ dependencies = [
"cookie", "cookie",
"dpi", "dpi",
@@ -5788,9 +5788,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-runtime-wry" name = "tauri-runtime-wry"
version = "2.12.3" version = "2.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1aa9d8b7a120f879f44fdc1053f7b7dbf416bf0bbc6a72b714dec46b782b52f" checksum = "b8c14a025255cc9816d401635035075b09b6cc9973b7b8fd7b8fcb8753f30f92"
dependencies = [ dependencies = [
"gtk", "gtk",
"http", "http",
@@ -5813,9 +5813,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-utils" name = "tauri-utils"
version = "2.10.2" version = "2.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "362ab21cd4cc713f2a02b1a9b5688198b1541cfb6907c4281e9190e0f0ef4aa3" checksum = "28d1d33d4453c5df0bf1672dbc7ada69d8ed74f56a4316d964a4aa73d4ecd3ad"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"brotli", "brotli",
@@ -5870,7 +5870,7 @@ dependencies = [
"getrandom 0.4.3", "getrandom 0.4.3",
"once_cell", "once_cell",
"rustix", "rustix",
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@@ -6413,9 +6413,9 @@ checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.29.0" version = "1.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" checksum = "3c14b15dffa2f4bd712103e857140aa04a4f2ff6e955c77d7eb8e53ee02a3b64"
dependencies = [ dependencies = [
"getrandom 0.4.3", "getrandom 0.4.3",
"js-sys", "js-sys",
@@ -6795,7 +6795,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@@ -6961,15 +6961,6 @@ dependencies = [
"windows-targets 0.52.6", "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]] [[package]]
name = "windows-sys" name = "windows-sys"
version = "0.61.2" version = "0.61.2"
@@ -7136,16 +7127,6 @@ dependencies = [
"memchr", "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]] [[package]]
name = "winreg" name = "winreg"
version = "0.56.0" version = "0.56.0"
@@ -7361,9 +7342,9 @@ dependencies = [
[[package]] [[package]]
name = "zeroize" name = "zeroize"
version = "1.9.1" version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" checksum = "85ccff8a4805aba1eaa4cd4afcd49f7557dd2cf5fd79ffc37f8959466effc5aa"
dependencies = [ dependencies = [
"serde", "serde",
] ]
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package] [workspace.package]
rust-version = "1.91" rust-version = "1.91"
version = "3.5.0" version = "3.6.0"
authors = ["Kevin Yue <[email protected]>"] authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect" homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2024" edition = "2024"
+14
View File
@@ -270,7 +270,21 @@ fn init_logger(cli: &Cli) {
} }
pub async fn run() { pub async fn run() {
#[cfg(not(windows))]
let cli = Cli::parse(); 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"))] #[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
if let Some(CliCommand::AuthCallback { callback }) = &cli.command { if let Some(CliCommand::AuthCallback { callback }) = &cli.command {
+10 -8
View File
@@ -18,25 +18,27 @@ clap.workspace = true
env_logger.workspace = true env_logger.workspace = true
inquire = "0.9" inquire = "0.9"
log.workspace = true 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"] } nix = { version = "0.31", features = ["fs", "signal", "process", "poll", "term"] }
ratatui = { version = "=0.30.2", default-features = false, features = ["crossterm", "unstable-rendered-line-info"] } ratatui = { version = "=0.30.2", default-features = false, features = ["crossterm", "unstable-rendered-line-info"] }
crossterm = { version = "0.29", features = ["use-dev-tty"] } crossterm = { version = "0.29", features = ["use-dev-tty"] }
strip-ansi-escapes = "0.2" strip-ansi-escapes = "0.2"
tokio = { workspace = true, features = ["rt-multi-thread"] }
tokio-util.workspace = true
sysinfo.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 uzers.workspace = true
whoami.workspace = true
[features] [features]
default = ["webview-auth"] default = ["webview-auth"]
webview-auth = ["gpapi/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" } gpvpnc = { path = "../../crates/gpvpnc" }
[dev-dependencies] [dev-dependencies]
+85 -17
View File
@@ -1,8 +1,10 @@
#[cfg(unix)]
use std::{ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
str::FromStr, str::FromStr,
}; };
#[cfg(unix)]
use anyhow::bail; use anyhow::bail;
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use gpapi::{ use gpapi::{
@@ -10,17 +12,22 @@ use gpapi::{
log_format::{LogFormat, write_json_record}, log_format::{LogFormat, write_json_record},
}; };
use log::info; use log::info;
#[cfg(unix)]
use sysinfo::{Pid, System}; use sysinfo::{Pid, System};
#[cfg(unix)]
use tokio::fs; use tokio::fs;
#[cfg(unix)]
use crate::{ use crate::{
GP_CLIENT_LOCK_FILE, GP_CLIENT_LOCK_FILE,
connect::{ConnectArgs, ConnectHandler},
diagnostics::DiagnosticsArgs, diagnostics::DiagnosticsArgs,
disconnect::{DisconnectArgs, DisconnectHandler}, disconnect::{DisconnectArgs, DisconnectHandler},
hip::{HipArgs, HipHandler},
launch_gui::{LaunchGuiArgs, LaunchGuiHandler}, launch_gui::{LaunchGuiArgs, LaunchGuiHandler},
}; };
use crate::{
connect::{ConnectArgs, ConnectHandler},
hip::{HipArgs, HipHandler},
};
const VERSION: &str = concat!( const VERSION: &str = concat!(
env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_VERSION"),
@@ -33,7 +40,10 @@ const VERSION: &str = concat!(
pub(crate) struct SharedArgs<'a> { pub(crate) struct SharedArgs<'a> {
pub(crate) ignore_tls_errors: bool, pub(crate) ignore_tls_errors: bool,
#[cfg(unix)]
pub(crate) lock_file: &'a Path, pub(crate) lock_file: &'a Path,
#[cfg(windows)]
pub(crate) system_tunnel: std::cell::RefCell<Option<gpvpnc::windows::SystemTunnel>>,
pub(crate) verbose: &'a InfoLevelVerbosity, pub(crate) verbose: &'a InfoLevelVerbosity,
pub(crate) log_format: LogFormat, pub(crate) log_format: LogFormat,
} }
@@ -42,12 +52,15 @@ pub(crate) struct SharedArgs<'a> {
enum CliCommand { enum CliCommand {
#[command(about = "Connect to a portal server")] #[command(about = "Connect to a portal server")]
Connect(Box<ConnectArgs>), Connect(Box<ConnectArgs>),
#[cfg(unix)]
#[command(about = "Disconnect from the server")] #[command(about = "Disconnect from the server")]
Disconnect(DisconnectArgs), Disconnect(DisconnectArgs),
#[cfg(unix)]
#[command(about = "Launch the GUI")] #[command(about = "Launch the GUI")]
LaunchGui(LaunchGuiArgs), LaunchGui(LaunchGuiArgs),
#[command(about = "Generate HIP report")] #[command(about = "Generate HIP report")]
Hip(HipArgs), Hip(HipArgs),
#[cfg(unix)]
#[command(about = "Collect system diagnostics for a bug report without connecting to a VPN")] #[command(about = "Collect system diagnostics for a bug report without connecting to a VPN")]
Diagnostics(DiagnosticsArgs), Diagnostics(DiagnosticsArgs),
#[command(hide = true)] #[command(hide = true)]
@@ -89,11 +102,12 @@ struct Cli {
#[command(subcommand)] #[command(subcommand)]
command: CliCommand, command: CliCommand,
#[cfg(not(target_os = "macos"))] #[cfg(all(unix, not(target_os = "macos")))]
#[arg(long, hide = true)] #[arg(long, hide = true)]
fix_openssl: bool, fix_openssl: bool,
#[arg(long, help = "Ignore the TLS errors")] #[arg(long, help = "Ignore the TLS errors")]
ignore_tls_errors: bool, ignore_tls_errors: bool,
#[cfg(unix)]
#[arg( #[arg(
long, long,
global = true, global = true,
@@ -102,6 +116,7 @@ struct Cli {
)] )]
lock_file: PathBuf, lock_file: PathBuf,
#[cfg(unix)]
#[arg(long, hide = true, global = true)] #[arg(long, hide = true, global = true)]
background_worker_fd: Option<i32>, background_worker_fd: Option<i32>,
@@ -128,6 +143,7 @@ impl Args for Cli {
} }
impl Cli { impl Cli {
#[cfg(unix)]
fn can_run_alongside_client(&self) -> bool { fn can_run_alongside_client(&self) -> bool {
match &self.command { match &self.command {
CliCommand::Connect(_) => false, CliCommand::Connect(_) => false,
@@ -136,6 +152,7 @@ impl Cli {
} }
} }
#[cfg(unix)]
async fn is_running(&self) -> bool { async fn is_running(&self) -> bool {
let Ok(c) = fs::read_to_string(&self.lock_file).await else { let Ok(c) = fs::read_to_string(&self.lock_file).await else {
return false; return false;
@@ -156,13 +173,15 @@ impl Cli {
} }
async fn run(&self) -> anyhow::Result<()> { async fn run(&self) -> anyhow::Result<()> {
#[cfg(not(target_os = "macos"))] #[cfg(all(unix, not(target_os = "macos")))]
if self.fix_openssl if self.fix_openssl
&& !(matches!(&self.command, CliCommand::Connect(args) if args.background) && self.background_worker_fd.is_none()) && !(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."); log::warn!("--fix-openssl is deprecated and has no effect. It will be removed in a future release.");
} }
#[cfg(unix)]
let background_worker = {
if let CliCommand::Connect(args) = &self.command { if let CliCommand::Connect(args) = &self.command {
if args.dashboard { if args.dashboard {
crate::dashboard::validate(self.log_format)?; crate::dashboard::validate(self.log_format)?;
@@ -180,7 +199,7 @@ impl Cli {
bail!("Another instance of the client is already running"); bail!("Another instance of the client is already running");
} }
let background_worker = if let CliCommand::Connect(args) = &self.command { if let CliCommand::Connect(args) = &self.command {
if args.background { if args.background {
let log_file = args let log_file = args
.log_file .log_file
@@ -195,11 +214,26 @@ impl Cli {
} }
} else { } else {
None 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 { let shared_args = SharedArgs {
ignore_tls_errors: self.ignore_tls_errors, ignore_tls_errors: self.ignore_tls_errors,
#[cfg(unix)]
lock_file: &self.lock_file, lock_file: &self.lock_file,
#[cfg(windows)]
system_tunnel: system_tunnel.into(),
verbose: &self.verbose, verbose: &self.verbose,
log_format: self.log_format, log_format: self.log_format,
}; };
@@ -210,14 +244,17 @@ impl Cli {
match &self.command { match &self.command {
CliCommand::Connect(args) => { CliCommand::Connect(args) => {
ConnectHandler::new(args, &shared_args) let handler = ConnectHandler::new(args, &shared_args);
.with_background(background_worker) #[cfg(unix)]
.handle() let handler = handler.with_background(background_worker);
.await handler.handle().await
} }
#[cfg(unix)]
CliCommand::Disconnect(args) => DisconnectHandler::new(args, shared_args.lock_file).handle().await, CliCommand::Disconnect(args) => DisconnectHandler::new(args, shared_args.lock_file).handle().await,
#[cfg(unix)]
CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await, CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await,
CliCommand::Hip(args) => HipHandler::new(args).handle().await, CliCommand::Hip(args) => HipHandler::new(args).handle().await,
#[cfg(unix)]
CliCommand::Diagnostics(_) => unreachable!("diagnostics is dispatched before VPN setup"), CliCommand::Diagnostics(_) => unreachable!("diagnostics is dispatched before VPN setup"),
CliCommand::DetectInternalHost { address, hostname } => { CliCommand::DetectInternalHost { address, hostname } => {
let internal = gpapi::session::desktop::network::native::detect_in_helper(*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 builder
} }
pub(crate) async fn run() { fn initialize_logger(cli: &Cli) {
let cli = Cli::parse(); #[cfg(unix)]
if matches!(&cli.command, CliCommand::Connect(args) if args.dashboard) { 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_max_level(logger.filter());
log::set_boxed_logger(Box::new(crate::dashboard::NoticeLogger::new(logger))).expect("failed to initialize logger"); log::set_boxed_logger(Box::new(crate::dashboard::NoticeLogger::new(logger))).expect("failed to initialize logger");
} else { return;
build_logger(&cli).init(); }
build_logger(cli).init();
} }
pub(crate) async fn run() {
let cli = Cli::parse();
initialize_logger(&cli);
info!("gpclient started: {}", VERSION); info!("gpclient started: {}", VERSION);
if let Err(err) = cli.run().await { if let Err(err) = cli.run().await {
@@ -269,7 +309,7 @@ pub(crate) async fn run() {
} }
} }
#[cfg(test)] #[cfg(all(test, unix))]
mod tests { mod tests {
use std::{ use std::{
io::Write, io::Write,
@@ -360,7 +400,7 @@ mod tests {
fn diagnostics_accepts_output_options_and_runs_alongside_the_client() { fn diagnostics_accepts_output_options_and_runs_alongside_the_client() {
let cli = Cli::try_parse_from([ let cli = Cli::try_parse_from([
"gpclient", "gpclient",
#[cfg(not(target_os = "macos"))] #[cfg(all(unix, not(target_os = "macos")))]
"--fix-openssl", "--fix-openssl",
"diagnostics", "diagnostics",
"--json", "--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());
}
}
+18 -3
View File
@@ -13,6 +13,7 @@ pub(crate) struct ConnectArgs {
#[arg(help = "The portal server to connect to")] #[arg(help = "The portal server to connect to")]
pub(super) server: String, pub(super) server: String,
#[cfg(unix)]
#[arg( #[arg(
long, long,
conflicts_with = "cookie_only", conflicts_with = "cookie_only",
@@ -20,6 +21,7 @@ pub(crate) struct ConnectArgs {
)] )]
pub(crate) background: bool, pub(crate) background: bool,
#[cfg(unix)]
#[arg( #[arg(
long, long,
conflicts_with_all = ["background", "cookie_only"], conflicts_with_all = ["background", "cookie_only"],
@@ -27,6 +29,7 @@ pub(crate) struct ConnectArgs {
)] )]
pub(crate) dashboard: bool, pub(crate) dashboard: bool,
#[cfg(unix)]
#[arg( #[arg(
long, long,
requires = "background", requires = "background",
@@ -61,18 +64,21 @@ pub(crate) struct ConnectArgs {
)] )]
pub(super) cookie_cache: Option<String>, pub(super) cookie_cache: Option<String>,
#[cfg(unix)]
#[arg(long, short, help = "The VPNC script to use", required_if_eq("script_tun", "true"))] #[arg(long, short, help = "The VPNC script to use", required_if_eq("script_tun", "true"))]
pub(super) script: Option<String>, pub(super) script: Option<String>,
#[arg(long, short, help = "The IFNAME for tunnel interface")] #[arg(long, short, help = "The IFNAME for tunnel interface")]
pub(super) interface: Option<String>, pub(super) interface: Option<String>,
#[cfg(unix)]
#[arg(long, short = 'S', help = "Pass traffic to '--script' program, not tun")] #[arg(long, short = 'S', help = "Pass traffic to '--script' program, not tun")]
pub(super) script_tun: bool, pub(super) script_tun: bool,
#[arg(long, help = "Connect the server as a gateway, instead of a portal")] #[arg(long, help = "Connect the server as a gateway, instead of a portal")]
pub(super) as_gateway: bool, pub(super) as_gateway: bool,
#[cfg(unix)]
#[arg( #[arg(
long, long,
help = "Enable HIP (Host Information Profile), optionally specify a custom executable", help = "Enable HIP (Host Information Profile), optionally specify a custom executable",
@@ -81,6 +87,11 @@ pub(crate) struct ConnectArgs {
)] )]
pub(super) hip: Option<String>, pub(super) hip: Option<String>,
#[cfg(windows)]
#[arg(long, help = "Generate a HIP (Host Information Profile) report")]
pub(super) hip: bool,
#[cfg(unix)]
#[arg( #[arg(
long, long,
help = "Run a custom HIP executable as this user; otherwise inherit the process user" 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")] #[arg(short = 'p', long, help = "The key passphrase of the private key")]
pub(super) key_password: Option<String>, pub(super) key_password: Option<String>,
#[cfg(unix)]
#[arg(long, hide = true)] #[arg(long, hide = true)]
pub(super) csd_user: Option<String>, pub(super) csd_user: Option<String>,
#[cfg(unix)]
#[arg(long, hide = true)] #[arg(long, hide = true)]
pub(super) csd_wrapper: Option<String>, pub(super) csd_wrapper: Option<String>,
@@ -188,7 +201,7 @@ pub(crate) struct ConnectArgs {
VPN tunnel. Outputs two lines: COOKIE='<value>' and HOST='<gateway>'. Combine with \ VPN tunnel. Outputs two lines: COOKIE='<value>' and HOST='<gateway>'. Combine with \
--cookie-cache to avoid re-authenticating when the portal session is still valid." --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 { 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<PathBuf> { pub(super) fn cookie_cache_path(args: &ConnectArgs) -> Option<PathBuf> {
args.cookie_cache.as_deref().map(|path| { args.cookie_cache.as_deref().and_then(|path| {
let custom = (!path.is_empty()).then_some(path); let custom = (!path.is_empty()).then_some(path);
cookie_store::cookie_path(custom) cookie_store::cookie_path(custom)
}) })
} }
pub(super) fn warn_deprecated_connect_args(args: &ConnectArgs) { pub(super) fn warn_deprecated_connect_args(args: &ConnectArgs) {
#[cfg(unix)]
if args.csd_user.is_some() { if args.csd_user.is_some() {
warn!("Deprecated option --csd-user will be removed; use --hip-user instead"); warn!("Deprecated option --csd-user will be removed; use --hip-user instead");
} }
#[cfg(unix)]
if args.csd_wrapper.is_some() { if args.csd_wrapper.is_some() {
warn!("Deprecated option --csd-wrapper will be removed; use --hip instead"); 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 { mod tests {
use super::*; use super::*;
+2
View File
@@ -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?; let cred = auth_launcher.cancellation(&self.cancellation).launch().await?;
self.check_cancelled()?; self.check_cancelled()?;
Ok(cred) Ok(cred)
+67 -68
View File
@@ -1,12 +1,12 @@
use std::{ use std::sync::{
fs,
path::Path,
sync::{
Arc, Mutex, Arc, Mutex,
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
},
}; };
#[cfg(unix)]
use std::{fs, path::Path};
#[cfg(unix)]
use gpapi::process::users::get_user_by_name;
use gpapi::{ use gpapi::{
clap::report, clap::report,
cookie_store, cookie_store,
@@ -15,19 +15,22 @@ use gpapi::{
gp_params::GpParams, gp_params::GpParams,
os_profile::OsProfile, os_profile::OsProfile,
portal::{PortalConfig, prelogin}, portal::{PortalConfig, prelogin},
process::users::get_user_by_name,
session::{GatewayAuthentication, SessionMode}, session::{GatewayAuthentication, SessionMode},
}; };
use inquire::Text; use inquire::Text;
use log::{Level, info, warn}; 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 tokio::{runtime::Handle, task::JoinHandle};
use crate::session::{ use crate::session::{
SessionContextInput, build_session_context, session_info_from_vpn, spawn_session_runtime_with_info, 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; const OPENCONNECT_INTERRUPTED_EXIT_CODE: i32 = -4;
@@ -452,7 +455,10 @@ impl ConnectHandler<'_> {
disable_ipv6: self.args.disable_ipv6, disable_ipv6: self.args.disable_ipv6,
extension_auth: Some(extension_auth), 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()) .interface(self.args.interface.clone())
.certificate(certificate) .certificate(certificate)
.sslkey(sslkey) .sslkey(sslkey)
@@ -487,21 +493,8 @@ impl ConnectHandler<'_> {
let disconnect_requested_on_signal = Arc::clone(&disconnect_requested); let disconnect_requested_on_signal = Arc::clone(&disconnect_requested);
let cancellation = self.cancellation.clone(); let cancellation = self.cancellation.clone();
let mut background_stdio = self #[cfg(unix)]
.background let mut output = TunnelOutput::prepare(self, gateway).map_err(GatewayConnectError::before_establishment)?;
.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
};
let monitor = gptunnel::TunnelMonitor::attach(vpn.clone()); let monitor = gptunnel::TunnelMonitor::attach(vpn.clone());
let disconnect_task = tokio::spawn(async move { let disconnect_task = tokio::spawn(async move {
@@ -511,7 +504,9 @@ impl ConnectHandler<'_> {
vpn_clone.disconnect(); vpn_clone.disconnect();
}); });
#[cfg(unix)]
let lock_file_on_connect = self.shared_args.lock_file.to_path_buf(); let lock_file_on_connect = self.shared_args.lock_file.to_path_buf();
#[cfg(unix)]
let pid_written = self.pid_written.clone(); let pid_written = self.pid_written.clone();
let log_format = self.shared_args.log_format; let log_format = self.shared_args.log_format;
let session_cancellation = self.cancellation.clone(); let session_cancellation = self.cancellation.clone();
@@ -523,6 +518,7 @@ impl ConnectHandler<'_> {
return; return;
} }
tunnel_established_on_connect.store(true, Ordering::SeqCst); tunnel_established_on_connect.store(true, Ordering::SeqCst);
#[cfg(unix)]
pid_written.store(write_pid_file(&lock_file_on_connect), Ordering::SeqCst); pid_written.store(write_pid_file(&lock_file_on_connect), Ordering::SeqCst);
let _ = established_tx.send(()); let _ = established_tx.send(());
@@ -536,7 +532,6 @@ impl ConnectHandler<'_> {
session_task_on_connect.lock().unwrap().replace(task); session_task_on_connect.lock().unwrap().replace(task);
}) })
}); });
let mut output_error = None;
let connect_result = tokio::select! { let connect_result = tokio::select! {
result = &mut worker => result, result = &mut worker => result,
established = established_rx => { established = established_rx => {
@@ -550,23 +545,8 @@ impl ConnectHandler<'_> {
self.logout_gateway(&server).await; self.logout_gateway(&server).await;
} }
}, || { }, || {
if let Some(dashboard) = &mut dashboard { #[cfg(unix)]
if let Err(error) = dashboard.start_tunnel(monitor.clone()) { output.ready(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);
}
}
}).await }).await
} else { } else {
(&mut worker).await (&mut worker).await
@@ -574,11 +554,8 @@ impl ConnectHandler<'_> {
} }
}; };
monitor.stop().await; monitor.stop().await;
if let Some(dashboard) = &mut dashboard { #[cfg(unix)]
if let Err(error) = dashboard.finish() { let output_result = output.finish();
output_error = Some(error);
}
}
let tunnel_established = tunnel_established.load(Ordering::SeqCst); let tunnel_established = tunnel_established.load(Ordering::SeqCst);
disconnect_task.abort(); disconnect_task.abort();
let _ = disconnect_task.await; let _ = disconnect_task.await;
@@ -589,15 +566,15 @@ impl ConnectHandler<'_> {
let _ = task.await; let _ = task.await;
} }
if let Some(error) = output_error { #[cfg(unix)]
return Err(GatewayConnectError::after_establishment(error)); output_result.map_err(GatewayConnectError::after_establishment)?;
}
let disconnect_requested = disconnect_requested.load(Ordering::SeqCst); let disconnect_requested = disconnect_requested.load(Ordering::SeqCst);
let connect_result = connect_result.map_err(|error| GatewayConnectError::after_establishment(error.into()))?; let connect_result = connect_result.map_err(|error| GatewayConnectError::after_establishment(error.into()))?;
classify_openconnect_result(connect_result, tunnel_established, disconnect_requested) classify_openconnect_result(connect_result, tunnel_established, disconnect_requested)
} }
#[cfg(unix)]
pub(super) fn hip_source(&self, profile: OsProfile) -> anyhow::Result<HipSource> { pub(super) fn hip_source(&self, profile: OsProfile) -> anyhow::Result<HipSource> {
let user = self.determine_hip_user(); let user = self.determine_hip_user();
let script = self.args.hip.as_ref().or(self.args.csd_wrapper.as_ref()); let script = self.args.hip.as_ref().or(self.args.csd_wrapper.as_ref());
@@ -605,7 +582,36 @@ impl ConnectHandler<'_> {
Some(path) if !path.is_empty() => Ok(HipSource::Script(HipScript::new(path.clone(), get_uid(&user)?)?)), Some(path) if !path.is_empty() => Ok(HipSource::Script(HipScript::new(path.clone(), get_uid(&user)?)?)),
Some(_) => { Some(_) => {
anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script"); anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script");
Ok(HipSource::Generator(Arc::new(move |request, control| { Ok(generated_hip(profile))
}
None => {
anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script");
Ok(HipSource::Disabled)
}
}
}
#[cfg(windows)]
pub(super) fn hip_source(&self, profile: OsProfile) -> anyhow::Result<HipSource> {
Ok(if self.args.hip {
generated_hip(profile)
} else {
HipSource::Disabled
})
}
#[cfg(unix)]
fn determine_hip_user(&self) -> Option<String> {
if let Some(hip_user) = &self.args.hip_user {
return Some(hip_user.clone());
}
self.args.csd_user.clone()
}
}
fn generated_hip(profile: OsProfile) -> HipSource {
HipSource::Generator(Arc::new(move |request, control| {
let input = gphip::ReportInput { let input = gphip::ReportInput {
profile: profile.clone(), profile: profile.clone(),
context: gphip::ReportContext::Connected { context: gphip::ReportContext::Connected {
@@ -617,22 +623,7 @@ impl ConnectHandler<'_> {
}; };
gphip::generate_report_with_control(&input, &|| control.check()) gphip::generate_report_with_control(&input, &|| control.check())
.map_err(|error| error.downcast::<std::io::Error>().unwrap_or_else(std::io::Error::other)) .map_err(|error| error.downcast::<std::io::Error>().unwrap_or_else(std::io::Error::other))
}))) }))
}
None => {
anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script");
Ok(HipSource::Disabled)
}
}
}
fn determine_hip_user(&self) -> Option<String> {
if let Some(hip_user) = &self.args.hip_user {
return Some(hip_user.clone());
}
self.args.csd_user.clone()
}
} }
async fn wait_for_tunnel_exit( async fn wait_for_tunnel_exit(
@@ -678,10 +669,17 @@ fn classify_openconnect_result(
} }
} }
#[cfg(unix)]
fn direct_gateway_command(gateway: &str) -> String { fn direct_gateway_command(gateway: &str) -> String {
format!("gpauth --gateway {gateway} | sudo gpclient connect {gateway} --as-gateway --cookie-on-stdin") 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 { pub(super) fn write_pid_file(lock_file: &Path) -> bool {
let pid = std::process::id(); 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<String>) -> anyhow::Result<Option<u32>> { fn get_uid(user: &Option<String>) -> anyhow::Result<Option<u32>> {
user user
.as_ref() .as_ref()
@@ -710,7 +709,7 @@ fn apply_os_profile(builder: VpnBuilder, profile: &OsProfile) -> VpnBuilder {
.user_agent(Some(profile.user_agent().to_string())) .user_agent(Some(profile.user_agent().to_string()))
} }
#[cfg(test)] #[cfg(all(test, unix))]
mod tests { mod tests {
use super::*; use super::*;
+49 -52
View File
@@ -14,7 +14,7 @@ use gpapi::{
}; };
use log::{info, warn}; use log::{info, warn};
use super::ConnectHandler; use super::{ConnectHandler, internal_output::InternalOutput};
impl ConnectHandler<'_> { impl ConnectHandler<'_> {
pub(super) async fn connect_internal_gateways( pub(super) async fn connect_internal_gateways(
@@ -26,6 +26,7 @@ impl ConnectHandler<'_> {
first_session: super::gateway::GatewayLoginSession, first_session: super::gateway::GatewayLoginSession,
remaining: &[&Gateway], remaining: &[&Gateway],
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
#[cfg(unix)]
ensure!( ensure!(
self.background.is_none(), self.background.is_none(),
"--background requires a VPN tunnel; internal non-tunnel sessions must run in the foreground" "--background requires a VPN tunnel; internal non-tunnel sessions must run in the foreground"
@@ -70,11 +71,18 @@ impl ConnectHandler<'_> {
} }
self.check_cancelled()?; self.check_cancelled()?;
let modes = authenticated.iter().map(|(_, session)| session.authentication.mode()); 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<Item = SessionMode>) -> anyhow::Result<()> {
ensure!( ensure!(
internal_session_mode(modes)? == SessionMode::NonTunnel, internal_session_mode(modes)? == SessionMode::NonTunnel,
"Expected non-tunnel authentication" "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( async fn run_internal_session(
@@ -112,18 +120,7 @@ impl ConnectHandler<'_> {
let source = Arc::new(source); let source = Arc::new(source);
let validate_network = network.clone(); let validate_network = network.clone();
let validate_detection = detection.clone(); let validate_detection = detection.clone();
let members = crate::dashboard::InternalMembers::default(); let (output, observe_status) = InternalOutput::prepare(self, authenticated[0].0.server())?;
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 callbacks = SessionCallbacks { let callbacks = SessionCallbacks {
produce_report: Arc::new(move |request, control| { produce_report: Arc::new(move |request, control| {
control.check()?; control.check()?;
@@ -165,16 +162,10 @@ impl ConnectHandler<'_> {
"Internal network — authenticated: {} (IPv4: {:?}, IPv6: {:?})", "Internal network — authenticated: {} (IPv4: {:?}, IPv6: {:?})",
member.gateway, member.client_ip, member.client_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), state => info!("Internal gateway {}: {state:?}", member.gateway),
} }
members.lock().unwrap().insert( observe_status(&member);
member.gateway.server().to_owned(),
format!("{}: {:?}", member.gateway, member.maintenance),
);
}), }),
validate_network: Arc::new(move |cancellation| { validate_network: Arc::new(move |cancellation| {
let network = validate_network.clone(); let network = validate_network.clone();
@@ -204,43 +195,20 @@ impl ConnectHandler<'_> {
// The PID spans maintenance and cleanup, including initialization before the // The PID spans maintenance and cleanup, including initialization before the
// first successful HIP exchange. The outer handler owns final session logout. // first successful HIP exchange. The outer handler owns final session logout.
#[cfg(unix)]
self.pid_written.store( self.pid_written.store(
super::gateway::write_pid_file(self.shared_args.lock_file), super::gateway::write_pid_file(self.shared_args.lock_file),
std::sync::atomic::Ordering::SeqCst, std::sync::atomic::Ordering::SeqCst,
); );
let mut sessions = self.sessions.take(); 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 { let maintenance = maintain_non_tunnel_sessions(&mut sessions, policy, callbacks, cancellation, async move {
network_signal.await.unwrap_or(SessionEndReason::NetworkChanged) network_signal.await.unwrap_or(SessionEndReason::NetworkChanged)
}); });
tokio::pin!(maintenance); let (result, output_result) = output.run(maintenance).await;
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);
}
}
self.sessions.replace(sessions); self.sessions.replace(sessions);
monitor_cancel.cancel(); monitor_cancel.cancel();
monitor.await.context("Internal network monitor failed")?; monitor.await.context("Internal network monitor failed")?;
if let Some(error) = dashboard_error { output_result?;
return Err(error);
}
match result? { match result? {
SessionExit::Disconnected => Ok(()), SessionExit::Disconnected => Ok(()),
SessionExit::Failed(reason) => bail!("Internal session ended: {reason:?}. Connect again to authenticate."), 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<Item = SessionMode>) -> anyhow::Result<SessionMode> { fn internal_session_mode(mut modes: impl Iterator<Item = SessionMode>) -> anyhow::Result<SessionMode> {
let mut modes = modes;
let mode = modes.next().context("No internal gateway authenticated successfully")?; let mode = modes.next().context("No internal gateway authenticated successfully")?;
ensure!( ensure!(
modes.all(|candidate| candidate == mode), modes.all(|candidate| candidate == mode),
@@ -276,9 +243,39 @@ mod tests {
internal_session_mode([SessionMode::NonTunnel, SessionMode::NonTunnel].into_iter()).unwrap(), internal_session_mode([SessionMode::NonTunnel, SessionMode::NonTunnel].into_iter()).unwrap(),
SessionMode::NonTunnel 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());
} }
} }
@@ -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<DashboardState>);
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<T>(self, maintenance: impl Future<Output = T>) -> (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))
}
}
@@ -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<T>(self, maintenance: impl Future<Output = T>) -> (T, anyhow::Result<()>) {
(maintenance.await, Ok(()))
}
}
+16 -1
View File
@@ -1,12 +1,21 @@
mod args; mod args;
mod credential; mod credential;
#[cfg(test)] #[cfg(all(test, unix))]
mod flow_tests; mod flow_tests;
mod gateway; mod gateway;
mod internal; 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; mod vpn_script;
use std::cell::RefCell; use std::cell::RefCell;
#[cfg(unix)]
use std::sync::{ use std::sync::{
Arc, Arc,
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
@@ -46,7 +55,9 @@ pub(crate) struct ConnectHandler<'a> {
auth_attempt_fixture: RefCell<credential::AuthAttemptFixture>, auth_attempt_fixture: RefCell<credential::AuthAttemptFixture>,
auth_recovery: RefCell<gpapi::process::rendering_recovery::RecoveryState>, auth_recovery: RefCell<gpapi::process::rendering_recovery::RecoveryState>,
sessions: RefCell<GatewaySessions>, sessions: RefCell<GatewaySessions>,
#[cfg(unix)]
pid_written: Arc<AtomicBool>, pid_written: Arc<AtomicBool>,
#[cfg(unix)]
background: Option<crate::background::BackgroundWorker>, background: Option<crate::background::BackgroundWorker>,
} }
@@ -72,11 +83,14 @@ impl<'a> ConnectHandler<'a> {
auth_attempt_fixture: Default::default(), auth_attempt_fixture: Default::default(),
auth_recovery: RefCell::default(), auth_recovery: RefCell::default(),
sessions: RefCell::default(), sessions: RefCell::default(),
#[cfg(unix)]
pid_written: Arc::default(), pid_written: Arc::default(),
#[cfg(unix)]
background: None, background: None,
} }
} }
#[cfg(unix)]
pub(crate) fn with_background(mut self, background: Option<crate::background::BackgroundWorker>) -> Self { pub(crate) fn with_background(mut self, background: Option<crate::background::BackgroundWorker>) -> Self {
self.background = background; self.background = background;
self self
@@ -134,6 +148,7 @@ impl<'a> ConnectHandler<'a> {
} else { } else {
sessions.logout().await; sessions.logout().await;
} }
#[cfg(unix)]
if self.pid_written.load(Ordering::SeqCst) { if self.pid_written.load(Ordering::SeqCst) {
if let Err(error) = std::fs::remove_file(self.shared_args.lock_file) { if let Err(error) = std::fs::remove_file(self.shared_args.lock_file) {
warn!("Failed to remove PID file: {error}"); warn!("Failed to remove PID file: {error}");
@@ -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<Dashboard>,
pid_written: &'a AtomicBool,
cancellation: &'a CancellationToken,
error: Option<anyhow::Error>,
}
impl<'a> TunnelOutput<'a> {
pub(super) fn prepare(handler: &'a ConnectHandler<'_>, gateway: &str) -> anyhow::Result<Self> {
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<TunnelMonitor>) {
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(()),
}
}
}
@@ -1,9 +1,13 @@
use openconnect::{Vpn, VpnBuilder}; use openconnect::{Vpn, VpnBuilder};
use crate::connect::ConnectArgs; use crate::connect::ConnectHandler;
pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> VpnBuilder { impl ConnectHandler<'_> {
pub(in crate::connect) fn vpn_builder(&self, server: &str, cookie: &str) -> anyhow::Result<VpnBuilder> {
Ok(
Vpn::builder(server, cookie) Vpn::builder(server, cookie)
.script(args.script.clone()) .script(self.args.script.clone())
.script_tun(args.script_tun) .script_tun(self.args.script_tun),
)
}
} }
+10 -3
View File
@@ -2,11 +2,18 @@ use std::ffi::OsStr;
use openconnect::{Vpn, VpnBuilder}; use openconnect::{Vpn, VpnBuilder};
use crate::connect::ConnectArgs; use crate::connect::{ConnectArgs, ConnectHandler};
pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> VpnBuilder { impl ConnectHandler<'_> {
pub(in crate::connect) fn vpn_builder(&self, server: &str, cookie: &str) -> anyhow::Result<VpnBuilder> {
let configured_script = std::env::var_os("GP_VPNC_SCRIPT"); let configured_script = std::env::var_os("GP_VPNC_SCRIPT");
configure_builder(server, cookie, args, configured_script.as_deref()) 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 { fn configure_builder(server: &str, cookie: &str, args: &ConnectArgs, configured_script: Option<&OsStr>) -> VpnBuilder {
+4 -2
View File
@@ -1,8 +1,10 @@
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
#[path = "macos.rs"] #[path = "macos.rs"]
mod platform; mod platform;
#[cfg(not(target_os = "macos"))] #[cfg(all(unix, not(target_os = "macos")))]
#[path = "default.rs"] #[path = "default.rs"]
mod platform; mod platform;
pub(super) use platform::builder; #[cfg(windows)]
#[path = "windows.rs"]
mod platform;
@@ -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<VpnBuilder> {
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)
}),
)
}
}
+6
View File
@@ -1,13 +1,19 @@
#[cfg(unix)]
mod background; mod background;
mod cli; mod cli;
mod connect; mod connect;
#[cfg(unix)]
mod dashboard; mod dashboard;
#[cfg(unix)]
mod diagnostics; mod diagnostics;
#[cfg(unix)]
mod disconnect; mod disconnect;
mod hip; mod hip;
#[cfg(unix)]
mod launch_gui; mod launch_gui;
mod session; mod session;
#[cfg(unix)]
pub(crate) const GP_CLIENT_LOCK_FILE: &str = "/var/run/gpclient.lock"; pub(crate) const GP_CLIENT_LOCK_FILE: &str = "/var/run/gpclient.lock";
#[tokio::main] #[tokio::main]
+54 -4
View File
@@ -75,8 +75,7 @@ async fn run_session_runtime(session_ctx: SessionContext, mut session_info: Sess
tokio::time::sleep(schedule.delay).await; tokio::time::sleep(schedule.delay).await;
crate::dashboard::session_notice(Level::Warn, &schedule.message); report_session_notice(log_format, Level::Warn, &schedule.message);
report(log_format, Level::Warn, &format!("\nWARNING: {}", schedule.message));
if !schedule.should_auto_extend { if !schedule.should_auto_extend {
info!("Session extension is not allowed by the gateway"); 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; return;
}; };
crate::dashboard::session_notice(Level::Info, "Session extended."); report_session_notice(log_format, Level::Info, "Session extended.");
report(log_format, Level::Info, "Session extended.");
session_info = next_session_info; session_info = next_session_info;
} }
Err(err) => { 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<SessionWarningSchedule> { fn build_session_warning_schedule(session_info: &SessionInfo) -> Option<SessionWarningSchedule> {
let warning = session_info.lifetime_warning.as_ref()?; let warning = session_info.lifetime_warning.as_ref()?;
let warning_secs = if let Some(user_expires) = session_info.user_expires { 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] #[test]
fn builds_warning_schedule_for_auto_extend() { fn builds_warning_schedule_for_auto_extend() {
let session_info = sample_session_info(Some(unix_timestamp() + 1830), true); let session_info = sample_session_info(Some(unix_timestamp() + 1830), true);
+1 -1
View File
@@ -1,4 +1,4 @@
#![cfg(not(target_os = "macos"))] #![cfg(all(unix, not(target_os = "macos")))]
use std::process::Command; use std::process::Command;
+2
View File
@@ -1,3 +1,5 @@
#![cfg(unix)]
use std::{os::unix::fs::PermissionsExt, process::Stdio, time::Duration}; use std::{os::unix::fs::PermissionsExt, process::Stdio, time::Duration};
use tokio::process::Command; use tokio::process::Command;
@@ -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(`<anonymous>`)&&(u=u.replace(`<anonymous>`,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` `+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(`<anonymous>`)&&(u=u.replace(`<anonymous>`,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+` 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;0<n;){var r=31-lt(n),i=1<<r;t|=e[r],n&=~i}return t}function bt(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function xt(){var e=ht;return ht<<=1,!(ht&62914560)&&(ht=4194304),e}function St(e){for(var t=[],n=0;31>n;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<n;){var u=31-lt(n),d=1<<u;s[u]=0,c[u]=-1;var f=l[u];if(f!==null)for(l[u]=null,u=0;u<f.length;u++){var p=f[u];p!==null&&(p.lane&=-536870913)}n&=~d}r!==0&&Tt(e,r,0),a!==0&&i===0&&e.tag!==0&&(e.suspendedLanes|=a&~(o&~t))}function Tt(e,t,n){e.pendingLanes|=t,e.suspendedLanes&=~t;var r=31-lt(t);e.entangledLanes|=t,e.entanglements[r]=e.entanglements[r]|1073741824|n&261930}function Et(e,t){var n=e.entangledLanes|=t;for(e=e.entanglements;n;){var r=31-lt(n),i=1<<r;i&t|e[r]&t&&(e[r]|=t),n&=~i}}function Dt(e,t){var n=t&-t;return n=n&42?1:Ot(n),(n&(e.suspendedLanes|t))===0?n:0}function Ot(e){switch(e){case 2:e=1;break;case 8:e=4;break;case 32:e=16;break;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:case 4194304:case 8388608:case 16777216:case 33554432:e=128;break;case 268435456:e=134217728;break;default:e=0}return e}function kt(e){return e&=-e,2<e?8<e?e&134217727?32:268435456:8:2}function At(){var e=E.p;return e===0?(e=window.event,e===void 0?32:Ch(e.type)):e}function jt(e,t){var n=E.p;try{return E.p=e,t()}finally{E.p=n}}var Mt=Math.random().toString(36).slice(2),Nt=`__reactFiber$`+Mt,Pt=`__reactProps$`+Mt,Ft=`__reactContainer$`+Mt,It=`__reactEvents$`+Mt,Lt=`__reactListeners$`+Mt,Rt=`__reactHandles$`+Mt,zt=`__reactResources$`+Mt,Bt=`__reactMarker$`+Mt,Vt=`__reactLoad$`+Mt;function Ht(e){delete e[Nt],delete e[Pt],delete e[Lt],delete e[Rt]}function Ut(e){var t;if(t=e[Nt])return t;for(var n=e.parentNode;n;){if(t=n[Ft]||n[Nt]){if(n=t.alternate,t.child!==null||n!==null&&n.child!==null)for(e=fm(e);e!==null;){if(n=e[Nt])return n;e=fm(e)}return t}e=n,n=e.parentNode}return null}function Wt(e){if(e=e[Nt]||e[Ft]){var t=e.tag;if(t===5||t===6||t===13||t===31||t===26||t===27||t===3)return e}return null}function Gt(e){var t=e.tag;if(t===5||t===26||t===27||t===6)return e.stateNode;throw Error(s(33))}function Kt(e){var t=e[zt];return t||=e[zt]={hoistableStyles:new Map,hoistableScripts:new Map},t}function qt(e){e[Bt]=!0}function Jt(e){e[Vt]=void 0}var Yt=new Set,Xt={};function Zt(e,t){Qt(e,t),Qt(e+`Capture`,t)}function Qt(e,t){for(Xt[e]=t,e=0;e<t.le Line truncated `+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;0<n;){var r=31-lt(n),i=1<<r;t|=e[r],n&=~i}return t}function bt(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function xt(){var e=ht;return ht<<=1,!(ht&62914560)&&(ht=4194304),e}function St(e){for(var t=[],n=0;31>n;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<n;){var u=31-lt(n),d=1<<u;s[u]=0,c[u]=-1;var f=l[u];if(f!==null)for(l[u]=null,u=0;u<f.length;u++){var p=f[u];p!==null&&(p.lane&=-536870913)}n&=~d}r!==0&&Tt(e,r,0),a!==0&&i===0&&e.tag!==0&&(e.suspendedLanes|=a&~(o&~t))}function Tt(e,t,n){e.pendingLanes|=t,e.suspendedLanes&=~t;var r=31-lt(t);e.entangledLanes|=t,e.entanglements[r]=e.entanglements[r]|1073741824|n&261930}function Et(e,t){var n=e.entangledLanes|=t;for(e=e.entanglements;n;){var r=31-lt(n),i=1<<r;i&t|e[r]&t&&(e[r]|=t),n&=~i}}function Dt(e,t){var n=t&-t;return n=n&42?1:Ot(n),(n&(e.suspendedLanes|t))===0?n:0}function Ot(e){switch(e){case 2:e=1;break;case 8:e=4;break;case 32:e=16;break;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:case 4194304:case 8388608:case 16777216:case 33554432:e=128;break;case 268435456:e=134217728;break;default:e=0}return e}function kt(e){return e&=-e,2<e?8<e?e&134217727?32:268435456:8:2}function At(){var e=E.p;return e===0?(e=window.event,e===void 0?32:Ch(e.type)):e}function jt(e,t){var n=E.p;try{return E.p=e,t()}finally{E.p=n}}var Mt=Math.random().toString(36).slice(2),Nt=`__reactFiber$`+Mt,Pt=`__reactProps$`+Mt,Ft=`__reactContainer$`+Mt,It=`__reactEvents$`+Mt,Lt=`__reactListeners$`+Mt,Rt=`__reactHandles$`+Mt,zt=`__reactResources$`+Mt,Bt=`__reactMarker$`+Mt,Vt=`__reactLoad$`+Mt;function Ht(e){delete e[Nt],delete e[Pt],delete e[Lt],delete e[Rt]}function Ut(e){var t;if(t=e[Nt])return t;for(var n=e.parentNode;n;){if(t=n[Ft]||n[Nt]){if(n=t.alternate,t.child!==null||n!==null&&n.child!==null)for(e=fm(e);e!==null;){if(n=e[Nt])return n;e=fm(e)}return t}e=n,n=e.parentNode}return null}function Wt(e){if(e=e[Nt]||e[Ft]){var t=e.tag;if(t===5||t===6||t===13||t===31||t===26||t===27||t===3)return e}return null}function Gt(e){var t=e.tag;if(t===5||t===26||t===27||t===6)return e.stateNode;throw Error(s(33))}function Kt(e){var t=e[zt];return t||=e[zt]={hoistableStyles:new Map,hoistableScripts:new Map},t}function qt(e){e[Bt]=!0}function Jt(e){e[Vt]=void 0}var Yt=new Set,Xt={};function Zt(e,t){Qt(e,t),Qt(e+`Capture`,t)}function Qt(e,t){for(Xt[e]=t,e=0;e<t.le Line truncated
`).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(!(2<n.length)||n[0]!==`o`&&n[0]!==`O`||n[1]!==`n`&&n[1]!==`N`)n=En.get(n)||n,an(e,n,r);else return}O=!0}function tp(e,t,n,r,i,a){switch(n){case`style`:wn(e,r,a);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`children`:if(typeof r==`string`)xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)xn(e,``+r);else return;break;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`onClick`:r!=null&&(e.onclick=kn);return;case`suppressContent Line truncated `).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(!(2<n.length)||n[0]!==`o`&&n[0]!==`O`||n[1]!==`n`&&n[1]!==`N`)n=En.get(n)||n,an(e,n,r);else return}O=!0}function tp(e,t,n,r,i,a){switch(n){case`style`:wn(e,r,a);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`children`:if(typeof r==`string`)xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)xn(e,``+r);else return;break;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`onClick`:r!=null&&(e.onclick=kn);return;case`suppressContent Line truncated
+1 -1
View File
@@ -15,7 +15,7 @@
<link rel="icon" type="image/svg+xml" href="/assets/icon-small-DFuJkDph.svg" /> <link rel="icon" type="image/svg+xml" href="/assets/icon-small-DFuJkDph.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>GPGUI Downloader</title> <title>GPGUI Downloader</title>
<script type="module" crossorigin src="/assets/main-BJvLW_Ih.js"></script> <script type="module" crossorigin src="/assets/main-mZlQiCQA.js"></script>
<link rel="stylesheet" crossorigin href="/assets/main-CVTp2z3I.css"> <link rel="stylesheet" crossorigin href="/assets/main-CVTp2z3I.css">
</head> </head>
<body> <body>
+7 -7
View File
@@ -10,25 +10,25 @@
"tauri": "tauri" "tauri": "tauri"
}, },
"dependencies": { "dependencies": {
"@tauri-apps/api": "^2.12.4", "@tauri-apps/api": "^2.12.5",
"react": "^19.3.1", "react": "^19.3.1",
"react-dom": "^19.3.1" "react-dom": "^19.3.1"
}, },
"devDependencies": { "devDependencies": {
"@tauri-apps/cli": "^2.12.4", "@tauri-apps/cli": "^2.12.6",
"@types/node": "^26.6.6", "@types/node": "^26.6.6",
"@types/react": "^19.3.0", "@types/react": "^19.3.0",
"@types/react-dom": "^19.3.0", "@types/react-dom": "^19.3.0",
"@typescript-eslint/eslint-plugin": "^8.72.1", "@typescript-eslint/eslint-plugin": "^8.73.0",
"@typescript-eslint/parser": "^8.72.1", "@typescript-eslint/parser": "^8.73.0",
"@vitejs/plugin-react": "^6.1.2", "@vitejs/plugin-react": "^6.3.0",
"eslint": "^9.39.5", "eslint": "^9.39.5",
"eslint-config-prettier": "^10.1.8", "eslint-config-prettier": "^10.1.8",
"eslint-plugin-react": "^7.37.5", "eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1", "eslint-plugin-react-hooks": "^7.1.1",
"prettier": "3.9.10", "prettier": "3.10.1",
"typescript": "^6.0.3", "typescript": "^6.0.3",
"vite": "^8.3.5" "vite": "^8.3.8"
}, },
"packageManager": "[email protected]" "packageManager": "[email protected]"
} }
+280 -200
View File
@@ -9,8 +9,8 @@ importers:
.: .:
dependencies: dependencies:
'@tauri-apps/api': '@tauri-apps/api':
specifier: ^2.12.4 specifier: ^2.12.5
version: 2.12.4 version: 2.12.5
react: react:
specifier: ^19.3.1 specifier: ^19.3.1
version: 19.3.1 version: 19.3.1
@@ -19,8 +19,8 @@ importers:
version: 19.3.1([email protected]) version: 19.3.1([email protected])
devDependencies: devDependencies:
'@tauri-apps/cli': '@tauri-apps/cli':
specifier: ^2.12.4 specifier: ^2.12.6
version: 2.12.4 version: 2.12.6
'@types/node': '@types/node':
specifier: ^26.6.6 specifier: ^26.6.6
version: 26.6.6 version: 26.6.6
@@ -31,14 +31,14 @@ importers:
specifier: ^19.3.0 specifier: ^19.3.0
version: 19.3.0(@types/[email protected]) version: 19.3.0(@types/[email protected])
'@typescript-eslint/eslint-plugin': '@typescript-eslint/eslint-plugin':
specifier: ^8.72.1 specifier: ^8.73.0
version: 8.72.1(@typescript-eslint/[email protected]2.1([email protected])([email protected]))([email protected])([email protected]) version: 8.73.0(@typescript-eslint/[email protected]3.0([email protected])([email protected]))([email protected])([email protected])
'@typescript-eslint/parser': '@typescript-eslint/parser':
specifier: ^8.72.1 specifier: ^8.73.0
version: 8.72.1([email protected])([email protected]) version: 8.73.0([email protected])([email protected])
'@vitejs/plugin-react': '@vitejs/plugin-react':
specifier: ^6.1.2 specifier: ^6.3.0
version: 6.1.2([email protected].5(@types/[email protected])([email protected])) version: 6.3.0([email protected].8(@types/[email protected])([email protected]))
eslint: eslint:
specifier: ^9.39.5 specifier: ^9.39.5
version: 9.39.5 version: 9.39.5
@@ -52,14 +52,14 @@ importers:
specifier: ^7.1.1 specifier: ^7.1.1
version: 7.1.1([email protected]) version: 7.1.1([email protected])
prettier: prettier:
specifier: 3.9.10 specifier: 3.10.1
version: 3.9.10 version: 3.10.1
typescript: typescript:
specifier: ^6.0.3 specifier: ^6.0.3
version: 6.0.3 version: 6.0.3
vite: vite:
specifier: ^8.3.5 specifier: ^8.3.8
version: 8.3.5(@types/[email protected])([email protected]) version: 8.3.8(@types/[email protected])([email protected])
packages: packages:
@@ -130,6 +130,15 @@ packages:
resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
'@emnapi/[email protected]':
resolution: {integrity: sha512-MzCVoWtcg4Pm2B3je5mMvYMvj3MmBKw+fU7vbsJc9/iT8ip6/eYIHo/Dsm/mr+wsHB6SEyJDuxB09Yy6r/8+4A==}
'@emnapi/[email protected]':
resolution: {integrity: sha512-JcrSPzPvZuNZvJqPTF9Fw25LbOJ8avzFVlaf2grmH4Cku0oGP47tRgqPZadcfj3YoZMHkFVnCYFbQM8I+i5QEw==}
'@emnapi/[email protected]':
resolution: {integrity: sha512-JP7OYH38Q7+pyTAe14raZHLQIK7BDKbdwji+Xi3pcd/6QkJYQH3SX4wu6EplGrGJWRepoNzedfm0G3B9Z4e9Rw==}
'@esbuild/[email protected]': '@esbuild/[email protected]':
resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
engines: {node: '>=18'} engines: {node: '>=18'}
@@ -344,6 +353,9 @@ packages:
resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
engines: {node: '>=18.18'} engines: {node: '>=18.18'}
'@isaacs/[email protected]':
resolution: {integrity: sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw==}
'@jridgewell/[email protected]': '@jridgewell/[email protected]':
resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
@@ -360,95 +372,107 @@ packages:
'@jridgewell/[email protected]': '@jridgewell/[email protected]':
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
'@napi-rs/[email protected]':
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/[email protected]': '@oxc-project/[email protected]':
resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==}
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==} resolution: {integrity: sha512-e+Ebe0WT+9tbXmNKPIiC8YrWAHYwug3m6i4p3rZGGulfZri1jtI4HslT+OZnFf/OIHowWF71DTlHwXBP2SiA7A==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm] cpu: [arm]
os: [android] os: [android]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==} resolution: {integrity: sha512-hOombrTJ+szt2ciEzS7oCA78lMPBgF5UMQWCJIyNfnrI7GLl8HYoFqCnpL2gcPOaXMqryGCU5ExdQKyDDcC+yA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [android] os: [android]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==} resolution: {integrity: sha512-XoMA2pwCKGTQzUjPgtRwkedH4WmXhdIPKT6l6oOxd1PUbNodGI6DcBekgN7EC//+x3pfBYX/qL1gNmZAqivw5g==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==} resolution: {integrity: sha512-zo8EsSSwMZCY/e+fRnGaX02YGgvJD0yvhNi/9hpGPA2MJ9ZF8dPCw75UGfpI6OpQ/myR/dIYmogRvqiZD0TrXg==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==} resolution: {integrity: sha512-O8ISAOfI1nj7AuBPd30FSF47z7f7lzlk5poQVGgiikvQuGEBFYvW8ki+UEnT+YJPnNGjQzn304klt4O9FUE7mA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [freebsd] os: [freebsd]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==} resolution: {integrity: sha512-/lYCba5NO0yq4S0jGMH8QTBtkvQxoXjoQWzF5BcWp9MjB9jxVRD1GQDNofkVjcOj30DWyhLIN/4Oe60JKzaONw==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==} resolution: {integrity: sha512-pm/apFMBnSbFb3O6nG5pHO1iqHhZrjGDFEjSm+ot9J17XXPvH9L90y5h+jgfHCE+Qdlsvy8qKEcU4VKxgjD+vA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==} resolution: {integrity: sha512-K1SmQp3FFichn8oqrNIwvFoZ5wcvjC7goBzpaMNvLf9FZc+QB/QvLmnpJZgAAGHiD980tP8FZZnXk2K94rvlxg==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==} resolution: {integrity: sha512-I0xwD57jP/3A7+5UPZin2w8Y7XHEmEM5zqpYZOcQ45MlNW6tUJUziymV3yRr7rL4vwyfEcRsRksC4a7Kc08p5Q==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64] cpu: [ppc64]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==} resolution: {integrity: sha512-BrtEHT24SNXj9HiXqy+s/kXiSiQGt6EKCPUlRirAoIioVxKGnbXBUEkbZASAei7iZJB0/Ynm+0JP00Ipx7AnSw==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x] cpu: [s390x]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==} resolution: {integrity: sha512-rm75/9DkHKeU2WnA8w4X94WGYgLlDCFCfkQC+4bguVJmC/jvDRv2B+2wLOYhyE0fVuv7//Ckk39OoOufyCu76Q==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==} resolution: {integrity: sha512-irh/4+iYFM4GAzpluDErgjz89bj6NDtqqMAG/6O1LG38Ed3NpyebzCpcVNkFW8uhy+/3/BocUvnXDR33CXWe9A==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==} resolution: {integrity: sha512-+KWTWNoPt+CfSq94CiceWu3yPE+QzkaG+phPyz9G60tmZLwfQkcA4AeksafzvJAw4pvg1mcd5a1TkUqVv0s4JA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [openharmony] os: [openharmony]
'@rolldown/binding-win32-arm64-msvc@1.2.16': '@rolldown/binding-wasm32-wasi@1.2.19':
resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==} resolution: {integrity: sha512-7EH+skOsl5qpWnK0vzamgJFhOv1cwxQpsxm8tI883K9fur5c27p8q87fzEO6BbBPabA2/+s/zR63/pLc137iOg==}
engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0}
cpu: [wasm32]
'@rolldown/[email protected]':
resolution: {integrity: sha512-3Q1Yg1Q7tEvBWoZf5rFvG/GKZQPgwfru+p4wBajDfJFBs0SHCpL++dfTjW9gyAKd1T7ZpIYvdaUax7Pa/IhFVQ==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==} resolution: {integrity: sha512-y/sqRRc6d7hECzOFc5n3LSeqctmIp9mMjY1Kq4s14uLPd/LZ4z7i1zrW6fMtp2mPeuQIC4e6ULMcwQzMomqQag==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
@@ -456,80 +480,83 @@ packages:
'@rolldown/[email protected]': '@rolldown/[email protected]':
resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].5':
resolution: {integrity: sha512-pVmfis+4zT8H0Qhp3xPZx9Ju7kpzvA6rr/PSJPyuwfvucTQ8sVt61NYU9KMkK703UFlYadFmjKA4HhybOtN0gg==} resolution: {integrity: sha512-G9QIMt5fzED+aS4QhVK3w1HWLKpLIwH/MnpCr9z1ugGEHnS2ORmqrLkc0uALOjRK4qXJy+4Yiw8LDl/KicC1Hg==}
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-OxqKSckIkoJ6vX2AjifIJpTasFC0Hbdoo7gEiCmAjauABO3U8m2MRsLWe+QTiBwDx1mIrvgA+rvI7tvDnbnHVg==} resolution: {integrity: sha512-Uokwk1hFfJoG54+kD8iU0St33jAIkNvojnjEfBZ6UbL5rnM10AiFwUS/2DHTJ9R4/Kba4U44v7djfMuWFTQgeg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-fz76/77wMMJOaaUN6n3CybRG0P/MTEjjqYk81mGPyhi9m6Ue5T+LWBnJP/AkPooNatBPI2vtulGqomyMJ44lCQ==} resolution: {integrity: sha512-WhahqzcyHCpCzh4Taf0ZbBm6nGkvuOSh5ffrgOO7EdYaYe+RBQK8LOlFu+bbjul5v9cdLDi3kco+0+7IlZtTVA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-K0w8Bof6Lt8QKLAYhRy0yy36ZH5iA/35VuSOvnxyjvCUZ+A3JKsUTlALviH/sVgAlisaPzzmeJSH8XOn4Q2HBA==} resolution: {integrity: sha512-GB6weN+iFHxiFZ9SOKW6fINis7gnxohoOldR7sryBe7uaavkFGaMCa0yQs5njeXPWvzlE9WTQ13z8oDjmqK+Ww==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-j5rOnjmRUwWrm1oosf0zBYl4D+fqydgUROFCk0hvKZxvbTT8SOERes0QB7rBV/XWNy+kM6pCKzb3oSm2sRglzg==} resolution: {integrity: sha512-mdHoUFYKfztUtPKE0C2hhGkEo7j6swXjg+5yRRKSD7A2gLkRPQFIXWD/DAYhiJdeAkyA8MCP6nvvKvg/4YryWQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-aOue3Fy6Jb7+oWcfAVUsVHfeTybSCt2CZoU06aO4jv4d2Ks/KnaTPwMAK3CLEduGOvBLY1lbBBrIyomqLLH5Sg==} resolution: {integrity: sha512-2BxB+9a3JRN0eJ0t0qGe8IKJfgBLOZDE8a499OXH+yg4J9bMpSK1oHXBxnHuSHFWhby4QnQ/t+sBf7tRC0UZeA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-Fx6GShY/RvST+t6LMlTHAwd66+1tEaAAGrnU7cysVfaiRP1BKng5Vl6rVmO6rSLOA1Sp1dRzNYM4f0OWQGb7qA==} resolution: {integrity: sha512-sb58RsNHex9QVqHdN1cf9MMlamUWAtk1NzuxTZalUnBUHfblIbe71hfmdI6whDZ84MufgOdeg/bzvhrbZS1r0w==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-tNzZSa79Z1nRpHxEpQ38lsAFpKlFlYvoXzjTV+lRRn/zSf3wrdUC3wnLcq2XEadchPu4ttK0zivhYzr+XGD19Q==} resolution: {integrity: sha512-ZAb4/CHRma3ErjL2RGfHjITTUBIs4zySf0hIli9BddOtEdSx0ze0hEgxl+HfBVc5OEW/QmbiZ2E2+CkkHc8Pcg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-jmZ1pr0xEqUhuEusWtt9Yt+GF6lCnGHUmIL+KIknpbjK/XQ2qkhDBhaxK/JMHM2A8dAacVXCxXJk2EXpwhQUfA==} resolution: {integrity: sha512-ueSzM2Du6r4i1d/lby9kEvrhPnXw5zM/VYvcW1ldEWSpkUyVohsBXkmD+U7vMskEW5tXeCUenki7nYVxyGBGpQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-fGo8pgEHZxdSYgZ/J98m1usJ7NHKmKbq7k6uT0x1rpOq6Bg2YVzzpaAblWk710f5LHYBJIL5QIFS5IrD+4gmTg==} resolution: {integrity: sha512-6bmOt2BQSe0Bba+5CJcTKSML7VOYDxyiAKyBrjo86VxMdC1usIQmklu3Xc83s3QoK1rOMwwbANlPF6i5R2mvIg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-ezl8sQIcjYsye3TUnTH5VcWmWzccZASlQm7hlZt0dYyj1XD0qpVW47u2xYVrIKui0F8uQv/7QGZixdWiClBsbg==} resolution: {integrity: sha512-9q9ZFNuFreBczwyJuhhlrEOBzGClwWUYirQ2GBl66Y6EaNl17IdLH8TRqoY9wYB1LnctNBi+Fa/WMGtFA4BtFQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-DJhDeCqjLDNMWYFy7ZS8cfeAHX2RK0RbQMLiA3bMVVkXRDJ4NBYiHriGqsUhsr9iG41aTb+dJGkFPmPw1gWwVw==} resolution: {integrity: sha512-ion7Chbj21ROxMRpjQ7G8rz5sIOaI7IoBQum1oq5sl1V5zGWyc/oYnCrQhVqO2TxK/lBDWxt648BzLi02SY3Xg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
resolution: {integrity: sha512-JI9bHfudSRJikGOrjbXEm6RjzzvmKuLc+JixB1NE8hNzQkNlCCIC3pTES3uypkR9lxHrsbxzcnSwhI2IxBQphw==} resolution: {integrity: sha512-/cOeQgqq8PBDPODOjjT0YHs4qxKCHcQMWMiBm4rLM3JNr9mZE+PHNKOK4zAkhIUtYMNL/0fweW48VNvzD1AbqA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
hasBin: true hasBin: true
'@tybys/[email protected]':
resolution: {integrity: sha512-dOGOPxlaNV+G046mZzN+9C0dAcQZeSKcXiVaM0TYy/LM4ttTmgSBDxYfovcYI8Em3+eAbiAYpvWLOv8+ZVRJKA==}
'@types/[email protected]': '@types/[email protected]':
resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
@@ -547,72 +574,76 @@ packages:
'@types/[email protected]': '@types/[email protected]':
resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==} resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==}
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-5CokTWXpmbylfFabsbvHC0CAw3XLaGnoa+nFJX5FR592h/LoZsENUE6p/rg5xvkKrFEXz6pYmgI29AgXc2N3BQ==} resolution: {integrity: sha512-UkygMFer53Yzn29MCYFTHf34hGXf5KJhiDWfIm1tXtXRrym1CS6l5H9Y3yCtPWChpC0/f93H88gdj8tN0dd4kw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: peerDependencies:
'@typescript-eslint/parser': ^8.72.1 '@typescript-eslint/parser': ^8.73.0
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
typescript: '>=4.8.4 <6.1.0' typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-ZGwZP4OCfyA0AQTpEAMWz+rtX01DRhQWW5hB0ucKDEIX5U7jdmPSaMx94rQfaPAQzIYz2BimOgKOJtjfpRFQ9g==} resolution: {integrity: sha512-AuL45bVcmssHfZ3Di3cs9Q0l4gBm4ZFVrJOQEE7VpqW+PVgQaEwSwazz4TVIiFabXkk6U51EprYDwqw+HR8ePw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
typescript: '>=4.8.4 <6.1.0' typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==} resolution: {integrity: sha512-/pEf8Rc4Mjk+qJnY0uO1+Gadeal8uv50xpuic+srG2vIVatA0XxvWMUeMtFvs6OCHqftiQ7/+qH4aehG5stzIA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: peerDependencies:
typescript: '>=4.8.4 <6.1.0' typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==} resolution: {integrity: sha512-/TjD738Iq2rzj5z0ixVOi+TsvgjAzZPLPaH1yWdDBytR/HTR5gMpyYWZeCe5WTQZLwk3ho8AV7U3muoQCRtXBQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==} resolution: {integrity: sha512-lmtCFOfYaJfpqZywGuXi4FpNtE+NQ+YLe3T0K9rtEDcW8ZuGWvfI++pj8r05sYMI8vWT2CYK4rWyedmD6Rp4og==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: peerDependencies:
typescript: '>=4.8.4 <6.1.0' typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-iY2wlmyrXJmx4yxUGP3aYCFF3cA/6ShddOKmLU2dx7LnEykbAM8WThlxZEfd1NddqceF6eJmZUayxx9oKIYNlg==} resolution: {integrity: sha512-MOC9i4xy1F7KcDde7Ip8jf1SrRiALb2Km4UWxGNjUE2YlhjIEo1ayE27GHIwIQyfWuHTmEonQT14uyurlyC6aA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
typescript: '>=4.8.4 <6.1.0' typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==} resolution: {integrity: sha512-O/1ytYzflF16QDKXx4/qOXg1IuZp+n7hr9t+S0nv7N/2Tl8rJiNCshztV1gcSUvHbPtoX3+zmNbtSAyVbzxVfw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==} resolution: {integrity: sha512-InjlBkSdWceIwIBWSwS3ENUp+i0O02PGX3Zv2wnihWJC1WDVGvG7mTHuf8b57uAaITj94d6tRPDH+sUEtXdRQQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: 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' typescript: '>=4.8.4 <6.1.0'
peerDependenciesMeta:
'@typescript/native':
optional: true
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-5v5liypurJBFHCBNqh/RjsymAD+VWcE0djuGY/BUqp5fC3Qn+luWDEksjuTtWjPn6i5zQlUtkZCRG/CYG0yCkA==} resolution: {integrity: sha512-j2SVJJvVkXdUL0WcEzo4vEH1mO1vIi8KlVukcYA2MgMZvYN2LlZR4PmsW+GTSxSW24j6Q/EP7+MOifLtg5hmsA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
typescript: '>=4.8.4 <6.1.0' typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
resolution: {integrity: sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==} resolution: {integrity: sha512-k4lsFVpRZICbltkIEEH4hZRkwXkqDF1GHBpClKQOHQY+RkoZAAuyc1ci3I6p+CB6v3U4jaHIUshc4RzzQXZWLg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@vitejs/plugin-react@6.1.2': '@vitejs/plugin-react@6.3.0':
resolution: {integrity: sha512-fhJNGUdscQa4HkI0xFxwonWyhnVReCPDbXI7FH7jmzpnVCrFQI7PRrhWecO263610vOrs9tr2Y4xcf8uAdFxbw==} resolution: {integrity: sha512-H9E955aVvD2F4zNHCw4eIZbIfF6xKldlh7MNu+hSU7xwQzh65lI/N+CJWqmfhi0PEjDXIt/H7T7J/4wU63KJiw==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
peerDependencies: 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 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 vite: ^8.0.0
peerDependenciesMeta: peerDependenciesMeta:
'@rolldown/plugin-babel': '@rolldown/plugin-babel':
@@ -1282,9 +1313,9 @@ packages:
resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
minimatch@10.2.6: minimatch@11.0.9:
resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==} resolution: {integrity: sha512-KCFkfyjqerNlSstjlhIGNXIKZGA/6O4V4RlhZ+Dsr621SPPw0mzlypE9D9ZOoPiVefHID+j7/XuMMlqfD/F60Q==}
engines: {node: 18 || 20 || >=22} engines: {node: 20 || >=22}
[email protected]: [email protected]:
resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
@@ -1386,8 +1417,8 @@ packages:
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'} engines: {node: '>= 0.8.0'}
prettier@3.9.10: prettier@3.10.1:
resolution: {integrity: sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==} resolution: {integrity: sha512-70vp3ZUYoPlFbF9uiTdXHUUCGEIp7d4+6p+8DYbkm2jP7x/3i/paXVF6dopSI3zd/CEitrZN1rc4i85xWmmXlg==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
@@ -1427,8 +1458,8 @@ packages:
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
hasBin: true hasBin: true
[email protected]6: [email protected]9:
resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==} resolution: {integrity: sha512-QIiV1J9d0pzN4jeeTH4sjPy0AZ6cAy2cG0ExeoE1+U8Rvj+hR3gYkokx0YbeUNGlZqiQJJ2utcETe0oKXwzsuA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true hasBin: true
@@ -1541,6 +1572,9 @@ packages:
peerDependencies: peerDependencies:
typescript: '>=4.8.4' typescript: '>=4.8.4'
[email protected]:
resolution: {integrity: sha512-a4Ux9VKuIMHsOS7ENbEq6hK2ZGYIT27Rtl0E4eD9KqwxhKiQeMZE/9xb3IdYwWaSOyIBQLExhQgXDTYoiCxnWA==}
[email protected]: [email protected]:
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
engines: {node: '>= 0.8.0'} engines: {node: '>= 0.8.0'}
@@ -1582,8 +1616,8 @@ packages:
[email protected]: [email protected]:
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
[email protected].5: [email protected].8:
resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==} resolution: {integrity: sha512-LzOn3h9rG/0vhLdXrV4yJ4QFA9eEoqCl+Yx+kGJd7aB9w6nfNgVHKSYwLPZUHrz4ZGa+t+kXjV9itvcHDLQouA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@@ -1768,6 +1802,22 @@ snapshots:
'@babel/helper-string-parser': 7.29.7 '@babel/helper-string-parser': 7.29.7
'@babel/helper-validator-identifier': 7.29.7 '@babel/helper-validator-identifier': 7.29.7
'@emnapi/[email protected]':
dependencies:
'@emnapi/wasi-threads': 2.2.0
tslib: 2.9.1
optional: true
'@emnapi/[email protected]':
dependencies:
tslib: 2.9.1
optional: true
'@emnapi/[email protected]':
dependencies:
tslib: 2.9.1
optional: true
'@esbuild/[email protected]': '@esbuild/[email protected]':
optional: true optional: true
@@ -1908,6 +1958,8 @@ snapshots:
'@humanwhocodes/[email protected]': {} '@humanwhocodes/[email protected]': {}
'@isaacs/[email protected]': {}
'@jridgewell/[email protected]': '@jridgewell/[email protected]':
dependencies: dependencies:
'@jridgewell/sourcemap-codec': 1.6.0 '@jridgewell/sourcemap-codec': 1.6.0
@@ -1927,103 +1979,122 @@ snapshots:
'@jridgewell/resolve-uri': 3.1.2 '@jridgewell/resolve-uri': 3.1.2
'@jridgewell/sourcemap-codec': 1.6.0 '@jridgewell/sourcemap-codec': 1.6.0
'@napi-rs/[email protected](@emnapi/[email protected])(@emnapi/[email protected])':
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/[email protected]': {} '@oxc-project/[email protected]': {}
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true optional: true
'@rolldown/[email protected]6': '@rolldown/[email protected]9':
optional: true 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/[email protected])(@emnapi/[email protected])
optional: true optional: true
'@rolldown/binding-win32-x[email protected]6': '@rolldown/binding-win32-arm[email protected]9':
optional: true
'@rolldown/[email protected]':
optional: true optional: true
'@rolldown/[email protected]': {} '@rolldown/[email protected]': {}
'@tauri-apps/[email protected].4': {} '@tauri-apps/[email protected].5': {}
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optional: true optional: true
'@tauri-apps/[email protected].4': '@tauri-apps/[email protected].6':
optionalDependencies: optionalDependencies:
'@tauri-apps/cli-darwin-arm64': 2.12.4 '@tauri-apps/cli-darwin-arm64': 2.12.6
'@tauri-apps/cli-darwin-x64': 2.12.4 '@tauri-apps/cli-darwin-x64': 2.12.6
'@tauri-apps/cli-linux-arm-gnueabihf': 2.12.4 '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.6
'@tauri-apps/cli-linux-arm64-gnu': 2.12.4 '@tauri-apps/cli-linux-arm64-gnu': 2.12.6
'@tauri-apps/cli-linux-arm64-musl': 2.12.4 '@tauri-apps/cli-linux-arm64-musl': 2.12.6
'@tauri-apps/cli-linux-riscv64-gnu': 2.12.4 '@tauri-apps/cli-linux-riscv64-gnu': 2.12.6
'@tauri-apps/cli-linux-x64-gnu': 2.12.4 '@tauri-apps/cli-linux-x64-gnu': 2.12.6
'@tauri-apps/cli-linux-x64-musl': 2.12.4 '@tauri-apps/cli-linux-x64-musl': 2.12.6
'@tauri-apps/cli-win32-arm64-msvc': 2.12.4 '@tauri-apps/cli-win32-arm64-msvc': 2.12.6
'@tauri-apps/cli-win32-ia32-msvc': 2.12.4 '@tauri-apps/cli-win32-ia32-msvc': 2.12.6
'@tauri-apps/cli-win32-x64-msvc': 2.12.4 '@tauri-apps/cli-win32-x64-msvc': 2.12.6
'@tybys/[email protected]':
dependencies:
tslib: 2.9.1
optional: true
'@types/[email protected]': {} '@types/[email protected]': {}
@@ -2041,74 +2112,77 @@ snapshots:
dependencies: dependencies:
csstype: 3.2.3 csstype: 3.2.3
'@typescript-eslint/[email protected]2.1(@typescript-eslint/[email protected]2.1([email protected])([email protected]))([email protected])([email protected])': '@typescript-eslint/[email protected]3.0(@typescript-eslint/[email protected]3.0([email protected])([email protected]))([email protected])([email protected])':
dependencies: dependencies:
'@eslint-community/regexpp': 4.12.2 '@eslint-community/regexpp': 4.12.2
'@typescript-eslint/parser': 8.72.1([email protected])([email protected]) '@typescript-eslint/parser': 8.73.0([email protected])([email protected])
'@typescript-eslint/scope-manager': 8.72.1 '@typescript-eslint/scope-manager': 8.73.0
'@typescript-eslint/type-utils': 8.72.1([email protected])([email protected]) '@typescript-eslint/type-utils': 8.73.0([email protected])([email protected])
'@typescript-eslint/utils': 8.72.1([email protected])([email protected]) '@typescript-eslint/utils': 8.73.0([email protected])([email protected])
'@typescript-eslint/visitor-keys': 8.72.1 '@typescript-eslint/visitor-keys': 8.73.0
eslint: 9.39.5 eslint: 9.39.5
ignore: 7.0.14 ignore: 7.0.14
natural-compare: 1.4.0 natural-compare: 1.4.0
ts-api-utils: 2.5.0([email protected]) ts-api-utils: 2.5.0([email protected])
typescript: 6.0.3 typescript: 6.0.3
transitivePeerDependencies: transitivePeerDependencies:
- '@typescript/native'
- supports-color - supports-color
'@typescript-eslint/[email protected]2.1([email protected])([email protected])': '@typescript-eslint/[email protected]3.0([email protected])([email protected])':
dependencies: dependencies:
'@typescript-eslint/scope-manager': 8.72.1 '@typescript-eslint/scope-manager': 8.73.0
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
'@typescript-eslint/typescript-estree': 8.72.1([email protected]) '@typescript-eslint/typescript-estree': 8.73.0([email protected])
'@typescript-eslint/visitor-keys': 8.72.1 '@typescript-eslint/visitor-keys': 8.73.0
debug: 4.4.3 debug: 4.4.3
eslint: 9.39.5 eslint: 9.39.5
typescript: 6.0.3 typescript: 6.0.3
transitivePeerDependencies: transitivePeerDependencies:
- '@typescript/native'
- supports-color - supports-color
'@typescript-eslint/[email protected]2.1([email protected])': '@typescript-eslint/[email protected]3.0([email protected])':
dependencies: dependencies:
'@typescript-eslint/tsconfig-utils': 8.72.1([email protected]) '@typescript-eslint/tsconfig-utils': 8.73.0([email protected])
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
debug: 4.4.3 debug: 4.4.3
typescript: 6.0.3 typescript: 6.0.3
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
dependencies: dependencies:
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
'@typescript-eslint/visitor-keys': 8.72.1 '@typescript-eslint/visitor-keys': 8.73.0
'@typescript-eslint/[email protected]2.1([email protected])': '@typescript-eslint/[email protected]3.0([email protected])':
dependencies: dependencies:
typescript: 6.0.3 typescript: 6.0.3
'@typescript-eslint/[email protected]2.1([email protected])([email protected])': '@typescript-eslint/[email protected]3.0([email protected])([email protected])':
dependencies: dependencies:
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
'@typescript-eslint/typescript-estree': 8.72.1([email protected]) '@typescript-eslint/typescript-estree': 8.73.0([email protected])
'@typescript-eslint/utils': 8.72.1([email protected])([email protected]) '@typescript-eslint/utils': 8.73.0([email protected])([email protected])
debug: 4.4.3 debug: 4.4.3
eslint: 9.39.5 eslint: 9.39.5
ts-api-utils: 2.5.0([email protected]) ts-api-utils: 2.5.0([email protected])
typescript: 6.0.3 typescript: 6.0.3
transitivePeerDependencies: transitivePeerDependencies:
- '@typescript/native'
- supports-color - supports-color
'@typescript-eslint/[email protected]2.1': {} '@typescript-eslint/[email protected]3.0': {}
'@typescript-eslint/[email protected]2.1([email protected])': '@typescript-eslint/[email protected]3.0([email protected])':
dependencies: dependencies:
'@typescript-eslint/project-service': 8.72.1([email protected]) '@typescript-eslint/project-service': 8.73.0([email protected])
'@typescript-eslint/tsconfig-utils': 8.72.1([email protected]) '@typescript-eslint/tsconfig-utils': 8.73.0([email protected])
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
'@typescript-eslint/visitor-keys': 8.72.1 '@typescript-eslint/visitor-keys': 8.73.0
debug: 4.4.3 debug: 4.4.3
minimatch: 10.2.6 minimatch: 11.0.9
semver: 7.8.5 semver: 7.8.5
tinyglobby: 0.2.17 tinyglobby: 0.2.17
ts-api-utils: 2.5.0([email protected]) ts-api-utils: 2.5.0([email protected])
@@ -2116,26 +2190,27 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@typescript-eslint/[email protected]2.1([email protected])([email protected])': '@typescript-eslint/[email protected]3.0([email protected])([email protected])':
dependencies: dependencies:
'@eslint-community/eslint-utils': 4.10.1([email protected]) '@eslint-community/eslint-utils': 4.10.1([email protected])
'@typescript-eslint/scope-manager': 8.72.1 '@typescript-eslint/scope-manager': 8.73.0
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
'@typescript-eslint/typescript-estree': 8.72.1([email protected]) '@typescript-eslint/typescript-estree': 8.73.0([email protected])
eslint: 9.39.5 eslint: 9.39.5
typescript: 6.0.3 typescript: 6.0.3
transitivePeerDependencies: transitivePeerDependencies:
- '@typescript/native'
- supports-color - supports-color
'@typescript-eslint/[email protected]2.1': '@typescript-eslint/[email protected]3.0':
dependencies: dependencies:
'@typescript-eslint/types': 8.72.1 '@typescript-eslint/types': 8.73.0
eslint-visitor-keys: 5.0.1 eslint-visitor-keys: 5.0.1
'@vitejs/plugin-react@6.1.2([email protected].5(@types/[email protected])([email protected]))': '@vitejs/plugin-react@6.3.0([email protected].8(@types/[email protected])([email protected]))':
dependencies: dependencies:
'@rolldown/pluginutils': 1.0.1 '@rolldown/pluginutils': 1.0.1
vite: 8.3.5(@types/[email protected])([email protected]) vite: 8.3.8(@types/[email protected])([email protected])
[email protected]([email protected]): [email protected]([email protected]):
dependencies: dependencies:
@@ -2941,8 +3016,9 @@ snapshots:
[email protected]: {} [email protected]: {}
minimatch@10.2.6: minimatch@11.0.9:
dependencies: dependencies:
'@isaacs/nonrecursive-glob-match': 1.1.0
brace-expansion: 5.0.12 brace-expansion: 5.0.12
[email protected]: [email protected]:
@@ -3048,7 +3124,7 @@ snapshots:
[email protected]: {} [email protected]: {}
prettier@3.9.10: {} prettier@3.10.1: {}
[email protected]: [email protected]:
dependencies: dependencies:
@@ -3098,26 +3174,27 @@ snapshots:
path-parse: 1.0.7 path-parse: 1.0.7
supports-preserve-symlinks-flag: 1.0.0 supports-preserve-symlinks-flag: 1.0.0
[email protected]6: [email protected]9:
dependencies: dependencies:
'@oxc-project/types': 0.156.0 '@oxc-project/types': 0.156.0
'@rolldown/pluginutils': 1.0.1 '@rolldown/pluginutils': 1.0.1
optionalDependencies: optionalDependencies:
'@rolldown/binding-android-arm-eabi': 1.2.16 '@rolldown/binding-android-arm-eabi': 1.2.19
'@rolldown/binding-android-arm64': 1.2.16 '@rolldown/binding-android-arm64': 1.2.19
'@rolldown/binding-darwin-arm64': 1.2.16 '@rolldown/binding-darwin-arm64': 1.2.19
'@rolldown/binding-darwin-x64': 1.2.16 '@rolldown/binding-darwin-x64': 1.2.19
'@rolldown/binding-freebsd-x64': 1.2.16 '@rolldown/binding-freebsd-x64': 1.2.19
'@rolldown/binding-linux-arm-gnueabihf': 1.2.16 '@rolldown/binding-linux-arm-gnueabihf': 1.2.19
'@rolldown/binding-linux-arm64-gnu': 1.2.16 '@rolldown/binding-linux-arm64-gnu': 1.2.19
'@rolldown/binding-linux-arm64-musl': 1.2.16 '@rolldown/binding-linux-arm64-musl': 1.2.19
'@rolldown/binding-linux-ppc64-gnu': 1.2.16 '@rolldown/binding-linux-ppc64-gnu': 1.2.19
'@rolldown/binding-linux-s390x-gnu': 1.2.16 '@rolldown/binding-linux-s390x-gnu': 1.2.19
'@rolldown/binding-linux-x64-gnu': 1.2.16 '@rolldown/binding-linux-x64-gnu': 1.2.19
'@rolldown/binding-linux-x64-musl': 1.2.16 '@rolldown/binding-linux-x64-musl': 1.2.19
'@rolldown/binding-openharmony-arm64': 1.2.16 '@rolldown/binding-openharmony-arm64': 1.2.19
'@rolldown/binding-win32-arm64-msvc': 1.2.16 '@rolldown/binding-wasm32-wasi': 1.2.19
'@rolldown/binding-win32-x64-msvc': 1.2.16 '@rolldown/binding-win32-arm64-msvc': 1.2.19
'@rolldown/binding-win32-x64-msvc': 1.2.19
[email protected]: [email protected]:
dependencies: dependencies:
@@ -3269,6 +3346,9 @@ snapshots:
dependencies: dependencies:
typescript: 6.0.3 typescript: 6.0.3
[email protected]:
optional: true
[email protected]: [email protected]:
dependencies: dependencies:
prelude-ls: 1.2.1 prelude-ls: 1.2.1
@@ -3326,12 +3406,12 @@ snapshots:
dependencies: dependencies:
punycode: 2.3.1 punycode: 2.3.1
[email protected].5(@types/[email protected])([email protected]): [email protected].8(@types/[email protected])([email protected]):
dependencies: dependencies:
lightningcss: 1.33.0 lightningcss: 1.33.0
picomatch: 4.0.7 picomatch: 4.0.7
postcss: 8.5.32 postcss: 8.5.32
rolldown: 1.2.16 rolldown: 1.2.19
tinyglobby: 0.2.17 tinyglobby: 0.2.17
optionalDependencies: optionalDependencies:
'@types/node': 26.6.6 '@types/node': 26.6.6
+2 -2
View File
@@ -23,8 +23,6 @@ serde_json.workspace = true
env_logger.workspace = true env_logger.workspace = true
log.workspace = true log.workspace = true
compile-time.workspace = true compile-time.workspace = true
xz2 = "0.1"
tar = "0.4"
thiserror.workspace = true thiserror.workspace = true
uuid = { workspace = true, features = ["v4"] } uuid = { workspace = true, features = ["v4"] }
zeroize.workspace = true zeroize.workspace = true
@@ -33,6 +31,8 @@ getrandom = "0.4"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
nix = { version = "0.31", features = ["fs", "socket", "user"] } 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] [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
mac_address = "1.2.1" mac_address = "1.2.1"
+4 -4
View File
@@ -1,10 +1,10 @@
use gpapi::service::request::ConnectArgs; use gpapi::service::request::ConnectArgs;
use gpvpnc::windows::SystemTunnel;
use openconnect::{Vpn, VpnBuilder}; use openconnect::{Vpn, VpnBuilder};
use std::sync::Mutex; use std::sync::Mutex;
const RECOVERY_KEY: &str = r"SOFTWARE\GP Connect\NetworkRecovery";
pub(crate) fn recover_network() -> std::io::Result<()> { 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<VpnBuilder> { pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result<VpnBuilder> {
@@ -12,7 +12,7 @@ pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow:
args.vpnc_script().is_none(), args.vpnc_script().is_none(),
"Windows does not support custom VPN scripts" "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( Ok(
Vpn::builder(server, cookie).network_configuration_handler(move |configuration| { Vpn::builder(server, cookie).network_configuration_handler(move |configuration| {
network network
+7
View File
@@ -1,5 +1,12 @@
# Changelog # 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 ## 3.5.0
### Added ### Added
+1 -1
View File
@@ -108,5 +108,5 @@ tauri = { workspace = true, optional = true, features = ["unstable"] }
webview2-com = { version = "0.39", optional = true } 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"] } 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" dunce = "1"
winreg = "0.55" winreg = "0.56"
common = { path = "../common" } common = { path = "../common" }
+1 -1
View File
@@ -17,7 +17,7 @@ default = []
launcher = ["dep:open", "dep:webbrowser", "dep:which", "dep:winreg"] launcher = ["dep:open", "dep:webbrowser", "dep:which", "dep:winreg"]
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winreg = { version = "0.55", optional = true } winreg = { version = "0.56", optional = true }
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
open = { version = "5", optional = true } open = { version = "5", optional = true }
+1 -4
View File
@@ -101,10 +101,7 @@ uzers = { workspace = true, optional = true }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
file-rotate = { version = "0.8.0", optional = true } 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"] } 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"] }
[target.'cfg(windows)'.dev-dependencies]
windows-sys = { version = "0.61", features = ["Win32_UI_Shell"] }
[[test]] [[test]]
name = "certificate_compatibility" name = "certificate_compatibility"
+37 -65
View File
@@ -8,6 +8,13 @@ use serde::{Deserialize, Serialize};
use crate::credential::AuthCookieCredential; 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; const STORE_VERSION: u32 = 1;
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -45,16 +52,15 @@ impl StoredCookie {
} }
} }
pub fn cookie_path(custom: Option<&str>) -> PathBuf { pub fn cookie_path(custom: Option<&str>) -> Option<PathBuf> {
if let Some(p) = custom { match custom {
return PathBuf::from(p); 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<StoredCookie> { pub fn load(path: &Path, server: &str, host_id: &str) -> Option<StoredCookie> {
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()?; let stored: StoredCookie = serde_json::from_slice(&bytes).ok()?;
if stored.version != STORE_VERSION || stored.server != server || stored.host_id != host_id { if stored.version != STORE_VERSION || stored.server != server || stored.host_id != host_id {
return None; return None;
@@ -67,12 +73,12 @@ pub fn save(path: &Path, stored: &StoredCookie) -> anyhow::Result<()> {
.parent() .parent()
.ok_or_else(|| anyhow::anyhow!("cookie path has no parent directory"))?; .ok_or_else(|| anyhow::anyhow!("cookie path has no parent directory"))?;
fs::create_dir_all(parent)?; fs::create_dir_all(parent)?;
set_private_dir_permissions(parent)?; platform::prepare_directory(parent)?;
let mut tmp = tempfile::NamedTempFile::new_in(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()?; tmp.flush()?;
set_private_file_permissions(tmp.path())?; platform::prepare_file(tmp.path())?;
tmp.persist(path)?; tmp.persist(path)?;
Ok(()) Ok(())
} }
@@ -81,60 +87,6 @@ pub fn clear(path: &Path) {
let _ = fs::remove_file(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<u32> {
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<u32> {
#[cfg(unix)]
return unix::file_mode(path);
#[cfg(not(unix))]
{
let _ = path;
None
}
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; 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] #[test]
fn roundtrip_and_mode_0600() { fn roundtrip_and_mode_0600() {
let dir = tempfile::tempdir().unwrap(); let dir = tempfile::tempdir().unwrap();
@@ -156,8 +126,10 @@ mod tests {
let s = sample(); let s = sample();
save(&path, &s).unwrap(); save(&path, &s).unwrap();
if let Some(mode) = permissions::file_mode(&path) { #[cfg(unix)]
assert_eq!(mode, 0o600, "cookie file must be mode 0600, got {:o}", mode); {
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(); let loaded = load(&path, "vpn.example.com", "host-1").unwrap();
+24
View File
@@ -0,0 +1,24 @@
use std::{
fs, io,
os::unix::fs::PermissionsExt,
path::{Path, PathBuf},
};
pub(super) fn default_path() -> Option<PathBuf> {
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<u8>) -> io::Result<Vec<u8>> {
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))
}
+87
View File
@@ -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<PathBuf> {
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<u8>) -> io::Result<Vec<u8>> {
let result = transform(&mut bytes, true);
bytes.zeroize();
result
}
pub(super) fn decode(mut bytes: Vec<u8>) -> io::Result<Vec<u8>> {
transform(&mut bytes, false)
}
// DPAPI encrypts for the current Windows user, including at custom paths.
fn transform(bytes: &mut [u8], protect: bool) -> io::Result<Vec<u8>> {
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;
+20
View File
@@ -32,6 +32,8 @@ pub struct SamlAuthLauncher<'a> {
cancellation: CancellationToken, cancellation: CancellationToken,
server: &'a str, server: &'a str,
auth_executable: Option<&'a str>, auth_executable: Option<&'a str>,
#[cfg(windows)]
windows_cli: bool,
gateway: bool, gateway: bool,
saml_request: Option<&'a str>, saml_request: Option<&'a str>,
os: Option<&'a str>, os: Option<&'a str>,
@@ -65,6 +67,8 @@ impl<'a> SamlAuthLauncher<'a> {
cancellation: CancellationToken::new(), cancellation: CancellationToken::new(),
server, server,
auth_executable: None, auth_executable: None,
#[cfg(windows)]
windows_cli: false,
gateway: false, gateway: false,
saml_request: None, saml_request: None,
os: 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 { pub fn desktop_compatibility_graphics(mut self) -> Self {
self.desktop_compatibility_graphics = true; self.desktop_compatibility_graphics = true;
self self
@@ -297,6 +307,12 @@ impl<'a> SamlAuthLauncher<'a> {
.auth_executable .auth_executable
.map(PathBuf::from) .map(PathBuf::from)
.unwrap_or_else(binary_paths::gpauth); .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 auth_cmd = self.build_command(&program);
let mut command = auth_cmd.into_non_root()?.into_std(); 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 detect_gbm_failure = can_use_shared_memory && !use_shared_memory;
let stdin = auth_stdin(self.browser); let stdin = auth_stdin(self.browser);
let cancellation = self.cancellation.clone(); let cancellation = self.cancellation.clone();
#[cfg(windows)]
let windows_cli = self.windows_cli;
let output = tokio::task::spawn_blocking(move || { let output = tokio::task::spawn_blocking(move || {
#[cfg(feature = "logger")] #[cfg(feature = "logger")]
let stderr = crate::logger::diagnostic_writer(); let stderr = crate::logger::diagnostic_writer();
@@ -351,6 +369,8 @@ impl<'a> SamlAuthLauncher<'a> {
}, },
&mut stderr, &mut stderr,
stdin, stdin,
#[cfg(windows)]
windows_cli,
); );
std::io::Write::flush(&mut stderr)?; std::io::Write::flush(&mut stderr)?;
if gbm_failed.get() && !cancellation.is_cancelled() { if gbm_failed.get() && !cancellation.is_cancelled() {
+1 -1
View File
@@ -217,7 +217,7 @@ impl<'a> GuiLauncher<'a> {
use super::rendering_recovery::{GbmBufferFailure, RecoveryState}; use super::rendering_recovery::{GbmBufferFailure, RecoveryState};
let mut recovery = RecoveryState::default(); let mut recovery = RecoveryState::default();
let mut program = program; let mut program = program;
let (mut child, start_result) = loop { let (child, start_result) = loop {
service_input.write_all(&[DESKTOP_SWITCH_BEGIN]).await?; service_input.write_all(&[DESKTOP_SWITCH_BEGIN]).await?;
pending = true; pending = true;
let credential = super::desktop_launcher::read_credential(service_output).await? let credential = super::desktop_launcher::read_credential(service_output).await?
+12
View File
@@ -39,3 +39,15 @@ pub mod rendering_recovery;
#[cfg(windows)] #[cfg(windows)]
#[path = "windows/user_process.rs"] #[path = "windows/user_process.rs"]
pub mod user_process; 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;
@@ -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<u8>,
}
impl AuthBootstrap {
pub(super) fn prepare(command: &Command) -> io::Result<Self> {
let args: Vec<_> = command
.get_args()
.map(|arg| {
arg
.to_str()
.ok_or_else(|| invalid("Invalid Windows authentication argument"))
})
.collect::<io::Result<_>>()?;
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<Option<Vec<String>>> {
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<Vec<String>> {
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!("<html>{}</html>", "🎵".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::<Vec<_>>(), 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]);
}
}
@@ -1,9 +1,15 @@
//! Controlled Windows child execution. Pipe polling keeps cancellation responsive. //! 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 crate::collection::CollectionControl;
use std::{ use std::{
fs::File,
io::{self, Read, Write}, io::{self, Read, Write},
os::windows::io::AsRawHandle, os::windows::io::{AsRawHandle, OwnedHandle},
process::{Child, Command, Output, Stdio}, process::{Child, Command, ExitStatus, Output, Stdio},
thread, thread,
time::Duration, time::Duration,
}; };
@@ -30,45 +36,35 @@ pub(crate) fn run_controlled(command: Command, control: &dyn CollectionControl,
&mut |_| {}, &mut |_| {},
&mut io::sink(), &mut io::sink(),
ChildInput::Null, ChildInput::Null,
false,
) )
.map(|observed| observed.output) .map(|observed| observed.output)
} }
pub(crate) fn run_observed( pub(crate) fn run_observed(
mut command: Command, command: Command,
control: &dyn CollectionControl, control: &dyn CollectionControl,
output_limit: Option<usize>, output_limit: Option<usize>,
observer: &mut dyn FnMut(&[u8]), observer: &mut dyn FnMut(&[u8]),
stderr_sink: &mut dyn Write, stderr_sink: &mut dyn Write,
stdin: ChildInput<'_>, stdin: ChildInput<'_>,
windows_cli_auth: bool,
) -> io::Result<ObservedOutput> { ) -> io::Result<ObservedOutput> {
control.check()?; control.check()?;
// Windows desktop processes must not open a console for each helper. let bootstrap = windows_cli_auth.then(|| AuthBootstrap::prepare(&command)).transpose()?;
use std::os::windows::process::CommandExt; let (mut child, mut stdout, mut stderr, input) = match bootstrap {
if !matches!(stdin, ChildInput::Terminal) { Some(bootstrap) if crate::windows::is_elevated()? => {
command.creation_flags(0x08000000); // CREATE_NO_WINDOW let (child, stdout, stderr, input) = DesktopChild::spawn(&command, bootstrap, &stdin, control)?;
(ControlledChild::Desktop(child), Some(stdout), stderr, input)
} }
command.stdout(if output_limit.is_some() { bootstrap => spawn_command(command, &stdin, output_limit, bootstrap, control)?,
Stdio::piped() };
} else { let input = if let (ChildInput::Frame(frame), Some(mut pipe)) = (stdin, input) {
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 frame = frame.to_vec(); let frame = frame.to_vec();
Some(thread::spawn(move || pipe.write_all(&frame))) Some(thread::spawn(move || pipe.write_all(&frame)))
} else { } else {
None 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 output = Vec::new();
let mut buffer = [0u8; 8192]; let mut buffer = [0u8; 8192];
loop { loop {
@@ -86,7 +82,7 @@ pub(crate) fn run_observed(
let length = read_available(&mut stderr, &mut buffer)?; let length = read_available(&mut stderr, &mut buffer)?;
observer(&buffer[..length]); observer(&buffer[..length]);
stderr_sink.write_all(&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. // Drain the remaining buffered output after the process exits.
if let Some(pipe) = &mut stdout { if let Some(pipe) = &mut stdout {
loop { loop {
@@ -126,6 +122,60 @@ pub(crate) fn run_observed(
} }
} }
fn spawn_command(
command: Command,
stdin: &ChildInput<'_>,
output_limit: Option<usize>,
bootstrap: Option<AuthBootstrap>,
control: &dyn CollectionControl,
) -> io::Result<(ControlledChild, Option<File>, File, Option<File>)> {
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<usize> { fn read_available(pipe: &mut (impl Read + AsRawHandle), buffer: &mut [u8]) -> io::Result<usize> {
let mut available = 0; let mut available = 0;
let success = unsafe { let success = unsafe {
@@ -152,11 +202,34 @@ fn read_available(pipe: &mut (impl Read + AsRawHandle), buffer: &mut [u8]) -> io
pipe.read(&mut buffer[..length]) pipe.read(&mut buffer[..length])
} }
struct ControlledChild(Child); enum ControlledChild {
impl Drop for ControlledChild { Standard(StandardChild),
Desktop(DesktopChild),
}
impl ControlledChild {
fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
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<ConsoleInput>,
}
impl Drop for StandardChild {
fn drop(&mut self) { fn drop(&mut self) {
let _ = self.0.kill(); let _ = self.child.kill();
let _ = self.0.wait(); let _ = self.child.wait();
} }
} }
@@ -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<AtomicBool>,
worker: Option<JoinHandle<io::Result<()>>>,
}
impl ConsoleInput {
pub(super) fn start(input: OwnedHandle, output: File) -> io::Result<Self> {
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<String> {
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<OwnedHandle> {
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) })
}
@@ -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<ConsoleInput>,
}
impl DesktopChild {
pub(super) fn spawn(
command: &Command,
bootstrap: AuthBootstrap,
input: &ChildInput<'_>,
control: &dyn CollectionControl,
) -> io::Result<(Self, File, File, Option<File>)> {
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::<STARTUPINFOW>() 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<Option<ExitStatus>> {
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<OwnedHandle> {
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<u32> {
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<OwnedHandle> {
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::<SECURITY_ATTRIBUTES>() 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))
}
@@ -36,7 +36,7 @@ impl Drop for Environment {
fn invalid(message: &str) -> io::Error { fn invalid(message: &str) -> io::Error {
io::Error::new(io::ErrorKind::InvalidInput, message) io::Error::new(io::ErrorKind::InvalidInput, message)
} }
fn wide(value: &OsStr) -> io::Result<Vec<u16>> { pub(super) fn wide(value: &OsStr) -> io::Result<Vec<u16>> {
let value: Vec<_> = value.encode_wide().collect(); let value: Vec<_> = value.encode_wide().collect();
if value.contains(&0) { if value.contains(&0) {
return Err(invalid("Windows process strings cannot contain NUL")); return Err(invalid("Windows process strings cannot contain NUL"));
@@ -63,12 +63,15 @@ fn quote(argument: &[u16], output: &mut Vec<u16>) {
output.extend(std::iter::repeat_n(b'\\' as u16, backslashes * 2)); output.extend(std::iter::repeat_n(b'\\' as u16, backslashes * 2));
output.push(b'"' as u16); output.push(b'"' as u16);
} }
fn command_line(program: &[u16], arguments: &[String]) -> io::Result<Vec<u16>> { pub(super) fn command_line<'a>(
program: &[u16],
arguments: impl IntoIterator<Item = &'a OsStr>,
) -> io::Result<Vec<u16>> {
let mut output = Vec::new(); let mut output = Vec::new();
quote(program, &mut output); quote(program, &mut output);
for argument in arguments { for argument in arguments {
output.push(b' ' as u16); output.push(b' ' as u16);
quote(&wide(OsStr::new(argument))?, &mut output); quote(&wide(argument)?, &mut output);
} }
output.push(0); output.push(0);
if output.len() > 32767 { 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) } unsafe { CompareStringOrdinal(left.as_ptr(), left.len() as i32, right.as_ptr(), right.len() as i32, 1) }
.cmp(&CSTR_EQUAL) .cmp(&CSTR_EQUAL)
} }
fn user_environment(token: BorrowedHandle<'_>, variables: &[(&str, &str)]) -> io::Result<Vec<u16>> { pub(super) fn user_environment<'a>(
token: BorrowedHandle<'_>,
variables: impl IntoIterator<Item = (&'a OsStr, &'a OsStr)>,
) -> io::Result<Vec<u16>> {
let mut pointer = ptr::null_mut(); let mut pointer = ptr::null_mut();
if unsafe { CreateEnvironmentBlock(&mut pointer, token.as_raw_handle(), 0) } == 0 { if unsafe { CreateEnvironmentBlock(&mut pointer, token.as_raw_handle(), 0) } == 0 {
return Err(io::Error::last_os_error()); 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 { 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")); return Err(invalid("Invalid worker environment name"));
} }
let name = wide(OsStr::new(name))?; let value = wide(value)?;
let value = wide(OsStr::new(value))?;
entries.retain(|entry| compare(key(entry), &name) != std::cmp::Ordering::Equal); entries.retain(|entry| compare(key(entry), &name) != std::cmp::Ordering::Equal);
let mut entry = name; let mut entry = name;
entry.push(b'=' as u16); entry.push(b'=' as u16);
@@ -145,9 +151,14 @@ impl UserProcess {
return Err(invalid("Windows worker executable must be absolute")); return Err(invalid("Windows worker executable must be absolute"));
} }
let mut executable = wide(program.as_os_str())?; 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); 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 directory = program.parent().ok_or_else(|| invalid("Worker directory is missing"))?;
let mut directory = wide(directory.as_os_str())?; let mut directory = wide(directory.as_os_str())?;
directory.push(0); directory.push(0);
@@ -286,7 +297,7 @@ mod tests {
"&|<>", "&|<>",
] ]
.map(String::from); .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; let mut count = 0;
unsafe { unsafe {
let parsed = CommandLineToArgvW(command.as_ptr(), &mut count); let parsed = CommandLineToArgvW(command.as_ptr(), &mut count);
@@ -8,6 +8,32 @@ use super::*;
const MAX_ADDRESSES: usize = 64; const MAX_ADDRESSES: usize = 64;
#[cfg(not(windows))]
fn native_helper() -> anyhow::Result<PathBuf> {
Ok(common::binary_paths::gpclient())
}
#[cfg(windows)]
fn native_helper() -> anyhow::Result<PathBuf> {
windows_native_helper(&crate::windows::application_directory()?)
}
#[cfg(windows)]
fn windows_native_helper(directory: &std::path::Path) -> anyhow::Result<PathBuf> {
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)] #[doc(hidden)]
pub fn detect_in_helper(address: std::net::IpAddr, hostname: &str) -> anyhow::Result<bool> { pub fn detect_in_helper(address: std::net::IpAddr, hostname: &str) -> anyhow::Result<bool> {
super::detection::validate_target(address, hostname)?; super::detection::validate_target(address, hostname)?;
@@ -27,7 +53,7 @@ pub(in crate::session) async fn detect(
"--hostname".into(), "--hostname".into(),
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") serde_json::from_slice(&output).context("Invalid internal detection helper response")
} }
@@ -68,14 +94,7 @@ pub(super) async fn resolve(
if disable_ipv6 { if disable_ipv6 {
args.push("--disable-ipv6".into()); args.push("--disable-ipv6".into());
} }
run_resolver( run_resolver(native_helper()?, args, port, disable_ipv6, cancellation.clone()).await
common::binary_paths::gpclient(),
args,
port,
disable_ipv6,
cancellation.clone(),
)
.await
} }
async fn run_resolver( async fn run_resolver(
@@ -147,6 +166,26 @@ fn validate_addresses(addresses: &[SocketAddr], port: u16, disable_ipv6: bool) -
mod tests { mod tests {
use super::*; 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] #[tokio::test]
async fn actual_helper_output_is_validated_before_admission() { async fn actual_helper_output_is_validated_before_admission() {
let addresses = run_resolver( let addresses = run_resolver(
+54 -2
View File
@@ -1,6 +1,10 @@
//! Windows user identity and private local IPC. //! Windows user identity and private local IPC.
use std::os::windows::io::{AsHandle, AsRawHandle, BorrowedHandle, FromRawHandle, OwnedHandle}; use std::os::windows::io::{AsHandle, AsRawHandle, BorrowedHandle, FromRawHandle, OwnedHandle};
use std::{io, ptr}; use std::{
env, io,
path::{Path, PathBuf},
ptr,
};
mod pipes; mod pipes;
pub use pipes::{PacketPipe, connect_service_admission, connect_service_worker, create_service_admission_pipe}; pub use pipes::{PacketPipe, connect_service_admission, connect_service_worker, create_service_admission_pipe};
use tokio::net::windows::named_pipe::NamedPipeServer; use tokio::net::windows::named_pipe::NamedPipeServer;
@@ -22,6 +26,54 @@ pub fn current_user_sid() -> io::Result<String> {
} }
} }
/// Locate bundled Windows helpers relative to the installed executable.
pub fn application_directory() -> std::io::Result<PathBuf> {
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<bool> {
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<u32> {
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. /// 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. /// Windows user identity is a SID and token; it is never represented as a Unix UID.
pub struct PipeClientIdentity { pub struct PipeClientIdentity {
@@ -111,7 +163,7 @@ pub fn process_user_sid(pid: u32) -> io::Result<String> {
} }
} }
unsafe fn token_user_sid(token: windows_sys::Win32::Foundation::HANDLE) -> io::Result<String> { pub(crate) unsafe fn token_user_sid(token: windows_sys::Win32::Foundation::HANDLE) -> io::Result<String> {
unsafe { unsafe {
let mut length = 0; let mut length = 0;
GetTokenInformation(token, TokenUser, ptr::null_mut(), 0, &mut length); GetTokenInformation(token, TokenUser, ptr::null_mut(), 0, &mut length);
+1 -5
View File
@@ -4,11 +4,7 @@ use gpapi::{collection::CollectionControl, process::collection::CollectorCommand
use std::io; use std::io;
pub(super) fn collect(commands: &CollectorCommands<'_>, control: &dyn CollectionControl) -> io::Result<WindowsReport> { pub(super) fn collect(commands: &CollectorCommands<'_>, control: &dyn CollectionControl) -> io::Result<WindowsReport> {
let executable = std::env::current_exe()?; let helper = gpapi::windows::application_directory()?.join("gp-posture.exe");
let helper = executable
.parent()
.ok_or_else(|| io::Error::other("Application directory is unavailable"))?
.join("gp-posture.exe");
let output = commands let output = commands
.run_executable(&helper, &[])? .run_executable(&helper, &[])?
.ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "Windows posture helper is not installed"))?; .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "Windows posture helper is not installed"))?;
+37 -6
View File
@@ -284,7 +284,7 @@ impl Observation {
/// One native tunnel's negotiated state and optional sampler. The connection /// One native tunnel's negotiated state and optional sampler. The connection
/// owner must join `Vpn::connect` before calling `stop`. /// owner must join `Vpn::connect` before calling `stop`.
pub struct TunnelMonitor { pub struct TunnelMonitor {
vpn: Arc<Vpn>, vpn: Mutex<Option<Arc<Vpn>>>,
observation: Mutex<Observation>, observation: Mutex<Observation>,
updates: watch::Sender<TunnelUpdate>, updates: watch::Sender<TunnelUpdate>,
wake: Arc<Notify>, wake: Arc<Notify>,
@@ -302,14 +302,14 @@ impl TunnelMonitor {
let observation = Observation::new(); let observation = Observation::new();
let (updates, _) = watch::channel(observation.project(Instant::now())); let (updates, _) = watch::channel(observation.project(Instant::now()));
let monitor = Arc::new(Self { let monitor = Arc::new(Self {
vpn, vpn: Mutex::new(Some(vpn.clone())),
observation: Mutex::new(observation), observation: Mutex::new(observation),
updates, updates,
wake: Arc::new(Notify::new()), wake: Arc::new(Notify::new()),
worker: Mutex::new(None), worker: Mutex::new(None),
}); });
let observer = Arc::downgrade(&monitor); let observer = Arc::downgrade(&monitor);
monitor.vpn.set_tunnel_observer(move |event| { vpn.set_tunnel_observer(move |event| {
on_event(&event); on_event(&event);
if let Some(monitor) = observer.upgrade() { if let Some(monitor) = observer.upgrade() {
monitor.observe(event); monitor.observe(event);
@@ -347,7 +347,9 @@ impl TunnelMonitor {
observation.finish(Instant::now()); observation.finish(Instant::now());
self.publish(&observation); self.publish(&observation);
drop(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(); self.wake.notify_one();
} }
@@ -405,7 +407,11 @@ impl TunnelMonitor {
} }
return true; 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) => { Ok(true) => {
observation.pending = Some(RequestStamp { observation.pending = Some(RequestStamp {
generation: observation.generation, generation: observation.generation,
@@ -431,7 +437,9 @@ impl TunnelMonitor {
impl Drop for TunnelMonitor { impl Drop for TunnelMonitor {
fn drop(&mut self) { 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() { if let Some(worker) = self.worker.get_mut().unwrap().take() {
worker.abort(); worker.abort();
} }
@@ -468,6 +476,29 @@ fn millis(duration: Duration) -> u64 {
mod tests { mod tests {
use super::*; 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 { fn connected(now: Instant) -> Observation {
let mut observation = Observation::new(); let mut observation = Observation::new();
observation.apply(Event::Established, now); observation.apply(Event::Established, now);
+1 -1
View File
@@ -15,7 +15,7 @@ serde_json.workspace = true
serde.workspace = true serde.workspace = true
winreg = "0.56" winreg = "0.56"
uuid = { workspace = true, features = ["v4"] } 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] [dev-dependencies]
ipnet = "2" ipnet = "2"
+29 -8
View File
@@ -1,5 +1,5 @@
//! Adapter DNS settings and Windows name-resolution policy scoped to this connection. //! 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 base64::Engine;
use serde_json::json; use serde_json::json;
use std::{ use std::{
@@ -23,6 +23,7 @@ pub(super) struct Installed {
guid: GUID, guid: GUID,
snapshot: Option<Snapshot>, snapshot: Option<Snapshot>,
tag: Option<String>, tag: Option<String>,
tunnel: Option<SystemTunnel>,
} }
fn check(status: u32) -> io::Result<()> { fn check(status: u32) -> io::Result<()> {
if status == 0 { if status == 0 {
@@ -77,7 +78,7 @@ impl Snapshot {
} }
} }
impl Installed { impl Installed {
pub fn apply(configuration: &Configuration) -> io::Result<Self> { pub fn apply(configuration: &Configuration, recovery_key: &str, tunnel: Option<&SystemTunnel>) -> io::Result<Self> {
let mut luid = NET_LUID_LH::default(); let mut luid = NET_LUID_LH::default();
let mut guid = GUID::default(); let mut guid = GUID::default();
check(unsafe { ConvertInterfaceIndexToLuid(configuration.interface, &mut luid) })?; check(unsafe { ConvertInterfaceIndexToLuid(configuration.interface, &mut luid) })?;
@@ -86,6 +87,7 @@ impl Installed {
guid, guid,
snapshot: Some(Snapshot::capture(guid)?), snapshot: Some(Snapshot::capture(guid)?),
tag: None, tag: None,
tunnel: tunnel.cloned(),
}; };
Snapshot { Snapshot {
domain: configuration.domains.first().cloned().unwrap_or_default(), domain: configuration.domains.first().cloned().unwrap_or_default(),
@@ -105,9 +107,13 @@ impl Installed {
.map(|domain| format!(".{}", domain.trim_matches('.'))) .map(|domain| format!(".{}", domain.trim_matches('.')))
.collect() .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()); installed.tag = Some(tag.clone());
policy( policy(
tunnel,
json!({"operation":"add", "tag":tag, "namespaces":namespaces, "servers":configuration.servers.iter().map(ToString::to_string).collect::<Vec<_>>()}), json!({"operation":"add", "tag":tag, "namespaces":namespaces, "servers":configuration.servers.iter().map(ToString::to_string).collect::<Vec<_>>()}),
)?; )?;
} }
@@ -116,7 +122,7 @@ impl Installed {
pub fn restore(&mut self) -> io::Result<()> { pub fn restore(&mut self) -> io::Result<()> {
let mut failure = None; let mut failure = None;
if let Some(tag) = self.tag.take() { 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}"); log::warn!("Could not remove VPN DNS policy: {error}");
failure = Some(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 /// A crashed service cannot run Drop. Remove only GP Connect's tagged policies
/// before accepting a new connection; adapter rows disappear with Wintun itself. /// before accepting a new connection; adapter rows disappear with Wintun itself.
pub(super) fn clear_stale_policies() -> io::Result<()> { pub(super) fn clear_stale_policies(tunnel: &SystemTunnel) -> io::Result<()> {
policy(json!({"operation":"clear-stale"})) 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"); const SCRIPT: &str = include_str!("dns-policy.ps1");
let encoded = base64::engine::general_purpose::STANDARD let encoded = base64::engine::general_purpose::STANDARD
.encode(SCRIPT.encode_utf16().flat_map(u16::to_le_bytes).collect::<Vec<_>>()); .encode(SCRIPT.encode_utf16().flat_map(u16::to_le_bytes).collect::<Vec<_>>());
let root = let root =
std::env::var_os("SystemRoot").ok_or_else(|| io::Error::other("Windows system directory is unavailable"))?; 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"); 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) let mut child = Command::new(executable)
.args(["-NoProfile", "-NonInteractive", "-EncodedCommand", &encoded]) .args(["-NoProfile", "-NonInteractive", "-EncodedCommand", &encoded])
.creation_flags(CREATE_NO_WINDOW) .creation_flags(CREATE_NO_WINDOW)
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::null()) .stdout(stdout)
.stderr(Stdio::piped()) .stderr(Stdio::piped())
.spawn()?; .spawn()?;
let input = child let input = child
+17 -4
View File
@@ -3,24 +3,32 @@ mod configuration;
mod dns; mod dns;
mod ip_helper; mod ip_helper;
mod recovery; mod recovery;
mod system_tunnel;
use configuration::Configuration; use configuration::Configuration;
use std::io; use std::io;
pub use system_tunnel::SystemTunnel;
pub struct NetworkConfigurator { pub struct NetworkConfigurator {
connection: Option<Connection>, connection: Option<Connection>,
recovery_key: String, recovery_key: String,
system_tunnel: Option<SystemTunnel>,
} }
struct Connection { struct Connection {
dns: dns::Installed, dns: dns::Installed,
network: ip_helper::Installed, network: ip_helper::Installed,
} }
impl NetworkConfigurator { 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> { pub fn new(recovery_key: &str) -> io::Result<Self> {
Self::with_owner(recovery_key, None)
}
fn with_owner(recovery_key: &str, system_tunnel: Option<SystemTunnel>) -> io::Result<Self> {
recovery::Journal::begin(recovery_key)?; recovery::Journal::begin(recovery_key)?;
Ok(Self { Ok(Self {
connection: None, connection: None,
recovery_key: recovery_key.into(), recovery_key: recovery_key.into(),
system_tunnel,
}) })
} }
pub fn configure(&mut self, reason: &str, environment: &[(String, Option<String>)]) -> io::Result<()> { pub fn configure(&mut self, reason: &str, environment: &[(String, Option<String>)]) -> io::Result<()> {
@@ -30,7 +38,7 @@ impl NetworkConfigurator {
let configuration = Configuration::parse(environment)?; let configuration = Configuration::parse(environment)?;
self.disconnect()?; self.disconnect()?;
let network = ip_helper::Installed::apply(&configuration, &self.recovery_key)?; 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 }); self.connection = Some(Connection { dns, network });
Ok(()) 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<()> { 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)? { if let Some(journal) = recovery::Journal::open(recovery_key)? {
for (name, route) in journal.routes()? { for (name, route) in journal.routes()? {
ip_helper::recover_route(&route)?; ip_helper::recover_route(&route)?;
journal.forget(&name)?; journal.forget(&name)?;
} }
} }
dns::clear_stale_policies() Ok(())
} }
@@ -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<File>,
}
impl SystemTunnel {
pub fn try_acquire() -> io::Result<Option<Self>> {
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> {
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> {
NetworkConfigurator::with_owner(RECOVERY_KEY, Some(self.clone()))
}
pub(super) fn duplicate_lock(&self) -> io::Result<File> {
self.lock.try_clone()
}
}
fn machine_data() -> io::Result<PathBuf> {
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])))
}
+47 -7
View File
@@ -235,12 +235,18 @@ fn assert_dns_policy(active: bool) {
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$ProgressPreference = 'SilentlyContinue' $ProgressPreference = 'SilentlyContinue'
$expected = [int]$env:GP_TEST_EXPECTED_DNS_POLICIES $expected = [int]$env:GP_TEST_EXPECTED_DNS_POLICIES
$configured = @(Get-DnsClientNrptRule | Where-Object { $_.Namespace -contains '.gp-connect-test.invalid' }) $configured = @(Get-DnsClientNrptRule)
$effective = @(Get-DnsClientNrptPolicy | Where-Object { $_.Namespace -contains '.gp-connect-test.invalid' }) $effective = @(Get-DnsClientNrptPolicy)
if ($configured.Count -ne $expected -or $effective.Count -ne $expected) { throw 'Unexpected configured or effective VPN DNS policy' } 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) { if ($expected) {
$servers = @($configured[0].NameServers) $servers = @($rules[0].NameServers)
if ($servers -notcontains '198.18.0.53' -or $servers -notcontains 'fd42:1235::53') { throw 'VPN DNS server families are missing' } if ($servers -notcontains '198.18.0.53' -or $servers -notcontains 'fd42:1235::53') { throw "VPN DNS server families are missing for $namespace" }
}
} }
"#; "#;
let powershell = let powershell =
@@ -253,6 +259,22 @@ if ($expected) {
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr)); assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
} }
fn global_search_list() -> Vec<u8> {
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] #[test]
#[ignore = "requires administrator privileges and GP_TEST_WINTUN_DLL"] #[ignore = "requires administrator privileges and GP_TEST_WINTUN_DLL"]
fn installs_and_restores_native_network_configuration() -> Result<(), Box<dyn std::error::Error>> { fn installs_and_restores_native_network_configuration() -> Result<(), Box<dyn std::error::Error>> {
@@ -274,10 +296,17 @@ fn installs_and_restores_native_network_configuration() -> Result<(), Box<dyn st
let recovery_key = format!(r"SOFTWARE\GP Connect\Tests\Network{}", uuid::Uuid::new_v4().simple()); let recovery_key = format!(r"SOFTWARE\GP Connect\Tests\Network{}", uuid::Uuid::new_v4().simple());
assert_dns_policy(false); assert_dns_policy(false);
let before = state(index); let before = state(index);
let original_search_list = global_search_list();
{ {
let mut network = NetworkConfigurator::new(&recovery_key)?; let mut network = NetworkConfigurator::new(&recovery_key)?;
network.configure("connect", &environment)?; network.configure("connect", &environment)?;
let during = state(index); let during = state(index);
assert!(during.iter().any(|row| row == "dns-domain gp-connect-test.invalid"));
assert!(
during
.iter()
.any(|row| row == "dns-search gp-connect-test.invalid,second-gp-connect-test.invalid")
);
assert!(during.iter().any(|row| row == "address 192.0.2.2/24")); assert!(during.iter().any(|row| row == "address 192.0.2.2/24"));
assert!(during.iter().any(|row| row == "address fd42:1234::2/64")); assert!(during.iter().any(|row| row == "address fd42:1234::2/64"));
assert!( assert!(
@@ -298,10 +327,14 @@ fn installs_and_restores_native_network_configuration() -> Result<(), Box<dyn st
assert_ne!(best_route("198.51.100.1").InterfaceIndex, index); assert_ne!(best_route("198.51.100.1").InterfaceIndex, index);
println!("PASS: IPv4/IPv6 addresses, split routes, resolver routes and MTU installed"); println!("PASS: IPv4/IPv6 addresses, split routes, resolver routes and MTU installed");
assert_dns_policy(true); assert_dns_policy(true);
gpvpnc::windows::recover(&format!(r"{recovery_key}-other"))?;
assert_dns_policy(true);
assert_eq!(global_search_list(), original_search_list);
network.configure("disconnect", &[])?; network.configure("disconnect", &[])?;
} }
assert_eq!(before, state(index), "Network state was not restored"); assert_eq!(before, state(index), "Network state was not restored");
assert_dns_policy(false); assert_dns_policy(false);
assert_eq!(global_search_list(), original_search_list);
println!("PASS: disconnect restored addresses, routes and interface settings"); println!("PASS: disconnect restored addresses, routes and interface settings");
{ {
let mut network = NetworkConfigurator::new(&recovery_key)?; let mut network = NetworkConfigurator::new(&recovery_key)?;
@@ -324,6 +357,7 @@ fn installs_and_restores_native_network_configuration() -> Result<(), Box<dyn st
println!("PASS: partial setup failure rolled back its physical gateway route"); println!("PASS: partial setup failure rolled back its physical gateway route");
drop(adapter); drop(adapter);
assert_crash_recovery(&recovery_key)?; assert_crash_recovery(&recovery_key)?;
assert_eq!(global_search_list(), original_search_list);
winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE).delete_subkey(&recovery_key)?; winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE).delete_subkey(&recovery_key)?;
Ok(()) Ok(())
} }
@@ -347,8 +381,14 @@ fn environment(index: u32) -> Vec<(String, Option<String>)> {
("CISCO_IPV6_SPLIT_INC_0_ADDR", "2001:db8:1234::".into()), ("CISCO_IPV6_SPLIT_INC_0_ADDR", "2001:db8:1234::".into()),
("CISCO_IPV6_SPLIT_INC_0_MASKLEN", "64".into()), ("CISCO_IPV6_SPLIT_INC_0_MASKLEN", "64".into()),
("INTERNAL_IP4_DNS", "198.18.0.53 fd42:1235::53".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 pairs
.into_iter() .into_iter()
+3 -2
View File
@@ -34,5 +34,6 @@ Depends:
libsecret-1-0, libsecret-1-0,
gnome-keyring, gnome-keyring,
xdg-utils, xdg-utils,
Description: A GUI client for GlobalProtect VPN Description: Graphical client for GlobalProtect VPN
A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method. GP Connect uses OpenConnect to connect to GlobalProtect VPN servers.
It supports single sign-on (SSO).
+16 -2
View File
@@ -9,7 +9,10 @@
`TARGET_ARCH` is `x64` or `arm64` and must match every executable and DLL in `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 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 native library build accepts `scripts/build-openconnect-windows.ps1 -TunnelType 'GP Connect'`
(the default). This passes OpenConnect's `--with-wintun-tunnel-type` build option; (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 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 identity, including the snapshot build when applicable. The payload must contain matching
`gpgui.exe`, `gpauth.exe`, `gpservice.exe`, their DLL dependency closure, the `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. adds the generated uninstaller; it is not a separately built executable.
The installer, extraction progress and uninstaller use the shared Windows icon 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 files and uninstall metadata, and leave A's service running. Also check held
runtime files, active GUI/auth windows, Wintun-signature failure, and concurrent runtime files, active GUI/auth windows, Wintun-signature failure, and concurrent
installer attempts. Do not run failure fixtures against a live company VPN. 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.
+63 -13
View File
@@ -14,10 +14,13 @@ if ($PSVersionTable.PSEdition -eq 'Desktop') {
} }
if (![Environment]::Is64BitProcess) { throw 'Run the GP Connect installer with 64-bit PowerShell.' } if (![Environment]::Is64BitProcess) { throw 'Run the GP Connect installer with 64-bit PowerShell.' }
$destination = Join-Path ([Environment]::GetFolderPath('ProgramFiles')) 'GP Connect' $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' $serviceName = 'GPConnect'
$serviceBinary = Join-Path $destination 'gpservice.exe' $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' $uninstallKey = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPConnect'
$recoveryKey = 'HKLM:\SOFTWARE\GP Connect\NetworkRecovery' $recoveryKey = 'HKLM:\SOFTWARE\GP Connect\NetworkRecovery'
$publicAcl = 'O:BAG:BAD:P(A;OICI;FA;;;SY)(A;OICI;FA;;;BA)(A;OICI;FRFX;;;BU)' $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 { function Wait-ForApplications {
$deadline = [DateTime]::UtcNow.AddSeconds(30) $deadline = [DateTime]::UtcNow.AddSeconds(30)
do { do {
$running = @(Get-CimInstance Win32_Process -Filter "Name='gpgui.exe' OR Name='gpauth.exe'" | $clientPath = Join-Path $destination 'cli\gpclient.exe'
Where-Object { $_.ExecutablePath -in @((Join-Path $destination 'gpgui.exe'), (Join-Path $destination 'gpauth.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 (!$running.Count) { return }
if ([DateTime]::UtcNow -ge $deadline) { if ([DateTime]::UtcNow -ge $deadline) {
throw 'Quit GP Connect and finish or cancel sign-in in all Windows sessions, then try again.' 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) $deadline = [DateTime]::UtcNow.AddSeconds(30)
do { do {
$locked = $false $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 { try {
$stream = [IO.File]::Open($file.FullName, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::None) $stream = [IO.File]::Open($file.FullName, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::None)
$stream.Dispose() $stream.Dispose()
@@ -103,12 +112,24 @@ function Wait-ForRuntimeRelease {
} while ($true) } 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 { function Assert-NetworkClean {
$records = @() $records = @()
if (Test-Path $recoveryKey) { $records = @((Get-Item $recoveryKey).GetValueNames() | Where-Object { $_ -like 'Route-*' }) } if (Test-Path $recoveryKey) { $records = @((Get-Item $recoveryKey).GetValueNames() | Where-Object { $_ -like 'Route-*' }) }
$policies = @(Get-DnsClientNrptRule | Where-Object { $_.Comment -like 'GPConnect:*' }) $policies = @(Get-DnsClientNrptRule | Where-Object { $_.Comment -like 'GPConnect:*' })
if ($records.Count -or $policies.Count) { 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 { function Set-MachineState {
Set-DirectoryAcl $state $publicAcl Set-DirectoryAcl $state $publicAcl
Set-DirectoryAcl (Join-Path $state 'Private') $privateAcl Set-DirectoryAcl $private $privateAcl
foreach ($name in @('gpservice.lock', 'gpservice.log')) { foreach ($name in @('gpservice.lock', 'gpservice.log')) {
$path = Join-Path $state $name $path = Join-Path $state $name
if (Test-Path -LiteralPath $path) { if (Test-Path -LiteralPath $path) {
@@ -281,7 +302,7 @@ try {
if ($source -eq $destination -or $source.StartsWith($destination + '\', [StringComparison]::OrdinalIgnoreCase)) { if ($source -eq $destination -or $source.StartsWith($destination + '\', [StringComparison]::OrdinalIgnoreCase)) {
throw 'Install from an extracted package outside the application folder.' 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" } 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 $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) { 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.' throw 'The package version or architecture does not match this installer.'
} }
if (![Environment]::Is64BitProcess -or [Environment]::OSVersion.Version.Build -lt 19041) { $build = [Environment]::OSVersion.Version.Build
throw 'GP Connect requires Windows 10 build 19041 or newer.' if ($architecture -eq 'arm64' -and $build -lt 22000) {
}
if ($architecture -eq 'arm64' -and [Environment]::OSVersion.Version.Build -lt 22000) {
throw 'GP Connect for ARM64 requires Windows 11.' 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 { $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 (!$_.PSIsContainer -and ($_.Extension -eq '.dll' -or
$_.Name -in @('gpservice.exe', 'gpauth.exe', 'gpgui.exe', 'gp-posture.exe', 'uninstall.exe', 'build-info.json'))) $_.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') { if ($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -notmatch 'WireGuard LLC') {
throw 'The package requires the vendor-signed Wintun driver DLL.' 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 ((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 ($existing -and !(Test-Path -LiteralPath $destination)) { throw 'The registered installation is missing. Restore its files before updating.' }
if (Test-Path $uninstallKey) { if (Test-Path $uninstallKey) {
@@ -368,6 +411,9 @@ try {
if ($existing) { if ($existing) {
$serviceStopped = $true $serviceStopped = $true
Stop-InstalledService Stop-InstalledService
}
$tunnelLock = Open-TunnelLock
if ($existing) {
Assert-NetworkClean Assert-NetworkClean
Wait-ForRuntimeRelease Wait-ForRuntimeRelease
} }
@@ -382,6 +428,7 @@ try {
} else { Set-Service -Name $serviceName -StartupType Automatic } } else { Set-Service -Name $serviceName -StartupType Automatic }
Invoke-ServiceCommand @('failure', $serviceName, 'reset=', '86400', 'actions=', 'restart/3000/restart/10000/none/0') Invoke-ServiceCommand @('failure', $serviceName, 'reset=', '86400', 'actions=', 'restart/3000/restart/10000/none/0')
Set-InstallationMetadata $Version Set-InstallationMetadata $Version
$tunnelLock.Dispose(); $tunnelLock = $null
Start-InstalledService Start-InstalledService
$committed = $true $committed = $true
if ($oldMoved) { Remove-Item -LiteralPath $backup -Recurse -Force; $oldMoved = $false } if ($oldMoved) { Remove-Item -LiteralPath $backup -Recurse -Force; $oldMoved = $false }
@@ -395,6 +442,7 @@ try {
Wait-ForApplications Wait-ForApplications
$serviceStopped = $true $serviceStopped = $true
Stop-InstalledService Stop-InstalledService
$tunnelLock = Open-TunnelLock
Assert-NetworkClean Assert-NetworkClean
Wait-ForRuntimeRelease Wait-ForRuntimeRelease
# Move first: a locked runtime aborts while its registration and files are intact. # 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 ($oldMoved) { Move-Item -LiteralPath $backup -Destination $destination; $oldMoved = $false }
if ($createdService) { Invoke-ServiceCommand @('delete', $serviceName) } if ($createdService) { Invoke-ServiceCommand @('delete', $serviceName) }
if ($newMoved) { Restore-InstallationMetadata } if ($newMoved) { Restore-InstallationMetadata }
if ($tunnelLock) { $tunnelLock.Dispose(); $tunnelLock = $null }
if ($existing -and $serviceStopped -and $wasRunning) { Start-InstalledService } if ($existing -and $serviceStopped -and $wasRunning) { Start-InstalledService }
} catch { } catch {
Write-Host "Could not restore GP Connect: $($_.Exception.Message)" Write-Host "Could not restore GP Connect: $($_.Exception.Message)"
@@ -428,6 +477,7 @@ try {
Write-Host "Details: $(Join-Path $state 'installer.log')" Write-Host "Details: $(Join-Path $state 'installer.log')"
throw $failure throw $failure
} finally { } finally {
if ($tunnelLock) { $tunnelLock.Dispose() }
if ($stage -and (Test-Path -LiteralPath $stage)) { if ($stage -and (Test-Path -LiteralPath $stage)) {
try { Remove-Item -LiteralPath $stage -Recurse -Force } catch { Write-Warning "Could not remove temporary files: $stage" } try { Remove-Item -LiteralPath $stage -Recurse -Force } catch { Write-Warning "Could not remove temporary files: $stage" }
} }
+16 -3
View File
@@ -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 ($info.architecture -ne $Architecture -or [string]$info.build_version -ne $Build) { throw 'The installed package identity does not match.' }
if ($env:WINDOWS_SIGNING_PUBLISHER) { if ($env:WINDOWS_SIGNING_PUBLISHER) {
$signed = @($Installer) $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 $signed += Join-Path $destination $name
} }
& (Join-Path $PSScriptRoot 'test-windows-signature.ps1') -Files $signed -Publisher $env:WINDOWS_SIGNING_PUBLISHER & (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 $process = Start-Process (Join-Path $destination $name) -ArgumentList '--version' -PassThru -Wait
if ($process.ExitCode -ne 0) { throw "The installed $name cannot start." } 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' $helper = Join-Path $destination 'gp-posture.exe'
$output = Join-Path $env:TEMP 'gp-posture-install-test.json' $output = Join-Path $env:TEMP 'gp-posture-install-test.json'
$process = Start-Process $helper -PassThru -Wait -RedirectStandardOutput $output $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 New-Item -ItemType Directory -Force $state | Out-Null
$marker = Join-Path $state 'ci-install-retention' $marker = Join-Path $state 'ci-install-retention'
[IO.File]::WriteAllText($marker, 'retain user settings') [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 ($process.ExitCode -ne 0) { throw 'The uninstaller failed.' }
if ((Get-Service GPConnect -ErrorAction SilentlyContinue) -or (Test-Path $destination) -or (Test-Path ($destination + '.previous'))) { if ((Get-Service GPConnect -ErrorAction SilentlyContinue) -or (Test-Path $destination) -or (Test-Path ($destination + '.previous'))) {
throw 'The uninstaller left service registration or runtime files.' 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.' } if ([IO.File]::ReadAllText($marker) -ne 'retain user settings') { throw 'The uninstaller changed user state.' }
Remove-Item $marker 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."
+1 -1
View File
@@ -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}}}os"), f"windows-{payload.architecture}")
self.assertEqual(enclosure.get(f"{{{feed.SPARKLE}}}installerArguments"), "/UPDATE") self.assertEqual(enclosure.get(f"{{{feed.SPARKLE}}}installerArguments"), "/UPDATE")
self.assertEqual(enclosure.get(f"{{{feed.SPARKLE}}}version"), "3.4.0") 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(item.findtext(f"{{{feed.SPARKLE}}}minimumSystemVersion"), minimum)
self.assertEqual(json.loads((args.output / "latest.json").read_text())["stable"]["platforms"], ["windows"]) self.assertEqual(json.loads((args.output / "latest.json").read_text())["stable"]["platforms"], ["windows"])
+1 -1
View File
@@ -96,7 +96,7 @@ def generate(args: argparse.Namespace) -> None:
item = ET.SubElement(channel, "item") item = ET.SubElement(channel, "item")
ET.SubElement(item, "title").text = f"GP Connect {display_version}" ET.SubElement(item, "title").text = f"GP Connect {display_version}"
ET.SubElement(item, "description").text = "\n".join(release["highlights"]) 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, f"{{{SPARKLE}}}minimumSystemVersion").text = minimum
ET.SubElement(item, "enclosure", { ET.SubElement(item, "enclosure", {
"url": payload.installer_url, "length": str(length), "type": "application/octet-stream", "url": payload.installer_url, "length": str(length), "type": "application/octet-stream",