Compare commits

..
4 Commits
Author SHA1 Message Date
Kevin Yue baa77a774b chore: prepare GP Connect 3.3.1 release 2026-11-08 21:49:14 +08:00
Kevin Yue 92857fc1ba fix: add gateway login diagnostics and scope platform dependencies 2026-11-08 21:36:31 +08:00
Kevin Yue 5ff3760bc0 fix: select PKCS12 issuers by certificate signature
Handle CA rollover and self-issued intermediates by checking issuer signatures. Preserve RSA-PSS signature parameters during GnuTLS verification and keep the original archive for OpenConnect.

Add mutual-TLS regression coverage for certificate bag order and RSA-PSS salt lengths. Verified 53 targeted tests plus gpapi, desktop-core, and iOS compile checks.
2026-11-07 13:27:42 +08:00
Kevin Yue c476dfefb0 fix: restore client certificate compatibility after OpenSSL removal
Use GnuTLS for desktop client key matching and signing without applying server certificate policy to local identities. Restore RC4 PKCS12 import and renewed certificate selection, and provide actionable unsupported identity errors.

Add HTTP and OpenConnect mutual TLS regressions. Record the unresolved TLS 1.2 ECDSA hash limitation and reject P-521 and RSA-PSS keys explicitly.
2026-11-07 11:23:19 +08:00
9 changed files with 32 additions and 51 deletions

No files matched your search

Generated
+12 -12
View File
@@ -292,7 +292,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "auth"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"block2",
@@ -547,7 +547,7 @@ dependencies = [
[[package]]
name = "browser-launcher"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"log",
@@ -911,7 +911,7 @@ dependencies = [
[[package]]
name = "common"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"tempfile",
]
@@ -2115,7 +2115,7 @@ dependencies = [
[[package]]
name = "gpapi"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"base64 0.23.1",
@@ -2176,7 +2176,7 @@ dependencies = [
[[package]]
name = "gpauth"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"auth",
@@ -2195,7 +2195,7 @@ dependencies = [
[[package]]
name = "gpclient"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"clap",
@@ -2226,7 +2226,7 @@ dependencies = [
[[package]]
name = "gpgui-helper"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"clap",
@@ -2247,7 +2247,7 @@ dependencies = [
[[package]]
name = "gphip"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"askama",
@@ -2264,7 +2264,7 @@ dependencies = [
[[package]]
name = "gpservice"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"anyhow",
"axum",
@@ -2299,7 +2299,7 @@ dependencies = [
[[package]]
name = "gptunnel"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"gpapi",
"log",
@@ -2311,7 +2311,7 @@ dependencies = [
[[package]]
name = "gpvpnc"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"log",
]
@@ -3825,7 +3825,7 @@ dependencies = [
[[package]]
name = "openconnect"
version = "3.4.0"
version = "3.3.1"
dependencies = [
"autotools",
"cc",
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package]
rust-version = "1.91"
version = "3.4.0"
version = "3.3.1"
authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2024"
-18
View File
@@ -1,23 +1,5 @@
# Changelog
## 3.4.0
### Added
- Added gateway selection and switching directly from the system tray or macOS menu bar.
### Improved
- Added a Retry Activation action to recover from temporary license activation failures without re-entering the key.
- Made sign-in prompts and connection errors visible when connecting or switching gateways from the tray.
### Fixed
- Fixed a Native Shell crash after license activation.
- Fixed the macOS Tauri interface opening unexpectedly after signing in from the tray while the main window was hidden.
- Fixed the Native Shell update button text becoming unreadable when pressed.
- Fixed Linux Nix builds using unavailable WebKitGTK dependencies.
## 3.3.1
### Improved
Generated
+3 -3
View File
@@ -63,11 +63,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1794285365,
"narHash": "sha256-wZbTou+ANeUoN7ojuMBOPU9D4qMZ96MLxcDp2BzmIUY=",
"lastModified": 1793795574,
"narHash": "sha256-pgG/CO+txdf2sA2z6DsM+2G3F9ajfIp/3BMC4wfKMDY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9ac0edc06bfb33e6c0000be79d98ef8d89e26503",
"rev": "13e53762c5afaf384d4614e94527a9ccfafe41d0",
"type": "github"
},
"original": {
+6 -6
View File
@@ -29,8 +29,8 @@
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
pname = "globalprotect-openconnect";
version = cargoToml.workspace.package.version;
releaseTag = "v3.3.1";
releaseVersion = "3.3.1";
releaseTag = "v3.3.0";
releaseVersion = "3.3.0";
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
@@ -55,8 +55,8 @@
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
gpguiHashes = {
x86_64 = "sha256-yFXqpxmY222xm6Z8WgNsZgbWUwbYE3qWEeGqZxD7wTU=";
aarch64 = "sha256-8+GaeDAqX3kvjd8a7Tzv9AjtnefaZO0h4sXzOltG5GY=";
x86_64 = "sha256-6+rt47Cu/6uLwM3FgUaP/0qvTALF+UJRFD2nkybNCTg=";
aarch64 = "sha256-auCDdt6LMwnYJ0B9oneoPYAVfEGa/1GkIs8XkXXv85U=";
};
gpguiArchive = pkgs.fetchurl {
@@ -70,8 +70,8 @@
};
binaryHashes = {
x86_64 = "sha256-JXUYT6DRMvN67No4jgJMcp0PyOzib8l0lPHM6muhb9w=";
aarch64 = "sha256-JhYLZTZvw+jdu5ewqrWSnNSW66ub1J2S4rhhwcrR43E=";
x86_64 = "sha256-nsVNOfZ1JxT1mTyiHS3VYyBjbKm5+XsHC/v/fkWwK7A=";
aarch64 = "sha256-EjvkgYpOsaktnNE+Xta/GoKjILQzijW0U2bN1e/FiAQ=";
};
binaryArchive = pkgs.fetchurl {
@@ -1,7 +1,7 @@
pkgbase = globalprotect-openconnect-git
pkgdesc = A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
pkgver = 3.3.1.r623.g4085368
pkgrel = 1
pkgver = 2.5.1.r1.g24f9bbb
pkgrel = 2
url = https://github.com/yuezk/GlobalProtect-openconnect
install = gp.install
arch = x86_64
@@ -2,8 +2,8 @@
_pkgname_prefix=globalprotect-openconnect
pkgname="${_pkgname_prefix}-git"
pkgver=3.3.1.r623.g4085368
pkgrel=1
pkgver=2.5.1.r1.g24f9bbb
pkgrel=2
pkgdesc="A GUI client for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method."
arch=(x86_64 aarch64)
url="https://github.com/yuezk/GlobalProtect-openconnect"
+4 -4
View File
@@ -36,13 +36,13 @@ PY
branch="chore/promote-$tag"
git switch -c "$branch" origin/main
git merge --ff --no-edit "$release_sha"
git merge --no-commit --no-ff "$release_sha"
cp "$artifact_dir/flake.nix" "$artifact_dir/flake.lock" .
python3 "$script_dir/validate-release-version.py" --version "${tag#v}"
# Check against Cargo too: overriding the expectation above is only for artifacts.
python3 "$script_dir/validate-release-version.py"
git add flake.nix flake.lock
if ! git diff --cached --quiet; then
git commit -m "release: validate Nix packages for $tag"
if ! git diff --cached --quiet || [[ -f "$(git rev-parse --git-path MERGE_HEAD)" ]]; then
git commit -m "release: promote $tag sources and Nix packages together"
fi
echo "Prepared $branch. Open one PR against main and use a regular merge to preserve $tag in main's history."
echo "Prepared $branch. Review the candidate, push normally, and open one PR against main."
+2 -3
View File
@@ -119,7 +119,7 @@ class SourceSelectionTests(unittest.TestCase):
class PromotionTests(unittest.TestCase):
def test_promotion_keeps_tag_history_and_adds_flake_commit(self):
def test_sources_and_flake_are_committed_together_preserving_main_work(self):
with tempfile.TemporaryDirectory() as temp:
root = Path(temp)
repo, origin, artifact = root / 'repo', root / 'origin.git', root / 'artifact'
@@ -149,8 +149,7 @@ class PromotionTests(unittest.TestCase):
self.assertEqual(git(repo, 'show', f'{old}:Cargo.toml'), '[workspace.package]\nversion = "3.1.0"')
self.assertTrue((repo / 'infrastructure').exists())
self.assertTrue((repo / 'feature').exists())
self.assertEqual(git(repo, 'rev-list', '--parents', '-1', 'HEAD^').split()[1:], [main, release])
self.assertEqual(git(repo, 'diff', '--name-only', 'HEAD^', 'HEAD'), 'flake.nix')
self.assertEqual(git(repo, 'rev-list', '--parents', '-1', 'HEAD').split()[1:], [main, release])
self.assertEqual(git(repo, 'status', '--porcelain'), '')