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