mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
225acf13aa | ||
|
|
3276ac0f9a | ||
|
|
0b037e158c | ||
|
|
10e94e0b81 | ||
|
|
0f76539075 | ||
|
|
f9b8c55924 | ||
|
|
a708ce0115 | ||
|
|
b3f4ba0a32 | ||
|
|
02cf4a0b26 | ||
|
|
370189cbee |
No files matched your search
@@ -242,7 +242,6 @@ jobs:
|
|||||||
build-gpgui:
|
build-gpgui:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
max-parallel: 1
|
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
- runner: ubuntu-latest
|
- runner: ubuntu-latest
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ on:
|
|||||||
version:
|
version:
|
||||||
description: "Release version. Defaults to Cargo.toml workspace version."
|
description: "Release version. Defaults to Cargo.toml workspace version."
|
||||||
required: false
|
required: false
|
||||||
|
release_tag:
|
||||||
|
description: "GitHub release tag to fetch assets from. Defaults to v<version>; use snapshot for snapshot assets."
|
||||||
|
required: false
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -24,11 +27,12 @@ jobs:
|
|||||||
- name: Update flake hashes
|
- name: Update flake hashes
|
||||||
env:
|
env:
|
||||||
RELEASE_VERSION: ${{ inputs.version }}
|
RELEASE_VERSION: ${{ inputs.version }}
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
run: |
|
run: |
|
||||||
if [[ -n "$RELEASE_VERSION" ]]; then
|
if [[ -n "$RELEASE_VERSION" ]]; then
|
||||||
scripts/update-flake-hashes.sh "$RELEASE_VERSION"
|
scripts/update-flake-hashes.sh "$RELEASE_VERSION" "$RELEASE_TAG"
|
||||||
else
|
else
|
||||||
scripts/update-flake-hashes.sh
|
scripts/update-flake-hashes.sh "" "$RELEASE_TAG"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Upload updated flake
|
- name: Upload updated flake
|
||||||
@@ -112,4 +116,5 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
RELEASE_VERSION: ${{ inputs.version }}
|
RELEASE_VERSION: ${{ inputs.version }}
|
||||||
run: scripts/open-flake-hashes-pr.sh "$RELEASE_VERSION"
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
run: scripts/open-flake-hashes-pr.sh "$RELEASE_VERSION" "$RELEASE_TAG"
|
||||||
Generated
+8
-8
@@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "auth"
|
name = "auth"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"block2",
|
"block2",
|
||||||
@@ -705,7 +705,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "common"
|
name = "common"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "compile-time"
|
name = "compile-time"
|
||||||
@@ -1732,7 +1732,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpapi"
|
name = "gpapi"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
@@ -1776,7 +1776,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpauth"
|
name = "gpauth"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"auth",
|
"auth",
|
||||||
@@ -1796,7 +1796,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpclient"
|
name = "gpclient"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"askama",
|
"askama",
|
||||||
@@ -1825,7 +1825,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpgui-helper"
|
name = "gpgui-helper"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -1843,7 +1843,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpservice"
|
name = "gpservice"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -3191,7 +3191,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openconnect"
|
name = "openconnect"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autotools",
|
"autotools",
|
||||||
"cc",
|
"cc",
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ members = [
|
|||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
rust-version = "1.89"
|
rust-version = "1.89"
|
||||||
version = "2.6.1"
|
version = "2.6.3"
|
||||||
authors = ["Kevin Yue <[email protected]>"]
|
authors = ["Kevin Yue <[email protected]>"]
|
||||||
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ impl ConnectHandler<'_> {
|
|||||||
&self,
|
&self,
|
||||||
prelogin: &Prelogin,
|
prelogin: &Prelogin,
|
||||||
server: &str,
|
server: &str,
|
||||||
gateway_external_browser_allowed: bool,
|
gateway_browser_auth_allowed: bool,
|
||||||
) -> anyhow::Result<Credential> {
|
) -> anyhow::Result<Credential> {
|
||||||
if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) {
|
if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) {
|
||||||
return self.read_cookie_from_stdin();
|
return self.read_cookie_from_stdin();
|
||||||
@@ -58,10 +58,10 @@ impl ConnectHandler<'_> {
|
|||||||
|
|
||||||
match prelogin {
|
match prelogin {
|
||||||
Prelogin::Saml(prelogin) => {
|
Prelogin::Saml(prelogin) => {
|
||||||
let external_browser_supported = default_browser_auth_allowed(
|
let external_browser_supported = can_use_external_browser_auth(
|
||||||
prelogin.support_default_browser(),
|
prelogin.support_default_browser(),
|
||||||
is_gateway,
|
is_gateway,
|
||||||
gateway_external_browser_allowed,
|
gateway_browser_auth_allowed,
|
||||||
);
|
);
|
||||||
let browser = if external_browser_supported {
|
let browser = if external_browser_supported {
|
||||||
self.args.browser.as_deref()
|
self.args.browser.as_deref()
|
||||||
@@ -188,12 +188,12 @@ fn should_read_stdin_credential(cookie_on_stdin: bool, as_gateway: bool, prelogi
|
|||||||
cookie_on_stdin && (!prelogin_is_gateway || as_gateway)
|
cookie_on_stdin && (!prelogin_is_gateway || as_gateway)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_browser_auth_allowed(
|
fn can_use_external_browser_auth(
|
||||||
saml_support_default_browser: bool,
|
saml_support_default_browser: bool,
|
||||||
is_gateway: bool,
|
is_gateway: bool,
|
||||||
gateway_external_browser_allowed: bool,
|
gateway_browser_auth_allowed: bool,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
saml_support_default_browser && (!is_gateway || gateway_external_browser_allowed)
|
saml_support_default_browser && (!is_gateway || gateway_browser_auth_allowed)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn log_stdin_host_id(host_id: Option<&str>) {
|
fn log_stdin_host_id(host_id: Option<&str>) {
|
||||||
@@ -254,18 +254,18 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn portal_saml_can_use_default_browser_when_supported() {
|
fn portal_saml_can_use_default_browser_when_supported() {
|
||||||
assert!(default_browser_auth_allowed(true, false, false));
|
assert!(can_use_external_browser_auth(true, false, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn gateway_saml_requires_portal_default_browser_policy() {
|
fn gateway_saml_requires_gateway_browser_auth_allowance() {
|
||||||
assert!(!default_browser_auth_allowed(true, true, false));
|
assert!(!can_use_external_browser_auth(true, true, false));
|
||||||
assert!(default_browser_auth_allowed(true, true, true));
|
assert!(can_use_external_browser_auth(true, true, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn default_browser_auth_requires_saml_support() {
|
fn default_browser_auth_requires_saml_support() {
|
||||||
assert!(!default_browser_auth_allowed(false, false, true));
|
assert!(!can_use_external_browser_auth(false, false, true));
|
||||||
assert!(!default_browser_auth_allowed(false, true, true));
|
assert!(!can_use_external_browser_auth(false, true, true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,6 +28,8 @@ use crate::{
|
|||||||
|
|
||||||
use super::{ConnectHandler, args::cookie_cache_path};
|
use super::{ConnectHandler, args::cookie_cache_path};
|
||||||
|
|
||||||
|
const OPENCONNECT_INTERRUPTED_EXIT_CODE: i32 = -4;
|
||||||
|
|
||||||
struct GatewayLoginSession {
|
struct GatewayLoginSession {
|
||||||
cookie: String,
|
cookie: String,
|
||||||
extension_auth: SessionExtensionAuth,
|
extension_auth: SessionExtensionAuth,
|
||||||
@@ -139,10 +141,10 @@ impl ConnectHandler<'_> {
|
|||||||
let mut gp_params = self.build_gp_params();
|
let mut gp_params = self.build_gp_params();
|
||||||
gp_params.set_is_gateway(true);
|
gp_params.set_is_gateway(true);
|
||||||
|
|
||||||
let gateway_external_browser_allowed = true;
|
let gateway_browser_auth_allowed = true;
|
||||||
let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?;
|
let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?;
|
||||||
let cred = self
|
let cred = self
|
||||||
.obtain_credential(&prelogin, gateway, gateway_external_browser_allowed)
|
.obtain_credential(&prelogin, gateway, gateway_browser_auth_allowed)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let login_session = self
|
let login_session = self
|
||||||
@@ -177,19 +179,16 @@ impl ConnectHandler<'_> {
|
|||||||
gateway: &str,
|
gateway: &str,
|
||||||
portal_cred: &AuthCookieCredential,
|
portal_cred: &AuthCookieCredential,
|
||||||
allow_extend_session: bool,
|
allow_extend_session: bool,
|
||||||
portal_default_browser_enabled: bool,
|
portal_config_default_browser: bool,
|
||||||
gateway_context: GatewayLoginContext,
|
gateway_context: GatewayLoginContext,
|
||||||
) -> Result<(), GatewayConnectError> {
|
) -> Result<(), GatewayConnectError> {
|
||||||
info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback...");
|
info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback...");
|
||||||
|
|
||||||
let mut gp_params = self.build_gp_params();
|
let mut gp_params = self.build_gp_params();
|
||||||
gp_params.set_is_gateway(true);
|
gp_params.set_is_gateway(true);
|
||||||
|
let gateway_browser_auth_allowed = self.gateway_browser_auth_allowed(portal_config_default_browser);
|
||||||
|
|
||||||
let gateway_prelogin = prelogin(
|
let gateway_prelogin = prelogin(gateway, &gp_params, self.prelogin_options(gateway_browser_auth_allowed))
|
||||||
gateway,
|
|
||||||
&gp_params,
|
|
||||||
self.prelogin_options(portal_default_browser_enabled),
|
|
||||||
)
|
|
||||||
.await
|
.await
|
||||||
.map_err(GatewayConnectError::before_tunnel)?;
|
.map_err(GatewayConnectError::before_tunnel)?;
|
||||||
|
|
||||||
@@ -222,7 +221,7 @@ impl ConnectHandler<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let gateway_cred = match self
|
let gateway_cred = match self
|
||||||
.obtain_credential(&gateway_prelogin, gateway, portal_default_browser_enabled)
|
.obtain_credential(&gateway_prelogin, gateway, gateway_browser_auth_allowed)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(cred) => cred,
|
Ok(cred) => cred,
|
||||||
@@ -375,10 +374,13 @@ impl ConnectHandler<'_> {
|
|||||||
let session_ctx_on_connect = Arc::clone(&session_ctx);
|
let session_ctx_on_connect = Arc::clone(&session_ctx);
|
||||||
let tunnel_established = Arc::new(AtomicBool::new(false));
|
let tunnel_established = Arc::new(AtomicBool::new(false));
|
||||||
let tunnel_established_on_connect = Arc::clone(&tunnel_established);
|
let tunnel_established_on_connect = Arc::clone(&tunnel_established);
|
||||||
|
let disconnect_requested = Arc::new(AtomicBool::new(false));
|
||||||
|
let disconnect_requested_on_signal = Arc::clone(&disconnect_requested);
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
shutdown_signal().await;
|
shutdown_signal().await;
|
||||||
info!("Received the interrupt signal, disconnecting...");
|
info!("Received the interrupt signal, disconnecting...");
|
||||||
|
disconnect_requested_on_signal.store(true, Ordering::SeqCst);
|
||||||
vpn_clone.disconnect();
|
vpn_clone.disconnect();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -406,7 +408,8 @@ impl ConnectHandler<'_> {
|
|||||||
fs::remove_file(GP_CLIENT_LOCK_FILE).map_err(|err| GatewayConnectError::after_tunnel(err.into()))?;
|
fs::remove_file(GP_CLIENT_LOCK_FILE).map_err(|err| GatewayConnectError::after_tunnel(err.into()))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
classify_openconnect_result(connect_result, tunnel_established)
|
let disconnect_requested = disconnect_requested.load(Ordering::SeqCst);
|
||||||
|
classify_openconnect_result(connect_result, tunnel_established, disconnect_requested)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn determine_hip_script(&self) -> (bool, Option<String>) {
|
fn determine_hip_script(&self) -> (bool, Option<String>) {
|
||||||
@@ -430,11 +433,19 @@ impl ConnectHandler<'_> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn classify_openconnect_result(exit_code: i32, tunnel_established: bool) -> Result<(), GatewayConnectError> {
|
fn classify_openconnect_result(
|
||||||
|
exit_code: i32,
|
||||||
|
tunnel_established: bool,
|
||||||
|
disconnect_requested: bool,
|
||||||
|
) -> Result<(), GatewayConnectError> {
|
||||||
if exit_code == 0 {
|
if exit_code == 0 {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if disconnect_requested && exit_code == OPENCONNECT_INTERRUPTED_EXIT_CODE {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
let error = anyhow::anyhow!("OpenConnect exited with status {}", exit_code);
|
let error = anyhow::anyhow!("OpenConnect exited with status {}", exit_code);
|
||||||
if tunnel_established {
|
if tunnel_established {
|
||||||
Err(GatewayConnectError::after_tunnel(error))
|
Err(GatewayConnectError::after_tunnel(error))
|
||||||
@@ -480,20 +491,33 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn openconnect_success_is_not_a_gateway_failure() {
|
fn openconnect_success_is_not_a_gateway_failure() {
|
||||||
assert!(classify_openconnect_result(0, false).is_ok());
|
assert!(classify_openconnect_result(0, false, false).is_ok());
|
||||||
assert!(classify_openconnect_result(0, true).is_ok());
|
assert!(classify_openconnect_result(0, true, false).is_ok());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn openconnect_failure_before_callback_is_retryable_gateway_failure() {
|
fn openconnect_failure_before_callback_is_retryable_gateway_failure() {
|
||||||
let err = classify_openconnect_result(1, false).expect_err("nonzero exit should fail");
|
let err = classify_openconnect_result(1, false, false).expect_err("nonzero exit should fail");
|
||||||
|
|
||||||
assert!(err.is_before_tunnel());
|
assert!(err.is_before_tunnel());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn openconnect_failure_after_callback_is_terminal_gateway_failure() {
|
fn openconnect_failure_after_callback_is_terminal_gateway_failure() {
|
||||||
let err = classify_openconnect_result(1, true).expect_err("nonzero exit should fail");
|
let err = classify_openconnect_result(1, true, false).expect_err("nonzero exit should fail");
|
||||||
|
|
||||||
|
assert!(!err.is_before_tunnel());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_exit_after_requested_disconnect_is_success() {
|
||||||
|
assert!(classify_openconnect_result(OPENCONNECT_INTERRUPTED_EXIT_CODE, true, true).is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_exit_without_requested_disconnect_is_failure() {
|
||||||
|
let err = classify_openconnect_result(OPENCONNECT_INTERRUPTED_EXIT_CODE, true, false)
|
||||||
|
.expect_err("unexpected interrupt should fail");
|
||||||
|
|
||||||
assert!(!err.is_before_tunnel());
|
assert!(!err.is_before_tunnel());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,16 +65,20 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
builder.build()
|
builder.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn prelogin_options(&self, gateway_external_browser_allowed: bool) -> PreloginOptions {
|
pub(super) fn prelogin_options(&self, gateway_browser_auth_allowed: bool) -> PreloginOptions {
|
||||||
PreloginOptions::default()
|
PreloginOptions::default()
|
||||||
.external_browser_requested(self.external_browser_requested())
|
.external_browser_requested(self.external_browser_requested())
|
||||||
.gateway_external_browser_allowed(gateway_external_browser_allowed)
|
.gateway_external_browser_allowed(gateway_browser_auth_allowed)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions {
|
pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions {
|
||||||
self.prelogin_options(true)
|
self.prelogin_options(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(super) fn gateway_browser_auth_allowed(&self, portal_config_default_browser: bool) -> bool {
|
||||||
|
gateway_browser_auth_allowed(portal_config_default_browser, self.external_browser_requested())
|
||||||
|
}
|
||||||
|
|
||||||
fn external_browser_requested(&self) -> bool {
|
fn external_browser_requested(&self) -> bool {
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
{
|
{
|
||||||
@@ -173,7 +177,8 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
None => portal_config.auth_cookie().clone(),
|
None => portal_config.auth_cookie().clone(),
|
||||||
};
|
};
|
||||||
let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false);
|
let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false);
|
||||||
let portal_default_browser_enabled = portal_config.default_browser().unwrap_or(false);
|
let portal_config_default_browser = portal_config.default_browser().unwrap_or(false);
|
||||||
|
info!("Portal config default-browser: {}", portal_config_default_browser);
|
||||||
|
|
||||||
if self.args.auto_gateway {
|
if self.args.auto_gateway {
|
||||||
let gateways = portal_config.gateways();
|
let gateways = portal_config.gateways();
|
||||||
@@ -198,7 +203,7 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
gateway.server(),
|
gateway.server(),
|
||||||
&auth_cookie,
|
&auth_cookie,
|
||||||
allow_extend_session,
|
allow_extend_session,
|
||||||
portal_default_browser_enabled,
|
portal_config_default_browser,
|
||||||
gateway_context,
|
gateway_context,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
@@ -263,7 +268,7 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
gateway,
|
gateway,
|
||||||
&auth_cookie,
|
&auth_cookie,
|
||||||
allow_extend_session,
|
allow_extend_session,
|
||||||
portal_default_browser_enabled,
|
portal_config_default_browser,
|
||||||
gateway_context,
|
gateway_context,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
@@ -283,3 +288,27 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn gateway_browser_auth_allowed(portal_config_default_browser: bool, external_browser_requested: bool) -> bool {
|
||||||
|
portal_config_default_browser || external_browser_requested
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::gateway_browser_auth_allowed;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gateway_browser_auth_is_allowed_by_portal_config() {
|
||||||
|
assert!(gateway_browser_auth_allowed(true, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gateway_browser_auth_is_allowed_by_explicit_browser_request() {
|
||||||
|
assert!(gateway_browser_auth_allowed(false, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gateway_browser_auth_is_disabled_without_portal_config_or_user_request() {
|
||||||
|
assert!(!gateway_browser_auth_allowed(false, false));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,22 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2.6.3
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed NixOS GUI launch authorization after package updates.
|
||||||
|
- Fixed disconnect handling so a normal Ctrl+C logout no longer reports an error.
|
||||||
|
- Fixed snapshot flake hash update automation for prebuilt Nix packages.
|
||||||
|
|
||||||
|
## 2.6.2
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed gateway fallback browser authentication when external browser authentication is explicitly requested.
|
||||||
|
- Added logging for portal config default-browser behavior.
|
||||||
|
- Added GUI managed configuration support with `gpgui.conf`, including reset to managed config.
|
||||||
|
- Improved GUI config directory migration and managed license auto activation.
|
||||||
|
|
||||||
## 2.6.1
|
## 2.6.1
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
|
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
|
||||||
pname = "globalprotect-openconnect";
|
pname = "globalprotect-openconnect";
|
||||||
version = cargoToml.workspace.package.version;
|
version = cargoToml.workspace.package.version;
|
||||||
|
releaseTag = "v2.6.3";
|
||||||
|
|
||||||
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||||
|
|
||||||
@@ -35,29 +36,29 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
src = pkgs.fetchzip {
|
src = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${releaseTag}/globalprotect-openconnect-${version}.tar.gz";
|
||||||
hash = "sha256-Ejvb//r6tE6yMwNwUJq5Z0r57K0IHKFN1YVaXnvpGIs=";
|
hash = "sha256-cp7KRUwVJsyg8m7O70k/uo6WwLqCPbFCnWtXzHn1GgU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
||||||
|
|
||||||
gpguiHashes = {
|
gpguiHashes = {
|
||||||
x86_64 = "sha256-jLMErGlfbzhRk8onqqiRXOMeNhdFWBZGOqPPEh9vLyM=";
|
x86_64 = "sha256-HbZYZOr0Vei/wBNQUxZNOSEfHlJV3PP8CzhL34Ixm9I=";
|
||||||
aarch64 = "sha256-YSjn2oxDaKTtdfK7rsmuMZfD9n1bitVbScIW0fyedXI=";
|
aarch64 = "sha256-aHou275EwrWqUVsGmW8f6zfVIKuhqW0m+ZdGD7hq7jM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpgui = pkgs.fetchzip {
|
gpgui = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/gpgui_${cpu}.bin.tar.xz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${releaseTag}/gpgui_${cpu}.bin.tar.xz";
|
||||||
hash = gpguiHashes.${cpu};
|
hash = gpguiHashes.${cpu};
|
||||||
};
|
};
|
||||||
|
|
||||||
binaryHashes = {
|
binaryHashes = {
|
||||||
x86_64 = "sha256-atZRM7v5areQTDkrJrOczSz0tc3P6aGU+BE4VblNE08=";
|
x86_64 = "sha256-UA3GdjS69P3oYGQ9alE7T0Ro7+ZzzyY6VpIg2kgR+9Y=";
|
||||||
aarch64 = "sha256-ENE0fHlLSt493QIlotaIMf11MszJszl4ZZAsYWuFJeE=";
|
aarch64 = "sha256-1DCpSffjm0HA42aWnpPCa0WQP7XfgKYCBzikXW5hQwA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
binaryPackage = pkgs.fetchzip {
|
binaryPackage = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect_${version}_${cpu}.bin.tar.xz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${releaseTag}/globalprotect-openconnect_${version}_${cpu}.bin.tar.xz";
|
||||||
hash = binaryHashes.${cpu};
|
hash = binaryHashes.${cpu};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -90,7 +91,7 @@
|
|||||||
|
|
||||||
rewriteSourceInstallPaths = ''
|
rewriteSourceInstallPaths = ''
|
||||||
substituteInPlace $out/share/applications/gpgui.desktop \
|
substituteInPlace $out/share/applications/gpgui.desktop \
|
||||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
--replace-fail /usr/bin/gpclient /run/current-system/sw/bin/gpclient
|
||||||
|
|
||||||
substituteInPlace $out/libexec/gpclient/hipreport.sh \
|
substituteInPlace $out/libexec/gpclient/hipreport.sh \
|
||||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||||
@@ -106,7 +107,7 @@
|
|||||||
|
|
||||||
rewriteHostInstallPaths = ''
|
rewriteHostInstallPaths = ''
|
||||||
substituteInPlace $out/share/applications/gpgui.desktop \
|
substituteInPlace $out/share/applications/gpgui.desktop \
|
||||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
--replace-fail /usr/bin/gpclient /run/current-system/sw/bin/gpclient
|
||||||
|
|
||||||
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
|
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
|
||||||
@@ -117,6 +118,22 @@
|
|||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
installNixosPolkitRule = ''
|
||||||
|
chmod u+w $out/share $out/share/polkit-1 2>/dev/null || true
|
||||||
|
install -d $out/share/polkit-1/rules.d
|
||||||
|
cat > $out/share/polkit-1/rules.d/49-gpgui.rules <<EOF
|
||||||
|
polkit.addRule(function(action, subject) {
|
||||||
|
if (
|
||||||
|
action.id == "org.freedesktop.policykit.exec" &&
|
||||||
|
action.lookup("program") == "$out/bin/gpservice" &&
|
||||||
|
subject.active
|
||||||
|
) {
|
||||||
|
return polkit.Result.YES;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
fromSource = naersk'.buildPackage {
|
fromSource = naersk'.buildPackage {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
@@ -168,6 +185,7 @@
|
|||||||
cp -r packaging/files/usr/libexec $out/libexec
|
cp -r packaging/files/usr/libexec $out/libexec
|
||||||
|
|
||||||
${rewriteSourceInstallPaths}
|
${rewriteSourceInstallPaths}
|
||||||
|
${installNixosPolkitRule}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -197,6 +215,8 @@
|
|||||||
cp -r artifacts/usr/lib $out/lib
|
cp -r artifacts/usr/lib $out/lib
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
install -Dm755 ${gpgui}/gpgui $out/bin/gpgui
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -218,6 +238,9 @@
|
|||||||
"--bind-try"
|
"--bind-try"
|
||||||
"/run/wrappers"
|
"/run/wrappers"
|
||||||
"/run/wrappers"
|
"/run/wrappers"
|
||||||
|
"--ro-bind-try"
|
||||||
|
"/etc/gpgui"
|
||||||
|
"/etc/gpgui"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -327,6 +350,7 @@
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
${rewriteHostInstallPaths}
|
${rewriteHostInstallPaths}
|
||||||
|
${installNixosPolkitRule}
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ Build-Depends: debhelper (>= 9),
|
|||||||
libayatana-appindicator3-1,
|
libayatana-appindicator3-1,
|
||||||
gnome-keyring,
|
gnome-keyring,
|
||||||
libwebkit2gtk-4.1-dev,
|
libwebkit2gtk-4.1-dev,
|
||||||
rust-@RUST_VERSION@-all
|
cargo-@RUST_VERSION@,
|
||||||
|
rustc-@RUST_VERSION@
|
||||||
Homepage: https://github.com/yuezk/GlobalProtect-openconnect
|
Homepage: https://github.com/yuezk/GlobalProtect-openconnect
|
||||||
|
|
||||||
Package: globalprotect-openconnect
|
Package: globalprotect-openconnect
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
release_version="${1:-}"
|
release_version="${1:-}"
|
||||||
|
release_tag="${2:-}"
|
||||||
|
|
||||||
if git diff --quiet -- flake.nix; then
|
if git diff --quiet -- flake.nix; then
|
||||||
echo "flake.nix hashes are already up to date"
|
echo "flake.nix hashes are already up to date"
|
||||||
@@ -14,16 +15,41 @@ if [[ -z "$release_version" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
version="${release_version#v}"
|
version="${release_version#v}"
|
||||||
branch="chore/update-flake-hashes-v${version}"
|
if [[ -z "$release_tag" ]]; then
|
||||||
|
release_tag="v$version"
|
||||||
|
fi
|
||||||
|
|
||||||
|
branch_suffix="v${version}"
|
||||||
title="chore: update flake hashes for v${version}"
|
title="chore: update flake hashes for v${version}"
|
||||||
body="Updates the Nix flake fetchzip hashes for v${version} release assets."
|
body="Updates the Nix flake fetchzip hashes for v${version} release assets."
|
||||||
|
|
||||||
|
if [[ "$release_tag" != "v$version" ]]; then
|
||||||
|
branch_suffix="${branch_suffix}-${release_tag}"
|
||||||
|
title="chore: update flake hashes for v${version} from ${release_tag}"
|
||||||
|
body="Updates the Nix flake fetchzip hashes for v${version} using ${release_tag} release assets."
|
||||||
|
fi
|
||||||
|
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
|
||||||
|
if [[ "$release_tag" == "snapshot" ]]; then
|
||||||
|
source_branch="${GITHUB_REF_NAME:-$(git branch --show-current)}"
|
||||||
|
source_branch_slug="$(printf '%s' "$source_branch" | sed -E 's#[/[:space:]]+#-#g; s#[^A-Za-z0-9._-]##g; s#^-+##; s#-+$##')"
|
||||||
|
branch="chore/flake-${source_branch_slug}"
|
||||||
git switch -C "$branch"
|
git switch -C "$branch"
|
||||||
git add flake.nix
|
git add flake.nix
|
||||||
git commit -m "$title"
|
git commit -m "$title"
|
||||||
git push --force-with-lease origin "$branch"
|
git push --force origin "$branch"
|
||||||
|
echo "Updated snapshot flake hashes on branch $branch from $source_branch; skipping PR creation"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
branch="chore/update-flake-hashes-${branch_suffix}"
|
||||||
|
|
||||||
|
git switch -C "$branch"
|
||||||
|
git add flake.nix
|
||||||
|
git commit -m "$title"
|
||||||
|
git push --force origin "$branch"
|
||||||
|
|
||||||
if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then
|
if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then
|
||||||
pr_number="$(jq -r '.number' /tmp/flake-pr.json)"
|
pr_number="$(jq -r '.number' /tmp/flake-pr.json)"
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ if [[ -z "$tag" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
version="${tag#v}"
|
version="${tag#v}"
|
||||||
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
changelog="$script_dir/../changelog.md"
|
||||||
|
|
||||||
awk -v version="$version" '
|
awk -v version="$version" '
|
||||||
$0 == "## " version {
|
$0 == "## " version {
|
||||||
@@ -27,4 +29,4 @@ awk -v version="$version" '
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
' changelog.md
|
' "$changelog"
|
||||||
@@ -9,10 +9,11 @@ PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
|
|||||||
FLAKE_FILE="$PROJECT_DIR/flake.nix"
|
FLAKE_FILE="$PROJECT_DIR/flake.nix"
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: $0 [version]"
|
echo "Usage: $0 [version] [release-tag]"
|
||||||
echo
|
echo
|
||||||
echo "Updates flake.nix fetchzip hashes from the published GitHub release assets."
|
echo "Updates flake.nix fetchzip hashes from the published GitHub release assets."
|
||||||
echo "When version is omitted, the workspace package version from Cargo.toml is used."
|
echo "When version is omitted, the workspace package version from Cargo.toml is used."
|
||||||
|
echo "When release-tag is omitted, v<version> is used. Use snapshot to test snapshot assets."
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
|
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
|
||||||
@@ -35,12 +36,21 @@ if [[ -z "$version" ]]; then
|
|||||||
version="$(grep '^version' "$PROJECT_DIR/Cargo.toml" | head -1 | sed 's/version *= *"\(.*\)"/\1/')"
|
version="$(grep '^version' "$PROJECT_DIR/Cargo.toml" | head -1 | sed 's/version *= *"\(.*\)"/\1/')"
|
||||||
fi
|
fi
|
||||||
version="${version#v}"
|
version="${version#v}"
|
||||||
|
release_tag="${2:-}"
|
||||||
|
if [[ -z "$release_tag" ]]; then
|
||||||
|
release_tag="v$version"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z "$version" ]]; then
|
if [[ -z "$version" ]]; then
|
||||||
echo "Could not determine release version" >&2
|
echo "Could not determine release version" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$release_tag" ]]; then
|
||||||
|
echo "Could not determine release tag" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
prefetch_hash() {
|
prefetch_hash() {
|
||||||
local url="$1"
|
local url="$1"
|
||||||
local attempt
|
local attempt
|
||||||
@@ -67,7 +77,7 @@ prefetch_hash() {
|
|||||||
|
|
||||||
release_url() {
|
release_url() {
|
||||||
local asset="$1"
|
local asset="$1"
|
||||||
echo "https://github.com/$REPO/releases/download/v$version/$asset"
|
echo "https://github.com/$REPO/releases/download/$release_tag/$asset"
|
||||||
}
|
}
|
||||||
|
|
||||||
source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")"
|
source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")"
|
||||||
@@ -81,8 +91,10 @@ GPGUI_X86_64_HASH="$gpgui_x86_64_hash" \
|
|||||||
GPGUI_AARCH64_HASH="$gpgui_aarch64_hash" \
|
GPGUI_AARCH64_HASH="$gpgui_aarch64_hash" \
|
||||||
BINARY_X86_64_HASH="$binary_x86_64_hash" \
|
BINARY_X86_64_HASH="$binary_x86_64_hash" \
|
||||||
BINARY_AARCH64_HASH="$binary_aarch64_hash" \
|
BINARY_AARCH64_HASH="$binary_aarch64_hash" \
|
||||||
|
RELEASE_TAG="$release_tag" \
|
||||||
perl -0pi -e '
|
perl -0pi -e '
|
||||||
s|(url = "https://github\.com/yuezk/GlobalProtect-openconnect/releases/download/v\$\{version\}/globalprotect-openconnect-\$\{version\}\.tar\.gz";\n\s*hash = ")[^"]+(";)|$1 . $ENV{"SOURCE_HASH"} . $2|e;
|
s|(releaseTag = ")[^"]+(";)|$1 . $ENV{"RELEASE_TAG"} . $2|e;
|
||||||
|
s|(url = "https://github\.com/yuezk/GlobalProtect-openconnect/releases/download/\$\{releaseTag\}/globalprotect-openconnect-\$\{version\}\.tar\.gz";\n\s*hash = ")[^"]+(";)|$1 . $ENV{"SOURCE_HASH"} . $2|e;
|
||||||
s|(gpguiHashes = \{\n\s*x86_64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_X86_64_HASH"} . $2|e;
|
s|(gpguiHashes = \{\n\s*x86_64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_X86_64_HASH"} . $2|e;
|
||||||
s|(gpguiHashes = \{\n\s*x86_64 = "[^"]+";\n\s*aarch64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_AARCH64_HASH"} . $2|e;
|
s|(gpguiHashes = \{\n\s*x86_64 = "[^"]+";\n\s*aarch64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_AARCH64_HASH"} . $2|e;
|
||||||
s|(binaryHashes = \{\n\s*x86_64 = ")[^"]+(";)|$1 . $ENV{"BINARY_X86_64_HASH"} . $2|e;
|
s|(binaryHashes = \{\n\s*x86_64 = ")[^"]+(";)|$1 . $ENV{"BINARY_X86_64_HASH"} . $2|e;
|
||||||
@@ -94,5 +106,6 @@ grep -F "$gpgui_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
|||||||
grep -F "$gpgui_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
grep -F "$gpgui_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
grep -F "$binary_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
grep -F "$binary_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
grep -F "$binary_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
grep -F "$binary_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
grep -F "releaseTag = \"$release_tag\";" "$FLAKE_FILE" > /dev/null
|
||||||
|
|
||||||
echo "Updated flake.nix hashes for v$version"
|
echo "Updated flake.nix hashes for v$version assets from $release_tag"
|
||||||
Reference in new issue
Block a user