diff --git a/Makefile b/Makefile index d8e3dd8..b841090 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,7 @@ install: install -Dm755 target/release/gpclient $(DESTDIR)/usr/bin/gpclient install -Dm755 target/release/gpauth $(DESTDIR)/usr/bin/gpauth install -Dm755 target/release/gpservice $(DESTDIR)/usr/bin/gpservice + install -Dm755 target/release/gp-vpnc-script-installer $(DESTDIR)/usr/libexec/gpclient/gp-vpnc-script-installer # Install the GUI components if BUILD_GUI_HELPER is set to 1 if [ $(BUILD_GUI_HELPER) -eq 1 ]; then \ @@ -188,6 +189,7 @@ install-bsd: fi install -d $(DESTDIR)$(PREFIX)/libexec/gpclient + install -m 755 target/release/gp-vpnc-script-installer $(DESTDIR)$(PREFIX)/libexec/gpclient/gp-vpnc-script-installer install -m 755 packaging/files/usr/libexec/gpclient/vpnc-script $(DESTDIR)$(PREFIX)/libexec/gpclient/vpnc-script install -m 755 packaging/files/usr/libexec/gpclient/hipreport.sh $(DESTDIR)$(PREFIX)/libexec/gpclient/hipreport.sh @@ -276,6 +278,7 @@ uninstall: rm -f $(DESTDIR)/usr/libexec/gpclient/vpnc-script rm -f $(DESTDIR)/usr/libexec/gpclient/hipreport.sh + rm -f $(DESTDIR)/usr/libexec/gpclient/gp-vpnc-script-installer rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook diff --git a/apps/gpservice/src/bin/gp-vpnc-script-installer/main.rs b/apps/gpservice/src/bin/gp-vpnc-script-installer/main.rs new file mode 100644 index 0000000..87ca689 --- /dev/null +++ b/apps/gpservice/src/bin/gp-vpnc-script-installer/main.rs @@ -0,0 +1,10 @@ +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +#[path = "privileged_unix.rs"] +mod platform; +#[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd")))] +#[path = "unsupported.rs"] +mod platform; + +fn main() { + platform::run(); +} diff --git a/apps/gpservice/src/bin/gp-vpnc-script-installer/privileged_unix.rs b/apps/gpservice/src/bin/gp-vpnc-script-installer/privileged_unix.rs new file mode 100644 index 0000000..976ddd5 --- /dev/null +++ b/apps/gpservice/src/bin/gp-vpnc-script-installer/privileged_unix.rs @@ -0,0 +1,35 @@ +use std::io; + +use anyhow::bail; +use clap::{Parser, Subcommand}; +use nix::unistd::Uid; + +#[derive(Parser)] +struct Cli { + #[command(subcommand)] + command: Command, +} + +#[derive(Subcommand)] +enum Command { + Install, + Remove, +} + +fn try_run() -> anyhow::Result<()> { + if !Uid::effective().is_root() { + bail!("The VPNC script installer must run as root"); + } + + match Cli::parse().command { + Command::Install => gpservice::vpnc_script::install(io::stdin().lock()), + Command::Remove => gpservice::vpnc_script::remove(), + } +} + +pub(super) fn run() { + if let Err(err) = try_run() { + eprintln!("Error: {err:#}"); + std::process::exit(1); + } +} diff --git a/apps/gpservice/src/bin/gp-vpnc-script-installer/unsupported.rs b/apps/gpservice/src/bin/gp-vpnc-script-installer/unsupported.rs new file mode 100644 index 0000000..7cb0a49 --- /dev/null +++ b/apps/gpservice/src/bin/gp-vpnc-script-installer/unsupported.rs @@ -0,0 +1,4 @@ +pub(super) fn run() { + eprintln!("The VPNC script installer is only available on Linux, FreeBSD, and OpenBSD"); + std::process::exit(1); +} diff --git a/apps/gpservice/src/cli.rs b/apps/gpservice/src/cli.rs index a2f1c76..4b579eb 100644 --- a/apps/gpservice/src/cli.rs +++ b/apps/gpservice/src/cli.rs @@ -102,6 +102,7 @@ impl Cli { let gui_restart_requested = Arc::new(AtomicBool::new(false)); let registry = Arc::new(SessionRegistry::new(Uuid::new_v4())); let externally_brokered = self.externally_brokered(); + let trusted_csd_uid = crate::runtime_user::trusted_csd_uid()?; let brokered_scripts_dir = if externally_brokered { let executable = std::env::current_exe().context("Failed to locate the gpservice executable")?; let contents_dir = executable @@ -120,7 +121,7 @@ impl Cli { brokered_scripts_dir, )); - let mut vpn_task = VpnTask::new(ws_req_rx, vpn_state_tx, externally_brokered); + let mut vpn_task = VpnTask::new(ws_req_rx, vpn_state_tx, externally_brokered, trusted_csd_uid); let idle_vpn_state_rx = vpn_state_rx.clone(); let ws_server = WsServer::new( env!("CARGO_PKG_VERSION"), diff --git a/apps/gpservice/src/lib.rs b/apps/gpservice/src/lib.rs new file mode 100644 index 0000000..da1ab0e --- /dev/null +++ b/apps/gpservice/src/lib.rs @@ -0,0 +1,2 @@ +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +pub mod vpnc_script; diff --git a/apps/gpservice/src/main.rs b/apps/gpservice/src/main.rs index 2949cc3..db8d6fc 100644 --- a/apps/gpservice/src/main.rs +++ b/apps/gpservice/src/main.rs @@ -8,7 +8,9 @@ mod handlers; mod macos_broker; mod request_dispatcher; mod routes; +mod runtime_user; mod session_registry; +mod vpn_script; mod vpn_task; mod ws_connection; mod ws_server; diff --git a/apps/gpservice/src/runtime_user/default.rs b/apps/gpservice/src/runtime_user/default.rs new file mode 100644 index 0000000..42e7133 --- /dev/null +++ b/apps/gpservice/src/runtime_user/default.rs @@ -0,0 +1,3 @@ +pub(crate) fn trusted_csd_uid() -> anyhow::Result> { + Ok(None) +} diff --git a/apps/gpservice/src/runtime_user/mod.rs b/apps/gpservice/src/runtime_user/mod.rs new file mode 100644 index 0000000..177ba34 --- /dev/null +++ b/apps/gpservice/src/runtime_user/mod.rs @@ -0,0 +1,8 @@ +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +#[path = "privileged_unix.rs"] +mod platform; +#[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd")))] +#[path = "default.rs"] +mod platform; + +pub(crate) use platform::trusted_csd_uid; diff --git a/apps/gpservice/src/runtime_user/privileged_unix.rs b/apps/gpservice/src/runtime_user/privileged_unix.rs new file mode 100644 index 0000000..bd78ab1 --- /dev/null +++ b/apps/gpservice/src/runtime_user/privileged_unix.rs @@ -0,0 +1,7 @@ +pub(crate) fn trusted_csd_uid() -> anyhow::Result> { + let uid = gpapi::process::users::get_non_root_user()?.uid(); + if uid == 0 { + anyhow::bail!("The HIP script user must not be root"); + } + Ok(Some(uid)) +} diff --git a/apps/gpservice/src/vpn_script/default.rs b/apps/gpservice/src/vpn_script/default.rs new file mode 100644 index 0000000..1c68531 --- /dev/null +++ b/apps/gpservice/src/vpn_script/default.rs @@ -0,0 +1,6 @@ +use gpapi::service::request::ConnectArgs; +use openconnect::{Vpn, VpnBuilder}; + +pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result { + Ok(Vpn::builder(server, cookie).script_path(args.vpnc_script())) +} diff --git a/apps/gpservice/src/vpn_script/mod.rs b/apps/gpservice/src/vpn_script/mod.rs new file mode 100644 index 0000000..756f3ac --- /dev/null +++ b/apps/gpservice/src/vpn_script/mod.rs @@ -0,0 +1,10 @@ +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +#[path = "privileged_unix.rs"] +mod platform; +#[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd")))] +#[path = "default.rs"] +mod platform; +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +mod selection; + +pub(crate) use platform::builder; diff --git a/apps/gpservice/src/vpn_script/privileged_unix.rs b/apps/gpservice/src/vpn_script/privileged_unix.rs new file mode 100644 index 0000000..44a82bc --- /dev/null +++ b/apps/gpservice/src/vpn_script/privileged_unix.rs @@ -0,0 +1,15 @@ +use gpapi::service::request::ConnectArgs; +use openconnect::{Vpn, VpnBuilder}; + +use super::selection::{ScriptSource, select}; + +pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> anyhow::Result { + let installed = gpservice::vpnc_script::installed_script()?; + match select(installed.as_deref(), args.vpnc_script()) { + ScriptSource::Installed(path) => { + Ok(Vpn::builder(server, cookie).script_path(Some(path.to_string_lossy().into_owned()))) + } + ScriptSource::Legacy(script) => Ok(Vpn::builder(server, cookie).script(Some(script.to_owned()))), + ScriptSource::Default => Ok(Vpn::builder(server, cookie).script_path(None)), + } +} diff --git a/apps/gpservice/src/vpn_script/selection.rs b/apps/gpservice/src/vpn_script/selection.rs new file mode 100644 index 0000000..49df229 --- /dev/null +++ b/apps/gpservice/src/vpn_script/selection.rs @@ -0,0 +1,41 @@ +use std::path::Path; + +#[derive(Debug, PartialEq, Eq)] +pub(super) enum ScriptSource<'a> { + Installed(&'a Path), + Legacy(&'a str), + Default, +} + +pub(super) fn select<'a>(installed: Option<&'a Path>, legacy: Option<&'a str>) -> ScriptSource<'a> { + if let Some(path) = installed { + return ScriptSource::Installed(path); + } + if let Some(script) = legacy { + return ScriptSource::Legacy(script); + } + ScriptSource::Default +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn installed_script_takes_precedence_over_legacy() { + let installed = Path::new("/var/lib/gpclient/scripts/vpnc-script"); + assert_eq!( + select(Some(installed), Some("legacy-command")), + ScriptSource::Installed(installed) + ); + } + + #[test] + fn legacy_script_is_used_before_default() { + assert_eq!( + select(None, Some("legacy-command")), + ScriptSource::Legacy("legacy-command") + ); + assert_eq!(select(None, None), ScriptSource::Default); + } +} diff --git a/apps/gpservice/src/vpn_task.rs b/apps/gpservice/src/vpn_task.rs index e77a5c4..521c626 100644 --- a/apps/gpservice/src/vpn_task.rs +++ b/apps/gpservice/src/vpn_task.rs @@ -19,16 +19,18 @@ pub(crate) struct VpnTaskContext { vpn_state_tx: Arc>, disconnect_rx: RwLock>>, brokered_macos: bool, + trusted_csd_uid: Option, identity_files: Arc>>, } impl VpnTaskContext { - pub fn new(vpn_state_tx: watch::Sender, brokered_macos: bool) -> Self { + pub fn new(vpn_state_tx: watch::Sender, brokered_macos: bool, trusted_csd_uid: Option) -> Self { Self { vpn_handle: Default::default(), vpn_state_tx: Arc::new(vpn_state_tx), disconnect_rx: Default::default(), brokered_macos, + trusted_csd_uid, identity_files: Default::default(), } } @@ -53,11 +55,21 @@ impl VpnTaskContext { } }; let allow_extend_session = args.allow_extend_session(); - let mut vpn_builder = Vpn::builder(req.gateway().server(), args.cookie()); - vpn_builder = if self.brokered_macos { - vpn_builder.script_path(args.vpnc_script()) - } else { - vpn_builder.script(args.vpnc_script()) + let vpn_builder = match crate::vpn_script::builder(req.gateway().server(), args.cookie(), args) { + Ok(builder) => builder, + Err(err) => { + warn!("Failed to select the VPNC script: {err}"); + vpn_state_tx.send(VpnState::Disconnected).ok(); + return; + } + }; + let csd_uid = match resolve_csd_uid(self.trusted_csd_uid, args.csd_uid(), args.hip()) { + Ok(uid) => uid, + Err(err) => { + warn!("Failed to select the HIP script user: {err}"); + vpn_state_tx.send(VpnState::Disconnected).ok(); + return; + } }; let vpn = match vpn_builder .user_agent(args.user_agent()) @@ -69,7 +81,7 @@ impl VpnTaskContext { .sslkey(identity.sslkey.clone()) .key_password(args.key_password()) .hip(args.hip()) - .csd_uid(args.csd_uid()) + .csd_uid(csd_uid) .csd_wrapper(args.csd_wrapper()) .reconnect_timeout(args.reconnect_timeout()) .mtu(args.mtu()) @@ -162,8 +174,9 @@ impl VpnTask { ws_req_rx: mpsc::Receiver, vpn_state_tx: watch::Sender, brokered_macos: bool, + trusted_csd_uid: Option, ) -> Self { - let ctx = Arc::new(VpnTaskContext::new(vpn_state_tx, brokered_macos)); + let ctx = Arc::new(VpnTaskContext::new(vpn_state_tx, brokered_macos, trusted_csd_uid)); let cancel_token = CancellationToken::new(); Self { @@ -204,6 +217,14 @@ impl VpnTask { } } +fn resolve_csd_uid(trusted_uid: Option, requested_uid: u32, hip_enabled: bool) -> anyhow::Result { + let uid = trusted_uid.unwrap_or(requested_uid); + if hip_enabled && uid == 0 { + anyhow::bail!("HIP scripts must not run as root"); + } + Ok(uid) +} + struct PreparedIdentity { certificate: Option, sslkey: Option, @@ -278,6 +299,17 @@ async fn process_ws_req(req: WsRequest, ctx: Arc) { mod tests { use super::*; + #[test] + fn trusted_csd_uid_overrides_request_uid() { + assert_eq!(resolve_csd_uid(Some(1000), 0, true).unwrap(), 1000); + } + + #[test] + fn root_csd_uid_is_rejected_when_hip_is_enabled() { + assert!(resolve_csd_uid(None, 0, true).is_err()); + assert_eq!(resolve_csd_uid(None, 0, false).unwrap(), 0); + } + #[test] fn maps_openconnect_session_metadata_to_service_session_info() { let info = SessionInfo::from_vpn_session_fields( diff --git a/apps/gpservice/src/vpnc_script.rs b/apps/gpservice/src/vpnc_script.rs new file mode 100644 index 0000000..2398530 --- /dev/null +++ b/apps/gpservice/src/vpnc_script.rs @@ -0,0 +1,216 @@ +use std::{ + fs::{self, File, Metadata, Permissions}, + io::{self, Read, Write}, + os::unix::fs::{MetadataExt, PermissionsExt}, + path::{Path, PathBuf}, +}; + +use anyhow::{Context, bail}; +use common::constants::{INSTALLED_VPNC_SCRIPT, MAX_VPNC_SCRIPT_SIZE}; +use tempfile::NamedTempFile; + +const DIRECTORY_MODE: u32 = 0o755; +const SCRIPT_MODE: u32 = 0o755; +const ROOT_UID: u32 = 0; + +pub fn installed_script() -> anyhow::Result> { + let path = PathBuf::from(INSTALLED_VPNC_SCRIPT); + match fs::symlink_metadata(&path) { + Ok(metadata) => { + validate_script_metadata(&path, &metadata, ROOT_UID)?; + let directory = path.parent().context("Installed VPNC script has no parent directory")?; + validate_directory(directory, ROOT_UID)?; + validate_directory( + directory + .parent() + .context("Installed VPNC script directory has no parent directory")?, + ROOT_UID, + )?; + Ok(Some(path)) + } + Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(None), + Err(err) => Err(err).context("Failed to inspect the installed VPNC script"), + } +} + +pub fn install(input: impl Read) -> anyhow::Result<()> { + let target = Path::new(INSTALLED_VPNC_SCRIPT); + let directory = target + .parent() + .context("Installed VPNC script has no parent directory")?; + let state_directory = directory + .parent() + .context("Installed VPNC script directory has no parent directory")?; + let state_parent = state_directory + .parent() + .context("VPNC script state directory has no parent directory")?; + validate_directory(state_parent, ROOT_UID)?; + ensure_directory(state_directory, ROOT_UID)?; + ensure_directory(directory, ROOT_UID)?; + install_at(input, target, ROOT_UID) +} + +pub fn remove() -> anyhow::Result<()> { + if installed_script()?.is_none() { + return Ok(()); + } + remove_at(Path::new(INSTALLED_VPNC_SCRIPT), ROOT_UID) +} + +fn install_at(mut input: impl Read, target: &Path, owner_uid: u32) -> anyhow::Result<()> { + let directory = target + .parent() + .context("Installed VPNC script has no parent directory")?; + ensure_directory(directory, owner_uid)?; + + if let Ok(metadata) = fs::symlink_metadata(target) { + validate_script_metadata(target, &metadata, owner_uid)?; + } + + let mut contents = Vec::new(); + input + .by_ref() + .take(MAX_VPNC_SCRIPT_SIZE as u64 + 1) + .read_to_end(&mut contents) + .context("Failed to read the VPNC script")?; + if contents.is_empty() { + bail!("VPNC script is empty"); + } + if contents.len() > MAX_VPNC_SCRIPT_SIZE { + bail!("VPNC script exceeds the {} byte limit", MAX_VPNC_SCRIPT_SIZE); + } + + let mut staged = NamedTempFile::new_in(directory).context("Failed to stage the VPNC script")?; + staged + .as_file() + .set_permissions(Permissions::from_mode(SCRIPT_MODE)) + .context("Failed to set VPNC script permissions")?; + staged.write_all(&contents).context("Failed to write the VPNC script")?; + staged.as_file().sync_all().context("Failed to sync the VPNC script")?; + staged + .persist(target) + .map_err(|err| err.error) + .context("Failed to install the VPNC script")?; + sync_directory(directory)?; + + let metadata = fs::symlink_metadata(target).context("Failed to inspect the installed VPNC script")?; + validate_script_metadata(target, &metadata, owner_uid) +} + +fn remove_at(target: &Path, owner_uid: u32) -> anyhow::Result<()> { + let directory = target + .parent() + .context("Installed VPNC script has no parent directory")?; + validate_directory(directory, owner_uid)?; + + match fs::symlink_metadata(target) { + Ok(metadata) => { + validate_script_metadata(target, &metadata, owner_uid)?; + fs::remove_file(target).context("Failed to remove the installed VPNC script")?; + sync_directory(directory) + } + Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(()), + Err(err) => Err(err).context("Failed to inspect the installed VPNC script"), + } +} + +fn ensure_directory(directory: &Path, owner_uid: u32) -> anyhow::Result<()> { + match fs::symlink_metadata(directory) { + Ok(_) => validate_directory(directory, owner_uid), + Err(err) if err.kind() == io::ErrorKind::NotFound => { + if let Some(parent) = directory.parent() { + ensure_directory(parent, owner_uid)?; + } + fs::create_dir(directory).context("Failed to create the VPNC script directory")?; + fs::set_permissions(directory, Permissions::from_mode(DIRECTORY_MODE)) + .context("Failed to set VPNC script directory permissions")?; + validate_directory(directory, owner_uid) + } + Err(err) => Err(err).context("Failed to inspect the VPNC script directory"), + } +} + +fn validate_directory(path: &Path, owner_uid: u32) -> anyhow::Result<()> { + let metadata = fs::symlink_metadata(path) + .with_context(|| format!("Failed to inspect VPNC script directory {}", path.display()))?; + if metadata.file_type().is_symlink() || !metadata.is_dir() { + bail!("VPNC script directory {} is not a real directory", path.display()); + } + validate_ownership_and_mode(path, &metadata, owner_uid) +} + +fn validate_script_metadata(path: &Path, metadata: &Metadata, owner_uid: u32) -> anyhow::Result<()> { + if metadata.file_type().is_symlink() || !metadata.is_file() { + bail!("Installed VPNC script {} is not a regular file", path.display()); + } + validate_ownership_and_mode(path, metadata, owner_uid)?; + if metadata.mode() & 0o111 == 0 { + bail!("Installed VPNC script {} is not executable", path.display()); + } + Ok(()) +} + +fn validate_ownership_and_mode(path: &Path, metadata: &Metadata, owner_uid: u32) -> anyhow::Result<()> { + if metadata.uid() != owner_uid { + bail!("{} must be owned by uid {}", path.display(), owner_uid); + } + if metadata.mode() & 0o022 != 0 { + bail!("{} must not be writable by group or other users", path.display()); + } + Ok(()) +} + +fn sync_directory(directory: &Path) -> anyhow::Result<()> { + File::open(directory) + .and_then(|file| file.sync_all()) + .context("Failed to sync the VPNC script directory") +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn installs_and_removes_script_atomically() { + let temp = tempfile::tempdir().unwrap(); + let metadata = fs::symlink_metadata(temp.path()).unwrap(); + let owner_uid = metadata.uid(); + let directory = temp.path().join("scripts"); + let target = directory.join("vpnc-script"); + + install_at("#!/bin/sh\nexit 0\n".as_bytes(), &target, owner_uid).unwrap(); + let metadata = fs::symlink_metadata(&target).unwrap(); + assert!(metadata.is_file()); + assert_eq!(metadata.mode() & 0o777, SCRIPT_MODE); + + remove_at(&target, owner_uid).unwrap(); + assert!(!target.exists()); + } + + #[test] + fn rejects_oversized_script() { + let temp = tempfile::tempdir().unwrap(); + let metadata = fs::symlink_metadata(temp.path()).unwrap(); + let owner_uid = metadata.uid(); + let target = temp.path().join("scripts/vpnc-script"); + let input = vec![b'x'; MAX_VPNC_SCRIPT_SIZE + 1]; + + assert!(install_at(input.as_slice(), &target, owner_uid).is_err()); + assert!(!target.exists()); + } + + #[test] + fn rejects_symlink_target() { + use std::os::unix::fs::symlink; + + let temp = tempfile::tempdir().unwrap(); + let metadata = fs::symlink_metadata(temp.path()).unwrap(); + let owner_uid = metadata.uid(); + let directory = temp.path().join("scripts"); + fs::create_dir(&directory).unwrap(); + let target = directory.join("vpnc-script"); + symlink("/bin/sh", &target).unwrap(); + + assert!(install_at("exit 0\n".as_bytes(), &target, owner_uid).is_err()); + } +} diff --git a/crates/common/src/binary_paths.rs b/crates/common/src/binary_paths.rs index ebc4dc9..c0d2b1f 100644 --- a/crates/common/src/binary_paths.rs +++ b/crates/common/src/binary_paths.rs @@ -3,6 +3,8 @@ use std::{ path::{Path, PathBuf}, }; +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +use crate::constants::GP_VPNC_SCRIPT_INSTALLER_BINARY; use crate::constants::{GP_AUTH_BINARY, GP_CLIENT_BINARY, GP_GUI_BINARY, GP_GUI_HELPER_BINARY, GP_SERVICE_BINARY}; pub fn gpclient() -> PathBuf { @@ -13,6 +15,15 @@ pub fn gpservice() -> PathBuf { resolve("GP_SERVICE_BINARY", "gpservice", GP_SERVICE_BINARY) } +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +pub fn gp_vpnc_script_installer() -> PathBuf { + resolve( + "GP_VPNC_SCRIPT_INSTALLER_BINARY", + "gp-vpnc-script-installer", + GP_VPNC_SCRIPT_INSTALLER_BINARY, + ) +} + pub fn gpauth() -> PathBuf { resolve("GP_AUTH_BINARY", "gpauth", GP_AUTH_BINARY) } diff --git a/crates/common/src/constants.rs b/crates/common/src/constants.rs index 13ffb50..11bfc3c 100644 --- a/crates/common/src/constants.rs +++ b/crates/common/src/constants.rs @@ -3,6 +3,15 @@ pub const GP_CLIENT_VERSION_LINUX: &str = "6.3.3-619"; pub const GP_CLIENT_VERSION_WINDOWS: &str = "6.3.3-650"; pub const GP_CLIENT_VERSION_MACOS: &str = "6.3.3-915"; pub const GP_SERVICE_LOCK_FILE: &str = "/var/run/gpservice.lock"; +#[cfg(target_os = "linux")] +pub const GP_VPNC_SCRIPT_INSTALLER_BINARY: &str = "/usr/libexec/gpclient/gp-vpnc-script-installer"; +#[cfg(target_os = "linux")] +pub const INSTALLED_VPNC_SCRIPT: &str = "/var/lib/gpclient/scripts/vpnc-script"; +#[cfg(any(target_os = "freebsd", target_os = "openbsd"))] +pub const GP_VPNC_SCRIPT_INSTALLER_BINARY: &str = "/usr/local/libexec/gpclient/gp-vpnc-script-installer"; +#[cfg(any(target_os = "freebsd", target_os = "openbsd"))] +pub const INSTALLED_VPNC_SCRIPT: &str = "/var/db/gpclient/scripts/vpnc-script"; +pub const MAX_VPNC_SCRIPT_SIZE: usize = 1024 * 1024; pub const GP_CALLBACK_PORT_FILENAME: &str = "gpcallback.port"; // Release binaries - macOS (Apple Silicon Homebrew) diff --git a/flake.nix b/flake.nix index e72e156..4ec9684 100644 --- a/flake.nix +++ b/flake.nix @@ -101,7 +101,8 @@ --replace-fail /usr/bin/gpauth /run/current-system/sw/bin/gpauth substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \ - --replace-fail /usr/bin/gpservice $out/bin/gpservice + --replace-fail /usr/bin/gpservice $out/bin/gpservice \ + --replace-fail /usr/libexec/gpclient/gp-vpnc-script-installer $out/bin/gp-vpnc-script-installer if [ -f $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down ]; then substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \ @@ -117,7 +118,8 @@ --replace-fail /usr/bin/gpauth /run/current-system/sw/bin/gpauth substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \ - --replace-fail /usr/bin/gpservice $out/bin/gpservice + --replace-fail /usr/bin/gpservice $out/bin/gpservice \ + --replace-fail /usr/libexec/gpclient/gp-vpnc-script-installer ${prebuiltFiles}/libexec/gpclient/gp-vpnc-script-installer if [ -f $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down ]; then substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \ @@ -254,6 +256,7 @@ runScript = "/usr/bin/${binaryName}"; profile = '' export PATH=/run/wrappers/bin:$PATH + export GP_VPNC_SCRIPT_INSTALLER_BINARY='${prebuiltFiles}/libexec/gpclient/gp-vpnc-script-installer' ''; extraBwrapArgs = [ "--bind-try" diff --git a/packaging/binary/Makefile.in b/packaging/binary/Makefile.in index ba5abdc..941c804 100644 --- a/packaging/binary/Makefile.in +++ b/packaging/binary/Makefile.in @@ -12,6 +12,7 @@ install: install -Dm755 artifacts/usr/libexec/gpclient/vpnc-script $(DESTDIR)/usr/libexec/gpclient/vpnc-script install -Dm755 artifacts/usr/libexec/gpclient/hipreport.sh $(DESTDIR)/usr/libexec/gpclient/hipreport.sh + install -Dm755 artifacts/usr/libexec/gpclient/gp-vpnc-script-installer $(DESTDIR)/usr/libexec/gpclient/gp-vpnc-script-installer # Install the disconnect hooks install -Dm755 artifacts/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down @@ -37,6 +38,7 @@ uninstall: rm -f $(DESTDIR)/usr/libexec/gpclient/vpnc-script rm -f $(DESTDIR)/usr/libexec/gpclient/hipreport.sh + rm -f $(DESTDIR)/usr/libexec/gpclient/gp-vpnc-script-installer rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook diff --git a/packaging/bsd/com.yuezk.gpgui.policy b/packaging/bsd/com.yuezk.gpgui.policy index a8081dd..6f87593 100644 --- a/packaging/bsd/com.yuezk.gpgui.policy +++ b/packaging/bsd/com.yuezk.gpgui.policy @@ -15,4 +15,15 @@ /usr/local/bin/gpservice true + + Manage the system-wide GP Connect VPN script + Administrator authentication is required to manage the system-wide VPN script + + auth_admin + auth_admin + auth_admin + + /usr/local/libexec/gpclient/gp-vpnc-script-installer + true + diff --git a/packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy b/packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy index 8c8af09..043508b 100644 --- a/packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy +++ b/packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy @@ -15,4 +15,15 @@ /usr/bin/gpservice true + + Manage the system-wide GP Connect VPN script + Administrator authentication is required to manage the system-wide VPN script + + auth_admin + auth_admin + auth_admin + + /usr/libexec/gpclient/gp-vpnc-script-installer + true + diff --git a/packaging/rpm/globalprotect-openconnect.spec.in b/packaging/rpm/globalprotect-openconnect.spec.in index 80b0faa..ecb13c0 100644 --- a/packaging/rpm/globalprotect-openconnect.spec.in +++ b/packaging/rpm/globalprotect-openconnect.spec.in @@ -64,6 +64,7 @@ make build %{_bindir}/* %{_libexecdir}/gpclient/vpnc-script %{_libexecdir}/gpclient/hipreport.sh +%{_libexecdir}/gpclient/gp-vpnc-script-installer %{_datadir}/applications/gpgui.desktop %{_datadir}/applications/gpauth.desktop %{_datadir}/icons/hicolor/32x32/apps/gpgui.png