mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 14:36:15 -05:00
feat: build and publish Windows NSH packages with verified updates
This commit is contained in:
113 files changed
+7264
-801
No files matched your search
@@ -16,4 +16,7 @@ which = { workspace = true, optional = true }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
launcher = ["dep:open", "dep:webbrowser", "dep:which"]
|
||||
launcher = ["dep:open", "dep:webbrowser", "dep:which", "dep:winreg"]
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
winreg = { version = "0.55", optional = true }
|
||||
@@ -1,8 +1,11 @@
|
||||
#[cfg(all(feature = "launcher", windows))]
|
||||
#[path = "platform/windows.rs"]
|
||||
mod platform;
|
||||
#[cfg(all(feature = "launcher", target_os = "macos"))]
|
||||
#[path = "platform/macos.rs"]
|
||||
mod platform;
|
||||
|
||||
#[cfg(all(feature = "launcher", not(target_os = "macos")))]
|
||||
#[cfg(all(feature = "launcher", unix, not(target_os = "macos")))]
|
||||
#[path = "platform/generic.rs"]
|
||||
mod platform;
|
||||
|
||||
@@ -38,7 +41,7 @@ impl<'a> Browser<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(all(feature = "launcher", not(target_os = "macos")))]
|
||||
#[cfg(all(feature = "launcher", unix, not(target_os = "macos")))]
|
||||
pub(crate) fn as_str(&self) -> &str {
|
||||
match self {
|
||||
Browser::Auto => "auto",
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
//! Windows browsers are resolved through their registered App Paths.
|
||||
use crate::Browser;
|
||||
use anyhow::{Context, bail};
|
||||
use std::path::PathBuf;
|
||||
use winreg::{
|
||||
RegKey,
|
||||
enums::{HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE},
|
||||
};
|
||||
|
||||
pub(super) fn open_url(url: &str, browser: Browser<'_>) -> anyhow::Result<()> {
|
||||
let executable = match browser {
|
||||
Browser::Auto | Browser::Default => return webbrowser::open(url).context("Could not open the browser"),
|
||||
Browser::Chrome => registered_browser("chrome.exe").context("Chrome is not installed")?,
|
||||
Browser::Edge => registered_browser("msedge.exe").context("Edge is not installed")?,
|
||||
Browser::Firefox => registered_browser("firefox.exe").context("Firefox is not installed")?,
|
||||
Browser::Safari => bail!("Safari is not available on Windows"),
|
||||
Browser::Other(program) => PathBuf::from(program),
|
||||
};
|
||||
std::process::Command::new(executable)
|
||||
.arg(url)
|
||||
.spawn()
|
||||
.context("Could not open the configured browser")?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn registered_browser(name: &str) -> Option<PathBuf> {
|
||||
[HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE].into_iter().find_map(|hive| {
|
||||
let key = RegKey::predef(hive)
|
||||
.open_subkey(format!(r"Software\Microsoft\Windows\CurrentVersion\App Paths\{name}"))
|
||||
.ok()?;
|
||||
let path: String = key.get_value("").ok()?;
|
||||
let path = PathBuf::from(path.trim_matches('"'));
|
||||
path.is_file().then_some(path)
|
||||
})
|
||||
}
|
||||
Reference in new issue
Block a user