mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
feat: release GP Connect 3.3.0 with Native Shell support
This commit is contained in:
226 files changed
+7700
-5225
No files matched your search
@@ -1,6 +1,6 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use gpapi::service::transport::SessionCredential;
|
||||
use gpapi::{gui::GuiTheme, service::transport::SessionCredential};
|
||||
use log::info;
|
||||
use tauri::{Listener, Manager};
|
||||
use tokio::sync::watch;
|
||||
@@ -11,30 +11,68 @@ pub struct App {
|
||||
credential: Arc<SessionCredential>,
|
||||
credential_lease: watch::Receiver<bool>,
|
||||
gui_version: String,
|
||||
variant: gpapi::gui::GuiVariant,
|
||||
theme: GuiTheme,
|
||||
}
|
||||
|
||||
impl App {
|
||||
pub fn new(credential: Arc<SessionCredential>, credential_lease: watch::Receiver<bool>, gui_version: &str) -> Self {
|
||||
pub fn new(
|
||||
credential: Arc<SessionCredential>,
|
||||
credential_lease: watch::Receiver<bool>,
|
||||
gui_version: &str,
|
||||
variant: gpapi::gui::GuiVariant,
|
||||
theme: GuiTheme,
|
||||
) -> Self {
|
||||
Self {
|
||||
credential,
|
||||
credential_lease,
|
||||
gui_version: gui_version.to_string(),
|
||||
variant,
|
||||
theme,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run(&self) -> anyhow::Result<()> {
|
||||
let gui_version = self.gui_version.clone();
|
||||
let variant = self.variant;
|
||||
let theme = self.theme;
|
||||
let credential = Arc::clone(&self.credential);
|
||||
let credential_lease = self.credential_lease.clone();
|
||||
|
||||
tauri::Builder::default()
|
||||
.on_window_event(move |window, event| {
|
||||
if theme == GuiTheme::System
|
||||
&& let tauri::WindowEvent::ThemeChanged(theme) = event
|
||||
&& let Some(win) = window.get_webview_window(window.label())
|
||||
&& let Err(error) = win.set_background_color(Some(background_color(*theme)))
|
||||
{
|
||||
log::warn!("Could not update helper window background: {error}");
|
||||
}
|
||||
})
|
||||
.setup(move |app| {
|
||||
let win = app.get_webview_window("main").expect("no main window");
|
||||
let native_theme = match theme {
|
||||
GuiTheme::System => None,
|
||||
GuiTheme::Light => Some(tauri::Theme::Light),
|
||||
GuiTheme::Dark => Some(tauri::Theme::Dark),
|
||||
};
|
||||
let config = app
|
||||
.config()
|
||||
.app
|
||||
.windows
|
||||
.iter()
|
||||
.find(|window| window.label == "main")
|
||||
.expect("no main window");
|
||||
let win = tauri::WebviewWindowBuilder::from_config(app, config)?
|
||||
.theme(native_theme)
|
||||
.initialization_script(format!("window.__GP_HELPER_THEME__ = {:?};", theme.as_str()))
|
||||
.visible(false)
|
||||
.build()?;
|
||||
win.set_background_color(Some(background_color(win.theme()?)))?;
|
||||
let _ = win.hide_menu();
|
||||
|
||||
let notifier = ProgressNotifier::new(win.clone());
|
||||
let installer = Installer::new(credential, credential_lease.clone());
|
||||
let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer));
|
||||
let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer, variant));
|
||||
|
||||
let app_handle = app.handle().clone();
|
||||
let mut app_credential_lease = credential_lease;
|
||||
@@ -66,6 +104,8 @@ impl App {
|
||||
tokio::spawn(async move { updater.update().await });
|
||||
});
|
||||
|
||||
win.show()?;
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.run(tauri::generate_context!())?;
|
||||
@@ -73,3 +113,10 @@ impl App {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn background_color(theme: tauri::Theme) -> tauri::window::Color {
|
||||
match theme {
|
||||
tauri::Theme::Dark => tauri::window::Color(36, 36, 36, 255),
|
||||
_ => tauri::window::Color(246, 245, 244, 255),
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ use std::{io::Read, sync::Arc};
|
||||
use anyhow::{Context, bail};
|
||||
use gpapi::{
|
||||
clap::InfoLevelVerbosity,
|
||||
gui::GuiTheme,
|
||||
service::transport::{MAX_CREDENTIAL_FRAME, SessionCredential},
|
||||
utils::env_utils,
|
||||
};
|
||||
@@ -29,6 +30,11 @@ struct Cli {
|
||||
|
||||
#[arg(long, default_value = env!("CARGO_PKG_VERSION"), help = "The version of the GUI")]
|
||||
gui_version: String,
|
||||
#[arg(long, default_value = "tauri", value_parser = ["tauri", "nsh"])]
|
||||
gui_variant: String,
|
||||
|
||||
#[arg(long, value_enum, default_value = "system", help = "Window appearance")]
|
||||
theme: GuiTheme,
|
||||
|
||||
#[command(flatten)]
|
||||
verbose: InfoLevelVerbosity,
|
||||
@@ -38,7 +44,22 @@ impl Cli {
|
||||
fn run(&self) -> anyhow::Result<()> {
|
||||
let credential = self.read_credential()?;
|
||||
let credential_lease = monitor_credential_lease().context("Failed to monitor service credential lifetime")?;
|
||||
let app = App::new(Arc::new(credential), credential_lease, &self.gui_version);
|
||||
let variant = if self.gui_variant == "nsh" {
|
||||
gpapi::gui::GuiVariant::Nsh
|
||||
} else {
|
||||
gpapi::gui::GuiVariant::Tauri
|
||||
};
|
||||
anyhow::ensure!(
|
||||
variant != gpapi::gui::GuiVariant::Nsh || cfg!(target_os = "linux"),
|
||||
"Native Shell is available only on Linux"
|
||||
);
|
||||
let app = App::new(
|
||||
Arc::new(credential),
|
||||
credential_lease,
|
||||
&self.gui_version,
|
||||
variant,
|
||||
self.theme,
|
||||
);
|
||||
|
||||
env_utils::patch_gui_runtime_env(false);
|
||||
|
||||
@@ -110,6 +131,22 @@ mod tests {
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn theme_defaults_to_system_and_accepts_explicit_modes() {
|
||||
assert_eq!(Cli::try_parse_from(["gpgui-helper"]).unwrap().theme, GuiTheme::System);
|
||||
for (value, expected) in [
|
||||
("system", GuiTheme::System),
|
||||
("light", GuiTheme::Light),
|
||||
("dark", GuiTheme::Dark),
|
||||
] {
|
||||
assert_eq!(
|
||||
Cli::try_parse_from(["gpgui-helper", "--theme", value]).unwrap().theme,
|
||||
expected
|
||||
);
|
||||
}
|
||||
assert!(Cli::try_parse_from(["gpgui-helper", "--theme", "invalid"]).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn credential_lease_closes_at_eof() {
|
||||
let (lease_tx, lease_rx) = watch::channel(true);
|
||||
|
||||
@@ -33,7 +33,12 @@ impl<'a> FileDownloader<'a> {
|
||||
}
|
||||
|
||||
pub async fn download(&self) -> anyhow::Result<NamedTempFile> {
|
||||
let res = reqwest::get(self.url).await?.error_for_status()?;
|
||||
let res = gpapi::utils::request::client_builder()
|
||||
.build()?
|
||||
.get(self.url)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let content_length = res.content_length().unwrap_or(0);
|
||||
|
||||
info!("Content length: {}", content_length);
|
||||
@@ -79,7 +84,12 @@ impl<'a> ChecksumFetcher<'a> {
|
||||
}
|
||||
|
||||
pub async fn fetch(&self) -> anyhow::Result<String> {
|
||||
let res = reqwest::get(self.url).await?.error_for_status()?;
|
||||
let res = gpapi::utils::request::client_builder()
|
||||
.build()?
|
||||
.get(self.url)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let checksum = res.text().await?.trim().to_string();
|
||||
|
||||
Ok(checksum)
|
||||
|
||||
@@ -41,10 +41,20 @@ const GUI_LIBC_SUFFIX: &str = "-musl";
|
||||
#[cfg(not(target_env = "musl"))]
|
||||
const GUI_LIBC_SUFFIX: &str = "";
|
||||
|
||||
fn gui_asset_name() -> Option<String> {
|
||||
fn gui_asset_name(variant: gpapi::gui::GuiVariant) -> Option<String> {
|
||||
if variant == gpapi::gui::GuiVariant::Nsh {
|
||||
return nsh_asset_name_for(std::env::consts::OS, std::env::consts::ARCH);
|
||||
}
|
||||
gui_asset_name_for(std::env::consts::OS, std::env::consts::ARCH, GUI_LIBC_SUFFIX)
|
||||
}
|
||||
|
||||
fn nsh_asset_name_for(os: &str, arch: &str) -> Option<String> {
|
||||
match (os, arch) {
|
||||
("linux", "x86_64" | "aarch64") => Some(format!("gpgui-nsh_{arch}.bin.tar.xz")),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn gui_asset_name_for(os: &str, arch: &str, libc_suffix: &str) -> Option<String> {
|
||||
let name = match (os, arch) {
|
||||
("linux", "x86_64" | "aarch64") => format!("gpgui_{arch}{libc_suffix}.bin.tar.xz"),
|
||||
@@ -97,10 +107,11 @@ impl Installer {
|
||||
Self { command_tx }
|
||||
}
|
||||
|
||||
async fn install(&self, path: &str, checksum: &str) -> anyhow::Result<()> {
|
||||
async fn install(&self, path: &str, checksum: &str, variant: gpapi::gui::GuiVariant) -> anyhow::Result<()> {
|
||||
let request = UpdateGuiRequest {
|
||||
path: path.to_string(),
|
||||
checksum: checksum.to_string(),
|
||||
variant,
|
||||
};
|
||||
let (reply, result) = oneshot::channel();
|
||||
self
|
||||
@@ -363,6 +374,7 @@ async fn receive_binary(socket: &mut Socket) -> anyhow::Result<Vec<u8>> {
|
||||
|
||||
pub struct GuiUpdater {
|
||||
version: String,
|
||||
variant: gpapi::gui::GuiVariant,
|
||||
notifier: Arc<ProgressNotifier>,
|
||||
installer: Installer,
|
||||
in_progress: RwLock<bool>,
|
||||
@@ -370,9 +382,15 @@ pub struct GuiUpdater {
|
||||
}
|
||||
|
||||
impl GuiUpdater {
|
||||
pub fn new(version: String, notifier: ProgressNotifier, installer: Installer) -> Self {
|
||||
pub fn new(
|
||||
version: String,
|
||||
notifier: ProgressNotifier,
|
||||
installer: Installer,
|
||||
variant: gpapi::gui::GuiVariant,
|
||||
) -> Self {
|
||||
Self {
|
||||
version,
|
||||
variant,
|
||||
notifier: Arc::new(notifier),
|
||||
installer,
|
||||
in_progress: Default::default(),
|
||||
@@ -381,7 +399,7 @@ impl GuiUpdater {
|
||||
}
|
||||
|
||||
pub async fn update(&self) {
|
||||
let Some(asset_name) = gui_asset_name() else {
|
||||
let Some(asset_name) = gui_asset_name(self.variant) else {
|
||||
info!("GUI updates are not supported on this platform.");
|
||||
return;
|
||||
};
|
||||
@@ -438,7 +456,7 @@ impl GuiUpdater {
|
||||
|
||||
info!("Checksum success");
|
||||
|
||||
if let Err(err) = self.installer.install(&file_path, &checksum).await {
|
||||
if let Err(err) = self.installer.install(&file_path, &checksum, self.variant).await {
|
||||
warn!("Install error: {}", err);
|
||||
self.notify_error();
|
||||
} else {
|
||||
@@ -488,13 +506,10 @@ impl GuiUpdater {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use gpapi::{
|
||||
os_profile::HostIdentity,
|
||||
service::{
|
||||
transport::{ClientPrelude, NoiseResponder},
|
||||
vpn_env::{HostInfo, VpnEnv},
|
||||
vpn_state::VpnState,
|
||||
},
|
||||
use gpapi::service::{
|
||||
transport::{ClientPrelude, NoiseResponder},
|
||||
vpn_env::{HostInfo, VpnEnv},
|
||||
vpn_state::VpnState,
|
||||
};
|
||||
use tokio::net::TcpListener;
|
||||
use tokio_tungstenite::accept_async;
|
||||
@@ -522,6 +537,21 @@ mod tests {
|
||||
assert_eq!(gui_asset_name_for("macos", "aarch64", ""), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nsh_assets_are_linux_only_and_use_the_nsh_binary_archive() {
|
||||
assert_eq!(
|
||||
nsh_asset_name_for("linux", "x86_64"),
|
||||
Some("gpgui-nsh_x86_64.bin.tar.xz".into())
|
||||
);
|
||||
assert_eq!(
|
||||
nsh_asset_name_for("linux", "aarch64"),
|
||||
Some("gpgui-nsh_aarch64.bin.tar.xz".into())
|
||||
);
|
||||
for os in ["freebsd", "openbsd", "macos"] {
|
||||
assert_eq!(nsh_asset_name_for(os, "x86_64"), None);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn pending_install_reconnects_with_a_fresh_handshake() {
|
||||
let credential = Arc::new(SessionCredential::generate(Uuid::new_v4(), env!("CARGO_PKG_VERSION")).unwrap());
|
||||
@@ -532,6 +562,7 @@ mod tests {
|
||||
request: UpdateGuiRequest {
|
||||
path: "/tmp/gpgui-update".to_owned(),
|
||||
checksum: "checksum".to_owned(),
|
||||
variant: gpapi::gui::GuiVariant::Tauri,
|
||||
},
|
||||
reply: reply_tx,
|
||||
})
|
||||
@@ -635,7 +666,7 @@ mod tests {
|
||||
vpnc_script: None,
|
||||
auth_executable: String::new(),
|
||||
host_info: HostInfo {
|
||||
host_identity: HostIdentity::collect(),
|
||||
host_identity: gpapi::os_profile::desktop::collect_identity(),
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user