Compare commits

...
Author SHA1 Message Date
Kevin Yue 6746cf64c3 fix: complete 2.6.1 release updates 2026-06-22 11:46:26 +08:00
Kevin Yue 40739739b5 fix: correct direct gateway browser auth mode 2026-06-22 08:24:48 +08:00
Kevin Yue dc7a200b93 ci: avoid Docker Hub auth pulls in release builds 2026-06-21 22:28:49 +08:00
Kevin Yue f49b6471f3 ci: reduce release Docker pull pressure 2026-06-21 22:25:28 +08:00
Kevin Yue 4da922aa3b chore: prepare 2.6.1 release 2026-06-21 22:15:09 +08:00
Kevin Yue ecc9c9f09c feat: auto-select browser for external auth 2026-06-21 20:59:13 +08:00
Kevin Yue b32002710b fix: support NixOS prebuilt GUI package 2026-06-21 20:08:19 +08:00
Kevin Yue 7b6d20a003 fix: substitute NixOS gpservice wrapper path 2026-06-21 15:26:52 +08:00
Kevin Yue d27029fad8 fix: match NixOS polkit service path 2026-06-21 15:21:51 +08:00
Kevin Yue 1b488ba696 fix: launch NixOS GUI service outside FHS env 2026-06-21 14:32:13 +08:00
Kevin Yue f78f7c9bc8 fix: prefer NixOS host wrappers in prebuilt package 2026-06-21 14:03:42 +08:00
Kevin Yue 7e11693ce3 Merge branch 'feature/nix-prebuilt-binaries'
# Conflicts:
#	.github/workflows/build.yaml
#	flake.nix
2026-06-21 12:46:18 +08:00
Kevin Yue c601fa9aa2 feat: add prebuilt Nix package 2026-06-21 12:20:28 +08:00
Kevin Yue 536a43773f feat: add prebuilt Nix package (#622) 2026-06-21 11:57:57 +08:00
Kevin Yue ae4cbedd3b doc: update NixOS installation instructions 2026-06-20 22:11:06 +08:00
Kevin Yue fe55d11fc4 ci: use main PPA publish action 2026-06-20 19:39:26 +08:00
github-actions[bot] 34f1feaf43 chore: update flake hashes for v2.6.0 (#621) 2026-06-20 19:12:58 +08:00
Kevin Yue f640b4d325 Merge branch 'fix/settings-crash-wayland-thread-safety' 2026-06-20 19:08:23 +08:00
31 changed files with 765 additions and 192 deletions

No files matched your search

+11 -8
View File
@@ -130,6 +130,7 @@ jobs:
if-no-files-found: error if-no-files-found: error
build-gp: build-gp:
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
needs: needs:
- tarball - tarball
strategy: strategy:
@@ -153,19 +154,17 @@ jobs:
with: with:
name: artifact-source name: artifact-source
path: build-gp-${{ matrix.package }} path: build-gp-${{ matrix.package }}
- name: Docker Login
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build ${{ matrix.package }} package in Docker - name: Build ${{ matrix.package }} package in Docker
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros # LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
run: | run: |
docker run --pull=always --rm \ docker run --rm \
-e COREPACK_INTEGRITY_KEYS=0 \ -e COREPACK_INTEGRITY_KEYS=0 \
-e LIBXML2_STATIC=1 \ -e LIBXML2_STATIC=1 \
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \ -v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 yuezk/gpdev:${{ matrix.package }}-builder-tauri2
- name: Install ${{ matrix.package }} package in Docker - name: Install ${{ matrix.package }} package in Docker
run: | run: |
docker run --pull=always --rm \ docker run --rm \
-e COREPACK_INTEGRITY_KEYS=0 \ -e COREPACK_INTEGRITY_KEYS=0 \
-e GPGUI_INSTALLED=0 \ -e GPGUI_INSTALLED=0 \
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \ -v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
@@ -182,6 +181,7 @@ jobs:
build-gp-${{ matrix.package }}/artifacts/* build-gp-${{ matrix.package }}/artifacts/*
build-docker-image: build-docker-image:
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -242,6 +242,7 @@ 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
@@ -282,18 +283,16 @@ jobs:
run: | run: |
cd gpgui-source cd gpgui-source
tar -czf gpgui.tar.gz gpgui gp tar -czf gpgui.tar.gz gpgui gp
- name: Docker Login
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build gpgui in Docker - name: Build gpgui in Docker
run: | run: |
docker run --pull=always --rm \ docker run --rm \
-e COREPACK_INTEGRITY_KEYS=0 \ -e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd)/gpgui-source:/workspace yuezk/gpdev:${{ matrix.libc.builder }} -v $(pwd)/gpgui-source:/workspace yuezk/gpdev:${{ matrix.libc.builder }}
- name: Install gpgui in Docker - name: Install gpgui in Docker
run: | run: |
cd gpgui-source cd gpgui-source
tar -xJf *.bin.tar.xz tar -xJf *.bin.tar.xz
docker run --pull=always --rm \ docker run --rm \
-e COREPACK_INTEGRITY_KEYS=0 \ -e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd):/workspace yuezk/gpdev:${{ matrix.libc.builder }} \ -v $(pwd):/workspace yuezk/gpdev:${{ matrix.libc.builder }} \
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version" bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
@@ -548,6 +547,7 @@ jobs:
env: env:
NEEDS_JSON: ${{ toJson(needs) }} NEEDS_JSON: ${{ toJson(needs) }}
BSD_MATRIX_ENABLED: ${{ needs.setup-bsd-matrix.outputs.enabled }} BSD_MATRIX_ENABLED: ${{ needs.setup-bsd-matrix.outputs.enabled }}
IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
run: | run: |
python3 - <<'PY' python3 - <<'PY'
import json import json
@@ -556,12 +556,15 @@ jobs:
needs = json.loads(os.environ["NEEDS_JSON"]) needs = json.loads(os.environ["NEEDS_JSON"])
bsd_matrix_enabled = os.environ["BSD_MATRIX_ENABLED"] == "true" bsd_matrix_enabled = os.environ["BSD_MATRIX_ENABLED"] == "true"
is_tag = os.environ["IS_TAG"] == "true"
failed = [] failed = []
for name, data in needs.items(): for name, data in needs.items():
result = data["result"] result = data["result"]
if result in {"failure", "cancelled"}: if result in {"failure", "cancelled"}:
failed.append(f"{name}: {result}") failed.append(f"{name}: {result}")
elif name in {"build-gp", "build-docker-image"} and result == "skipped" and is_tag:
continue
elif name in {"build-gpgui-frontend", "build-bsd"} and result == "skipped" and not bsd_matrix_enabled: elif name in {"build-gpgui-frontend", "build-bsd"} and result == "skipped" and not bsd_matrix_enabled:
continue continue
elif result == "skipped": elif result == "skipped":
+1 -1
View File
@@ -137,7 +137,7 @@ jobs:
sed -i "s/DISABLE_RUST_TOOLCHAIN = 0/DISABLE_RUST_TOOLCHAIN = 1/g" .build/debian/rules sed -i "s/DISABLE_RUST_TOOLCHAIN = 0/DISABLE_RUST_TOOLCHAIN = 1/g" .build/debian/rules
- name: Publish to PPA - name: Publish to PPA
uses: yuezk/publish-ppa-package@gp uses: yuezk/publish-ppa-package@main
with: with:
repository: "yuezk/globalprotect-openconnect" repository: "yuezk/globalprotect-openconnect"
gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+10 -4
View File
@@ -116,12 +116,10 @@ jobs:
--pattern '*[^offline].tar.gz' \ --pattern '*[^offline].tar.gz' \
--dir build-${{ matrix.package }} --dir build-${{ matrix.package }}
- name: Docker Login
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build ${{ matrix.package }} package in Docker - name: Build ${{ matrix.package }} package in Docker
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros # LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
run: | run: |
docker run --pull=always --rm \ docker run --rm \
-v $(pwd)/build-${{ matrix.package }}:/workspace \ -v $(pwd)/build-${{ matrix.package }}:/workspace \
-e COREPACK_INTEGRITY_KEYS=0 \ -e COREPACK_INTEGRITY_KEYS=0 \
-e LIBXML2_STATIC=1 \ -e LIBXML2_STATIC=1 \
@@ -130,7 +128,7 @@ jobs:
- name: Install ${{ matrix.package }} package in Docker - name: Install ${{ matrix.package }} package in Docker
run: | run: |
docker run --pull=always --rm \ docker run --rm \
-e COREPACK_INTEGRITY_KEYS=0 \ -e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd)/build-${{ matrix.package }}:/workspace \ -v $(pwd)/build-${{ matrix.package }}:/workspace \
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \ yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
@@ -274,6 +272,13 @@ jobs:
uses: actions/download-artifact@v8 uses: actions/download-artifact@v8
with: with:
path: gh-release path: gh-release
- name: Generate release notes
id: release-notes
run: |
cd gh-release/gp
mkdir -p .build
scripts/release-notes.sh "${{ inputs.tag }}" > .build/release-notes.md
echo "path=$GITHUB_WORKSPACE/gh-release/gp/.build/release-notes.md" >> "$GITHUB_OUTPUT"
- name: Rename APK artifacts - name: Rename APK artifacts
run: | run: |
shopt -s nullglob shopt -s nullglob
@@ -314,4 +319,5 @@ jobs:
prerelease: ${{ contains(github.ref, 'snapshot') }} prerelease: ${{ contains(github.ref, 'snapshot') }}
fail_on_unmatched_files: true fail_on_unmatched_files: true
tag_name: ${{ inputs.tag }} tag_name: ${{ inputs.tag }}
body_path: ${{ steps.release-notes.outputs.path }}
files: ${{ steps.release-assets.outputs.files }} files: ${{ steps.release-assets.outputs.files }}
+80 -34
View File
@@ -6,9 +6,6 @@ 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:
types:
- published
permissions: permissions:
contents: write contents: write
@@ -26,7 +23,7 @@ jobs:
- name: Update flake hashes - name: Update flake hashes
env: env:
RELEASE_VERSION: ${{ github.event.release.tag_name || inputs.version }} RELEASE_VERSION: ${{ inputs.version }}
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"
@@ -34,36 +31,85 @@ jobs:
scripts/update-flake-hashes.sh scripts/update-flake-hashes.sh
fi fi
- name: Upload updated flake
uses: actions/upload-artifact@v7
with:
name: updated-flake
path: flake.nix
if-no-files-found: error
validate-nix-prebuilt:
needs:
- update-flake-hashes
strategy:
fail-fast: false
matrix:
include:
- runner: ubuntu-latest
nixpkgs: nixos-25.11
- runner: ubuntu-latest
nixpkgs: nixos-26.05
- runner: ubuntu-24.04-arm
nixpkgs: nixos-25.11
- runner: ubuntu-24.04-arm
nixpkgs: nixos-26.05
name: validate-nix-prebuilt (${{ matrix.nixpkgs }}, ${{ matrix.runner }})
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout GlobalProtect-openconnect
uses: actions/checkout@v6
with:
submodules: recursive
- name: Download updated flake
uses: actions/download-artifact@v8
with:
name: updated-flake
path: .
- name: Install Nix
uses: cachix/install-nix-action@v31
- name: Build prebuilt Nix package
run: |
nix build .#prebuilt \
--override-input nixpkgs "github:NixOS/nixpkgs/${{ matrix.nixpkgs }}" \
--extra-experimental-features "nix-command flakes" \
--print-build-logs
- name: Inspect prebuilt Nix package
run: |
test -x result/bin/gpclient
test -x result/bin/gpauth
test -x result/bin/gpservice
test -x result/bin/gpgui-helper
test -x result/bin/gpgui
test ! -L result/bin/gpservice
head -n1 result/bin/gpclient | grep '^#!'
head -n1 result/bin/gpservice | grep '^#!'
grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient
grep -q 'gpservice_public=.*/bin/gpservice' result/bin/gpclient
grep -q 'exec .*/bin/gpservice' result/bin/gpservice
! grep -q '@gpservice_public@\|@gpservice_fhs@\|\$out/bin/gpservice' result/bin/gpclient result/bin/gpservice
! grep -R '/usr/bin/gp' result/share
open-pull-request:
needs:
- validate-nix-prebuilt
runs-on: ubuntu-latest
steps:
- name: Checkout GlobalProtect-openconnect
uses: actions/checkout@v6
- name: Download updated flake
uses: actions/download-artifact@v8
with:
name: updated-flake
path: .
- name: Open pull request - name: Open pull request
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
RELEASE_VERSION: ${{ github.event.release.tag_name || inputs.version }} RELEASE_VERSION: ${{ inputs.version }}
run: | run: scripts/open-flake-hashes-pr.sh "$RELEASE_VERSION"
if git diff --quiet -- flake.nix; then
echo "flake.nix hashes are already up to date"
exit 0
fi
version="${RELEASE_VERSION:-$(grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/')}"
version="${version#v}"
branch="chore/update-flake-hashes-v${version}"
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git switch -c "$branch"
git add flake.nix
git commit -m "chore: update flake hashes for v${version}"
git push --force-with-lease origin "$branch"
if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then
pr_number="$(jq -r '.number' /tmp/flake-pr.json)"
gh pr edit "$pr_number" \
--title "chore: update flake hashes for v${version}" \
--body "Updates the Nix flake fetchzip hashes for v${version} release assets."
else
gh pr create \
--title "chore: update flake hashes for v${version}" \
--body "Updates the Nix flake fetchzip hashes for v${version} release assets." \
--base main \
--head "$branch"
fi
Generated
+8 -8
View File
@@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "auth" name = "auth"
version = "2.6.0" version = "2.6.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"block2", "block2",
@@ -705,7 +705,7 @@ dependencies = [
[[package]] [[package]]
name = "common" name = "common"
version = "2.6.0" version = "2.6.1"
[[package]] [[package]]
name = "compile-time" name = "compile-time"
@@ -1732,7 +1732,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "2.6.0" version = "2.6.1"
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.0" version = "2.6.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auth", "auth",
@@ -1796,7 +1796,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "2.6.0" version = "2.6.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"askama", "askama",
@@ -1825,7 +1825,7 @@ dependencies = [
[[package]] [[package]]
name = "gpgui-helper" name = "gpgui-helper"
version = "2.6.0" version = "2.6.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -1843,7 +1843,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "2.6.0" version = "2.6.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3191,7 +3191,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "2.6.0" version = "2.6.1"
dependencies = [ dependencies = [
"autotools", "autotools",
"cc", "cc",
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package] [workspace.package]
rust-version = "1.89" rust-version = "1.89"
version = "2.6.0" version = "2.6.1"
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"
+28 -20
View File
@@ -81,6 +81,8 @@ gpauth <portal> --browser 2>/dev/null | sudo gpclient connect <portal> --cookie-
``` ```
**Browser Options:** **Browser Options:**
- Use `--browser` to auto-select Chrome, Firefox, then the system default browser
- Use `--browser default` to use the system default browser
- Use `--browser <browser>` to specify a browser (e.g., `firefox`, `chrome`) - Use `--browser <browser>` to specify a browser (e.g., `firefox`, `chrome`)
- Use `--browser remote` for headless servers – this provides a URL you can access from another machine to complete authentication - Use `--browser remote` for headless servers – this provides a URL you can access from another machine to complete authentication
@@ -214,7 +216,7 @@ This repository includes a flake for NixOS integration.
#### Installation Steps #### Installation Steps
1. Add the flake to your `flake.nix`: Add the flake input and package to your `flake.nix`:
```nix ```nix
{ {
@@ -223,35 +225,41 @@ This repository includes a flake for NixOS integration.
globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect"; globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect";
}; };
outputs = { nixpkgs, ... }@inputs: { outputs = { self, nixpkgs, globalprotect-openconnect, ... }:
nixosConfigurations.<your-host> = nixpkgs.lib.nixosSystem { let
specialArgs = { inherit inputs; }; system = "x86_64-linux"; # or "aarch64-linux" for ARM64
hostname = "<your-host>";
in {
nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
inherit system;
modules = [ modules = [
./configuration.nix ./configuration.nix
];
};
};
}
```
2. Add the package to your `configuration.nix`:
```nix
{ pkgs, inputs, ... }:
{ {
# ... other configurations services.ayatana-indicators.enable = true;
environment.systemPackages = with pkgs; [
# ... other packages environment.systemPackages = [
inputs.globalprotect-openconnect.packages.${pkgs.stdenv.hostPlatform.system}.default globalprotect-openconnect.packages.${system}.default
nixpkgs.legacyPackages.${system}.gnomeExtensions.appindicator
]; ];
} }
];
};
};
}
``` ```
3. Apply the changes: Apply:
```bash ```bash
sudo nixos-rebuild switch sudo nixos-rebuild switch
loginctl terminate-user "$USER"
```
After logging back in to GNOME, enable AppIndicator support if needed:
```bash
gnome-extensions enable [email protected]
``` ```
### Official Docker Image ### Official Docker Image
+55 -3
View File
@@ -57,6 +57,19 @@ struct Cli {
#[arg(long, help = "Override the GlobalProtect client version reported to the server")] #[arg(long, help = "Override the GlobalProtect client version reported to the server")]
client_version: Option<String>, client_version: Option<String>,
#[arg(
short,
long,
help = "Use SSL client certificate file in pkcs#8 (.pem) or pkcs#12 (.p12, .pfx) format"
)]
certificate: Option<String>,
#[arg(short = 'k', long, help = "Use SSL private key file in pkcs#8 (.pem) format")]
sslkey: Option<String>,
#[arg(short = 'p', long, help = "The key passphrase of the private key")]
key_password: Option<String>,
#[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")] #[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
fix_openssl: bool, fix_openssl: bool,
@@ -69,8 +82,8 @@ struct Cli {
#[arg( #[arg(
long, long,
help = "The browser to use for authentication, e.g., `default`, `firefox`, `chrome`, `chromium`, or the path to the browser executable", help = "Use external browser authentication. With no value, auto-select Chrome, Firefox, then system default. Use `default` for the system default browser.",
default_missing_value = "default", default_missing_value = "auto",
num_args=0..=1 num_args=0..=1
)] )]
browser: Option<String>, browser: Option<String>,
@@ -128,7 +141,7 @@ impl Cli {
let auth_request = match self.saml_request.as_deref() { let auth_request = match self.saml_request.as_deref() {
Some(auth_request) => auth_request.to_string(), Some(auth_request) => auth_request.to_string(),
None => auth_prelogin(&server, &gp_params, self.external_browser_requested()).await?, None => auth_prelogin(&server, &gp_params, self.external_browser_requested(), self.gateway).await?,
}; };
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
@@ -161,6 +174,9 @@ impl Cli {
fn build_gp_params(&self) -> GpParams { fn build_gp_params(&self) -> GpParams {
GpParams::builder(self.build_os_profile()) GpParams::builder(self.build_os_profile())
.ignore_tls_errors(self.ignore_tls_errors) .ignore_tls_errors(self.ignore_tls_errors)
.certificate(self.certificate.clone())
.sslkey(self.sslkey.clone())
.key_password(self.key_password.clone())
.is_gateway(self.gateway) .is_gateway(self.gateway)
.build() .build()
} }
@@ -250,6 +266,23 @@ mod tests {
assert!(cli.external_browser_requested()); assert!(cli.external_browser_requested());
} }
#[test]
fn browser_without_value_uses_auto_mode() {
let cli = Cli::try_parse_from(["gpauth", "portal.example.com", "--browser"]).expect("gpauth args should parse");
assert_eq!(cli.browser.as_deref(), Some("auto"));
assert!(cli.external_browser_requested());
}
#[test]
fn browser_default_keeps_system_default_mode() {
let cli =
Cli::try_parse_from(["gpauth", "portal.example.com", "--browser", "default"]).expect("gpauth args should parse");
assert_eq!(cli.browser.as_deref(), Some("default"));
assert!(cli.external_browser_requested());
}
#[test] #[test]
fn client_version_arg_sets_profile_client_version() { fn client_version_arg_sets_profile_client_version() {
let cli = Cli::try_parse_from(["gpauth", "portal.example.com", "--client-version", "legacy-client"]) let cli = Cli::try_parse_from(["gpauth", "portal.example.com", "--client-version", "legacy-client"])
@@ -259,4 +292,23 @@ mod tests {
assert_eq!(profile.client_version(), "legacy-client"); assert_eq!(profile.client_version(), "legacy-client");
assert!(profile.user_agent().contains("legacy-client")); assert!(profile.user_agent().contains("legacy-client"));
} }
#[test]
fn client_certificate_args_parse() {
let cli = Cli::try_parse_from([
"gpauth",
"portal.example.com",
"--certificate",
"/tmp/client.pem",
"--sslkey",
"/tmp/client.key",
"--key-password",
"secret",
])
.expect("gpauth args should parse");
assert_eq!(cli.certificate.as_deref(), Some("/tmp/client.pem"));
assert_eq!(cli.sslkey.as_deref(), Some("/tmp/client.key"));
assert_eq!(cli.key_password.as_deref(), Some("secret"));
}
} }
+22 -2
View File
@@ -141,8 +141,8 @@ pub(crate) struct ConnectArgs {
#[arg( #[arg(
long, long,
help = "Use the specified browser to authenticate, e.g., `default`, `firefox`, `chrome`, `chromium`, `remote`.\nOr the path to the browser executable.\nUse 'remote' for headless servers.", help = "Use external browser authentication. With no value, auto-select Chrome, Firefox, then system default. Use `default` for the system default browser or `remote` for headless servers.",
default_missing_value = "default", default_missing_value = "auto",
num_args=0..=1 num_args=0..=1
)] )]
pub(super) browser: Option<String>, pub(super) browser: Option<String>,
@@ -243,6 +243,26 @@ mod tests {
assert_eq!(cli.args.gateway.as_deref(), Some("gw1")); assert_eq!(cli.args.gateway.as_deref(), Some("gw1"));
} }
#[test]
fn browser_without_value_uses_auto_mode() {
use clap::Parser;
let cli = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com", "--browser"])
.expect("--browser without value should parse");
assert_eq!(cli.args.browser.as_deref(), Some("auto"));
}
#[test]
fn browser_default_keeps_system_default_mode() {
use clap::Parser;
let cli = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com", "--browser", "default"])
.expect("--browser default should parse");
assert_eq!(cli.args.browser.as_deref(), Some("default"));
}
#[test] #[test]
fn os_defaults_to_runtime_os() { fn os_defaults_to_runtime_os() {
use clap::Parser; use clap::Parser;
+8 -4
View File
@@ -48,7 +48,7 @@ impl ConnectHandler<'_> {
&self, &self,
prelogin: &Prelogin, prelogin: &Prelogin,
server: &str, server: &str,
portal_default_browser_enabled: bool, gateway_external_browser_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();
@@ -61,7 +61,7 @@ impl ConnectHandler<'_> {
let external_browser_supported = default_browser_auth_allowed( let external_browser_supported = default_browser_auth_allowed(
prelogin.support_default_browser(), prelogin.support_default_browser(),
is_gateway, is_gateway,
portal_default_browser_enabled, gateway_external_browser_allowed,
); );
let browser = if external_browser_supported { let browser = if external_browser_supported {
self.args.browser.as_deref() self.args.browser.as_deref()
@@ -74,12 +74,16 @@ impl ConnectHandler<'_> {
}; };
let verbose = self.shared_args.verbose.to_verbose_arg(); let verbose = self.shared_args.verbose.to_verbose_arg();
let os_profile = self.os_profile.borrow().clone(); let os_profile = self.os_profile.borrow().clone();
let key_password = self.latest_key_password.borrow().clone();
let auth_launcher = SamlAuthLauncher::new(server) let auth_launcher = SamlAuthLauncher::new(server)
.gateway(is_gateway) .gateway(is_gateway)
.saml_request(prelogin.saml_request()) .saml_request(prelogin.saml_request())
.os_profile(&os_profile) .os_profile(&os_profile)
.fix_openssl(self.shared_args.fix_openssl) .fix_openssl(self.shared_args.fix_openssl)
.ignore_tls_errors(self.shared_args.ignore_tls_errors) .ignore_tls_errors(self.shared_args.ignore_tls_errors)
.certificate(self.args.certificate.as_deref())
.sslkey(self.args.sslkey.as_deref())
.key_password(key_password.as_deref())
.browser(browser) .browser(browser)
.verbose(verbose); .verbose(verbose);
@@ -187,9 +191,9 @@ fn should_read_stdin_credential(cookie_on_stdin: bool, as_gateway: bool, prelogi
fn default_browser_auth_allowed( fn default_browser_auth_allowed(
saml_support_default_browser: bool, saml_support_default_browser: bool,
is_gateway: bool, is_gateway: bool,
portal_default_browser_enabled: bool, gateway_external_browser_allowed: bool,
) -> bool { ) -> bool {
saml_support_default_browser && (!is_gateway || portal_default_browser_enabled) saml_support_default_browser && (!is_gateway || gateway_external_browser_allowed)
} }
fn log_stdin_host_id(host_id: Option<&str>) { fn log_stdin_host_id(host_id: Option<&str>) {
+5 -2
View File
@@ -139,8 +139,11 @@ 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 prelogin = prelogin(gateway, &gp_params, self.prelogin_options(false)).await?; let gateway_external_browser_allowed = true;
let cred = self.obtain_credential(&prelogin, gateway, false).await?; let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?;
let cred = self
.obtain_credential(&prelogin, gateway, gateway_external_browser_allowed)
.await?;
let login_session = self let login_session = self
.login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref()) .login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref())
+6 -2
View File
@@ -65,10 +65,14 @@ impl<'a> ConnectHandler<'a> {
builder.build() builder.build()
} }
pub(super) fn prelogin_options(&self, portal_default_browser_enabled: bool) -> PreloginOptions { pub(super) fn prelogin_options(&self, gateway_external_browser_allowed: bool) -> PreloginOptions {
PreloginOptions::default() PreloginOptions::default()
.external_browser_requested(self.external_browser_requested()) .external_browser_requested(self.external_browser_requested())
.portal_default_browser_enabled(portal_default_browser_enabled) .gateway_external_browser_allowed(gateway_external_browser_allowed)
}
pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions {
self.prelogin_options(true)
} }
fn external_browser_requested(&self) -> bool { fn external_browser_requested(&self) -> bool {
+7 -8
View File
@@ -3,7 +3,6 @@ use std::{
io::BufReader, io::BufReader,
ops::ControlFlow, ops::ControlFlow,
os::unix::fs::PermissionsExt, os::unix::fs::PermissionsExt,
path::PathBuf,
sync::Arc, sync::Arc,
}; };
@@ -17,7 +16,7 @@ use axum::{
http::StatusCode, http::StatusCode,
response::IntoResponse, response::IntoResponse,
}; };
use common::constants::GP_GUI_BINARY; use common::binary_paths;
use futures::{SinkExt, StreamExt}; use futures::{SinkExt, StreamExt};
use gpapi::{ use gpapi::{
service::{event::WsEvent, request::UpdateGuiRequest}, service::{event::WsEvent, request::UpdateGuiRequest},
@@ -67,8 +66,8 @@ pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) ->
// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it // Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
async fn install_gui(src: &str) -> anyhow::Result<()> { async fn install_gui(src: &str) -> anyhow::Result<()> {
let path = PathBuf::from(GP_GUI_BINARY); let target = binary_paths::gpgui();
let Some(dir) = path.parent() else { let Some(dir) = target.parent() else {
bail!("Failed to get parent directory of GUI binary"); bail!("Failed to get parent directory of GUI binary");
}; };
@@ -81,13 +80,13 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {
for entry in ar.entries()? { for entry in ar.entries()? {
let mut entry = entry?; let mut entry = entry?;
let path = entry.path()?; let entry_path = entry.path()?;
if let Some(name) = path.file_name() { if let Some(name) = entry_path.file_name() {
let name = name.to_string_lossy(); let name = name.to_string_lossy();
if name == "gpgui" { if name == "gpgui" {
let mut file = File::create(GP_GUI_BINARY)?; let mut file = File::create(&target)?;
std::io::copy(&mut entry, &mut file)?; std::io::copy(&mut entry, &mut file)?;
break; break;
} }
@@ -95,7 +94,7 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {
} }
// Make the binary executable // Make the binary executable
fs::set_permissions(GP_GUI_BINARY, Permissions::from_mode(0o755)).await?; fs::set_permissions(target, Permissions::from_mode(0o755)).await?;
Ok(()) Ok(())
} }
+2 -2
View File
@@ -1,7 +1,7 @@
use std::sync::Arc; use std::sync::Arc;
use axum::extract::ws::Message; use axum::extract::ws::Message;
use common::constants::GP_AUTH_BINARY; use common::binary_paths;
use gpapi::{ use gpapi::{
os_profile::HostIdentity, os_profile::HostIdentity,
service::{ service::{
@@ -73,7 +73,7 @@ impl WsServerContext {
vpn_state: self.vpn_state_rx.borrow().clone(), vpn_state: self.vpn_state_rx.borrow().clone(),
vpnc_script: find_vpnc_script().map(|s| s.to_owned()), vpnc_script: find_vpnc_script().map(|s| s.to_owned()),
csd_wrapper: find_csd_wrapper().map(|s| s.to_owned()), csd_wrapper: find_csd_wrapper().map(|s| s.to_owned()),
auth_executable: GP_AUTH_BINARY.to_owned(), auth_executable: binary_paths::gpauth().to_string_lossy().into_owned(),
host_info, host_info,
}; };
+15
View File
@@ -1,5 +1,20 @@
# Changelog # Changelog
## 2.6.1
### Changed
- Improved external browser authentication so `--browser` chooses Chrome first, then Firefox, then the system default browser.
- Improved NixOS prebuilt package integration for launching helper binaries and desktop services.
- Updated the release process to publish GitHub release notes from the changelog.
### Fixed
- Fixed NixOS GUI launch failures caused by package-local binary paths.
- Fixed NixOS tray icon setup documentation for GNOME desktops.
- Fixed browser authentication for portals that require a client certificate.
- Fixed release automation so Nix flake hash updates are run manually after release assets are available.
## 2.6.0 ## 2.6.0
### Added ### Added
+38 -9
View File
@@ -11,6 +11,7 @@ use tokio::{
use crate::browser::auth_server::AuthServer; use crate::browser::auth_server::AuthServer;
pub enum Browser<'a> { pub enum Browser<'a> {
Auto,
Default, Default,
Chrome, Chrome,
Firefox, Firefox,
@@ -21,6 +22,7 @@ pub enum Browser<'a> {
impl<'a> Browser<'a> { impl<'a> Browser<'a> {
pub fn from_str(browser: &'a str) -> Self { pub fn from_str(browser: &'a str) -> Self {
match browser.to_lowercase().as_str() { match browser.to_lowercase().as_str() {
"auto" => Browser::Auto,
"default" => Browser::Default, "default" => Browser::Default,
"chrome" => Browser::Chrome, "chrome" => Browser::Chrome,
"firefox" => Browser::Firefox, "firefox" => Browser::Firefox,
@@ -31,6 +33,7 @@ impl<'a> Browser<'a> {
fn as_str(&self) -> &str { fn as_str(&self) -> &str {
match self { match self {
Browser::Auto => "auto",
Browser::Default => "default", Browser::Default => "default",
Browser::Chrome => "chrome", Browser::Chrome => "chrome",
Browser::Firefox => "firefox", Browser::Firefox => "firefox",
@@ -87,6 +90,15 @@ Note that the URL is only valid for a single use.
info!("Launching the default browser..."); info!("Launching the default browser...");
webbrowser::open(&auth_url)?; webbrowser::open(&auth_url)?;
} }
Browser::Auto => {
if let Some(app) = find_auto_browser_path() {
info!("Launching browser: {}", app);
open::with_detached(&auth_url, app)?;
} else {
info!("No preferred browser found; launching the default browser...");
webbrowser::open(&auth_url)?;
}
}
_ => { _ => {
let app = find_browser_path(&self.browser); let app = find_browser_path(&self.browser);
@@ -124,19 +136,25 @@ async fn detect_local_ip() -> anyhow::Result<String> {
fn find_browser_path(browser: &Browser) -> String { fn find_browser_path(browser: &Browser) -> String {
match browser { match browser {
Browser::Chrome => { Browser::Chrome => find_chrome_path().unwrap_or_else(|| browser.as_str().to_string()),
const CHROME_VARIANTS: &[&str] = &["google-chrome-stable", "google-chrome", "chromium"];
CHROME_VARIANTS
.iter()
.find_map(|&browser_name| which::which(browser_name).ok())
.map(|path| path.to_string_lossy().to_string())
.unwrap_or_else(|| browser.as_str().to_string())
}
_ => browser.as_str().to_string(), _ => browser.as_str().to_string(),
} }
} }
fn find_auto_browser_path() -> Option<String> {
find_chrome_path().or_else(|| find_program_path("firefox"))
}
fn find_chrome_path() -> Option<String> {
["google-chrome-stable", "google-chrome", "chromium"]
.iter()
.find_map(|browser_name| find_program_path(browser_name))
}
fn find_program_path(name: &str) -> Option<String> {
which::which(name).ok().map(|path| path.to_string_lossy().to_string())
}
async fn wait_auth_data() -> anyhow::Result<SamlAuthData> { async fn wait_auth_data() -> anyhow::Result<SamlAuthData> {
// Start a local server to receive the browser authentication data // Start a local server to receive the browser authentication data
let listener = TcpListener::bind("127.0.0.1:0").await?; let listener = TcpListener::bind("127.0.0.1:0").await?;
@@ -176,3 +194,14 @@ fn read_auth_data_from_stdin() -> anyhow::Result<SamlAuthData> {
let auth_data = SamlAuthData::from_gpcallback(data.trim())?; let auth_data = SamlAuthData::from_gpcallback(data.trim())?;
Ok(auth_data) Ok(auth_data)
} }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn browser_auto_is_distinct_from_system_default() {
assert!(matches!(Browser::from_str("auto"), Browser::Auto));
assert!(matches!(Browser::from_str("default"), Browser::Default));
}
}
+4 -3
View File
@@ -19,10 +19,11 @@ pub async fn auth_prelogin(
server: &str, server: &str,
gp_params: &GpParams, gp_params: &GpParams,
external_browser_requested: bool, external_browser_requested: bool,
gateway_external_browser_allowed: bool,
) -> anyhow::Result<String> { ) -> anyhow::Result<String> {
// gpauth only performs the initial portal/gateway prelogin. Portal policy is let options = PreloginOptions::default()
// not available here, so gateway prelogin stays on the embedded value. .external_browser_requested(external_browser_requested)
let options = PreloginOptions::default().external_browser_requested(external_browser_requested); .gateway_external_browser_allowed(gateway_external_browser_allowed);
match prelogin(server, gp_params, options).await? { match prelogin(server, gp_params, options).await? {
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()), Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"), Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
+2 -2
View File
@@ -184,7 +184,7 @@ impl<'a> WebviewAuthenticator<'a> {
let auth_request = match self.auth_request { let auth_request = match self.auth_request {
Some(auth_request) => auth_request.to_string(), Some(auth_request) => auth_request.to_string(),
None => auth_prelogin(&self.server, &self.gp_params, false).await?, None => auth_prelogin(&self.server, &self.gp_params, false, false).await?,
}; };
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>(); let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
@@ -257,7 +257,7 @@ impl<'a> WebviewAuthenticator<'a> {
document.body.appendChild(loading); document.body.appendChild(loading);
"#)?; "#)?;
let auth_request = auth_prelogin(&self.server, &self.gp_params, false).await?; let auth_request = auth_prelogin(&self.server, &self.gp_params, false, false).await?;
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>(); let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
let webview_user_agent = self.webview_user_agent.clone(); let webview_user_agent = self.webview_user_agent.clone();
+58
View File
@@ -0,0 +1,58 @@
use std::{
env,
path::{Path, PathBuf},
};
use crate::constants::{GP_AUTH_BINARY, GP_CLIENT_BINARY, GP_GUI_BINARY, GP_GUI_HELPER_BINARY, GP_SERVICE_BINARY};
pub fn gpclient() -> PathBuf {
resolve("GP_CLIENT_BINARY", "gpclient", GP_CLIENT_BINARY)
}
pub fn gpservice() -> PathBuf {
resolve("GP_SERVICE_BINARY", "gpservice", GP_SERVICE_BINARY)
}
pub fn gpauth() -> PathBuf {
resolve("GP_AUTH_BINARY", "gpauth", GP_AUTH_BINARY)
}
pub fn gpgui() -> PathBuf {
resolve("GP_GUI_BINARY", "gpgui", GP_GUI_BINARY)
}
pub fn gpgui_helper() -> PathBuf {
resolve("GP_GUI_HELPER_BINARY", "gpgui-helper", GP_GUI_HELPER_BINARY)
}
fn resolve(env_key: &str, binary_name: &str, default_path: &str) -> PathBuf {
env::var_os(env_key)
.filter(|value| !value.is_empty())
.map(PathBuf::from)
.or_else(|| sibling_binary(binary_name))
.unwrap_or_else(|| PathBuf::from(default_path))
}
fn sibling_binary(binary_name: &str) -> Option<PathBuf> {
let current_exe = env::current_exe().ok()?;
let bin_dir = current_exe.parent()?;
let binary = bin_dir.join(binary_name);
is_file(&binary).then_some(binary)
}
fn is_file(path: &Path) -> bool {
path.is_file()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn default_path_is_used_when_no_sibling_exists() {
let path = resolve("GP_TEST_BINARY", "missing-gp-test-binary", "/usr/bin/gp-test");
assert_eq!(path, PathBuf::from("/usr/bin/gp-test"));
}
}
+1
View File
@@ -1 +1,2 @@
pub mod binary_paths;
pub mod constants; pub mod constants;
+6 -6
View File
@@ -90,7 +90,7 @@ impl Prelogin {
#[derive(Debug, Clone, Copy, Default)] #[derive(Debug, Clone, Copy, Default)]
pub struct PreloginOptions { pub struct PreloginOptions {
external_browser_requested: bool, external_browser_requested: bool,
portal_default_browser_enabled: bool, gateway_external_browser_allowed: bool,
} }
impl PreloginOptions { impl PreloginOptions {
@@ -99,13 +99,13 @@ impl PreloginOptions {
self self
} }
pub fn portal_default_browser_enabled(mut self, portal_default_browser_enabled: bool) -> Self { pub fn gateway_external_browser_allowed(mut self, gateway_external_browser_allowed: bool) -> Self {
self.portal_default_browser_enabled = portal_default_browser_enabled; self.gateway_external_browser_allowed = gateway_external_browser_allowed;
self self
} }
fn browser_mode(self, is_gateway: bool) -> PreloginBrowserMode { fn browser_mode(self, is_gateway: bool) -> PreloginBrowserMode {
if self.external_browser_requested && (!is_gateway || self.portal_default_browser_enabled) { if self.external_browser_requested && (!is_gateway || self.gateway_external_browser_allowed) {
PreloginBrowserMode::External PreloginBrowserMode::External
} else { } else {
PreloginBrowserMode::Embedded PreloginBrowserMode::Embedded
@@ -307,12 +307,12 @@ mod tests {
} }
#[test] #[test]
fn browser_mode_requires_portal_policy_for_gateway_external() { fn browser_mode_requires_gateway_external_browser_allowed_for_gateway_external() {
let options = PreloginOptions::default().external_browser_requested(true); let options = PreloginOptions::default().external_browser_requested(true);
assert_eq!(options.browser_mode(true), PreloginBrowserMode::Embedded); assert_eq!(options.browser_mode(true), PreloginBrowserMode::Embedded);
let options = options.portal_default_browser_enabled(true); let options = options.gateway_external_browser_allowed(true);
assert_eq!(options.browser_mode(true), PreloginBrowserMode::External); assert_eq!(options.browser_mode(true), PreloginBrowserMode::External);
} }
+53 -5
View File
@@ -1,7 +1,7 @@
use std::process::Stdio; use std::{path::PathBuf, process::Stdio};
use anyhow::bail; use anyhow::bail;
use common::constants::GP_AUTH_BINARY; use common::binary_paths;
use tokio::process::Command; use tokio::process::Command;
use crate::{auth::SamlAuthResult, credential::Credential, os_profile::OsProfile}; use crate::{auth::SamlAuthResult, credential::Credential, os_profile::OsProfile};
@@ -16,6 +16,9 @@ pub struct SamlAuthLauncher<'a> {
os: Option<&'a str>, os: Option<&'a str>,
host_id: Option<&'a str>, host_id: Option<&'a str>,
client_version: Option<&'a str>, client_version: Option<&'a str>,
certificate: Option<&'a str>,
sslkey: Option<&'a str>,
key_password: Option<&'a str>,
fix_openssl: bool, fix_openssl: bool,
ignore_tls_errors: bool, ignore_tls_errors: bool,
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
@@ -38,6 +41,9 @@ impl<'a> SamlAuthLauncher<'a> {
os: None, os: None,
host_id: None, host_id: None,
client_version: None, client_version: None,
certificate: None,
sslkey: None,
key_password: None,
fix_openssl: false, fix_openssl: false,
ignore_tls_errors: false, ignore_tls_errors: false,
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
@@ -83,6 +89,21 @@ impl<'a> SamlAuthLauncher<'a> {
self self
} }
pub fn certificate(mut self, certificate: Option<&'a str>) -> Self {
self.certificate = certificate;
self
}
pub fn sslkey(mut self, sslkey: Option<&'a str>) -> Self {
self.sslkey = sslkey;
self
}
pub fn key_password(mut self, key_password: Option<&'a str>) -> Self {
self.key_password = key_password;
self
}
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
pub fn hidpi(mut self, hidpi: bool) -> Self { pub fn hidpi(mut self, hidpi: bool) -> Self {
self.hidpi = hidpi; self.hidpi = hidpi;
@@ -113,8 +134,11 @@ impl<'a> SamlAuthLauncher<'a> {
/// Launch the authenticator binary as the current user or SUDO_USER if available. /// Launch the authenticator binary as the current user or SUDO_USER if available.
pub async fn launch(self) -> anyhow::Result<Credential> { pub async fn launch(self) -> anyhow::Result<Credential> {
let program = self.auth_executable.unwrap_or(GP_AUTH_BINARY); let program = self
let mut auth_cmd = Command::new(program); .auth_executable
.map(PathBuf::from)
.unwrap_or_else(binary_paths::gpauth);
let mut auth_cmd = Command::new(&program);
auth_cmd.arg(self.server); auth_cmd.arg(self.server);
if self.gateway { if self.gateway {
@@ -145,6 +169,18 @@ impl<'a> SamlAuthLauncher<'a> {
auth_cmd.arg("--ignore-tls-errors"); auth_cmd.arg("--ignore-tls-errors");
} }
if let Some(certificate) = self.certificate {
auth_cmd.arg("--certificate").arg(certificate);
}
if let Some(sslkey) = self.sslkey {
auth_cmd.arg("--sslkey").arg(sslkey);
}
if let Some(key_password) = self.key_password {
auth_cmd.arg("--key-password").arg(key_password);
}
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
{ {
if self.hidpi { if self.hidpi {
@@ -174,7 +210,7 @@ impl<'a> SamlAuthLauncher<'a> {
let child = match child { let child = match child {
Ok(child) => child, Ok(child) => child,
Err(err) => { Err(err) => {
bail!("Failed to spawn {}: {}", program, err); bail!("Failed to spawn {}: {}", program.display(), err);
} }
}; };
@@ -219,4 +255,16 @@ mod tests {
assert_eq!(launcher.client_version, Some("6.0.0")); assert_eq!(launcher.client_version, Some("6.0.0"));
} }
#[test]
fn client_certificate_options_are_stored() {
let launcher = SamlAuthLauncher::new("portal.example.com")
.certificate(Some("/tmp/client.pem"))
.sslkey(Some("/tmp/client.key"))
.key_password(Some("secret"));
assert_eq!(launcher.certificate, Some("/tmp/client.pem"));
assert_eq!(launcher.sslkey, Some("/tmp/client.key"));
assert_eq!(launcher.key_password, Some("secret"));
}
} }
+21 -20
View File
@@ -33,41 +33,28 @@ mod platform {
let session_env = collect(user_id); let session_env = collect(user_id);
for key in DESKTOP_SESSION_ENV { for key in DESKTOP_SESSION_ENV {
if let Some(value) = env_value(key).or_else(|| session_env.get(*key).cloned()) { if let Some(value) = desktop_env_value(&session_env, key) {
command.env(key, value); command.env(key, value);
} }
} }
let runtime_dir = env_value("XDG_RUNTIME_DIR") let runtime_dir =
.or_else(|| session_env.get("XDG_RUNTIME_DIR").cloned()) desktop_env_value(&session_env, "XDG_RUNTIME_DIR").unwrap_or_else(|| format!("/run/user/{user_id}"));
.unwrap_or_else(|| format!("/run/user/{user_id}"));
command.env("XDG_RUNTIME_DIR", &runtime_dir); command.env("XDG_RUNTIME_DIR", &runtime_dir);
if env_value("DBUS_SESSION_BUS_ADDRESS") if desktop_env_value(&session_env, "DBUS_SESSION_BUS_ADDRESS").is_none() {
.or_else(|| session_env.get("DBUS_SESSION_BUS_ADDRESS").cloned())
.is_none()
{
command.env("DBUS_SESSION_BUS_ADDRESS", format!("unix:path={runtime_dir}/bus")); command.env("DBUS_SESSION_BUS_ADDRESS", format!("unix:path={runtime_dir}/bus"));
} }
if env_value("XDG_DATA_HOME") if desktop_env_value(&session_env, "XDG_DATA_HOME").is_none() {
.or_else(|| session_env.get("XDG_DATA_HOME").cloned())
.is_none()
{
command.env("XDG_DATA_HOME", home_dir.join(".local/share")); command.env("XDG_DATA_HOME", home_dir.join(".local/share"));
} }
if env_value("XDG_CONFIG_HOME") if desktop_env_value(&session_env, "XDG_CONFIG_HOME").is_none() {
.or_else(|| session_env.get("XDG_CONFIG_HOME").cloned())
.is_none()
{
command.env("XDG_CONFIG_HOME", home_dir.join(".config")); command.env("XDG_CONFIG_HOME", home_dir.join(".config"));
} }
if env_value("XDG_DATA_DIRS") if desktop_env_value(&session_env, "XDG_DATA_DIRS").is_none() {
.or_else(|| session_env.get("XDG_DATA_DIRS").cloned())
.is_none()
{
command.env("XDG_DATA_DIRS", default_xdg_data_dirs()); command.env("XDG_DATA_DIRS", default_xdg_data_dirs());
} }
} }
@@ -160,6 +147,10 @@ mod platform {
non_empty(env::var(key).ok()) non_empty(env::var(key).ok())
} }
fn desktop_env_value(session_env: &HashMap<String, String>, key: &str) -> Option<String> {
session_env.get(key).cloned().or_else(|| env_value(key))
}
fn non_empty(value: Option<String>) -> Option<String> { fn non_empty(value: Option<String>) -> Option<String> {
value.filter(|value| !value.trim().is_empty()) value.filter(|value| !value.trim().is_empty())
} }
@@ -203,6 +194,16 @@ mod platform {
assert_eq!(non_empty(Some(" ".to_string())), None); assert_eq!(non_empty(Some(" ".to_string())), None);
assert_eq!(non_empty(Some("value".to_string())), Some("value".to_string())); assert_eq!(non_empty(Some("value".to_string())), Some("value".to_string()));
} }
#[test]
fn desktop_env_value_prefers_collected_user_session() {
let env = HashMap::from([("XDG_DATA_DIRS".to_string(), "/run/current-system/sw/share".to_string())]);
assert_eq!(
desktop_env_value(&env, "XDG_DATA_DIRS"),
Some("/run/current-system/sw/share".to_string())
);
}
} }
} }
@@ -1,7 +1,7 @@
use std::{collections::HashMap, path::PathBuf, process::Stdio}; use std::{collections::HashMap, path::PathBuf, process::Stdio};
use anyhow::bail; use anyhow::bail;
use common::constants::GP_GUI_HELPER_BINARY; use common::binary_paths;
use log::info; use log::info;
use tokio::{io::AsyncWriteExt, process::Command}; use tokio::{io::AsyncWriteExt, process::Command};
@@ -17,7 +17,7 @@ pub struct GuiHelperLauncher<'a> {
impl<'a> GuiHelperLauncher<'a> { impl<'a> GuiHelperLauncher<'a> {
pub fn new(api_key: &'a [u8]) -> Self { pub fn new(api_key: &'a [u8]) -> Self {
Self { Self {
program: GP_GUI_HELPER_BINARY.into(), program: binary_paths::gpgui_helper(),
envs: None, envs: None,
api_key, api_key,
gui_version: None, gui_version: None,
+2 -2
View File
@@ -5,7 +5,7 @@ use std::{
}; };
use anyhow::bail; use anyhow::bail;
use common::constants::GP_GUI_BINARY; use common::binary_paths;
use log::info; use log::info;
use tokio::{io::AsyncWriteExt, process::Command}; use tokio::{io::AsyncWriteExt, process::Command};
@@ -25,7 +25,7 @@ impl<'a> GuiLauncher<'a> {
pub fn new(version: &'a str, api_key: &'a [u8]) -> Self { pub fn new(version: &'a str, api_key: &'a [u8]) -> Self {
Self { Self {
version, version,
program: GP_GUI_BINARY.into(), program: binary_paths::gpgui(),
api_key, api_key,
minimized: false, minimized: false,
envs: None, envs: None,
+2 -2
View File
@@ -4,7 +4,7 @@ use std::{
process::{ExitStatus, Stdio}, process::{ExitStatus, Stdio},
}; };
use common::constants::GP_SERVICE_BINARY; use common::binary_paths;
use tokio::process::Command; use tokio::process::Command;
use super::command_traits::CommandExt; use super::command_traits::CommandExt;
@@ -26,7 +26,7 @@ impl Default for ServiceLauncher<'_> {
impl<'a> ServiceLauncher<'a> { impl<'a> ServiceLauncher<'a> {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
program: GP_SERVICE_BINARY.into(), program: binary_paths::gpservice(),
minimized: false, minimized: false,
env_file: None, env_file: None,
log_file: None, log_file: None,
+239 -34
View File
@@ -21,6 +21,7 @@
inherit system; inherit system;
overlays = [ (import rust-overlay) ]; overlays = [ (import rust-overlay) ];
}; };
inherit (pkgs) lib;
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
pname = "globalprotect-openconnect"; pname = "globalprotect-openconnect";
@@ -35,28 +36,37 @@
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/v${version}/globalprotect-openconnect-${version}.tar.gz";
hash = "sha256-NS3tIZxkT9A4eqmfkcl29bHHJrrgVs/XSQBOz99cP30="; hash = "sha256-Ejvb//r6tE6yMwNwUJq5Z0r57K0IHKFN1YVaXnvpGIs=";
}; };
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name; cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
gpguiHashes = {
x86_64 = "sha256-jLMErGlfbzhRk8onqqiRXOMeNhdFWBZGOqPPEh9vLyM=";
aarch64 = "sha256-YSjn2oxDaKTtdfK7rsmuMZfD9n1bitVbScIW0fyedXI=";
};
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/v${version}/gpgui_${cpu}.bin.tar.xz";
hash = { hash = gpguiHashes.${cpu};
x86_64 = "sha256-1XBdrKJOhSViZOgfqohZjdzV6qzx/qpy0yhkbZ8DumA=";
aarch64 = "sha256-humujgf/M31SkBABc14g/ujjacGHxqElzNuCClhTAfA=";
}.${cpu};
}; };
in
{
# For `nix build`
packages.default = naersk'.buildPackage {
inherit pname version src;
# Must be set to true to avoid issues with the Tauri build process binaryHashes = {
singleStep = true; x86_64 = "sha256-atZRM7v5areQTDkrJrOczSz0tc3P6aGU+BE4VblNE08=";
aarch64 = "sha256-ENE0fHlLSt493QIlotaIMf11MszJszl4ZZAsYWuFJeE=";
};
buildInputs = binaryPackage = pkgs.fetchzip {
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect_${version}_${cpu}.bin.tar.xz";
hash = binaryHashes.${cpu};
};
linuxRuntimeDependencies = with pkgs; [
glib-networking
libayatana-appindicator
];
linuxBuildInputs =
with pkgs; with pkgs;
[ [
libxml2 libxml2
@@ -74,8 +84,47 @@
webkitgtk_4_1 webkitgtk_4_1
glib-networking glib-networking
openssl openssl
libsecret
libayatana-appindicator
]; ];
rewriteSourceInstallPaths = ''
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/libexec/gpclient/hipreport.sh \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice
if [ -f $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down ]; then
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
fi
'';
rewriteHostInstallPaths = ''
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice
if [ -f $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down ]; then
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
fi
'';
fromSource = naersk'.buildPackage {
inherit pname version src;
# Must be set to true to avoid issues with the Tauri build process
singleStep = true;
buildInputs = linuxBuildInputs;
nativeBuildInputs = nativeBuildInputs =
with pkgs; with pkgs;
[ [
@@ -89,13 +138,7 @@
wrapGAppsHook4 wrapGAppsHook4
]; ];
runtimeDependencies = runtimeDependencies = lib.optionals pkgs.stdenv.isLinux linuxRuntimeDependencies;
with pkgs;
[ ]
++ lib.optionals stdenv.isLinux [
libappindicator-gtk3
glib-networking
];
overrideMain = overrideMain =
{ ... }: { ... }:
@@ -124,23 +167,185 @@
cp -r packaging/files/usr/lib $out/lib cp -r packaging/files/usr/lib $out/lib
cp -r packaging/files/usr/libexec $out/libexec cp -r packaging/files/usr/libexec $out/libexec
# Change the `/usr/bin/gpclient` path in the desktop file ${rewriteSourceInstallPaths}
substituteInPlace $out/share/applications/gpgui.desktop \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
substituteInPlace $out/libexec/gpclient/hipreport.sh \
--replace-fail /usr/bin/gpclient $out/bin/gpclient
# Change the `/usr/bin/gpservice` path in the polkit policy file
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
--replace-fail /usr/bin/gpservice $out/bin/gpservice
''; '';
}; };
prebuiltFiles = pkgs.stdenv.mkDerivation {
inherit pname version;
src = binaryPackage;
dontBuild = true;
nativeBuildInputs = with pkgs; [
autoPatchelfHook
wrapGAppsHook4
];
buildInputs = linuxBuildInputs;
runtimeDependencies = linuxRuntimeDependencies;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r artifacts/usr/bin $out/bin
cp -r artifacts/usr/libexec $out/libexec
cp -r artifacts/usr/share $out/share
if [ -d artifacts/usr/lib ]; then
cp -r artifacts/usr/lib $out/lib
fi
runHook postInstall
'';
};
prebuiltCommand =
binaryName:
pkgs.buildFHSEnv {
name = binaryName;
targetPkgs =
pkgs:
[ prebuiltFiles ]
++ linuxBuildInputs
++ linuxRuntimeDependencies;
runScript = "/usr/bin/${binaryName}";
profile = ''
export PATH=/run/wrappers/bin:$PATH
'';
extraBwrapArgs = [
"--bind-try"
"/run/wrappers"
"/run/wrappers"
];
};
prebuiltCommands = {
gpclient = prebuiltCommand "gpclient";
gpservice = prebuiltCommand "gpservice";
gpauth = prebuiltCommand "gpauth";
gpgui = prebuiltCommand "gpgui";
gpgui-helper = prebuiltCommand "gpgui-helper";
};
prebuilt = pkgs.stdenv.mkDerivation {
inherit pname version;
dontUnpack = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cat > $out/bin/gpclient <<'EOF'
#!${pkgs.runtimeShell}
set -eu
gpclient_fhs='${prebuiltCommands.gpclient}/bin/gpclient'
gpservice_public='@gpservice_public@'
if [ "''${1:-}" = "launch-gui" ]; then
shift
auth_data=
minimized=
for arg in "$@"; do
case "$arg" in
--minimized)
minimized=--minimized
;;
--*)
;;
*)
auth_data=$arg
;;
esac
done
if [ -z "$auth_data" ]; then
if [ -n "''${XDG_DATA_HOME:-}" ]; then
data_home=$XDG_DATA_HOME
elif [ -n "''${HOME:-}" ]; then
data_home=$HOME/.local/share
else
data_home=/tmp
fi
log_dir="$data_home/gpclient"
mkdir -p "$log_dir"
log_file="$log_dir/gpclient.log"
env_file=$(mktemp)
env > "$env_file"
printf 'GP_LOG_FILE=%s\n' "$log_file" >> "$env_file"
pkexec_bin=/run/wrappers/bin/pkexec
if [ ! -x "$pkexec_bin" ]; then
pkexec_bin=pkexec
fi
set +e
if [ -n "$minimized" ]; then
"$pkexec_bin" --user root "$gpservice_public" --minimized --env-file "$env_file" 2>"$log_file"
else
"$pkexec_bin" --user root "$gpservice_public" --env-file "$env_file" 2>"$log_file"
fi
status=$?
set -e
rm -f "$env_file"
exit "$status"
fi
set -- launch-gui "$@"
fi
exec "$gpclient_fhs" "$@"
EOF
substituteInPlace $out/bin/gpclient \
--replace-fail '@gpservice_public@' "$out/bin/gpservice"
chmod +x $out/bin/gpclient
cat > $out/bin/gpservice <<'EOF'
#!${pkgs.runtimeShell}
set -eu
exec '@gpservice_fhs@' "$@"
EOF
substituteInPlace $out/bin/gpservice \
--replace-fail '@gpservice_fhs@' '${prebuiltCommands.gpservice}/bin/gpservice'
chmod +x $out/bin/gpservice
ln -s ${prebuiltCommands.gpauth}/bin/gpauth $out/bin/gpauth
ln -s ${prebuiltCommands.gpgui}/bin/gpgui $out/bin/gpgui
ln -s ${prebuiltCommands."gpgui-helper"}/bin/gpgui-helper $out/bin/gpgui-helper
cp -r ${prebuiltFiles}/libexec $out/libexec
cp -r ${prebuiltFiles}/share $out/share
if [ -d ${prebuiltFiles}/lib ]; then
cp -r ${prebuiltFiles}/lib $out/lib
fi
${rewriteHostInstallPaths}
runHook postInstall
'';
};
in
{
# For `nix build`
packages =
{
fromSource = fromSource;
}
// lib.optionalAttrs pkgs.stdenv.isLinux {
default = prebuilt;
prebuilt = prebuilt;
}
// lib.optionalAttrs (!pkgs.stdenv.isLinux) {
default = fromSource;
};
apps.default = { apps.default = {
type = "app"; type = "app";
program = "${self.packages.${system}.default}/bin/gpclient"; program = "${self.packages.${system}.default}/bin/gpclient";
+5 -6
View File
@@ -9,9 +9,6 @@ REPO="yuezk/GlobalProtect-openconnect"
TAG=${1:-} TAG=${1:-}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
RELEASE_NOTES="Release $TAG"
if [ -z "$TAG" ]; then if [ -z "$TAG" ]; then
echo "Usage: ./scripts/gh-release.sh <tag>" echo "Usage: ./scripts/gh-release.sh <tag>"
@@ -36,8 +33,6 @@ release_assets() {
# For snapshot release, we don't create a release, just clear the existing assets and upload new ones. # For snapshot release, we don't create a release, just clear the existing assets and upload new ones.
# This is to avoid notification spam. # This is to avoid notification spam.
release_snapshot() { release_snapshot() {
RELEASE_NOTES='**!!! DO NOT USE THIS RELEASE IN PRODUCTION !!!**'
while IFS= read -r asset; do while IFS= read -r asset; do
if [ -n "$asset" ]; then if [ -n "$asset" ]; then
gh -R "$REPO" release delete-asset "$TAG" "$asset" --yes gh -R "$REPO" release delete-asset "$TAG" "$asset" --yes
@@ -55,11 +50,15 @@ release_tag() {
gh -R "$REPO" release delete "$TAG" --yes --cleanup-tag || true gh -R "$REPO" release delete "$TAG" --yes --cleanup-tag || true
echo "Creating release..." echo "Creating release..."
local release_notes_file
release_notes_file="$(mktemp)"
"$SCRIPT_DIR/release-notes.sh" "$TAG" > "$release_notes_file"
# Upload source tarballs, GUI components, and BSD packages. Other Linux # Upload source tarballs, GUI components, and BSD packages. Other Linux
# packages are built in `release.yml` from the standalone source tarball. # packages are built in `release.yml` from the standalone source tarball.
gh -R "$REPO" release create "$TAG" \ gh -R "$REPO" release create "$TAG" \
--title "$TAG" \ --title "$TAG" \
--notes "$RELEASE_NOTES" --notes-file "$release_notes_file"
mapfile -t files < <(release_assets) mapfile -t files < <(release_assets)
upload_files "${files[@]}" upload_files "${files[@]}"
+33
View File
@@ -0,0 +1,33 @@
#!/usr/bin/env bash
set -euo pipefail
release_version="${1:-}"
if git diff --quiet -- flake.nix; then
echo "flake.nix hashes are already up to date"
exit 0
fi
if [[ -z "$release_version" ]]; then
release_version="$(grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/')"
fi
version="${release_version#v}"
branch="chore/update-flake-hashes-v${version}"
title="chore: update flake hashes for v${version}"
body="Updates the Nix flake fetchzip hashes for v${version} release assets."
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git switch -C "$branch"
git add flake.nix
git commit -m "$title"
git push --force-with-lease origin "$branch"
if gh pr view "$branch" --json number > /tmp/flake-pr.json 2> /dev/null; then
pr_number="$(jq -r '.number' /tmp/flake-pr.json)"
gh pr edit "$pr_number" --title "$title" --body "$body"
else
gh pr create --title "$title" --body "$body" --base main --head "$branch"
fi
+30
View File
@@ -0,0 +1,30 @@
#!/usr/bin/env bash
set -euo pipefail
tag="${1:-}"
if [[ -z "$tag" ]]; then
echo "Usage: $0 <tag>" >&2
exit 1
fi
version="${tag#v}"
awk -v version="$version" '
$0 == "## " version {
found = 1
next
}
found && /^## / {
exit
}
found {
print
}
END {
if (!found) {
exit 1
}
}
' changelog.md
+10 -2
View File
@@ -73,18 +73,26 @@ release_url() {
source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")" source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")"
gpgui_x86_64_hash="$(prefetch_hash "$(release_url "gpgui_x86_64.bin.tar.xz")")" gpgui_x86_64_hash="$(prefetch_hash "$(release_url "gpgui_x86_64.bin.tar.xz")")"
gpgui_aarch64_hash="$(prefetch_hash "$(release_url "gpgui_aarch64.bin.tar.xz")")" gpgui_aarch64_hash="$(prefetch_hash "$(release_url "gpgui_aarch64.bin.tar.xz")")"
binary_x86_64_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect_${version}_x86_64.bin.tar.xz")")"
binary_aarch64_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect_${version}_aarch64.bin.tar.xz")")"
SOURCE_HASH="$source_hash" \ SOURCE_HASH="$source_hash" \
GPGUI_X86_64_HASH="$gpgui_x86_64_hash" \ 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_AARCH64_HASH="$binary_aarch64_hash" \
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|(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|(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|(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 = "[^"]+";\n\s*aarch64 = ")[^"]+(";)|$1 . $ENV{"BINARY_AARCH64_HASH"} . $2|e;
' "$FLAKE_FILE" ' "$FLAKE_FILE"
grep -F "$source_hash" "$FLAKE_FILE" > /dev/null grep -F "$source_hash" "$FLAKE_FILE" > /dev/null
grep -F "$gpgui_x86_64_hash" "$FLAKE_FILE" > /dev/null 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_aarch64_hash" "$FLAKE_FILE" > /dev/null
echo "Updated flake.nix hashes for v$version" echo "Updated flake.nix hashes for v$version"