diff --git a/apps/gpclient/src/cli.rs b/apps/gpclient/src/cli.rs index 82ed45f..429b96f 100644 --- a/apps/gpclient/src/cli.rs +++ b/apps/gpclient/src/cli.rs @@ -119,6 +119,7 @@ impl Cli { fn can_run_alongside_client(&self) -> bool { match &self.command { CliCommand::Disconnect(_) => true, + CliCommand::Hip(_) => true, CliCommand::LaunchGui(args) => args.is_auth_callback(), _ => false, } @@ -240,6 +241,25 @@ mod tests { assert_eq!(cli.lock_file, PathBuf::from("/tmp/gpclient-portal.lock")); } + #[test] + fn hip_can_run_alongside_connected_client() { + let cli = Cli::try_parse_from([ + "gpclient", + "hip", + "--client-version", + "6.2.4-49", + "--client-os", + "Mac", + "--cookie", + "user=alice", + "--md5", + "test", + ]) + .expect("HIP arguments should parse"); + + assert!(cli.can_run_alongside_client()); + } + #[test] #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] fn launch_gui_accepts_auth_callback() { diff --git a/apps/gpclient/src/connect/args.rs b/apps/gpclient/src/connect/args.rs index 662d217..0e7beb5 100644 --- a/apps/gpclient/src/connect/args.rs +++ b/apps/gpclient/src/connect/args.rs @@ -149,6 +149,14 @@ pub(crate) struct ConnectArgs { #[arg(long, help = "Listen on this IP address when using '--browser remote'")] pub(super) browser_listen: Option, + + #[arg( + long, + help = "Authenticate and print the gateway cookie to stdout, then exit without starting the \ + VPN tunnel. Outputs two lines: COOKIE='' and HOST=''. Combine with \ + --cookie-cache to avoid re-authenticating when the portal session is still valid." + )] + pub(super) cookie_only: bool, } pub(super) fn build_os_profile(args: &ConnectArgs) -> OsProfile { @@ -418,4 +426,23 @@ mod tests { }; assert_eq!(err.kind(), ErrorKind::ArgumentConflict); } + + #[test] + fn cookie_only_flag_parses() { + use clap::Parser; + + let cli = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com", "--cookie-only"]) + .expect("--cookie-only should parse"); + + assert!(cli.args.cookie_only); + } + + #[test] + fn cookie_only_is_disabled_by_default() { + use clap::Parser; + + let cli = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com"]).expect("connect args should parse"); + + assert!(!cli.args.cookie_only); + } } diff --git a/apps/gpclient/src/connect/gateway.rs b/apps/gpclient/src/connect/gateway.rs index 3fbf7a4..ad36b42 100644 --- a/apps/gpclient/src/connect/gateway.rs +++ b/apps/gpclient/src/connect/gateway.rs @@ -341,6 +341,16 @@ impl ConnectHandler<'_> { allow_extend_session: bool, extension_auth: SessionExtensionAuth, ) -> Result<(), GatewayConnectError> { + // --cookie-only: print the gateway cookie and exit without opening a tunnel. + // No tun device is allocated, no root is required, and no logout is issued + // against the gateway — the cookie remains valid for subsequent use. + // Output format matches openconnect --authenticate for easy shell consumption. + if self.args.cookie_only { + println!("COOKIE='{}'", cookie); + println!("HOST='{}'", gateway); + return Ok(()); + } + let mtu = self.args.mtu.unwrap_or(0); let (hip, csd_wrapper) = self.determine_hip_script(); let hip_user = self.determine_hip_user();