Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc1376dbac | ||
|
|
15d85d1878 | ||
|
|
6edc93b579 | ||
|
|
1c34c52707 | ||
|
|
287d0cc6af | ||
|
|
5f4b2b602a | ||
|
|
43c20d0976 | ||
|
|
6ffb1e8709 | ||
|
|
1bdaf4e8be | ||
|
|
127961cab7 | ||
|
|
754b220a9d | ||
|
|
1072a35817 | ||
|
|
a43785792a | ||
|
|
76310f1494 | ||
|
|
029f292a6d | ||
|
|
dedd06366e | ||
|
|
5031d4dcfb | ||
|
|
1ac01081e0 | ||
|
|
594ab0ea32 | ||
|
|
e2e762dd35 | ||
|
|
9432f0c3e5 | ||
|
|
fdbe3bcbba | ||
|
|
2c9d227f02 | ||
|
|
f3cd4ca6fb | ||
|
|
79570610db | ||
|
|
a5e8c7abe5 | ||
|
|
e122ad8380 | ||
|
|
28643d2de6 | ||
|
|
f5b1b279c7 | ||
|
|
9528818793 | ||
|
|
53a778a1a4 | ||
|
|
d1815a02a1 | ||
|
|
1547d0c1e9 | ||
|
|
6e99d8d81f | ||
|
|
408536807c | ||
|
|
e03a758acb | ||
|
|
16e08c09af | ||
|
|
a949b175d4 | ||
|
|
1202ca6c81 | ||
|
|
0408bcb67f | ||
|
|
a9474d4059 | ||
|
|
5380a5f3c3 | ||
|
|
82c9ba2dcd | ||
|
|
fd08cdbe66 | ||
|
|
d12d677208 | ||
|
|
d15ebdfe3a | ||
|
|
4f8f828a0b | ||
|
|
c3188ce1c8 | ||
|
|
e509cbccdb | ||
|
|
1ea9327f18 | ||
|
|
69e4183202 | ||
|
|
4b61c84c37 | ||
|
|
3a8080eb2f | ||
|
|
6040ced26b | ||
|
|
ddd2137143 | ||
|
|
915c130c70 | ||
|
|
9b297b14a6 | ||
|
|
69d67721a6 | ||
|
|
935240f9b5 | ||
|
|
e15422a64f | ||
|
|
dfab3882e1 | ||
|
|
4cf17f6256 | ||
|
|
ac81463a3b | ||
|
|
4faa2ecb0d | ||
|
|
56751a755c | ||
|
|
18ed6bac1a | ||
|
|
10139e0f2c |
No files matched your search
@@ -0,0 +1,2 @@
|
|||||||
|
# Keep source and build scripts consistent on every platform.
|
||||||
|
* text=auto eol=lf
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
name: Checkout private source quietly
|
||||||
|
description: Fetch private source without printing Git diagnostics or retaining credentials.
|
||||||
|
inputs:
|
||||||
|
token:
|
||||||
|
required: true
|
||||||
|
description: Token with read access to the private repository
|
||||||
|
ref:
|
||||||
|
required: true
|
||||||
|
description: Branch, tag, or full commit SHA
|
||||||
|
path:
|
||||||
|
required: true
|
||||||
|
description: Destination within the workspace
|
||||||
|
runs:
|
||||||
|
using: composite
|
||||||
|
steps:
|
||||||
|
- shell: bash
|
||||||
|
env:
|
||||||
|
PRIVATE_TOKEN: ${{ inputs.token }}
|
||||||
|
PRIVATE_REF: ${{ inputs.ref }}
|
||||||
|
PRIVATE_PATH: ${{ inputs.path }}
|
||||||
|
run: |
|
||||||
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private source checkout failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
export GIT_TERMINAL_PROMPT=0
|
||||||
|
export GIT_CONFIG_COUNT=1
|
||||||
|
export GIT_CONFIG_KEY_0=http.https://github.com/.extraheader
|
||||||
|
GIT_CONFIG_VALUE_0="AUTHORIZATION: basic $(printf 'x-access-token:%s' "$PRIVATE_TOKEN" | base64 | tr -d '\n')"
|
||||||
|
export GIT_CONFIG_VALUE_0
|
||||||
|
git init "$PRIVATE_PATH"
|
||||||
|
git -C "$PRIVATE_PATH" remote add origin https://github.com/yuezk/gpgui
|
||||||
|
git -C "$PRIVATE_PATH" fetch --no-tags --depth=1 -- origin "$PRIVATE_REF"
|
||||||
|
git -C "$PRIVATE_PATH" checkout --detach FETCH_HEAD
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private source checkout passed."
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
name: Prepare cached macOS native dependencies
|
||||||
|
description: Cache only the completed public native-library prefix, without private source or app outputs.
|
||||||
|
inputs:
|
||||||
|
gpgui-directory:
|
||||||
|
description: Private checkout containing the native dependency builder
|
||||||
|
required: true
|
||||||
|
outputs:
|
||||||
|
prefix:
|
||||||
|
description: Validated native dependency installation prefix
|
||||||
|
value: ${{ steps.identity.outputs.path }}
|
||||||
|
cache-hit:
|
||||||
|
description: Whether the exact dependency cache was restored
|
||||||
|
value: ${{ steps.restore.outputs.cache-hit }}
|
||||||
|
runs:
|
||||||
|
using: composite
|
||||||
|
steps:
|
||||||
|
- name: Identify native dependency cache
|
||||||
|
id: identity
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
GPGUI_DIRECTORY: ${{ inputs.gpgui-directory }}
|
||||||
|
GPGUI_MACOS_DEPS_CACHE_DIR: ${{ runner.tool_cache }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Native dependency cache identification failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
metadata="$("$GPGUI_DIRECTORY/scripts/build-macos-native-deps.sh" --cache-info 2>/dev/null)"
|
||||||
|
key="$(printf '%s\n' "$metadata" | sed -n 's/^key=//p')"
|
||||||
|
prefix="$(printf '%s\n' "$metadata" | sed -n 's/^path=//p')"
|
||||||
|
# Emit only an opaque identity and one dependency directory outside the checkout.
|
||||||
|
if [[ "$key" =~ ^[0-9a-f]{64}$ ]] &&
|
||||||
|
[[ "$metadata" == "key=$key"$'\n'"path=$prefix" ]] &&
|
||||||
|
[[ "${prefix%/*}" == "$RUNNER_TOOL_CACHE/gpgui-macos-native-deps" ]] &&
|
||||||
|
[[ "${prefix##*/}" == macos-*-"$key" ]]; then
|
||||||
|
printf 'key=macos-native-deps-%s\npath=%s\n' "$key" "$prefix" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Restore public native libraries
|
||||||
|
id: restore
|
||||||
|
uses: actions/cache/restore@v5
|
||||||
|
with:
|
||||||
|
path: ${{ steps.identity.outputs.path }}
|
||||||
|
key: ${{ steps.identity.outputs.key }}
|
||||||
|
|
||||||
|
- name: Build or validate native libraries
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
GPGUI_DIRECTORY: ${{ inputs.gpgui-directory }}
|
||||||
|
GPGUI_MACOS_DEPS_CACHE_DIR: ${{ runner.tool_cache }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Native dependency preparation failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
started=$SECONDS
|
||||||
|
"$GPGUI_DIRECTORY/scripts/build-macos-native-deps.sh" >/dev/null 2>&1
|
||||||
|
echo "Native dependency preparation passed in $((SECONDS - started)) seconds."
|
||||||
|
|
||||||
|
# Save before any private application compilation or signing credential import.
|
||||||
|
- name: Save public native libraries
|
||||||
|
if: steps.restore.outputs.cache-hit != 'true'
|
||||||
|
uses: actions/cache/save@v5
|
||||||
|
with:
|
||||||
|
path: ${{ steps.identity.outputs.path }}
|
||||||
|
key: ${{ steps.identity.outputs.key }}
|
||||||
@@ -12,6 +12,9 @@ on:
|
|||||||
channel:
|
channel:
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
|
build:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
builder:
|
builder:
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
@@ -51,43 +54,72 @@ jobs:
|
|||||||
ref: ${{ inputs.gp_ref }}
|
ref: ${{ inputs.gp_ref }}
|
||||||
path: gpgui-source/gp
|
path: gpgui-source/gp
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Checkout gpgui
|
- name: Checkout CI helpers
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
path: .ci
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Checkout gpgui
|
||||||
|
uses: ./.ci/.github/actions/checkout-private
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
repository: yuezk/gpgui
|
|
||||||
ref: ${{ inputs.gpgui_ref }}
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
path: gpgui-source/gpgui
|
path: gpgui-source/gpgui
|
||||||
- name: Verify Linux desktop assets
|
- name: Verify Linux desktop assets
|
||||||
if: matrix.os.arch == 'amd64' && inputs.verify_desktop_assets
|
if: matrix.os.arch == 'amd64' && inputs.verify_desktop_assets
|
||||||
run: gpgui-source/gp/scripts/verify-linux-desktop-assets.sh gpgui-source/gpgui
|
run: |
|
||||||
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
gpgui-source/gp/scripts/verify-linux-desktop-assets.sh gpgui-source/gpgui
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private operation passed."
|
||||||
|
|
||||||
- name: Tarball
|
- name: Tarball
|
||||||
run: |
|
run: |
|
||||||
cd gpgui-source
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT
|
||||||
tar -czf gpgui.tar.gz gpgui gp
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
cd gpgui-source
|
||||||
|
tar -czf gpgui.tar.gz gpgui gp
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private operation passed."
|
||||||
|
|
||||||
- name: Build gpgui in Docker
|
- name: Build gpgui in Docker
|
||||||
env:
|
env:
|
||||||
GPGUI_BUILDER: ${{ inputs.builder }}
|
GPGUI_BUILDER: ${{ inputs.builder }}
|
||||||
GPGUI_BUILD_VERSION: ${{ github.run_number }}.${{ github.run_attempt }}
|
GPGUI_BUILD_VERSION: ${{ inputs.build }}
|
||||||
GPGUI_UPDATE_CHANNEL: ${{ inputs.channel }}
|
GPGUI_UPDATE_CHANNEL: ${{ inputs.channel }}
|
||||||
GPGUI_LICENSE_SIGNING_KEYS: ${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}
|
GPGUI_LICENSE_SIGNING_KEYS: ${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}
|
||||||
run: |
|
run: |
|
||||||
docker run --rm \
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
(
|
||||||
-e GPGUI_BUILD_VERSION \
|
set -euo pipefail
|
||||||
-e GPGUI_UPDATE_CHANNEL \
|
docker run --rm \
|
||||||
-e GPGUI_LICENSE_SIGNING_KEYS \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-v "$(pwd)/gpgui-source:/workspace" "yuezk/gpdev:$GPGUI_BUILDER"
|
-e GPGUI_BUILD_VERSION \
|
||||||
|
-e GPGUI_UPDATE_CHANNEL \
|
||||||
|
-e GPGUI_LICENSE_SIGNING_KEYS \
|
||||||
|
-v "$(pwd)/gpgui-source:/workspace" "yuezk/gpdev:$GPGUI_BUILDER"
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private operation passed."
|
||||||
|
|
||||||
- name: Install gpgui in Docker
|
- name: Install gpgui in Docker
|
||||||
env:
|
env:
|
||||||
GPGUI_BUILDER: ${{ inputs.builder }}
|
GPGUI_BUILDER: ${{ inputs.builder }}
|
||||||
run: |
|
run: |
|
||||||
cd gpgui-source
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT
|
||||||
tar -xJf ./*.bin.tar.xz
|
(
|
||||||
docker run --rm \
|
set -euo pipefail
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
cd gpgui-source
|
||||||
-v "$(pwd):/workspace" "yuezk/gpdev:$GPGUI_BUILDER" \
|
tar -xJf ./*.bin.tar.xz
|
||||||
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
|
docker run --rm \
|
||||||
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
|
-v "$(pwd):/workspace" "yuezk/gpdev:$GPGUI_BUILDER" \
|
||||||
|
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private operation passed."
|
||||||
|
|
||||||
- name: Upload gpgui
|
- name: Upload gpgui
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -0,0 +1,112 @@
|
|||||||
|
name: Build Linux Native Shell
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
gp_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
gpgui_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
channel:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
build:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- runner: ubuntu-24.04
|
||||||
|
arch: x86_64
|
||||||
|
- runner: ubuntu-24.04-arm
|
||||||
|
arch: aarch64
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
name: build (${{ matrix.arch }})
|
||||||
|
timeout-minutes: 90
|
||||||
|
env:
|
||||||
|
CARGO_INCREMENTAL: '0'
|
||||||
|
CARGO_BUILD_JOBS: '2'
|
||||||
|
GPGUI_BUILD_VERSION: ${{ inputs.build }}
|
||||||
|
GPGUI_GIT_COMMIT: ${{ inputs.gpgui_ref }}
|
||||||
|
GPGUI_UPDATE_CHANNEL: ${{ inputs.channel }}
|
||||||
|
GPGUI_LICENSE_SIGNING_KEYS: ${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.gp_ref }}
|
||||||
|
path: source/gp
|
||||||
|
submodules: recursive
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Checkout CI helpers
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
path: .ci
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Checkout gpgui
|
||||||
|
uses: ./.ci/.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: source/gpgui
|
||||||
|
- name: Install Ubuntu 24.04 dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y autoconf automake gettext libtool pkg-config \
|
||||||
|
clang libclang-dev libgtk-4-dev libxml2-dev \
|
||||||
|
libgnutls28-dev liblz4-dev libwayland-dev libxkbcommon-dev libdbus-1-dev
|
||||||
|
pkg-config --exists gtk4 gnutls dbus-1 wayland-client xkbcommon
|
||||||
|
- name: Install the NSH compiler
|
||||||
|
run: rustup toolchain install 1.97.0 --profile minimal
|
||||||
|
- name: Cache public crate downloads
|
||||||
|
uses: actions/cache@v5
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.cargo/registry/cache
|
||||||
|
~/.cargo/registry/index
|
||||||
|
key: nsh-crates-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('source/gpgui/apps/desktop-nsh/Cargo.lock') }}
|
||||||
|
restore-keys: nsh-crates-${{ runner.os }}-${{ runner.arch }}-
|
||||||
|
- name: Build and package Native Shell
|
||||||
|
run: |
|
||||||
|
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::Native Shell build failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
cd source/gpgui
|
||||||
|
cargo +1.97.0 build --manifest-path apps/desktop-nsh/Cargo.toml --locked \
|
||||||
|
--release --bin gpgui-nsh --target-dir target
|
||||||
|
target/release/gpgui-nsh --version
|
||||||
|
version="$(cargo +1.97.0 metadata --manifest-path apps/desktop-nsh/Cargo.toml --no-deps --format-version 1 \
|
||||||
|
| jq -r '.packages[] | select(.name == "gpgui-nsh") | .version')"
|
||||||
|
directory="gpgui-nsh_$version"
|
||||||
|
archive="gpgui-nsh_$(uname -m).bin.tar.xz"
|
||||||
|
mkdir -p ".build/package/$directory"
|
||||||
|
cp target/release/gpgui-nsh ".build/package/$directory/"
|
||||||
|
cp apps/desktop-nsh/ICU4X-LICENSE.txt ".build/package/$directory/ICU4X-LICENSE.txt"
|
||||||
|
if ldd target/release/gpgui-nsh | grep -q 'libicu'; then
|
||||||
|
echo "The release executable must not depend on ICU4C." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
tar -cJf ".build/package/$archive" -C .build/package "$directory"
|
||||||
|
sha256sum ".build/package/$archive" | cut -d ' ' -f 1 > ".build/package/$archive.sha256"
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Native Shell build and version check passed."
|
||||||
|
- name: Upload Native Shell
|
||||||
|
uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: artifact-gpgui-nsh-${{ matrix.arch }}
|
||||||
|
if-no-files-found: error
|
||||||
|
path: |
|
||||||
|
source/gpgui/.build/package/*.bin.tar.xz
|
||||||
|
source/gpgui/.build/package/*.bin.tar.xz.sha256
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
name: Build Windows package
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
gp_ref:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
gpgui_ref:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
channel:
|
||||||
|
type: choice
|
||||||
|
options: [snapshot, stable]
|
||||||
|
default: snapshot
|
||||||
|
build:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
architecture:
|
||||||
|
type: choice
|
||||||
|
options: [x64, arm64]
|
||||||
|
required: true
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
gp_ref:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
gpgui_ref:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
channel:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
build:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
architecture:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: true
|
||||||
|
WINDOWS_UPDATE_PRIVATE_KEY:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ${{ inputs.architecture == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
|
||||||
|
environment: windows-signing
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
id-token: write
|
||||||
|
timeout-minutes: 120
|
||||||
|
env:
|
||||||
|
BUILD_ARCHITECTURE: ${{ inputs.architecture }}
|
||||||
|
CARGO_INCREMENTAL: '0'
|
||||||
|
CARGO_TARGET_DIR: ${{ github.workspace }}/target-windows
|
||||||
|
CARGO_BUILD_JOBS: '2'
|
||||||
|
GPGUI_UPDATE_CHANNEL: ${{ inputs.channel }}
|
||||||
|
GPGUI_BUILD_VERSION: ${{ inputs.channel == 'snapshot' && inputs.build || '' }}
|
||||||
|
GPGUI_WINDOWS_UPDATE_PUBLIC_KEY: ${{ vars.WINDOWS_UPDATE_PUBLIC_KEY }}
|
||||||
|
GPGUI_LICENSE_SIGNING_KEYS: ${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}
|
||||||
|
AZURE_SIGNING_ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
|
||||||
|
AZURE_SIGNING_ACCOUNT: ${{ vars.AZURE_SIGNING_ACCOUNT }}
|
||||||
|
AZURE_SIGNING_PROFILE: ${{ vars.AZURE_SIGNING_PROFILE }}
|
||||||
|
WINDOWS_SIGNING_PUBLISHER: ${{ vars.WINDOWS_SIGNING_PUBLISHER }}
|
||||||
|
steps:
|
||||||
|
- name: Select native build tools
|
||||||
|
id: native
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
if ($env:BUILD_ARCHITECTURE -eq 'arm64') {
|
||||||
|
'msystem=CLANGARM64' >> $env:GITHUB_OUTPUT
|
||||||
|
'subsystem=clangarm64' >> $env:GITHUB_OUTPUT
|
||||||
|
'packages=mingw-w64-clang-aarch64-clang mingw-w64-clang-aarch64-pkgconf mingw-w64-clang-aarch64-gnutls mingw-w64-clang-aarch64-libxml2 mingw-w64-clang-aarch64-lz4' >> $env:GITHUB_OUTPUT
|
||||||
|
} elseif ($env:BUILD_ARCHITECTURE -eq 'x64') {
|
||||||
|
'msystem=UCRT64' >> $env:GITHUB_OUTPUT
|
||||||
|
'subsystem=ucrt64' >> $env:GITHUB_OUTPUT
|
||||||
|
'packages=mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-pkgconf mingw-w64-ucrt-x86_64-gnutls mingw-w64-ucrt-x86_64-libxml2 mingw-w64-ucrt-x86_64-lz4' >> $env:GITHUB_OUTPUT
|
||||||
|
} else { throw 'Unsupported Windows architecture.' }
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
path: .ci
|
||||||
|
persist-credentials: false
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.gp_ref }}
|
||||||
|
path: source/gp
|
||||||
|
submodules: recursive
|
||||||
|
persist-credentials: false
|
||||||
|
- uses: ./.ci/.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: source/gpgui
|
||||||
|
- uses: dtolnay/[email protected]
|
||||||
|
- uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: '3.13'
|
||||||
|
- uses: msys2/setup-msys2@v2
|
||||||
|
id: msys2
|
||||||
|
with:
|
||||||
|
msystem: ${{ steps.native.outputs.msystem }}
|
||||||
|
update: true
|
||||||
|
install: >-
|
||||||
|
base-devel autoconf automake libtool gettext git
|
||||||
|
${{ steps.native.outputs.packages }}
|
||||||
|
- name: Prepare pinned installer and driver inputs
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
if (!$env:GPGUI_WINDOWS_UPDATE_PUBLIC_KEY -or !$env:GPGUI_LICENSE_SIGNING_KEYS) { throw 'Configure the Windows update and licensing public keys.' }
|
||||||
|
$tools = Join-Path $env:RUNNER_TEMP 'windows-tools'
|
||||||
|
New-Item -ItemType Directory -Force $tools | Out-Null
|
||||||
|
choco install nsis --version=3.12.0 --yes --no-progress
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Installing NSIS 3.12 failed.' }
|
||||||
|
$wintun = Join-Path $tools 'wintun.zip'
|
||||||
|
Invoke-WebRequest 'https://www.wintun.net/builds/wintun-0.14.1.zip' -OutFile $wintun
|
||||||
|
if ((Get-FileHash $wintun).Hash -ne '07C256185D6EE3652E09FA55C0B673E2624B565E02C4B9091C79CA7D2F24EF51') { throw 'Wintun checksum mismatch.' }
|
||||||
|
Expand-Archive $wintun $tools
|
||||||
|
Remove-Item $wintun
|
||||||
|
"WINDOWS_BUILD_TOOLS=$tools" >> $env:GITHUB_ENV
|
||||||
|
- name: Build OpenConnect and test native packet transport
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
MSYS_ROOT: ${{ steps.msys2.outputs.msys2-location }}
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$prefix = Join-Path $env:RUNNER_TEMP 'native-windows'
|
||||||
|
& ./source/gp/scripts/build-openconnect-windows.ps1 -MsysRoot $env:MSYS_ROOT -MsysSubsystem ${{ steps.native.outputs.subsystem }} -Prefix $prefix
|
||||||
|
& ./source/gp/scripts/test-openconnect-windows.ps1 -MsysRoot $env:MSYS_ROOT -MsysSubsystem ${{ steps.native.outputs.subsystem }} -Prefix $prefix
|
||||||
|
"OPENCONNECT_WINDOWS_PREFIX=$prefix" >> $env:GITHUB_ENV
|
||||||
|
- name: Build the matching Windows runtime
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
MSYS_ROOT: ${{ steps.msys2.outputs.msys2-location }}
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$log = Join-Path $env:RUNNER_TEMP 'windows-package.log'
|
||||||
|
# Compiler diagnostics may contain private GUI source. Keep them on the runner.
|
||||||
|
try {
|
||||||
|
& ./source/gpgui/scripts/build-windows.ps1 -Profile Release -BuildOnly `
|
||||||
|
-NativePrefix $env:OPENCONNECT_WINDOWS_PREFIX -MsysRoot $env:MSYS_ROOT -MsysSubsystem ${{ steps.native.outputs.subsystem }} `
|
||||||
|
-WintunDirectory (Join-Path $env:WINDOWS_BUILD_TOOLS 'wintun') `
|
||||||
|
-MakeNsis (Join-Path ${env:ProgramFiles(x86)} 'NSIS/makensis.exe') `
|
||||||
|
-OutputDirectory "$env:GITHUB_WORKSPACE/artifacts" *> $log
|
||||||
|
} catch {
|
||||||
|
python ./.ci/scripts/private-ci-diagnostics.py compile $log
|
||||||
|
throw 'Windows compilation failed; private diagnostics remain on the runner.'
|
||||||
|
}
|
||||||
|
Write-Host 'Windows compilation passed.'
|
||||||
|
- name: Install Microsoft Artifact Signing tooling
|
||||||
|
shell: pwsh
|
||||||
|
run: Install-Module ArtifactSigning -RequiredVersion 0.1.20 -Repository PSGallery -Force -Scope CurrentUser
|
||||||
|
- name: Log in to Azure with GitHub OIDC
|
||||||
|
uses: azure/login@v3
|
||||||
|
with:
|
||||||
|
client-id: ${{ vars.AZURE_SIGNING_CLIENT_ID }}
|
||||||
|
tenant-id: ${{ vars.AZURE_TENANT_ID }}
|
||||||
|
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
|
||||||
|
- name: Sign and package the Windows runtime
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
MSYS_ROOT: ${{ steps.msys2.outputs.msys2-location }}
|
||||||
|
run: |
|
||||||
|
& ./source/gpgui/scripts/build-windows.ps1 -Profile Release -SkipBuild -Sign `
|
||||||
|
-NativePrefix $env:OPENCONNECT_WINDOWS_PREFIX -MsysRoot $env:MSYS_ROOT -MsysSubsystem ${{ steps.native.outputs.subsystem }} `
|
||||||
|
-WintunDirectory (Join-Path $env:WINDOWS_BUILD_TOOLS 'wintun') `
|
||||||
|
-MakeNsis (Join-Path ${env:ProgramFiles(x86)} 'NSIS/makensis.exe') `
|
||||||
|
-OutputDirectory "$env:GITHUB_WORKSPACE/artifacts"
|
||||||
|
- name: Sign and verify update payload
|
||||||
|
id: sign
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
UPDATE_PRIVATE_KEY: ${{ secrets.WINDOWS_UPDATE_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$key = Join-Path $env:RUNNER_TEMP 'windows-update.key'
|
||||||
|
try {
|
||||||
|
[IO.File]::WriteAllText($key, $env:UPDATE_PRIVATE_KEY.Trim())
|
||||||
|
. ./source/gpgui/scripts/windows-updates/Get-WinSparkle.ps1
|
||||||
|
$tools = Get-WinSparkleTools "$env:GITHUB_WORKSPACE/artifacts/tools" -Architecture $env:BUILD_ARCHITECTURE
|
||||||
|
$installer = @(Get-ChildItem artifacts -Filter '*-setup.exe')
|
||||||
|
if ($installer.Count -ne 1) { throw 'Expected exactly one Windows installer.' }
|
||||||
|
$signature = (& $tools.Tool sign -f $key $installer[0].FullName | Out-String).Trim()
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Windows update signing failed.' }
|
||||||
|
& $tools.Tool verify -p $env:GPGUI_WINDOWS_UPDATE_PUBLIC_KEY -s $signature $installer[0].FullName
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Windows update signature verification failed.' }
|
||||||
|
$signature | Set-Content ($installer[0].FullName + '.sig') -Encoding ascii
|
||||||
|
} finally {
|
||||||
|
Remove-Item $key -Force -ErrorAction SilentlyContinue
|
||||||
|
Remove-Item artifacts/tools -Recurse -Force -ErrorAction SilentlyContinue
|
||||||
|
}
|
||||||
|
- name: Test native installer and uninstaller
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$installer = @(Get-ChildItem artifacts -Filter '*-setup.exe')
|
||||||
|
if ($installer.Count -ne 1) { throw 'Expected exactly one Windows installer.' }
|
||||||
|
& ./source/gp/scripts/test-windows-installer.ps1 -Installer $installer[0].FullName -Architecture $env:BUILD_ARCHITECTURE -Build $env:GPGUI_BUILD_VERSION
|
||||||
|
- uses: actions/upload-artifact@v7
|
||||||
|
if: ${{ !cancelled() && steps.sign.outcome == 'success' }}
|
||||||
|
with:
|
||||||
|
name: artifact-gpgui-windows-${{ inputs.architecture }}
|
||||||
|
path: |
|
||||||
|
artifacts/*.exe
|
||||||
|
artifacts/*.exe.sig
|
||||||
|
artifacts/*.exe.sha256
|
||||||
|
overwrite: true
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 7
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
name: Check macOS native dependency cache
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
gpgui_ref:
|
||||||
|
description: Full gpgui commit SHA
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
gpgui_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check:
|
||||||
|
runs-on: ${{ vars.MACOS_RUNNER || 'macos-15' }}
|
||||||
|
timeout-minutes: 30
|
||||||
|
steps:
|
||||||
|
- name: Require immutable source ref
|
||||||
|
env:
|
||||||
|
GPGUI_REF: ${{ inputs.gpgui_ref }}
|
||||||
|
run: test "${#GPGUI_REF}" -eq 40 && [[ "$GPGUI_REF" != *[!0-9a-f]* ]]
|
||||||
|
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
path: .ci
|
||||||
|
persist-credentials: false
|
||||||
|
|
||||||
|
- name: Checkout gpgui quietly
|
||||||
|
uses: ./.ci/.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: source/gpgui
|
||||||
|
|
||||||
|
- name: Select release toolchain and install native build tools
|
||||||
|
env:
|
||||||
|
DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
|
||||||
|
run: |
|
||||||
|
test "$(uname -m)" = arm64
|
||||||
|
xcodebuild -version
|
||||||
|
echo "DEVELOPER_DIR=$DEVELOPER_DIR" >> "$GITHUB_ENV"
|
||||||
|
brew install autoconf automake gettext libtool meson ninja pkgconf
|
||||||
|
|
||||||
|
- name: Prepare cached native dependencies
|
||||||
|
id: native
|
||||||
|
uses: ./.ci/.github/actions/macos-native-deps
|
||||||
|
with:
|
||||||
|
gpgui-directory: source/gpgui
|
||||||
|
|
||||||
|
- name: Record cache result
|
||||||
|
env:
|
||||||
|
CACHE_HIT: ${{ steps.native.outputs.cache-hit }}
|
||||||
|
run: |
|
||||||
|
if [[ "$CACHE_HIT" == true ]]; then
|
||||||
|
echo "Validated an exact native dependency cache hit." >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
else
|
||||||
|
echo "Built and validated native dependencies after a cache miss." >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
name: Check NSH
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
gp_ref:
|
||||||
|
description: 'Full GlobalProtect-openconnect commit SHA'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
gpgui_ref:
|
||||||
|
description: 'Full gpgui commit SHA'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
gp_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
gpgui_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check:
|
||||||
|
name: NSH (${{ matrix.platform }})
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
timeout-minutes: 90
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- platform: linux
|
||||||
|
runner: ubuntu-24.04
|
||||||
|
- platform: macos
|
||||||
|
runner: ${{ vars.MACOS_RUNNER || 'macos-15' }}
|
||||||
|
env:
|
||||||
|
CARGO_INCREMENTAL: '0'
|
||||||
|
CARGO_BUILD_JOBS: '2'
|
||||||
|
steps:
|
||||||
|
- name: Require immutable source refs
|
||||||
|
env:
|
||||||
|
GP_REF: ${{ inputs.gp_ref }}
|
||||||
|
GPGUI_REF: ${{ inputs.gpgui_ref }}
|
||||||
|
run: |
|
||||||
|
[[ "$GP_REF" =~ ^[0-9a-f]{40}$ && "$GPGUI_REF" =~ ^[0-9a-f]{40}$ ]] || {
|
||||||
|
echo "Both source refs must be full commit SHAs."
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.gp_ref }}
|
||||||
|
path: source/gp
|
||||||
|
submodules: recursive
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Checkout CI helpers
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
path: .ci
|
||||||
|
persist-credentials: false
|
||||||
|
- name: Checkout gpgui
|
||||||
|
uses: ./.ci/.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: source/gpgui
|
||||||
|
|
||||||
|
- name: Install Linux dependencies
|
||||||
|
if: matrix.platform == 'linux'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y autoconf automake gettext libtool pkg-config \
|
||||||
|
clang libclang-dev libgtk-4-dev libxml2-dev \
|
||||||
|
libgnutls28-dev liblz4-dev libwayland-dev libxkbcommon-dev libdbus-1-dev
|
||||||
|
pkg-config --exists gtk4 gnutls dbus-1 wayland-client xkbcommon
|
||||||
|
- name: Install macOS dependencies
|
||||||
|
if: matrix.platform == 'macos'
|
||||||
|
env:
|
||||||
|
DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
|
||||||
|
run: |
|
||||||
|
xcodebuild -version
|
||||||
|
echo "DEVELOPER_DIR=$DEVELOPER_DIR" >> "$GITHUB_ENV"
|
||||||
|
brew install autoconf automake gettext libtool pkgconf gnutls libxml2 lz4
|
||||||
|
echo "$(brew --prefix gettext)/bin" >> "$GITHUB_PATH"
|
||||||
|
echo "ACLOCAL_PATH=$(brew --prefix gettext)/share/aclocal" >> "$GITHUB_ENV"
|
||||||
|
echo "PKG_CONFIG_PATH=$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix gnutls)/lib/pkgconfig" >> "$GITHUB_ENV"
|
||||||
|
- name: Install the NSH compiler
|
||||||
|
run: rustup toolchain install 1.97.0 --profile minimal
|
||||||
|
- name: Cache public crate downloads
|
||||||
|
uses: actions/cache@v5
|
||||||
|
with:
|
||||||
|
# Private source and build outputs stay out of the public cache.
|
||||||
|
path: |
|
||||||
|
~/.cargo/registry/cache
|
||||||
|
~/.cargo/registry/index
|
||||||
|
key: nsh-crates-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('source/gpgui/apps/desktop-nsh/Cargo.lock') }}
|
||||||
|
restore-keys: nsh-crates-${{ runner.os }}-${{ runner.arch }}-
|
||||||
|
|
||||||
|
- name: Check demo-free NSH production
|
||||||
|
timeout-minutes: 30
|
||||||
|
run: |
|
||||||
|
diagnostics="$(mktemp)"
|
||||||
|
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::NSH production check failed; diagnostics suppressed."; python3 .ci/scripts/private-ci-diagnostics.py compile "$diagnostics" || true; fi; rm -f "$diagnostics"' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
cd source/gpgui
|
||||||
|
cargo +1.97.0 check --manifest-path apps/desktop-nsh/Cargo.toml --locked --bin gpgui-nsh
|
||||||
|
) >"$diagnostics" 2>&1
|
||||||
|
echo "NSH production check passed."
|
||||||
|
- name: Compile NSH tests
|
||||||
|
timeout-minutes: 30
|
||||||
|
run: |
|
||||||
|
diagnostics="$(mktemp)"
|
||||||
|
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::NSH test compilation failed; diagnostics suppressed."; python3 .ci/scripts/private-ci-diagnostics.py compile "$diagnostics" || true; fi; rm -f "$diagnostics"' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
cd source/gpgui
|
||||||
|
cargo +1.97.0 test --manifest-path apps/desktop-nsh/Cargo.toml --locked --features demo --no-run
|
||||||
|
) >"$diagnostics" 2>&1
|
||||||
|
echo "NSH test compilation passed."
|
||||||
|
- name: Run NSH tests
|
||||||
|
timeout-minutes: 10
|
||||||
|
run: |
|
||||||
|
diagnostics="$(mktemp)"
|
||||||
|
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::NSH tests failed; diagnostics suppressed."; python3 .ci/scripts/private-ci-diagnostics.py tests "$diagnostics" || true; fi; rm -f "$diagnostics"' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
cd source/gpgui
|
||||||
|
cargo +1.97.0 test --manifest-path apps/desktop-nsh/Cargo.toml --locked --features demo -- --test-threads=1
|
||||||
|
) >"$diagnostics" 2>&1
|
||||||
|
echo "NSH tests passed."
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
name: Desktop icon compatibility
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/workflows/desktop-icons.yaml'
|
||||||
|
- 'scripts/tests/test_desktop_icon.py'
|
||||||
|
- 'packaging/files/usr/share/icons/**'
|
||||||
|
- 'apps/gpgui-helper/src-tauri/icons/**'
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- '.github/workflows/desktop-icons.yaml'
|
||||||
|
- 'scripts/tests/test_desktop_icon.py'
|
||||||
|
- 'packaging/files/usr/share/icons/**'
|
||||||
|
- 'apps/gpgui-helper/src-tauri/icons/**'
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
render:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-22.04, ubuntu-24.04]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Install the distro SVG loader
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y python3-gi gir1.2-gdkpixbuf-2.0 librsvg2-common
|
||||||
|
- name: Render desktop icons
|
||||||
|
run: /usr/bin/python3 -m unittest discover -s scripts/tests -p test_desktop_icon.py
|
||||||
@@ -3,6 +3,8 @@ name: Nix
|
|||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
|
- "Cargo.toml"
|
||||||
|
- "scripts/validate-release-version.py"
|
||||||
- "flake.nix"
|
- "flake.nix"
|
||||||
- "flake.lock"
|
- "flake.lock"
|
||||||
- "nix/**"
|
- "nix/**"
|
||||||
@@ -11,6 +13,8 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
paths:
|
paths:
|
||||||
|
- "Cargo.toml"
|
||||||
|
- "scripts/validate-release-version.py"
|
||||||
- "flake.nix"
|
- "flake.nix"
|
||||||
- "flake.lock"
|
- "flake.lock"
|
||||||
- "nix/**"
|
- "nix/**"
|
||||||
@@ -44,6 +48,9 @@ jobs:
|
|||||||
--extra-experimental-features "nix-command flakes" \
|
--extra-experimental-features "nix-command flakes" \
|
||||||
--print-build-logs
|
--print-build-logs
|
||||||
|
|
||||||
|
- name: Check installed release versions
|
||||||
|
run: python3 scripts/validate-release-version.py --package result
|
||||||
|
|
||||||
- name: Inspect prebuilt package
|
- name: Inspect prebuilt package
|
||||||
run: |
|
run: |
|
||||||
test -x result/bin/gpclient
|
test -x result/bin/gpclient
|
||||||
@@ -105,10 +112,12 @@ jobs:
|
|||||||
in
|
in
|
||||||
assert builtins.elem package
|
assert builtins.elem package
|
||||||
hostSystem.config.environment.systemPackages;
|
hostSystem.config.environment.systemPackages;
|
||||||
assert hostSystem.config.services.ayatana-indicators.enable;
|
|
||||||
package
|
package
|
||||||
'
|
'
|
||||||
|
|
||||||
|
- name: Check installed release versions
|
||||||
|
run: python3 scripts/validate-release-version.py --package result
|
||||||
|
|
||||||
- name: Inspect module package
|
- name: Inspect module package
|
||||||
run: |
|
run: |
|
||||||
test -x result/bin/gpclient
|
test -x result/bin/gpclient
|
||||||
|
|||||||
@@ -44,23 +44,32 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
pacman -Syu --noconfirm --needed \
|
pacman -Syu --noconfirm --needed \
|
||||||
appmenu-gtk-module \
|
appmenu-gtk-module \
|
||||||
|
autoconf \
|
||||||
|
automake \
|
||||||
cargo \
|
cargo \
|
||||||
curl \
|
curl \
|
||||||
desktop-file-utils \
|
desktop-file-utils \
|
||||||
file \
|
file \
|
||||||
git \
|
git \
|
||||||
libappindicator-gtk3 \
|
gettext \
|
||||||
|
gmp \
|
||||||
|
gnutls \
|
||||||
|
libp11-kit \
|
||||||
libsecret \
|
libsecret \
|
||||||
|
libtool \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
|
lz4 \
|
||||||
|
make \
|
||||||
namcap \
|
namcap \
|
||||||
openconnect \
|
nettle \
|
||||||
openssl \
|
patch \
|
||||||
pkgconf \
|
pkgconf \
|
||||||
librsvg \
|
librsvg \
|
||||||
shared-mime-info \
|
shared-mime-info \
|
||||||
vpnc \
|
|
||||||
wget \
|
wget \
|
||||||
webkit2gtk-4.1
|
webkit2gtk-4.1 \
|
||||||
|
xdg-utils \
|
||||||
|
zlib
|
||||||
|
|
||||||
- name: Save committed .SRCINFO
|
- name: Save committed .SRCINFO
|
||||||
if: ${{ github.event_name == 'push' }}
|
if: ${{ github.event_name == 'push' }}
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
name: Publish macOS assets
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
build_run_id:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
release_tag:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
expected_gui:
|
||||||
|
required: false
|
||||||
|
default: nsh
|
||||||
|
type: string
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: false
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
build_run_id:
|
||||||
|
description: 'Public gp Build run ID with a successful build-macos job'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
release_tag:
|
||||||
|
description: 'Existing public release tag (vX.Y.Z or snapshot)'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
expected_gui:
|
||||||
|
description: 'Expected macOS shell in the selected build artifact'
|
||||||
|
required: true
|
||||||
|
default: nsh
|
||||||
|
type: choice
|
||||||
|
options: [tauri, nsh]
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: publish-macos-assets
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
actions: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publish:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
environment: macos-release
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Check completed build and public release
|
||||||
|
id: build
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
BUILD_REPOSITORY: yuezk/GlobalProtect-openconnect
|
||||||
|
BUILD_RUN_ID: ${{ inputs.build_run_id }}
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
[[ "$BUILD_RUN_ID" =~ ^[0-9]+$ ]]
|
||||||
|
[[ "$RELEASE_TAG" == snapshot || "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]
|
||||||
|
run="$(gh api "repos/$BUILD_REPOSITORY/actions/runs/$BUILD_RUN_ID")"
|
||||||
|
jq -e '(.event == "workflow_dispatch" or .event == "push") and
|
||||||
|
.path == ".github/workflows/build.yaml"' <<<"$run" >/dev/null
|
||||||
|
attempt="$(jq -r '.run_attempt' <<<"$run")"
|
||||||
|
artifact_name="$(bash scripts/select-macos-artifact.sh "$BUILD_REPOSITORY" "$BUILD_RUN_ID" "$attempt")"
|
||||||
|
{
|
||||||
|
echo "artifact=$artifact_name"
|
||||||
|
echo "workflow_commit=$(jq -r '.head_sha' <<<"$run")"
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
gh release view "$RELEASE_TAG" \
|
||||||
|
--repo yuezk/GlobalProtect-openconnect --json isDraft,isPrerelease \
|
||||||
|
--jq 'select(.isDraft == false and .isPrerelease == false)' | jq -e .
|
||||||
|
|
||||||
|
- name: Download completed build artifacts
|
||||||
|
uses: actions/download-artifact@v8
|
||||||
|
with:
|
||||||
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
|
github-token: ${{ github.token }}
|
||||||
|
run-id: ${{ inputs.build_run_id }}
|
||||||
|
name: ${{ steps.build.outputs.artifact }}
|
||||||
|
path: release-assets
|
||||||
|
|
||||||
|
- name: Validate build identity and checksums
|
||||||
|
id: metadata
|
||||||
|
env:
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
WORKFLOW_COMMIT: ${{ steps.build.outputs.workflow_commit }}
|
||||||
|
ARTIFACT_NAME: ${{ steps.build.outputs.artifact }}
|
||||||
|
EXPECTED_GUI: ${{ inputs.expected_gui }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
metadata="$(python3 scripts/validate-macos-release.py release-assets \
|
||||||
|
--release-tag "$RELEASE_TAG" --workflow-commit "$WORKFLOW_COMMIT" --gui "$EXPECTED_GUI")"
|
||||||
|
[[ "$ARTIFACT_NAME" == "macos-release-$(jq -r '.request_id' <<<"$metadata")" ]]
|
||||||
|
{
|
||||||
|
echo "gp_ref=$(jq -r '.gp_ref' <<<"$metadata")"
|
||||||
|
echo "gpgui_ref=$(jq -r '.gpgui_ref' <<<"$metadata")"
|
||||||
|
echo "channel=$(jq -r '.channel' <<<"$metadata")"
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Checkout public upload helper
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
|
ref: ${{ steps.metadata.outputs.gp_ref }}
|
||||||
|
path: gp-release
|
||||||
|
|
||||||
|
- name: Check stable tags
|
||||||
|
if: ${{ steps.metadata.outputs.channel == 'stable' }}
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GH_PAT }}
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
GP_REF: ${{ steps.metadata.outputs.gp_ref }}
|
||||||
|
GPGUI_REF: ${{ steps.metadata.outputs.gpgui_ref }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
git -C gp-release fetch --no-tags origin "refs/tags/$RELEASE_TAG"
|
||||||
|
if [[ "$(git -C gp-release rev-parse 'FETCH_HEAD^{commit}')" != "$GP_REF" ]]; then
|
||||||
|
echo "gp source commit does not match $RELEASE_TAG" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! tagged_gui_commit="$(gh api "repos/yuezk/gpgui/commits/$RELEASE_TAG" --jq .sha 2>/dev/null)"; then
|
||||||
|
echo "Private source tag verification failed; diagnostics suppressed." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$tagged_gui_commit" != "$GPGUI_REF" ]]; then
|
||||||
|
echo "gpgui source commit does not match $RELEASE_TAG" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Publish and verify macOS assets
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
RELEASE_REPOSITORY: yuezk/GlobalProtect-openconnect
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
CHANNEL: ${{ steps.metadata.outputs.channel }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
files=(release-assets/*.dmg release-assets/*.zip release-assets/*.sha256)
|
||||||
|
args=()
|
||||||
|
if [[ "$CHANNEL" == snapshot ]]; then
|
||||||
|
args+=(--clobber)
|
||||||
|
fi
|
||||||
|
gp-release/scripts/upload-release-assets.sh "${args[@]}" "$RELEASE_TAG" "${files[@]}"
|
||||||
|
gh release download "$RELEASE_TAG" --repo yuezk/GlobalProtect-openconnect \
|
||||||
|
--pattern 'GPConnect_*_arm64.*' --dir published-assets
|
||||||
|
python3 - <<'PY'
|
||||||
|
import hashlib
|
||||||
|
import json
|
||||||
|
from pathlib import Path
|
||||||
|
metadata = json.loads(Path("release-assets/release-build.json").read_text())
|
||||||
|
for name, digest in metadata["assets"].items():
|
||||||
|
if hashlib.sha256((Path("published-assets") / name).read_bytes()).hexdigest() != digest:
|
||||||
|
raise SystemExit(f"Published asset checksum mismatch: {name}")
|
||||||
|
PY
|
||||||
|
echo "Published verified macOS assets to $RELEASE_TAG" >> "$GITHUB_STEP_SUMMARY"
|
||||||
@@ -0,0 +1,670 @@
|
|||||||
|
name: Publish update feeds
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: true
|
||||||
|
CLOUDFLARE_ACCOUNT_ID:
|
||||||
|
required: false
|
||||||
|
CLOUDFLARE_API_TOKEN:
|
||||||
|
required: false
|
||||||
|
SPARKLE_PRIVATE_KEY:
|
||||||
|
required: false
|
||||||
|
inputs:
|
||||||
|
gpgui_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
channel:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
release_tag:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
archive_name:
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
gp_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
expected_gui:
|
||||||
|
required: false
|
||||||
|
default: nsh
|
||||||
|
type: string
|
||||||
|
highlights:
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
unix_snapshot_build:
|
||||||
|
description: Verified Unix snapshot build when it differs from the macOS retry
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
unix_platforms:
|
||||||
|
required: false
|
||||||
|
default: linux,freebsd,openbsd
|
||||||
|
type: string
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
gpgui_ref:
|
||||||
|
description: gpgui ref containing the update feed Worker
|
||||||
|
required: true
|
||||||
|
default: main
|
||||||
|
type: string
|
||||||
|
channel:
|
||||||
|
description: Update channel
|
||||||
|
required: true
|
||||||
|
type: choice
|
||||||
|
options:
|
||||||
|
- stable
|
||||||
|
- snapshot
|
||||||
|
release_tag:
|
||||||
|
description: Release containing the macOS update archive
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
archive_name:
|
||||||
|
description: Exact ZIP asset name; leave empty when the release has one macOS update archive
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
gp_ref:
|
||||||
|
description: GlobalProtect-openconnect ref containing release helpers
|
||||||
|
required: true
|
||||||
|
default: main
|
||||||
|
type: string
|
||||||
|
expected_gui:
|
||||||
|
description: Expected macOS shell in the selected update archive
|
||||||
|
required: true
|
||||||
|
default: nsh
|
||||||
|
type: choice
|
||||||
|
options: [tauri, nsh]
|
||||||
|
highlights:
|
||||||
|
description: Stable release highlights, one per line
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
unix_snapshot_build:
|
||||||
|
description: Verified Unix snapshot build; omit when it matches the macOS build
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
unix_platforms:
|
||||||
|
description: Comma-separated Unix platforms with published assets (linux,freebsd,openbsd)
|
||||||
|
required: true
|
||||||
|
default: linux,freebsd,openbsd
|
||||||
|
type: string
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: update-feeds
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publish:
|
||||||
|
# Feed verification runs host tools, so it can use Intel runner capacity.
|
||||||
|
runs-on: macos-26-intel
|
||||||
|
environment: macos-release
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
env:
|
||||||
|
REPOSITORY: yuezk/GlobalProtect-openconnect
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
CHANNEL: ${{ inputs.channel }}
|
||||||
|
REQUESTED_ARCHIVE: ${{ inputs.archive_name }}
|
||||||
|
FEED_URL: ${{ vars.SPARKLE_FEED_URL }}
|
||||||
|
EXPECTED_TEAM_ID: ${{ vars.MACOS_TEAM_ID }}
|
||||||
|
EXPECTED_GUI: ${{ inputs.expected_gui }}
|
||||||
|
UPDATES_WORKER_NAME: ${{ vars.UPDATES_WORKER_NAME || 'gp-updates' }}
|
||||||
|
SPARKLE_VERSION: 2.9.2
|
||||||
|
UPDATE_HIGHLIGHTS: ${{ inputs.highlights }}
|
||||||
|
UNIX_PLATFORMS: ${{ inputs.unix_platforms }}
|
||||||
|
UNIX_SNAPSHOT_BUILD: ${{ inputs.unix_snapshot_build }}
|
||||||
|
SPARKLE_ARCHIVE_SHA256: b83e37436774556ed055e0244b297ef2c790e0737393bf65bf495fcbba6eed65
|
||||||
|
steps:
|
||||||
|
- name: Validate inputs
|
||||||
|
env:
|
||||||
|
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
if [[ "$CHANNEL" != "stable" && "$CHANNEL" != "snapshot" ]]; then
|
||||||
|
echo "channel must be stable or snapshot" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$EXPECTED_GUI" != "tauri" && "$EXPECTED_GUI" != "nsh" ]]; then
|
||||||
|
echo "expected_gui must be tauri or nsh" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ ! "$UNIX_PLATFORMS" =~ ^(linux|freebsd|openbsd)(,(linux|freebsd|openbsd))*$ ]]; then
|
||||||
|
echo "unix_platforms must list published Unix targets separated by commas" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ -n "$UNIX_SNAPSHOT_BUILD" ]]; then
|
||||||
|
if [[ "$CHANNEL" != "snapshot" || ! "$UNIX_SNAPSHOT_BUILD" =~ ^(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*)){0,2}$ ]]; then
|
||||||
|
echo "unix_snapshot_build requires a snapshot channel and one to three numeric components" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [[ "$CHANNEL" == "snapshot" && "$RELEASE_TAG" != "snapshot" ]]; then
|
||||||
|
echo "The snapshot channel must publish to the snapshot release" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$CHANNEL" == "stable" && "$RELEASE_TAG" == "snapshot" ]]; then
|
||||||
|
echo "The stable channel cannot publish to the snapshot release" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$CHANNEL" == "stable" && -z "${UPDATE_HIGHLIGHTS//[$'\t\r\n ']/}" ]]; then
|
||||||
|
echo "Stable updates require at least one release highlight" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ -z "$SPARKLE_PRIVATE_KEY" ]]; then
|
||||||
|
echo "SPARKLE_PRIVATE_KEY is not configured" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ -z "$EXPECTED_TEAM_ID" ]]; then
|
||||||
|
echo "MACOS_TEAM_ID is not configured" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
for variable in CLOUDFLARE_ACCOUNT_ID CLOUDFLARE_API_TOKEN; do
|
||||||
|
if [[ -z "${!variable:-}" ]]; then
|
||||||
|
echo "$variable is not configured" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [[ "$FEED_URL" != https://*/appcast.xml ]]; then
|
||||||
|
echo "SPARKLE_FEED_URL must be an HTTPS URL ending in /appcast.xml" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Checkout release infrastructure
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Checkout public release helpers
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
repository: yuezk/GlobalProtect-openconnect
|
||||||
|
ref: ${{ inputs.gp_ref }}
|
||||||
|
path: gp-release
|
||||||
|
|
||||||
|
- name: Checkout update feed Worker
|
||||||
|
uses: ./.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: gpgui
|
||||||
|
|
||||||
|
- uses: pnpm/action-setup@v5
|
||||||
|
with:
|
||||||
|
version: 9.15.1
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
|
||||||
|
- name: Install Worker tooling
|
||||||
|
run: |
|
||||||
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
pnpm --dir gpgui/apps/update-feed-worker install --frozen-lockfile --ignore-scripts
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private operation passed."
|
||||||
|
|
||||||
|
|
||||||
|
- name: Prepare Sparkle tools
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
archive="$RUNNER_TEMP/Sparkle.zip"
|
||||||
|
curl --fail --location --silent --show-error \
|
||||||
|
"https://github.com/sparkle-project/Sparkle/releases/download/$SPARKLE_VERSION/Sparkle-for-Swift-Package-Manager.zip" \
|
||||||
|
--output "$archive"
|
||||||
|
echo "$SPARKLE_ARCHIVE_SHA256 $archive" | shasum -a 256 --check
|
||||||
|
ditto -x -k "$archive" "$RUNNER_TEMP/sparkle"
|
||||||
|
test -x "$RUNNER_TEMP/sparkle/bin/generate_appcast"
|
||||||
|
|
||||||
|
- name: Validate GitHub release
|
||||||
|
id: release
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
release="$(gh release view "$RELEASE_TAG" --repo "$REPOSITORY" \
|
||||||
|
--json tagName,isDraft,isPrerelease,publishedAt)"
|
||||||
|
if [[ "$(jq -r '.tagName' <<<"$release")" != "$RELEASE_TAG" ]] || \
|
||||||
|
[[ "$(jq -r '.isDraft' <<<"$release")" != "false" ]]; then
|
||||||
|
echo "Release must be published with the requested tag" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
is_prerelease="$(jq -r '.isPrerelease' <<<"$release")"
|
||||||
|
if [[ "$is_prerelease" != "false" ]]; then
|
||||||
|
echo "Updates require a non-prerelease GitHub release" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
published_at="$(jq -r '.publishedAt' <<<"$release")"
|
||||||
|
if [[ ! "$published_at" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}T ]]; then
|
||||||
|
echo "Release has no valid publication date" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "released_at=${published_at%%T*}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Download update archive
|
||||||
|
id: archive
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
mkdir -p "$RUNNER_TEMP/updates"
|
||||||
|
archive_name="$REQUESTED_ARCHIVE"
|
||||||
|
if [[ -z "$archive_name" ]]; then
|
||||||
|
archive_name="$(gh release view "$RELEASE_TAG" --repo "$REPOSITORY" --json assets \
|
||||||
|
--jq '[.assets[] | select(.name | test("^GPConnect_[0-9A-Za-z._-]+_arm64\\.zip$"))] | sort_by(.createdAt) | last | .name // ""')"
|
||||||
|
if [[ -z "$archive_name" ]]; then
|
||||||
|
echo "No macOS update archive found on $RELEASE_TAG" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! "$archive_name" =~ ^GPConnect_[0-9A-Za-z._-]+_arm64\.zip$ ]]; then
|
||||||
|
echo "Invalid macOS update archive name: $archive_name" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
gh release download "$RELEASE_TAG" --repo "$REPOSITORY" \
|
||||||
|
--pattern "$archive_name" \
|
||||||
|
--pattern "$archive_name.sha256" \
|
||||||
|
--dir "$RUNNER_TEMP/updates"
|
||||||
|
{
|
||||||
|
echo "name=$archive_name"
|
||||||
|
echo "path=$RUNNER_TEMP/updates/$archive_name"
|
||||||
|
echo "checksum_path=$RUNNER_TEMP/updates/$archive_name.sha256"
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Verify update archive
|
||||||
|
id: bundle
|
||||||
|
env:
|
||||||
|
ARCHIVE_PATH: ${{ steps.archive.outputs.path }}
|
||||||
|
CHECKSUM_PATH: ${{ steps.archive.outputs.checksum_path }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
expected_digest="$(awk 'NR == 1 { print $1 }' "$CHECKSUM_PATH")"
|
||||||
|
actual_digest="$(shasum -a 256 "$ARCHIVE_PATH" | awk '{ print $1 }')"
|
||||||
|
if [[ -z "$expected_digest" || "$actual_digest" != "$expected_digest" ]]; then
|
||||||
|
echo "Update archive checksum does not match its release checksum" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
extract_dir="$RUNNER_TEMP/extracted"
|
||||||
|
ditto -x -k "$ARCHIVE_PATH" "$extract_dir"
|
||||||
|
app="$extract_dir/GP Connect.app"
|
||||||
|
test -d "$app"
|
||||||
|
codesign --verify --deep --strict --verbose=2 "$app"
|
||||||
|
|
||||||
|
signing_info="$(codesign -d --verbose=4 "$app" 2>&1)"
|
||||||
|
xcrun stapler validate "$app"
|
||||||
|
grep -q '^Authority=Developer ID Application:' <<<"$signing_info"
|
||||||
|
grep -q '^CodeDirectory .*flags=.*runtime' <<<"$signing_info"
|
||||||
|
team_identifier="$(sed -n 's/^TeamIdentifier=//p' <<<"$signing_info")"
|
||||||
|
if [[ "$team_identifier" != "$EXPECTED_TEAM_ID" ]]; then
|
||||||
|
echo "Unexpected Apple Team Identifier: $team_identifier" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
identifier="$(sed -n 's/^Identifier=//p' <<<"$signing_info")"
|
||||||
|
if [[ "$identifier" != "com.yuezk.gpgui" ]]; then
|
||||||
|
echo "Unexpected bundle identifier: $identifier" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
file "$app/Contents/MacOS/gpgui" | grep -q 'arm64'
|
||||||
|
|
||||||
|
desktop_shell="$(plutil -extract GPDesktopShell raw "$app/Contents/Info.plist")"
|
||||||
|
if [[ "$desktop_shell" != "$EXPECTED_GUI" ]]; then
|
||||||
|
echo "Update archive desktop shell does not match the selected GUI" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
feed_url="$(plutil -extract SUFeedURL raw "$app/Contents/Info.plist")"
|
||||||
|
if [[ "$feed_url" != "$FEED_URL" ]]; then
|
||||||
|
echo "Unexpected Sparkle feed URL: $feed_url" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
update_channel="$(plutil -extract GPUpdateChannel raw "$app/Contents/Info.plist")"
|
||||||
|
if [[ "$update_channel" != "$CHANNEL" ]]; then
|
||||||
|
echo "Unexpected update channel: $update_channel" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
bundle_version="$(plutil -extract CFBundleVersion raw "$app/Contents/Info.plist")"
|
||||||
|
short_version="$(plutil -extract CFBundleShortVersionString raw "$app/Contents/Info.plist")"
|
||||||
|
if [[ ! "$bundle_version" =~ ^[0-9]+(\.[0-9]+){0,2}$ ]]; then
|
||||||
|
echo "Invalid bundle version: $bundle_version" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$CHANNEL" == "stable" ]]; then
|
||||||
|
expected_tag="v$short_version"
|
||||||
|
expected_archive="GPConnect_${short_version}_arm64.zip"
|
||||||
|
else
|
||||||
|
expected_tag="snapshot"
|
||||||
|
expected_archive="GPConnect_${short_version}-snapshot.${bundle_version}_arm64.zip"
|
||||||
|
fi
|
||||||
|
if [[ "$RELEASE_TAG" != "$expected_tag" ]]; then
|
||||||
|
echo "Release tag $RELEASE_TAG does not match $expected_tag" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "${{ steps.archive.outputs.name }}" != "$expected_archive" ]]; then
|
||||||
|
echo "Archive name does not match packaged version: $expected_archive" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "version=$bundle_version" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "short_version=$short_version" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Prepare Unix update manifest
|
||||||
|
id: unix_manifest
|
||||||
|
env:
|
||||||
|
RELEASED_AT: ${{ steps.release.outputs.released_at }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
manifest="$RUNNER_TEMP/updates/latest.json"
|
||||||
|
current_manifest="$RUNNER_TEMP/current-latest.json"
|
||||||
|
latest_url="${FEED_URL%/appcast.xml}/latest.json"
|
||||||
|
status="$(curl --location --silent --show-error \
|
||||||
|
--output "$current_manifest" --write-out '%{http_code}' "$latest_url")"
|
||||||
|
generate_args=(
|
||||||
|
--repository "$REPOSITORY"
|
||||||
|
--channel "$CHANNEL"
|
||||||
|
--version "${{ steps.bundle.outputs.short_version }}"
|
||||||
|
)
|
||||||
|
IFS=',' read -r -a platforms <<<"$UNIX_PLATFORMS"
|
||||||
|
for platform in "${platforms[@]}"; do
|
||||||
|
generate_args+=(--platform "$platform")
|
||||||
|
done
|
||||||
|
case "$status" in
|
||||||
|
200)
|
||||||
|
python3 scripts/validate-update-manifest.py validate "$current_manifest" \
|
||||||
|
--repository "$REPOSITORY"
|
||||||
|
generate_args+=(--input "$current_manifest")
|
||||||
|
;;
|
||||||
|
404)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Could not check the current Unix update manifest: HTTP $status" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
highlights="$RUNNER_TEMP/update-highlights.txt"
|
||||||
|
if [[ "$CHANNEL" == "stable" ]]; then
|
||||||
|
printf '%s\n' "$UPDATE_HIGHLIGHTS" > "$highlights"
|
||||||
|
released_at="$RELEASED_AT"
|
||||||
|
else
|
||||||
|
printf 'Development snapshot after %s.\n' \
|
||||||
|
"${{ steps.bundle.outputs.short_version }}" > "$highlights"
|
||||||
|
unix_build="${UNIX_SNAPSHOT_BUILD:-${{ steps.bundle.outputs.version }}}"
|
||||||
|
generate_args+=(--build "$unix_build")
|
||||||
|
released_at="$(date -u +%F)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
python3 scripts/validate-update-manifest.py generate \
|
||||||
|
"${generate_args[@]}" \
|
||||||
|
--released-at "$released_at" \
|
||||||
|
--highlights-file "$highlights" \
|
||||||
|
--output "$manifest"
|
||||||
|
if [[ "$CHANNEL" == "snapshot" ]]; then
|
||||||
|
echo "build=$unix_build" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Fetch current appcast
|
||||||
|
id: current-appcast
|
||||||
|
env:
|
||||||
|
ARCHIVE_NAME: ${{ steps.archive.outputs.name }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
appcast="$RUNNER_TEMP/updates/appcast.xml"
|
||||||
|
archive_url="https://github.com/$REPOSITORY/releases/download/$RELEASE_TAG/$ARCHIVE_NAME"
|
||||||
|
status="$(curl --location --silent --show-error \
|
||||||
|
--output "$appcast" --write-out '%{http_code}' "$FEED_URL")"
|
||||||
|
case "$status" in
|
||||||
|
200)
|
||||||
|
test -s "$appcast"
|
||||||
|
decision="$(python3 scripts/validate-macos-appcast.py status "$appcast" \
|
||||||
|
--repository "$REPOSITORY" \
|
||||||
|
--build-version "${{ steps.bundle.outputs.version }}")"
|
||||||
|
if [[ "$decision" == "older" ]]; then
|
||||||
|
echo "Candidate build is older than the published appcast" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ "$decision" == "same" ]]; then
|
||||||
|
python3 scripts/validate-macos-appcast.py validate "$appcast" \
|
||||||
|
--repository "$REPOSITORY" \
|
||||||
|
--build-version "${{ steps.bundle.outputs.version }}" \
|
||||||
|
--short-version "${{ steps.bundle.outputs.short_version }}" \
|
||||||
|
--channel "$CHANNEL" \
|
||||||
|
--archive-url "$archive_url"
|
||||||
|
fi
|
||||||
|
echo "decision=$decision" >> "$GITHUB_OUTPUT"
|
||||||
|
;;
|
||||||
|
404)
|
||||||
|
rm -f "$appcast"
|
||||||
|
echo "decision=newer" >> "$GITHUB_OUTPUT"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Could not fetch the current appcast: HTTP $status" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
- name: Generate appcast
|
||||||
|
if: ${{ steps.current-appcast.outputs.decision == 'newer' }}
|
||||||
|
env:
|
||||||
|
ARCHIVE_NAME: ${{ steps.archive.outputs.name }}
|
||||||
|
SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
embedded_public_key="$(plutil -extract SUPublicEDKey raw \
|
||||||
|
"$RUNNER_TEMP/extracted/GP Connect.app/Contents/Info.plist")"
|
||||||
|
derived_public_key="$(swift -e '
|
||||||
|
import Foundation
|
||||||
|
import CryptoKit
|
||||||
|
let encoded = ProcessInfo.processInfo.environment["SPARKLE_PRIVATE_KEY"]!
|
||||||
|
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
|
let privateKey = try Curve25519.Signing.PrivateKey(
|
||||||
|
rawRepresentation: Data(base64Encoded: encoded)!)
|
||||||
|
print(privateKey.publicKey.rawRepresentation.base64EncodedString())
|
||||||
|
')"
|
||||||
|
if [[ "$derived_public_key" != "$embedded_public_key" ]]; then
|
||||||
|
echo "Sparkle private key does not match the public key embedded in the application" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
download_prefix="https://github.com/$REPOSITORY/releases/download/$RELEASE_TAG/"
|
||||||
|
generate_args=(
|
||||||
|
--download-url-prefix "$download_prefix"
|
||||||
|
--full-release-notes-url "https://github.com/$REPOSITORY/releases/tag/$RELEASE_TAG"
|
||||||
|
--maximum-deltas 0
|
||||||
|
--maximum-versions 1
|
||||||
|
--versions "${{ steps.bundle.outputs.version }}"
|
||||||
|
--ed-key-file -
|
||||||
|
)
|
||||||
|
if [[ "$CHANNEL" == "snapshot" ]]; then
|
||||||
|
generate_args+=(--channel snapshot)
|
||||||
|
fi
|
||||||
|
printf '%s' "$SPARKLE_PRIVATE_KEY" | \
|
||||||
|
"$RUNNER_TEMP/sparkle/bin/generate_appcast" \
|
||||||
|
"${generate_args[@]}" "$RUNNER_TEMP/updates"
|
||||||
|
|
||||||
|
appcast="$RUNNER_TEMP/updates/appcast.xml"
|
||||||
|
test -s "$appcast"
|
||||||
|
python3 scripts/validate-macos-appcast.py validate "$appcast" \
|
||||||
|
--repository "$REPOSITORY" \
|
||||||
|
--build-version "${{ steps.bundle.outputs.version }}" \
|
||||||
|
--short-version "${{ steps.bundle.outputs.short_version }}" \
|
||||||
|
--channel "$CHANNEL" \
|
||||||
|
--archive-url "$download_prefix$ARCHIVE_NAME"
|
||||||
|
|
||||||
|
- name: Publish appcast
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
appcast="$RUNNER_TEMP/updates/appcast.xml"
|
||||||
|
archive_url="https://github.com/$REPOSITORY/releases/download/$RELEASE_TAG/${{ steps.archive.outputs.name }}"
|
||||||
|
if [[ "$CHANNEL" == "stable" ]] && \
|
||||||
|
gh release view "$RELEASE_TAG" --repo "$REPOSITORY" --json assets \
|
||||||
|
--jq '.assets[].name' | grep -Fx appcast.xml >/dev/null; then
|
||||||
|
existing="$RUNNER_TEMP/existing-release-appcast.xml"
|
||||||
|
gh release download "$RELEASE_TAG" --repo "$REPOSITORY" \
|
||||||
|
--pattern appcast.xml --output "$existing"
|
||||||
|
python3 scripts/validate-macos-appcast.py validate "$existing" \
|
||||||
|
--repository "$REPOSITORY" \
|
||||||
|
--build-version "${{ steps.bundle.outputs.version }}" \
|
||||||
|
--short-version "${{ steps.bundle.outputs.short_version }}" \
|
||||||
|
--channel "$CHANNEL" \
|
||||||
|
--archive-url "$archive_url"
|
||||||
|
cp "$existing" "$appcast"
|
||||||
|
else
|
||||||
|
if [[ "$CHANNEL" == "snapshot" ]]; then
|
||||||
|
RELEASE_REPOSITORY="$REPOSITORY" \
|
||||||
|
gp-release/scripts/upload-release-assets.sh \
|
||||||
|
--clobber "$RELEASE_TAG" "$appcast"
|
||||||
|
else
|
||||||
|
RELEASE_REPOSITORY="$REPOSITORY" \
|
||||||
|
gp-release/scripts/upload-release-assets.sh "$RELEASE_TAG" "$appcast"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Validate final appcast
|
||||||
|
env:
|
||||||
|
ARCHIVE_NAME: ${{ steps.archive.outputs.name }}
|
||||||
|
run: |
|
||||||
|
python3 scripts/validate-macos-appcast.py validate \
|
||||||
|
"$RUNNER_TEMP/updates/appcast.xml" \
|
||||||
|
--repository "$REPOSITORY" \
|
||||||
|
--build-version "${{ steps.bundle.outputs.version }}" \
|
||||||
|
--short-version "${{ steps.bundle.outputs.short_version }}" \
|
||||||
|
--channel "$CHANNEL" \
|
||||||
|
--archive-url "https://github.com/$REPOSITORY/releases/download/$RELEASE_TAG/$ARCHIVE_NAME"
|
||||||
|
|
||||||
|
- name: Preserve other platform feeds
|
||||||
|
run: |
|
||||||
|
python3 scripts/preserve-update-feeds.py \
|
||||||
|
--base-url "${FEED_URL%/appcast.xml}" \
|
||||||
|
--directory gpgui/apps/update-feed-worker/public \
|
||||||
|
--exclude appcast.xml --exclude latest.json
|
||||||
|
|
||||||
|
- name: Deploy update feed worker
|
||||||
|
env:
|
||||||
|
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
run: |
|
||||||
|
trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT
|
||||||
|
(
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
cp "$RUNNER_TEMP/updates/appcast.xml" gpgui/apps/update-feed-worker/public/appcast.xml
|
||||||
|
if [[ -f "$RUNNER_TEMP/updates/latest.json" ]]; then
|
||||||
|
cp "$RUNNER_TEMP/updates/latest.json" gpgui/apps/update-feed-worker/public/latest.json
|
||||||
|
fi
|
||||||
|
pnpm --dir gpgui/apps/update-feed-worker exec wrangler deploy \
|
||||||
|
--config wrangler.jsonc \
|
||||||
|
--name "$UPDATES_WORKER_NAME"
|
||||||
|
) >/dev/null 2>&1
|
||||||
|
echo "Private operation passed."
|
||||||
|
|
||||||
|
- name: Verify published appcast
|
||||||
|
env:
|
||||||
|
ARCHIVE_NAME: ${{ steps.archive.outputs.name }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
published_appcast="$RUNNER_TEMP/published-appcast.xml"
|
||||||
|
for _ in 1 2 3 4 5 6 7 8 9 10; do
|
||||||
|
if curl --fail --location --silent --show-error \
|
||||||
|
--output "$published_appcast" "$FEED_URL" && \
|
||||||
|
python3 scripts/validate-macos-appcast.py validate "$published_appcast" \
|
||||||
|
--repository "$REPOSITORY" \
|
||||||
|
--build-version "${{ steps.bundle.outputs.version }}" \
|
||||||
|
--short-version "${{ steps.bundle.outputs.short_version }}" \
|
||||||
|
--channel "$CHANNEL" \
|
||||||
|
--archive-url "https://github.com/$REPOSITORY/releases/download/$RELEASE_TAG/$ARCHIVE_NAME"; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sleep 3
|
||||||
|
done
|
||||||
|
echo "Published appcast did not become available at $FEED_URL" >&2
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
- name: Verify published Unix update manifest
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
latest_url="${FEED_URL%/appcast.xml}/latest.json"
|
||||||
|
published_manifest="$RUNNER_TEMP/published-latest.json"
|
||||||
|
expected=(
|
||||||
|
--channel "$CHANNEL"
|
||||||
|
--version "${{ steps.bundle.outputs.short_version }}"
|
||||||
|
)
|
||||||
|
if [[ "$CHANNEL" == "snapshot" ]]; then
|
||||||
|
expected+=(--build "${{ steps.unix_manifest.outputs.build }}")
|
||||||
|
fi
|
||||||
|
for _ in 1 2 3 4 5 6 7 8 9 10; do
|
||||||
|
if curl --fail --location --silent --show-error \
|
||||||
|
--output "$published_manifest" "$latest_url" && \
|
||||||
|
python3 scripts/validate-update-manifest.py validate "$published_manifest" \
|
||||||
|
--repository "$REPOSITORY" "${expected[@]}"; then
|
||||||
|
if ! cmp --silent "$RUNNER_TEMP/updates/latest.json" "$published_manifest"; then
|
||||||
|
sleep 3
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sleep 3
|
||||||
|
done
|
||||||
|
echo "Published Unix update manifest did not become available at $latest_url" >&2
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
- name: Prune expired snapshot assets
|
||||||
|
if: ${{ inputs.channel == 'snapshot' }}
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
assets="$RUNNER_TEMP/snapshot-assets.json"
|
||||||
|
delete_list="$RUNNER_TEMP/delete-snapshot-assets.txt"
|
||||||
|
gh release view snapshot --repo "$REPOSITORY" --json assets > "$assets"
|
||||||
|
ASSETS="$assets" python3 - <<'PY' > "$delete_list"
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
|
||||||
|
with open(os.environ["ASSETS"], encoding="utf-8") as file:
|
||||||
|
assets = json.load(file)["assets"]
|
||||||
|
|
||||||
|
archive_pattern = re.compile(
|
||||||
|
r"^(GPConnect_.+-snapshot\.(\d+(?:\.\d+){1,2}))_arm64\.zip$"
|
||||||
|
)
|
||||||
|
asset_pattern = re.compile(
|
||||||
|
r"^(GPConnect_.+-snapshot\.\d+(?:\.\d+){1,2})_arm64\.(?:zip|dmg)(?:\.sha256)?$"
|
||||||
|
)
|
||||||
|
builds = []
|
||||||
|
for asset in assets:
|
||||||
|
match = archive_pattern.match(asset["name"])
|
||||||
|
if match:
|
||||||
|
builds.append((tuple(map(int, match.group(2).split("."))), match.group(1)))
|
||||||
|
keep = {stem for _, stem in sorted(builds, reverse=True)[:2]}
|
||||||
|
for asset in assets:
|
||||||
|
match = asset_pattern.match(asset["name"])
|
||||||
|
if match and not any(asset["name"].startswith(stem + "_arm64.") for stem in keep):
|
||||||
|
print(asset["name"])
|
||||||
|
PY
|
||||||
|
|
||||||
|
while IFS= read -r asset; do
|
||||||
|
if [[ -n "$asset" ]] && ! gh release delete-asset snapshot "$asset" \
|
||||||
|
--repo "$REPOSITORY" --yes; then
|
||||||
|
echo "::warning::Could not remove expired snapshot asset: $asset" >&2
|
||||||
|
fi
|
||||||
|
done < "$delete_list"
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
name: Publish Windows update feed
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
gpgui_ref:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
release_tag:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
version:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
channel:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
build:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
highlights:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
secrets:
|
||||||
|
GH_PAT:
|
||||||
|
required: true
|
||||||
|
CLOUDFLARE_ACCOUNT_ID:
|
||||||
|
required: false
|
||||||
|
CLOUDFLARE_API_TOKEN:
|
||||||
|
required: false
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
gpgui_ref:
|
||||||
|
description: gpgui ref containing the update Worker and pinned WinSparkle tools
|
||||||
|
required: true
|
||||||
|
default: main
|
||||||
|
type: string
|
||||||
|
release_tag:
|
||||||
|
description: GitHub release containing both tested native installers and signatures
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
version:
|
||||||
|
description: Base product version (x.y.z)
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
channel:
|
||||||
|
description: Update channel
|
||||||
|
required: true
|
||||||
|
type: choice
|
||||||
|
options: [stable, snapshot]
|
||||||
|
build:
|
||||||
|
description: Numeric snapshot build; empty for stable
|
||||||
|
type: string
|
||||||
|
highlights:
|
||||||
|
description: Release highlights, one per line
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: update-feeds
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publish:
|
||||||
|
runs-on: windows-latest
|
||||||
|
environment: macos-release
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
env:
|
||||||
|
REPOSITORY: yuezk/GlobalProtect-openconnect
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
PRODUCT_VERSION: ${{ inputs.version }}
|
||||||
|
UPDATE_CHANNEL: ${{ inputs.channel }}
|
||||||
|
BUILD_VERSION: ${{ inputs.build }}
|
||||||
|
UPDATE_HIGHLIGHTS: ${{ inputs.highlights }}
|
||||||
|
WINDOWS_UPDATE_PUBLIC_KEY: ${{ vars.WINDOWS_UPDATE_PUBLIC_KEY }}
|
||||||
|
WINDOWS_SIGNING_PUBLISHER: ${{ vars.WINDOWS_SIGNING_PUBLISHER }}
|
||||||
|
UPDATES_WORKER_NAME: ${{ vars.UPDATES_WORKER_NAME || 'gp-updates' }}
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Checkout update Worker and build helpers
|
||||||
|
uses: ./.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: gpgui
|
||||||
|
- uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: '3.13'
|
||||||
|
- uses: pnpm/action-setup@v5
|
||||||
|
with:
|
||||||
|
version: 9.15.1
|
||||||
|
- uses: actions/setup-node@v6
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
- name: Verify both tested native installers
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
if ($env:PRODUCT_VERSION -notmatch '^\d+\.\d+\.\d+$') { throw 'Invalid product version.' }
|
||||||
|
if ($env:UPDATE_CHANNEL -eq 'stable') {
|
||||||
|
if ($env:RELEASE_TAG -ne "v$env:PRODUCT_VERSION" -or $env:BUILD_VERSION) { throw 'Stable release identity does not match.' }
|
||||||
|
} elseif ($env:RELEASE_TAG -ne 'snapshot' -or $env:BUILD_VERSION -notmatch '^\d+(\.\d+){0,2}$') { throw 'Snapshot release identity does not match.' }
|
||||||
|
$displayVersion = $env:PRODUCT_VERSION
|
||||||
|
if ($env:UPDATE_CHANNEL -eq 'snapshot') { $displayVersion += "-snapshot.$env:BUILD_VERSION" }
|
||||||
|
if (!$env:WINDOWS_UPDATE_PUBLIC_KEY) { throw 'Configure the Windows public update key before promotion.' }
|
||||||
|
$downloads = Join-Path $env:RUNNER_TEMP 'windows-update'
|
||||||
|
New-Item -ItemType Directory -Force $downloads | Out-Null
|
||||||
|
. ./gpgui/scripts/windows-updates/Get-WinSparkle.ps1
|
||||||
|
$tools = Get-WinSparkleTools (Join-Path $env:RUNNER_TEMP 'signing-tools')
|
||||||
|
foreach ($architecture in @('x64','arm64')) {
|
||||||
|
$name = "GPConnect_${displayVersion}_windows-$architecture-setup.exe"
|
||||||
|
foreach ($asset in @($name, "$name.sig", "$name.sha256")) {
|
||||||
|
gh release download $env:RELEASE_TAG --repo $env:REPOSITORY --pattern $asset --dir $downloads
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "Missing release asset: $asset" }
|
||||||
|
}
|
||||||
|
$installer = Join-Path $downloads $name
|
||||||
|
$sum = (Get-Content "$installer.sha256" -Raw).Trim()
|
||||||
|
if ($sum -notmatch '^([a-fA-F0-9]{64}) (.+)$' -or $Matches[2] -ne $name) { throw 'Invalid installer checksum file.' }
|
||||||
|
if ((Get-FileHash $installer).Hash -ne $Matches[1]) { throw 'Installer checksum mismatch.' }
|
||||||
|
if ($env:WINDOWS_SIGNING_PUBLISHER) {
|
||||||
|
$authenticode = Get-AuthenticodeSignature $installer
|
||||||
|
if ($authenticode.Status -ne 'Valid' -or $authenticode.SignerCertificate.GetNameInfo([Security.Cryptography.X509Certificates.X509NameType]::SimpleName, $false) -ne $env:WINDOWS_SIGNING_PUBLISHER) { throw 'Installer publisher signature is invalid.' }
|
||||||
|
}
|
||||||
|
if ([Diagnostics.FileVersionInfo]::GetVersionInfo($installer).ProductVersion -ne $displayVersion) { throw 'Installer product version/build mismatch.' }
|
||||||
|
$signature = (Get-Content "$installer.sig" -Raw).Trim()
|
||||||
|
& $tools.Tool verify -p $env:WINDOWS_UPDATE_PUBLIC_KEY -s $signature $installer
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Installer update signature is invalid.' }
|
||||||
|
}
|
||||||
|
"WINDOWS_DISPLAY_VERSION=$displayVersion" >> $env:GITHUB_ENV
|
||||||
|
- name: Preserve other feeds and generate Windows metadata
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$public = 'gpgui/apps/update-feed-worker/public'
|
||||||
|
python scripts/preserve-update-feeds.py --base-url https://updates.gpgui.com --directory $public
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Could not preserve published feeds.' }
|
||||||
|
$notes = Join-Path $env:RUNNER_TEMP 'windows-highlights.txt'
|
||||||
|
$env:UPDATE_HIGHLIGHTS | Set-Content $notes -Encoding utf8NoBOM
|
||||||
|
$output = Join-Path $public 'windows'
|
||||||
|
$previous = Join-Path $output 'latest.json'
|
||||||
|
$arguments = @('scripts/windows-update-feed.py', '--version', $env:PRODUCT_VERSION,
|
||||||
|
'--channel', $env:UPDATE_CHANNEL, '--released-at', [DateTime]::UtcNow.ToString('yyyy-MM-dd'),
|
||||||
|
'--highlights-file', $notes, '--output', $output)
|
||||||
|
foreach ($architecture in @('x64','arm64')) {
|
||||||
|
$name = "GPConnect_$($env:WINDOWS_DISPLAY_VERSION)_windows-$architecture-setup.exe"
|
||||||
|
$installer = Join-Path (Join-Path $env:RUNNER_TEMP 'windows-update') $name
|
||||||
|
$arguments += @('--payload', $architecture, $installer,
|
||||||
|
"https://github.com/$env:REPOSITORY/releases/download/$env:RELEASE_TAG/$name", "$installer.sig")
|
||||||
|
}
|
||||||
|
if (Test-Path $previous) { $arguments += @('--input', $previous) }
|
||||||
|
if ($env:BUILD_VERSION) { $arguments += @('--build', $env:BUILD_VERSION) }
|
||||||
|
python @arguments
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Invalid Windows metadata.' }
|
||||||
|
- name: Deploy complete feed set
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
pnpm --dir gpgui/apps/update-feed-worker install --frozen-lockfile --ignore-scripts
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Worker dependency installation failed.' }
|
||||||
|
pnpm --dir gpgui/apps/update-feed-worker exec wrangler deploy --config wrangler.jsonc --name $env:UPDATES_WORKER_NAME
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Feed deployment failed.' }
|
||||||
|
- name: Verify published Windows metadata
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$windows = 'gpgui/apps/update-feed-worker/public/windows'
|
||||||
|
$feeds = @('latest.json', 'stable/appcast.xml', 'snapshot/appcast.xml') | Where-Object { Test-Path (Join-Path $windows $_) }
|
||||||
|
foreach ($relative in $feeds) {
|
||||||
|
$expected = [IO.File]::ReadAllBytes((Join-Path 'gpgui/apps/update-feed-worker/public/windows' $relative))
|
||||||
|
$downloaded = Join-Path $env:RUNNER_TEMP ('published-' + ($relative -replace '/', '-'))
|
||||||
|
$matched = $false
|
||||||
|
foreach ($attempt in 1..10) {
|
||||||
|
try {
|
||||||
|
Invoke-WebRequest "https://updates.gpgui.com/windows/$relative" -UserAgent 'GPConnectReleasePublisher/1.0' -OutFile $downloaded
|
||||||
|
$actual = [IO.File]::ReadAllBytes($downloaded)
|
||||||
|
$matched = [Convert]::ToBase64String($expected) -eq [Convert]::ToBase64String($actual)
|
||||||
|
} catch {
|
||||||
|
Write-Host "Waiting for published feed: $relative ($attempt/10)"
|
||||||
|
}
|
||||||
|
if ($matched) { break }
|
||||||
|
if ($attempt -lt 10) { Start-Sleep -Seconds 3 }
|
||||||
|
}
|
||||||
|
if (!$matched) { throw "Published feed does not match: $relative" }
|
||||||
|
}
|
||||||
@@ -4,18 +4,44 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- '.github/workflows/**'
|
- '.github/workflows/**'
|
||||||
|
- '.github/actions/**'
|
||||||
|
- 'scripts/record-build-sources.py'
|
||||||
|
- 'scripts/validate-release-version.py'
|
||||||
|
- 'scripts/publish-flake-test-branch.sh'
|
||||||
|
- 'scripts/prepare-release-promotion.sh'
|
||||||
|
- 'scripts/tests/test_release_flow.py'
|
||||||
|
- 'scripts/select-macos-artifact.sh'
|
||||||
|
- 'scripts/test-private-desktop.sh'
|
||||||
|
- 'scripts/tests/test_private_ci.py'
|
||||||
- 'scripts/wait-for-publication.py'
|
- 'scripts/wait-for-publication.py'
|
||||||
- 'scripts/select-publication-targets.py'
|
- 'scripts/select-publication-targets.py'
|
||||||
- 'scripts/verify-docker-publication.sh'
|
- 'scripts/verify-docker-publication.sh'
|
||||||
- 'scripts/tests/test_*publication.py'
|
- 'scripts/tests/test_*publication.py'
|
||||||
|
- 'scripts/validate-macos-release.py'
|
||||||
|
- 'scripts/validate-macos-appcast.py'
|
||||||
|
- 'scripts/validate-update-manifest.py'
|
||||||
|
- 'scripts/tests/test_validate_*.py'
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
paths:
|
paths:
|
||||||
- '.github/workflows/**'
|
- '.github/workflows/**'
|
||||||
|
- '.github/actions/**'
|
||||||
|
- 'scripts/record-build-sources.py'
|
||||||
|
- 'scripts/validate-release-version.py'
|
||||||
|
- 'scripts/publish-flake-test-branch.sh'
|
||||||
|
- 'scripts/prepare-release-promotion.sh'
|
||||||
|
- 'scripts/tests/test_release_flow.py'
|
||||||
|
- 'scripts/select-macos-artifact.sh'
|
||||||
|
- 'scripts/test-private-desktop.sh'
|
||||||
|
- 'scripts/tests/test_private_ci.py'
|
||||||
- 'scripts/wait-for-publication.py'
|
- 'scripts/wait-for-publication.py'
|
||||||
- 'scripts/select-publication-targets.py'
|
- 'scripts/select-publication-targets.py'
|
||||||
- 'scripts/verify-docker-publication.sh'
|
- 'scripts/verify-docker-publication.sh'
|
||||||
- 'scripts/tests/test_*publication.py'
|
- 'scripts/tests/test_*publication.py'
|
||||||
|
- 'scripts/validate-macos-release.py'
|
||||||
|
- 'scripts/validate-macos-appcast.py'
|
||||||
|
- 'scripts/validate-update-manifest.py'
|
||||||
|
- 'scripts/tests/test_validate_*.py'
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -36,3 +62,16 @@ jobs:
|
|||||||
shellcheck scripts/verify-docker-publication.sh
|
shellcheck scripts/verify-docker-publication.sh
|
||||||
- name: Test publication verification
|
- name: Test publication verification
|
||||||
run: python3 -m unittest discover -s scripts/tests -p 'test_*publication.py'
|
run: python3 -m unittest discover -s scripts/tests -p 'test_*publication.py'
|
||||||
|
- name: Test macOS publication and update feed validation
|
||||||
|
run: python3 -m unittest discover -s scripts/tests -p 'test_validate_*.py'
|
||||||
|
- name: Check private CI and macOS artifact selection
|
||||||
|
run: |
|
||||||
|
bash -n scripts/select-macos-artifact.sh
|
||||||
|
shellcheck scripts/select-macos-artifact.sh scripts/test-private-desktop.sh
|
||||||
|
bash -n scripts/test-private-desktop.sh
|
||||||
|
python3 -m unittest discover -s scripts/tests -p 'test_private_ci.py'
|
||||||
|
- name: Test release promotion and source selection
|
||||||
|
run: |
|
||||||
|
bash -n scripts/prepare-release-promotion.sh scripts/publish-flake-test-branch.sh
|
||||||
|
shellcheck scripts/prepare-release-promotion.sh scripts/publish-flake-test-branch.sh
|
||||||
|
python3 -m unittest discover -s scripts/tests -p 'test_release_flow.py'
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
name: Release version consistency
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release-version:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
# The default PR checkout is the candidate merged with the current base.
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Check main release version
|
||||||
|
env:
|
||||||
|
BASE_REF: ${{ github.event.pull_request.base.sha || github.event.before }}
|
||||||
|
run: python3 scripts/validate-release-version.py --base-ref "$BASE_REF"
|
||||||
@@ -73,6 +73,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
matrix: ${{ steps.set-matrix.outputs.result }}
|
matrix: ${{ steps.set-matrix.outputs.result }}
|
||||||
|
docker_matrix: ${{ steps.set-matrix.outputs.docker_matrix }}
|
||||||
steps:
|
steps:
|
||||||
- name: Set up matrix
|
- name: Set up matrix
|
||||||
id: set-matrix
|
id: set-matrix
|
||||||
@@ -88,6 +89,12 @@ jobs:
|
|||||||
"arm64": ["ubuntu-24.04-arm"]
|
"arm64": ["ubuntu-24.04-arm"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const docker = [
|
||||||
|
{ runner: 'ubuntu-latest', platform: 'linux/amd64' },
|
||||||
|
{ runner: 'ubuntu-24.04-arm', platform: 'linux/arm64' },
|
||||||
|
].filter(item => osMap[arch].includes(item.runner))
|
||||||
|
core.setOutput('docker_matrix', JSON.stringify({ include: docker }))
|
||||||
|
|
||||||
const package = Object.entries(inputs)
|
const package = Object.entries(inputs)
|
||||||
.filter(([key, value]) => key.startsWith('release-') && key !== 'release-docker' && value)
|
.filter(([key, value]) => key.startsWith('release-') && key !== 'release-docker' && value)
|
||||||
.map(([key, value]) => key.replace('release-', ''))
|
.map(([key, value]) => key.replace('release-', ''))
|
||||||
@@ -145,15 +152,11 @@ jobs:
|
|||||||
build-docker-image:
|
build-docker-image:
|
||||||
needs:
|
needs:
|
||||||
- check
|
- check
|
||||||
|
- setup-matrix
|
||||||
if: ${{ inputs.release-docker }}
|
if: ${{ inputs.release-docker }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix: ${{ fromJson(needs.setup-matrix.outputs.docker_matrix) }}
|
||||||
include:
|
|
||||||
- runner: ubuntu-latest
|
|
||||||
platform: linux/amd64
|
|
||||||
- runner: ubuntu-24.04-arm
|
|
||||||
platform: linux/arm64
|
|
||||||
runs-on: ${{ matrix.runner }}
|
runs-on: ${{ matrix.runner }}
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare
|
- name: Prepare
|
||||||
@@ -235,6 +238,17 @@ jobs:
|
|||||||
IMAGE: yuezk/globalprotect-openconnect
|
IMAGE: yuezk/globalprotect-openconnect
|
||||||
TAG: ${{ inputs.tag }}
|
TAG: ${{ inputs.tag }}
|
||||||
run: |
|
run: |
|
||||||
|
# Reject an incomplete or unexpected selection before writing any tag.
|
||||||
|
shopt -s nullglob
|
||||||
|
digest_files=(*)
|
||||||
|
expected_count=1
|
||||||
|
if [[ "${{ inputs.arch }}" == all ]]; then
|
||||||
|
expected_count=2
|
||||||
|
fi
|
||||||
|
[[ ${#digest_files[@]} -eq $expected_count ]]
|
||||||
|
for digest in "${digest_files[@]}"; do
|
||||||
|
[[ "$digest" =~ ^[0-9a-f]{64}$ ]]
|
||||||
|
done
|
||||||
VERSION="${TAG#v}"
|
VERSION="${TAG#v}"
|
||||||
tags=(-t "$IMAGE:$TAG")
|
tags=(-t "$IMAGE:$TAG")
|
||||||
|
|
||||||
@@ -335,7 +349,6 @@ jobs:
|
|||||||
if: ${{ inputs.release-binary && inputs.arch == 'all' && needs.gh-release.outputs.stable_version != '' }}
|
if: ${{ inputs.release-binary && inputs.arch == 'all' && needs.gh-release.outputs.stable_version != '' }}
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
pull-requests: write
|
|
||||||
uses: ./.github/workflows/update-flake-hashes.yaml
|
uses: ./.github/workflows/update-flake-hashes.yaml
|
||||||
with:
|
with:
|
||||||
version: ${{ needs.gh-release.outputs.stable_version }}
|
version: ${{ needs.gh-release.outputs.stable_version }}
|
||||||
|
|||||||
@@ -20,14 +20,47 @@ on:
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-flake-hashes:
|
update-flake-hashes:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.release.outputs.version }}
|
||||||
|
release_tag: ${{ steps.release.outputs.release_tag }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout GlobalProtect-openconnect
|
- name: Checkout GlobalProtect-openconnect
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.sha }}
|
||||||
|
|
||||||
|
- name: Resolve candidate release
|
||||||
|
id: release
|
||||||
|
env:
|
||||||
|
RELEASE_VERSION: ${{ inputs.version }}
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
run: |
|
||||||
|
python3 - <<'PYRELEASE'
|
||||||
|
import json, os, re, runpy, subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
helpers = runpy.run_path('scripts/validate-release-version.py')
|
||||||
|
version = os.environ['RELEASE_VERSION'].removeprefix('v') or helpers['cargo_version'](Path('.'))
|
||||||
|
tag = os.environ['RELEASE_TAG'] or f'v{version}'
|
||||||
|
if not re.fullmatch(r'(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)', version) or tag not in (f'v{version}', 'snapshot'):
|
||||||
|
raise SystemExit('Expected a stable version and its matching release tag, or snapshot')
|
||||||
|
source_slug = re.sub(r'[^A-Za-z0-9._-]', '', re.sub(r'[/\s]+', '-', os.environ['GITHUB_REF_NAME'])).strip('-')
|
||||||
|
test_branch = f'chore/flake-{source_slug}'
|
||||||
|
expected_head = ''
|
||||||
|
if tag == 'snapshot':
|
||||||
|
remote = subprocess.check_output(['git', 'ls-remote', '--heads', 'origin', f'refs/heads/{test_branch}'], text=True)
|
||||||
|
expected_head = remote.split()[0] if remote.strip() else ''
|
||||||
|
with open(os.environ['GITHUB_OUTPUT'], 'a') as output:
|
||||||
|
output.write(f'version={version}\nrelease_tag={tag}\n')
|
||||||
|
Path('release-candidate.json').write_text(json.dumps({
|
||||||
|
'version': version, 'releaseTag': tag, 'sourceSha': os.environ['GITHUB_SHA'],
|
||||||
|
'workflowRunId': os.environ['GITHUB_RUN_ID'],
|
||||||
|
'testBranch': test_branch, 'expectedTestHead': expected_head,
|
||||||
|
}, indent=2) + '\n')
|
||||||
|
PYRELEASE
|
||||||
|
|
||||||
- name: Install Nix
|
- name: Install Nix
|
||||||
uses: cachix/install-nix-action@v31
|
uses: cachix/install-nix-action@v31
|
||||||
@@ -39,8 +72,8 @@ jobs:
|
|||||||
|
|
||||||
- name: Update flake hashes
|
- name: Update flake hashes
|
||||||
env:
|
env:
|
||||||
RELEASE_VERSION: ${{ inputs.version }}
|
RELEASE_VERSION: ${{ steps.release.outputs.version }}
|
||||||
RELEASE_TAG: ${{ inputs.release_tag }}
|
RELEASE_TAG: ${{ steps.release.outputs.release_tag }}
|
||||||
run: |
|
run: |
|
||||||
if [[ -n "$RELEASE_VERSION" ]]; then
|
if [[ -n "$RELEASE_VERSION" ]]; then
|
||||||
scripts/update-flake-hashes.sh "$RELEASE_VERSION" "$RELEASE_TAG"
|
scripts/update-flake-hashes.sh "$RELEASE_VERSION" "$RELEASE_TAG"
|
||||||
@@ -55,6 +88,7 @@ jobs:
|
|||||||
path: |
|
path: |
|
||||||
flake.nix
|
flake.nix
|
||||||
flake.lock
|
flake.lock
|
||||||
|
release-candidate.json
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
validate-nix-prebuilt:
|
validate-nix-prebuilt:
|
||||||
@@ -79,6 +113,8 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout GlobalProtect-openconnect
|
- name: Checkout GlobalProtect-openconnect
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.sha }}
|
||||||
|
|
||||||
- name: Download updated flake
|
- name: Download updated flake
|
||||||
uses: actions/download-artifact@v8
|
uses: actions/download-artifact@v8
|
||||||
@@ -104,6 +140,12 @@ jobs:
|
|||||||
--print-build-logs
|
--print-build-logs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: Validate installed release versions
|
||||||
|
run: |
|
||||||
|
python3 scripts/validate-release-version.py \
|
||||||
|
--version '${{ needs.update-flake-hashes.outputs.version }}' \
|
||||||
|
--release-tag '${{ needs.update-flake-hashes.outputs.release_tag }}' --package result
|
||||||
|
|
||||||
- name: Inspect prebuilt Nix package
|
- name: Inspect prebuilt Nix package
|
||||||
run: |
|
run: |
|
||||||
test -x result/bin/gpclient
|
test -x result/bin/gpclient
|
||||||
@@ -126,13 +168,15 @@ jobs:
|
|||||||
- name: Verify desktop authorization runs on the host
|
- name: Verify desktop authorization runs on the host
|
||||||
run: bash scripts/tests/nix-desktop-authorization.sh result
|
run: bash scripts/tests/nix-desktop-authorization.sh result
|
||||||
|
|
||||||
open-pull-request:
|
publish-test-branch:
|
||||||
needs:
|
if: needs.update-flake-hashes.outputs.release_tag == 'snapshot'
|
||||||
- validate-nix-prebuilt
|
needs: [update-flake-hashes, validate-nix-prebuilt]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout GlobalProtect-openconnect
|
- name: Checkout GlobalProtect-openconnect
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.sha }}
|
||||||
|
|
||||||
- name: Download updated flake
|
- name: Download updated flake
|
||||||
uses: actions/download-artifact@v8
|
uses: actions/download-artifact@v8
|
||||||
@@ -140,9 +184,7 @@ jobs:
|
|||||||
name: updated-flake
|
name: updated-flake
|
||||||
path: .
|
path: .
|
||||||
|
|
||||||
- name: Open pull request
|
- name: Publish branch for snapshot testing
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
RELEASE_VERSION: ${{ inputs.version }}
|
run: scripts/publish-flake-test-branch.sh
|
||||||
RELEASE_TAG: ${{ inputs.release_tag }}
|
|
||||||
run: scripts/open-flake-hashes-pr.sh "$RELEASE_VERSION" "$RELEASE_TAG"
|
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
name: Verify public Windows release
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
release_tag:
|
||||||
|
description: Published snapshot or stable release tag
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
version:
|
||||||
|
description: Base product version
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
build:
|
||||||
|
description: Numeric snapshot build; empty for stable
|
||||||
|
type: string
|
||||||
|
gpgui_ref:
|
||||||
|
description: Matching GUI source ref containing the pinned update tools
|
||||||
|
required: true
|
||||||
|
default: release/next
|
||||||
|
type: string
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
verify:
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
architecture: [x64, arm64]
|
||||||
|
runs-on: ${{ matrix.architecture == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
|
||||||
|
timeout-minutes: 20
|
||||||
|
env:
|
||||||
|
RELEASE_TAG: ${{ inputs.release_tag }}
|
||||||
|
PRODUCT_VERSION: ${{ inputs.version }}
|
||||||
|
BUILD_VERSION: ${{ inputs.build }}
|
||||||
|
ARCHITECTURE: ${{ matrix.architecture }}
|
||||||
|
WINDOWS_UPDATE_PUBLIC_KEY: ${{ vars.WINDOWS_UPDATE_PUBLIC_KEY }}
|
||||||
|
WINDOWS_SIGNING_PUBLISHER: ${{ vars.WINDOWS_SIGNING_PUBLISHER }}
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.release_tag == 'snapshot' && 'release/next' || inputs.release_tag }}
|
||||||
|
persist-credentials: false
|
||||||
|
- uses: ./.github/actions/checkout-private
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
ref: ${{ inputs.gpgui_ref }}
|
||||||
|
path: gpgui
|
||||||
|
- name: Download, verify, install and uninstall the public installer
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
if ($env:PRODUCT_VERSION -notmatch '^\d+\.\d+\.\d+$') { throw 'Invalid product version.' }
|
||||||
|
if (!$env:WINDOWS_UPDATE_PUBLIC_KEY -or !$env:WINDOWS_SIGNING_PUBLISHER) { throw 'Configure the update key and signing publisher.' }
|
||||||
|
$displayVersion = $env:PRODUCT_VERSION
|
||||||
|
if ($env:RELEASE_TAG -eq 'snapshot') {
|
||||||
|
if ($env:BUILD_VERSION -notmatch '^\d+(\.\d+){0,2}$') { throw 'Invalid snapshot build.' }
|
||||||
|
$displayVersion += "-snapshot.$env:BUILD_VERSION"
|
||||||
|
} elseif ($env:RELEASE_TAG -ne "v$env:PRODUCT_VERSION" -or $env:BUILD_VERSION) { throw 'Stable release identity does not match.' }
|
||||||
|
$name = "GPConnect_${displayVersion}_windows-$env:ARCHITECTURE-setup.exe"
|
||||||
|
$downloads = Join-Path $env:RUNNER_TEMP 'public-windows-release'
|
||||||
|
New-Item -ItemType Directory $downloads | Out-Null
|
||||||
|
foreach ($asset in @($name, "$name.sha256", "$name.sig")) {
|
||||||
|
gh release download $env:RELEASE_TAG --repo $env:GITHUB_REPOSITORY --pattern $asset --dir $downloads
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "Could not download $asset" }
|
||||||
|
}
|
||||||
|
$installer = Join-Path $downloads $name
|
||||||
|
$sum = (Get-Content "$installer.sha256" -Raw).Trim()
|
||||||
|
if ($sum -notmatch '^([a-fA-F0-9]{64}) (.+)$' -or $Matches[2] -ne $name) { throw 'Invalid checksum file.' }
|
||||||
|
$hash = (Get-FileHash $installer).Hash
|
||||||
|
if ($hash -ne $Matches[1]) { throw 'Installer checksum mismatch.' }
|
||||||
|
if ([Diagnostics.FileVersionInfo]::GetVersionInfo($installer).ProductVersion -ne $displayVersion) { throw 'Installer version mismatch.' }
|
||||||
|
& ./scripts/test-windows-signature.ps1 -Files $installer -Publisher $env:WINDOWS_SIGNING_PUBLISHER
|
||||||
|
. ./gpgui/scripts/windows-updates/Get-WinSparkle.ps1
|
||||||
|
$tools = Get-WinSparkleTools (Join-Path $env:RUNNER_TEMP 'winsparkle-tools') -Architecture $env:ARCHITECTURE
|
||||||
|
$signature = (Get-Content "$installer.sig" -Raw).Trim()
|
||||||
|
& $tools.Tool verify -p $env:WINDOWS_UPDATE_PUBLIC_KEY -s $signature $installer
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Installer update signature is invalid.' }
|
||||||
|
& ./scripts/test-windows-installer.ps1 -Installer $installer -Architecture $env:ARCHITECTURE -Build $env:BUILD_VERSION
|
||||||
|
@{ release = $env:RELEASE_TAG; version = $displayVersion; architecture = $env:ARCHITECTURE;
|
||||||
|
sha256 = $hash.ToLowerInvariant(); publisher = $env:WINDOWS_SIGNING_PUBLISHER;
|
||||||
|
authenticode = 'Valid'; timestamped = $true; update_signature = 'Valid';
|
||||||
|
installed_signatures = 'Valid'; install_uninstall = 'Passed'
|
||||||
|
} | ConvertTo-Json | Set-Content verification.json -Encoding utf8
|
||||||
|
- uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: windows-release-verification-${{ matrix.architecture }}
|
||||||
|
path: verification.json
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 30
|
||||||
@@ -16,3 +16,6 @@ gen
|
|||||||
|
|
||||||
# Nix files
|
# Nix files
|
||||||
result
|
result
|
||||||
|
|
||||||
|
# Packages & test assets
|
||||||
|
*.ipa
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "3"
|
||||||
|
|
||||||
members = [
|
members = [
|
||||||
"crates/*",
|
"crates/*",
|
||||||
@@ -11,7 +11,7 @@ members = [
|
|||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
rust-version = "1.91"
|
rust-version = "1.91"
|
||||||
version = "3.0.4"
|
version = "3.5.0"
|
||||||
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"
|
||||||
@@ -19,47 +19,47 @@ license = "GPL-3.0"
|
|||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
askama = "0.16"
|
askama = { version = "0.16", default-features = false, features = ["std", "derive", "config"] }
|
||||||
base64 = "0.22"
|
base64 = { version = "0.23", default-features = false, features = ["std"] }
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
clap = { version = "4", features = ["derive"] }
|
clap = { version = "4", features = ["derive"] }
|
||||||
clap-verbosity-flag = "3"
|
clap-verbosity-flag = "3"
|
||||||
ctrlc = "3.4"
|
|
||||||
directories = "6.0"
|
directories = "6.0"
|
||||||
dns-lookup = "4.0.2"
|
dns-lookup = "4.0.2"
|
||||||
env_logger = "0.11"
|
env_logger = "0.11"
|
||||||
is_executable = "1.0"
|
is_executable = "1.0"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
regex = "1"
|
# RUST_LOG accepts user-supplied Unicode property filters through env_logger.
|
||||||
reqwest = { version = "0.13", default-features = false, features = ["native-tls", "charset", "http2", "system-proxy", "json", "form", "query"] }
|
regex = { version = "1", default-features = false, features = ["std", "perf", "unicode"] }
|
||||||
|
reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider", "charset", "http2", "system-proxy", "json", "form", "query"] }
|
||||||
openssl = "0.10"
|
openssl = "0.10"
|
||||||
pem = "3"
|
pem = "4"
|
||||||
xmltree = { version = "0.12", features = ["attribute-order"] }
|
xmltree = { version = "0.12", features = ["attribute-order"] }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
# The 0.39 series requires Rust 1.95, above the workspace minimum.
|
# The 0.39 series requires Rust 1.95, above the workspace minimum.
|
||||||
sysinfo = "0.38.4"
|
sysinfo = { version = "0.38.4", default-features = false, features = ["system"] }
|
||||||
tempfile = "3.8"
|
tempfile = "3.8"
|
||||||
tokio = { version = "1" }
|
tokio = { version = "1" }
|
||||||
tokio-util = "0.7"
|
tokio-util = "0.7"
|
||||||
|
tokio-tungstenite = "0.30"
|
||||||
url = "2.4"
|
url = "2.4"
|
||||||
urlencoding = "2.1.3"
|
urlencoding = "2.1.3"
|
||||||
axum = "0.8"
|
axum = { version = "0.8", default-features = false, features = ["http1", "tokio"] }
|
||||||
futures = "0.3"
|
futures = { version = "0.3", default-features = false, features = ["std"] }
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
uzers = "0.12"
|
uzers = "0.12"
|
||||||
whoami = "2"
|
whoami = "2"
|
||||||
thiserror = "2"
|
thiserror = "2"
|
||||||
redact-engine = "0.1"
|
compile-time = "0.4"
|
||||||
compile-time = "0.2"
|
|
||||||
serde_urlencoded = "0.7"
|
serde_urlencoded = "0.7"
|
||||||
md5 = "0.8"
|
md5 = "0.8"
|
||||||
sha256 = "1"
|
sha2 = { version = "0.11", default-features = false }
|
||||||
which = "8"
|
which = "8"
|
||||||
uuid = "1"
|
uuid = "1"
|
||||||
netdev = "0.46.3"
|
netdev = "0.47"
|
||||||
humantime = "2"
|
humantime = "2"
|
||||||
snow = { version = "0.10", default-features = false, features = ["std", "use-getrandom", "use-curve25519", "use-chacha20poly1305", "use-sha2"] }
|
snow = { version = "0.10", default-features = false, features = ["use-getrandom", "use-curve25519", "use-chacha20poly1305", "use-sha2"] }
|
||||||
zeroize = "1"
|
zeroize = "1"
|
||||||
|
|
||||||
# Tauri dependencies
|
# Tauri dependencies
|
||||||
@@ -68,10 +68,10 @@ specta = "=2.0.0-rc.20"
|
|||||||
proptest = "1"
|
proptest = "1"
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
# Restore BSD GTK resize hit testing until https://github.com/tauri-apps/tao/pull/1356 is released.
|
# Restore BSD GTK resize hit testing and apply fixed-size windows before first configure.
|
||||||
tao = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" }
|
tao = { git = "https://github.com/yuezk/tao", rev = "bba0f1c4e86d697b173c75280d1651f408b8023c" }
|
||||||
# Use one macro source for Tao and Wry so Cargo can vendor the workspace.
|
# Use one macro source for Tao and Wry so Cargo can vendor the workspace.
|
||||||
tao-macros = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" }
|
tao-macros = { git = "https://github.com/yuezk/tao", rev = "bba0f1c4e86d697b173c75280d1651f408b8023c" }
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
opt-level = 'z' # Optimize for size
|
opt-level = 'z' # Optimize for size
|
||||||
|
|||||||
@@ -190,8 +190,7 @@ install-unix: install-gpclient-unix
|
|||||||
set -e; if [ -f "$(GPGUI_BINARY)" ]; then \
|
set -e; if [ -f "$(GPGUI_BINARY)" ]; then \
|
||||||
install -m 755 "$(GPGUI_BINARY)" "$(DESTDIR)$(PREFIX)/bin/gpgui"; \
|
install -m 755 "$(GPGUI_BINARY)" "$(DESTDIR)$(PREFIX)/bin/gpgui"; \
|
||||||
fi
|
fi
|
||||||
set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.* \
|
set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.*; do \
|
||||||
packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-*.svg; do \
|
|
||||||
destination="$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \
|
destination="$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \
|
||||||
install -d "$$(dirname "$$destination")"; \
|
install -d "$$(dirname "$$destination")"; \
|
||||||
install -m 644 "$$file" "$$destination"; \
|
install -m 644 "$$file" "$$destination"; \
|
||||||
@@ -200,6 +199,8 @@ install-unix: install-gpclient-unix
|
|||||||
install-linux: install-unix
|
install-linux: install-unix
|
||||||
@echo "Installing Linux integration under $(PREFIX)..."
|
@echo "Installing Linux integration under $(PREFIX)..."
|
||||||
set -e; for file in share/applications/gpgui.desktop \
|
set -e; for file in share/applications/gpgui.desktop \
|
||||||
|
share/applications/gpgui-helper.desktop \
|
||||||
|
share/applications/gpauth.desktop \
|
||||||
share/polkit-1/actions/com.yuezk.gpgui.policy \
|
share/polkit-1/actions/com.yuezk.gpgui.policy \
|
||||||
lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
|
lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
|
||||||
lib/NetworkManager/dispatcher.d/gpclient-nm-hook; do \
|
lib/NetworkManager/dispatcher.d/gpclient-nm-hook; do \
|
||||||
@@ -213,7 +214,7 @@ install-linux: install-unix
|
|||||||
install-bsd: install-unix
|
install-bsd: install-unix
|
||||||
@echo "Installing BSD integration under $(PREFIX)..."
|
@echo "Installing BSD integration under $(PREFIX)..."
|
||||||
install -d "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/polkit-1/actions"
|
install -d "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/polkit-1/actions"
|
||||||
install -m 644 packaging/bsd/gpgui.desktop "$(DESTDIR)$(PREFIX)/share/applications/"
|
install -m 644 packaging/bsd/gpgui.desktop packaging/bsd/gpgui-helper.desktop packaging/bsd/gpauth.desktop "$(DESTDIR)$(PREFIX)/share/applications/"
|
||||||
install -m 644 packaging/bsd/com.yuezk.gpgui.policy "$(DESTDIR)$(PREFIX)/share/polkit-1/actions/"
|
install -m 644 packaging/bsd/com.yuezk.gpgui.policy "$(DESTDIR)$(PREFIX)/share/polkit-1/actions/"
|
||||||
sh scripts/relocate-install-paths.sh "$(PREFIX)" /usr/local "$(DESTDIR)$(PREFIX)"
|
sh scripts/relocate-install-paths.sh "$(PREFIX)" /usr/local "$(DESTDIR)$(PREFIX)"
|
||||||
|
|
||||||
@@ -259,7 +260,9 @@ package-openbsd: clean-bsd-package
|
|||||||
$(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/openbsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)"
|
$(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/openbsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)"
|
||||||
cp packaging/bsd/openbsd/COMMENT .build/openbsd/+COMMENT
|
cp packaging/bsd/openbsd/COMMENT .build/openbsd/+COMMENT
|
||||||
cp packaging/bsd/openbsd/DESC .build/openbsd/+DESC
|
cp packaging/bsd/openbsd/DESC .build/openbsd/+DESC
|
||||||
|
sh scripts/openbsd-library-dependencies.sh .build/openbsd/pkgroot > .build/openbsd/WANTLIB
|
||||||
{ \
|
{ \
|
||||||
|
cat .build/openbsd/WANTLIB; \
|
||||||
echo '@unexec-delete /bin/rm -f /usr/local/libexec/gpclient/gpgui /var/db/gpclient/scripts/vpnc-script /var/db/gpclient/scripts/vpnc-script.metadata || echo "Warning: failed to remove gpclient runtime files" >&2'; \
|
echo '@unexec-delete /bin/rm -f /usr/local/libexec/gpclient/gpgui /var/db/gpclient/scripts/vpnc-script /var/db/gpclient/scripts/vpnc-script.metadata || echo "Warning: failed to remove gpclient runtime files" >&2'; \
|
||||||
echo '@unexec-delete /bin/rmdir /usr/local/libexec/gpclient 2>/dev/null || true'; \
|
echo '@unexec-delete /bin/rmdir /usr/local/libexec/gpclient 2>/dev/null || true'; \
|
||||||
echo '@unexec-delete /bin/rmdir /var/db/gpclient/scripts 2>/dev/null || true'; \
|
echo '@unexec-delete /bin/rmdir /var/db/gpclient/scripts 2>/dev/null || true'; \
|
||||||
@@ -314,11 +317,12 @@ uninstall-unix:
|
|||||||
set -e; for file in gp-hip-script-installer gp-vpnc-script-installer vpnc-script; do \
|
set -e; for file in gp-hip-script-installer gp-vpnc-script-installer vpnc-script; do \
|
||||||
rm -f "$(DESTDIR)$(PREFIX)/libexec/gpclient/$$file"; \
|
rm -f "$(DESTDIR)$(PREFIX)/libexec/gpclient/$$file"; \
|
||||||
done
|
done
|
||||||
set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.* \
|
set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.*; do \
|
||||||
packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-*.svg; do \
|
|
||||||
rm -f "$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \
|
rm -f "$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \
|
||||||
done
|
done
|
||||||
rm -f "$(DESTDIR)$(PREFIX)/share/applications/gpgui.desktop" \
|
rm -f "$(DESTDIR)$(PREFIX)/share/applications/gpgui.desktop" \
|
||||||
|
"$(DESTDIR)$(PREFIX)/share/applications/gpgui-helper.desktop" \
|
||||||
|
"$(DESTDIR)$(PREFIX)/share/applications/gpauth.desktop" \
|
||||||
"$(DESTDIR)$(PREFIX)/share/polkit-1/actions/com.yuezk.gpgui.policy"
|
"$(DESTDIR)$(PREFIX)/share/polkit-1/actions/com.yuezk.gpgui.policy"
|
||||||
rmdir "$(DESTDIR)$(PREFIX)/libexec/gpclient" 2>/dev/null || true
|
rmdir "$(DESTDIR)$(PREFIX)/libexec/gpclient" 2>/dev/null || true
|
||||||
|
|
||||||
@@ -326,6 +330,7 @@ uninstall-linux: uninstall-unix
|
|||||||
rm -f "$(DESTDIR)$(PREFIX)/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down" \
|
rm -f "$(DESTDIR)$(PREFIX)/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down" \
|
||||||
"$(DESTDIR)$(PREFIX)/lib/NetworkManager/dispatcher.d/gpclient-nm-hook"
|
"$(DESTDIR)$(PREFIX)/lib/NetworkManager/dispatcher.d/gpclient-nm-hook"
|
||||||
rm -f "$(DESTDIR)/var/lib/gpclient/gpgui" \
|
rm -f "$(DESTDIR)/var/lib/gpclient/gpgui" \
|
||||||
|
"$(DESTDIR)/var/lib/gpclient/gpgui-nsh" \
|
||||||
"$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script" \
|
"$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script" \
|
||||||
"$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script.metadata"
|
"$(DESTDIR)/var/lib/gpclient/scripts/vpnc-script.metadata"
|
||||||
rmdir "$(DESTDIR)/var/lib/gpclient/scripts" "$(DESTDIR)/var/lib/gpclient" 2>/dev/null || true
|
rmdir "$(DESTDIR)/var/lib/gpclient/scripts" "$(DESTDIR)/var/lib/gpclient" 2>/dev/null || true
|
||||||
@@ -357,7 +362,6 @@ init-debian: clean-debian tarball
|
|||||||
# Remove the GUI dependencies if neither GUI component is included
|
# Remove the GUI dependencies if neither GUI component is included
|
||||||
if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ]; then \
|
if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ]; then \
|
||||||
sed -i "/libsecret-1-0/d" .build/deb/$(PKG)/debian/control; \
|
sed -i "/libsecret-1-0/d" .build/deb/$(PKG)/debian/control; \
|
||||||
sed -i "/libayatana-appindicator3-1/d" .build/deb/$(PKG)/debian/control; \
|
|
||||||
sed -i "/gnome-keyring/d" .build/deb/$(PKG)/debian/control; \
|
sed -i "/gnome-keyring/d" .build/deb/$(PKG)/debian/control; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -470,7 +474,6 @@ init-apk: clean-apk tarball
|
|||||||
|
|
||||||
# Remove the GUI dependencies if neither GUI component is included
|
# Remove the GUI dependencies if neither GUI component is included
|
||||||
if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ]; then \
|
if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ]; then \
|
||||||
sed -i "/^\tlibayatana-appindicator$$/d" .build/apk/APKBUILD; \
|
|
||||||
sed -i "/^\tlibsecret$$/d" .build/apk/APKBUILD; \
|
sed -i "/^\tlibsecret$$/d" .build/apk/APKBUILD; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
# GlobalProtect-openconnect
|
# GlobalProtect-openconnect
|
||||||
|
|
||||||
A GlobalProtect VPN client built on OpenConnect with support for SSO authentication. It provides command-line tools and the GP Connect desktop application for macOS, Linux, FreeBSD, and OpenBSD.
|
A GlobalProtect VPN client built on OpenConnect. GP Connect runs on Windows, macOS, Linux, FreeBSD, and OpenBSD.
|
||||||
|
|
||||||
|
> **Disclaimer**: GP Connect is an independent third-party client for GlobalProtect VPN networks. It is not affiliated with or endorsed by Palo Alto Networks, Inc.
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img width="300" src="https://github.com/user-attachments/assets/2fb6116c-dc57-43f2-af75-9c3d97ab7122">
|
<picture>
|
||||||
|
<source media="(prefers-color-scheme: dark)" srcset="docs/images/gp-connect-showcase-dark.png">
|
||||||
|
<source media="(prefers-color-scheme: light)" srcset="docs/images/gp-connect-showcase-light.png">
|
||||||
|
<img alt="GP Connect Desktop" src="docs/images/gp-connect-showcase-light.png" width="640">
|
||||||
|
</picture>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
> **Inspired by** [gp-saml-gui](https://github.com/dlenski/gp-saml-gui)
|
> **Inspired by** [gp-saml-gui](https://github.com/dlenski/gp-saml-gui)
|
||||||
@@ -15,146 +21,100 @@ A GlobalProtect VPN client built on OpenConnect with support for SSO authenticat
|
|||||||
- [Command-Line Interface](#command-line-interface)
|
- [Command-Line Interface](#command-line-interface)
|
||||||
- [Graphical User Interface](#graphical-user-interface)
|
- [Graphical User Interface](#graphical-user-interface)
|
||||||
- [Installation](#installation)
|
- [Installation](#installation)
|
||||||
|
- [Windows](#windows)
|
||||||
- [macOS](#macos)
|
- [macOS](#macos)
|
||||||
- [Debian / Ubuntu](#debian--ubuntu)
|
- [Debian / Ubuntu](#debian--ubuntu)
|
||||||
- [Arch Linux / Manjaro](#arch-linux--manjaro)
|
- [Arch Linux / Manjaro](#arch-linux--manjaro)
|
||||||
- [Fedora 38+ / Rawhide](#fedora-38--rawhide)
|
- [Fedora / RHEL](#fedora--rhel)
|
||||||
- [openSUSE Leap 15.6+ / Tumbleweed](#opensuse-leap-156--tumbleweed)
|
- [openSUSE](#opensuse)
|
||||||
- [Other RPM-based Distributions](#other-rpm-based-distributions)
|
|
||||||
- [Alpine Linux](#alpine-linux)
|
- [Alpine Linux](#alpine-linux)
|
||||||
- [FreeBSD](#freebsd)
|
- [FreeBSD](#freebsd)
|
||||||
- [OpenBSD](#openbsd)
|
- [OpenBSD](#openbsd)
|
||||||
- [Gentoo](#gentoo)
|
- [Gentoo](#gentoo)
|
||||||
- [NixOS](#nixos)
|
- [NixOS](#nixos)
|
||||||
- [Official Docker Image](#official-docker-image)
|
- [Docker](#docker)
|
||||||
- [Other Distributions](#other-distributions)
|
- [Other Distributions](#other-distributions)
|
||||||
- [Building from Source](#building-from-source)
|
- [Building from Source](#building-from-source)
|
||||||
- [Frequently Asked Questions](#frequently-asked-questions)
|
- [Troubleshooting](#troubleshooting)
|
||||||
- [NetworkManager Integration](#networkmanager-integration)
|
- [NetworkManager Integration](#networkmanager-integration)
|
||||||
- [Licensing](#licensing)
|
- [Licensing](#licensing)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- **Desktop Platform Support** – macOS, Linux, FreeBSD, and OpenBSD
|
- **Multi-Platform** – Windows (x64 and ARM64), macOS (Apple silicon), Linux, FreeBSD, and OpenBSD
|
||||||
- **Dual Interface** – Available as both CLI and GUI applications
|
- **Dual Interfaces** – Desktop GUI (**GP Connect**) and terminal CLI (`gpclient`, on macOS, Linux, and BSD)
|
||||||
- **Flexible Authentication** – Supports SSO, non-SSO, FIDO2 (e.g., YubiKey), and client certificate authentication
|
- **Native Shell on Linux** – Ultra-low-memory native desktop GUI alongside the webview interface
|
||||||
- **Browser Integration** – Authenticate using your default browser or any specified browser
|
- **Flexible Routing** – Full System VPN tunnel or local SOCKS5 proxy mode
|
||||||
- **Multi-Portal Support** – Connect to multiple portals and gateways
|
- **Modern Authentication** – SAML / SSO, MFA, FIDO2 (YubiKey), client certificates, and external browser login
|
||||||
- **Direct Gateway Connection** – Bypass portal selection when needed
|
- **Automated HIP Reports** – Built-in HIP report generation or custom scripts
|
||||||
- **Auto-Connect** – Automatically connect on system startup
|
- **Multi-Portal & Direct Gateway** – Manage multiple saved portals or connect directly to a gateway
|
||||||
- **System Tray Integration** – Convenient system tray icon (requires [gnome-shell-extension-appindicator](https://extensions.gnome.org/extension/615/appindicator-support/) on GNOME)
|
- **Desktop Integration** – Theme-aware system tray icon, auto-connect on launch, and reconnect on wake
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
### Command-Line Interface
|
### Command-Line Interface
|
||||||
|
|
||||||
The CLI is free and open source. Use it to authenticate, connect to portals or gateways, and generate HIP reports from the terminal.
|
On macOS, Linux, and BSD, the open-source `gpclient` CLI handles authentication, connection lifecycle, and HIP generation:
|
||||||
|
|
||||||
#### Basic Commands
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
Usage: gpclient [OPTIONS] <COMMAND>
|
# Connect to a portal server
|
||||||
|
sudo gpclient connect <portal>
|
||||||
|
|
||||||
Commands:
|
# Connect using browser authentication (SSO / SAML)
|
||||||
connect Connect to a portal server
|
|
||||||
disconnect Disconnect from the server
|
|
||||||
launch-gui Launch the GUI
|
|
||||||
hip Generate HIP report
|
|
||||||
help Print this message or the help of the given subcommand(s)
|
|
||||||
|
|
||||||
Options:
|
|
||||||
--fix-openssl Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats.
|
|
||||||
--ignore-tls-errors Ignore the TLS errors
|
|
||||||
--lock-file <LOCK_FILE> Path to the gpclient PID lock file
|
|
||||||
--log-format <LOG_FORMAT> Log output format. JSON is intended for non-interactive consumers; interactive prompts remain text. [default: text] [possible values: text, json]
|
|
||||||
-v, --verbose... Enable verbose output, -v for debug, -vv for trace
|
|
||||||
-q, --quiet... Decrease logging verbosity, -q for warnings, -qq for errors
|
|
||||||
-h, --help Print help (see more with '--help')
|
|
||||||
-V, --version Print version
|
|
||||||
```
|
|
||||||
|
|
||||||
> **Tip:** Use `gpclient help <command>` for detailed information on a specific command.
|
|
||||||
|
|
||||||
#### HIP reports
|
|
||||||
|
|
||||||
HIP is disabled in the CLI unless enabled explicitly. Use `--hip` to generate reports inside `gpclient`, including later reports requested by the gateway:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo gpclient connect <portal> --hip
|
|
||||||
```
|
|
||||||
|
|
||||||
Use `--hip=/absolute/path/to/script` for a custom executable. It runs as the `gpclient` process user unless `--hip-user` specifies another user. No installed HIP script is discovered automatically. `--hip-user` applies only to custom executables.
|
|
||||||
|
|
||||||
`gpclient hip` generates a report on demand for inspection; see `gpclient hip --help` for report inputs. The GUI's HIP tab supports generated reports, edited XML, and HIP Off on all desktop platforms. Linux, FreeBSD, and OpenBSD also support desktop-user scripts and explicitly approved root scripts.
|
|
||||||
|
|
||||||
#### External Browser Authentication
|
|
||||||
|
|
||||||
Use `gpclient` directly for browser-based authentication. It opens the browser as your normal desktop user while keeping VPN tunnel setup privileged:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo gpclient connect <portal> --browser
|
sudo gpclient connect <portal> --browser
|
||||||
|
|
||||||
|
# Connect directly to a gateway server
|
||||||
|
sudo gpclient connect <gateway> --as-gateway
|
||||||
|
|
||||||
|
# Connect with automatic HIP report generation
|
||||||
|
sudo gpclient connect <portal> --hip
|
||||||
|
|
||||||
|
# Headless / remote server authentication (prints auth URL to open in any browser)
|
||||||
|
sudo gpclient connect <portal> --browser manual
|
||||||
|
|
||||||
|
# Disconnect
|
||||||
|
sudo gpclient disconnect
|
||||||
```
|
```
|
||||||
|
|
||||||
To reuse a saved portal cookie for later connections, add `--cookie-cache`:
|
Run `gpclient --help` or `gpclient <command> --help` to view all available commands and options.
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo gpclient connect <portal> --browser --cookie-cache
|
|
||||||
```
|
|
||||||
|
|
||||||
Add `--gateway <gateway>` to select a particular gateway. Cookie caching is handled by `gpclient`. Its default cache file is `$HOME/.config/gpclient/cookie.json`, which normally belongs to root when running with `sudo`. To choose a predictable location, specify the path explicitly:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo gpclient connect <portal> --browser --cookie-cache=/absolute/path/to/cookie.json
|
|
||||||
```
|
|
||||||
|
|
||||||
**Browser Options:**
|
|
||||||
|
|
||||||
- Use `--browser` to try your recognized default browser first, then another detected browser, and finally the system URL handler
|
|
||||||
- Use `--browser default` to use the system default browser
|
|
||||||
- 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
|
|
||||||
|
|
||||||
### Graphical User Interface
|
### Graphical User Interface
|
||||||
|
|
||||||
GP Connect provides a desktop interface for managing VPN connections. On macOS, open GP Connect from Applications. On Linux, FreeBSD, and OpenBSD, launch it from your application menu or via the terminal:
|
- **Windows**: Open **GP Connect** from the Start menu.
|
||||||
|
- **macOS**: Open **GP Connect** from Applications.
|
||||||
|
- **Linux / BSD**: Launch GP Connect from your application menu or run:
|
||||||
|
```bash
|
||||||
|
gpclient launch-gui
|
||||||
|
```
|
||||||
|
|
||||||
```bash
|
> [!TIP]
|
||||||
gpclient launch-gui
|
> **On Linux, try Native Shell for lower memory usage.** Switch between Native Shell and Tauri in **Settings → General → Interface**.
|
||||||
```
|
|
||||||
|
|
||||||
> [!Note]
|
|
||||||
>
|
|
||||||
> The GUI version is partially open source. The background service ([gpservice](./apps/gpservice/)) is open source, while the GUI wrapper is proprietary.
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
> [!Note]
|
### Windows
|
||||||
>
|
|
||||||
> For older Linux distributions, use [v2.3.13](https://github.com/yuezk/GlobalProtect-openconnect/releases/tag/v2.3.13) instead of the latest release. It provides release assets for common distro families, including Debian/Ubuntu (`.deb`), Arch Linux / Manjaro (`.pkg.tar.zst`), RPM-based distros such as Fedora / RHEL / Rocky / AlmaLinux / CentOS (`.rpm`), and generic Linux tarballs (`.bin.tar.xz`).
|
1. Download the **x64** or **ARM64** installer for your PC from [GitHub Releases](https://github.com/yuezk/GlobalProtect-openconnect/releases/latest).
|
||||||
|
2. Run the installer and approve the administrator prompt.
|
||||||
|
3. Open **GP Connect** from the Start menu.
|
||||||
|
|
||||||
### macOS
|
### macOS
|
||||||
|
|
||||||
GP Connect requires Apple silicon and macOS 13 or later. The macOS app includes both the desktop application and the free `gpclient` CLI. The CLI does not require a GUI license.
|
Requires Apple silicon and macOS 13+. Includes both GP Connect and the `gpclient` CLI.
|
||||||
|
|
||||||
#### Option 1: Install with Homebrew
|
#### Option 1: Homebrew (Recommended)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
brew install --cask yuezk/gp-connect/gp-connect
|
brew install --cask yuezk/gp-connect/gp-connect
|
||||||
```
|
```
|
||||||
|
|
||||||
Open GP Connect from Applications, or connect from the terminal:
|
#### Option 2: DMG Installer
|
||||||
|
|
||||||
```bash
|
Download the `.dmg` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page and drag GP Connect into Applications.
|
||||||
sudo gpclient connect <portal> --browser
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Option 2: Install from DMG
|
|
||||||
|
|
||||||
Download the GP Connect `.dmg` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, open it, and drag GP Connect into Applications.
|
|
||||||
|
|
||||||
### Debian / Ubuntu
|
### Debian / Ubuntu
|
||||||
|
|
||||||
#### Option 1: Install from PPA (Recommended)
|
#### Option 1: PPA (Recommended)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo add-apt-repository ppa:yuezk/globalprotect-openconnect
|
sudo add-apt-repository ppa:yuezk/globalprotect-openconnect
|
||||||
@@ -162,384 +122,152 @@ sudo apt-get update
|
|||||||
sudo apt-get install globalprotect-openconnect
|
sudo apt-get install globalprotect-openconnect
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!Note]
|
#### Option 2: DEB Package
|
||||||
>
|
|
||||||
> **For Linux Mint users:** If you encounter a GPG key error, import the key manually:
|
|
||||||
> ```bash
|
|
||||||
> sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7937C393082992E5D6E4A60453FC26B43838D761
|
|
||||||
> ```
|
|
||||||
|
|
||||||
#### Option 2: Install from DEB Package
|
Download the latest `.deb` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
||||||
|
|
||||||
Download the latest `.deb` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apt install --fix-broken ./globalprotect-openconnect_*.deb
|
sudo apt install ./globalprotect-openconnect_*.deb
|
||||||
```
|
```
|
||||||
|
|
||||||
### Arch Linux / Manjaro
|
### Arch Linux / Manjaro
|
||||||
|
|
||||||
#### Option 1: Install from AUR
|
|
||||||
|
|
||||||
Package: [globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/)
|
|
||||||
|
|
||||||
You can install it using an AUR helper like [`yay`](https://github.com/Jguer/yay):
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
# Official Extra repository
|
||||||
|
sudo pacman -S globalprotect-openconnect
|
||||||
|
|
||||||
|
# AUR (git main)
|
||||||
yay -S globalprotect-openconnect-git
|
yay -S globalprotect-openconnect-git
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Option 2: Install from the Official Extra Repository
|
### Fedora / RHEL
|
||||||
|
|
||||||
The package is also available in the official Arch Linux Extra repository.
|
Enable the COPR repository:
|
||||||
|
|
||||||
Package: [globalprotect-openconnect](https://archlinux.org/packages/extra/x86_64/globalprotect-openconnect/)
|
|
||||||
|
|
||||||
> [!Note]
|
|
||||||
>
|
|
||||||
> Since the official package does not include the system tray support dependency, you need to install `libappindicator` manually:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo pacman -S libappindicator globalprotect-openconnect
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Option 3: Install from Package
|
|
||||||
|
|
||||||
Download the latest package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo pacman -U globalprotect-openconnect-*.pkg.tar.zst
|
|
||||||
```
|
|
||||||
|
|
||||||
### Fedora 38+ / Rawhide
|
|
||||||
|
|
||||||
#### Install from COPR
|
|
||||||
|
|
||||||
The package is available on [COPR](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/) for RPM-based distributions:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo dnf copr enable yuezk/globalprotect-openconnect
|
sudo dnf copr enable yuezk/globalprotect-openconnect
|
||||||
sudo dnf install globalprotect-openconnect
|
sudo dnf install globalprotect-openconnect
|
||||||
```
|
```
|
||||||
|
|
||||||
### openSUSE Leap 15.6+ / Tumbleweed
|
### openSUSE
|
||||||
|
|
||||||
#### Install from OBS (openSUSE Build Service)
|
Packages are available on the [openSUSE Build Service](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect). Follow the [OBS instructions](https://software.opensuse.org/download.html?project=home%3Ayuezk&package=globalprotect-openconnect) for your distribution.
|
||||||
|
|
||||||
Packages are available on the [openSUSE Build Service](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect). Follow the [installation instructions](https://software.opensuse.org//download.html?project=home%3Ayuezk&package=globalprotect-openconnect) for your distribution.
|
|
||||||
|
|
||||||
### Other RPM-based Distributions
|
|
||||||
|
|
||||||
#### Install from RPM Package
|
|
||||||
|
|
||||||
Download the latest RPM package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo rpm -i globalprotect-openconnect-*.rpm
|
|
||||||
```
|
|
||||||
|
|
||||||
### Alpine Linux
|
### Alpine Linux
|
||||||
|
|
||||||
Download the latest `.apk` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
|
Download the latest `.apk` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apk add --allow-untrusted globalprotect-openconnect-*.apk
|
sudo apk add --allow-untrusted globalprotect-openconnect-*.apk
|
||||||
```
|
```
|
||||||
|
|
||||||
The package uses Alpine's native musl build. Make sure the `community` repository is enabled so GUI dependencies such as `webkit2gtk-4.1`, `libsecret`, and `libayatana-appindicator` can be resolved. GUI-launched connections use polkit, and VPN tunnel creation requires `/dev/net/tun`.
|
*(Requires the `community` repository for WebKitGTK dependencies).*
|
||||||
|
|
||||||
### FreeBSD
|
### FreeBSD
|
||||||
|
|
||||||
Download the latest FreeBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
|
Download the latest FreeBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo pkg install ./globalprotect-openconnect-*-freebsd-*.pkg
|
sudo pkg install ./globalprotect-openconnect-*-freebsd-*.pkg
|
||||||
```
|
```
|
||||||
|
|
||||||
To build from source, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md).
|
|
||||||
|
|
||||||
### OpenBSD
|
### OpenBSD
|
||||||
|
|
||||||
Download the latest OpenBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
|
Download the latest OpenBSD package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
doas pkg_add -D unsigned ./globalprotect-openconnect-*-openbsd-*.tgz
|
doas pkg_add -D unsigned ./globalprotect-openconnect-*-openbsd-*.tgz
|
||||||
```
|
```
|
||||||
|
|
||||||
To build from source, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md).
|
|
||||||
|
|
||||||
### Gentoo
|
### Gentoo
|
||||||
|
|
||||||
Available via the `guru` and `lamdness` overlays:
|
Available via the `guru` repository:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo eselect repository enable guru
|
sudo eselect repository enable guru
|
||||||
sudo emerge --sync guru
|
sudo emerge --sync guru
|
||||||
sudo emerge --ask --verbose net-vpn/GlobalProtect-openconnect
|
sudo emerge --ask net-vpn/GlobalProtect-openconnect
|
||||||
```
|
```
|
||||||
|
|
||||||
### NixOS
|
### NixOS
|
||||||
|
|
||||||
This repository includes a flake for NixOS integration.
|
Add the flake to your `flake.nix`:
|
||||||
|
|
||||||
#### Installation Steps
|
|
||||||
|
|
||||||
Add the flake input and NixOS module to your `flake.nix`:
|
|
||||||
|
|
||||||
The module builds the package with your NixOS configuration's `pkgs`, so the
|
|
||||||
GlobalProtect GUI and the system use the same Nixpkgs dependency versions.
|
|
||||||
It also enables Polkit and its setuid `pkexec` wrapper for privileged operations.
|
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs.globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect";
|
||||||
# ... other inputs
|
|
||||||
globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs, globalprotect-openconnect, ... }:
|
outputs = { self, nixpkgs, globalprotect-openconnect, ... }: {
|
||||||
let
|
nixosConfigurations.<hostname> = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux"; # or "aarch64-linux" for ARM64
|
modules = [
|
||||||
hostname = "<your-host>";
|
globalprotect-openconnect.nixosModules.default
|
||||||
in {
|
{
|
||||||
nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
|
programs.globalprotect-openconnect.enable = true;
|
||||||
inherit system;
|
}
|
||||||
|
];
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
globalprotect-openconnect.nixosModules.default
|
|
||||||
{
|
|
||||||
programs.globalprotect-openconnect.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
nixpkgs.legacyPackages.${system}.gnomeExtensions.appindicator
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Apply:
|
Apply changes:
|
||||||
|
|
||||||
```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:
|
### Docker
|
||||||
|
|
||||||
```bash
|
Run the CLI client in an official Alpine container:
|
||||||
gnome-extensions enable [email protected]
|
|
||||||
```
|
|
||||||
|
|
||||||
NixOS does not run an imperative package-uninstall hook when a package is
|
|
||||||
removed from the system configuration. Remove an installed replacement VPN
|
|
||||||
script from the app settings before removing the package.
|
|
||||||
|
|
||||||
The `prebuilt` package and NixOS module use the published release pinned in `flake.nix`. Both `prebuilt` and `fromSource` run natively on the host with packaged dependencies and installer paths. The `fromSource` package builds the current flake checkout, including its Git submodules:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git submodule update --init --recursive
|
|
||||||
nix build "git+file://$PWD?submodules=1#fromSource"
|
|
||||||
```
|
|
||||||
|
|
||||||
Local source builds require initialized Git submodules and a flake URL with `submodules=1`, as shown above. For a remote source flake, use a Git URL with submodules enabled, such as `git+https://github.com/yuezk/GlobalProtect-openconnect?submodules=1#fromSource`. The `prebuilt` package and NixOS module do not require Git submodules. Build output (`target`, `.build`, and `node_modules`) is excluded from the source input. Updating release asset hashes changes the prebuilt package, independently of source builds.
|
|
||||||
|
|
||||||
### Official Docker Image
|
|
||||||
|
|
||||||
The [official Docker image](https://hub.docker.com/r/yuezk/globalprotect-openconnect) provides the CLI tools on Alpine Linux:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker pull yuezk/globalprotect-openconnect:<version>
|
|
||||||
```
|
|
||||||
|
|
||||||
Release images are tagged as `vX.Y.Z`, `X.Y.Z`, and `latest`.
|
|
||||||
|
|
||||||
Run it with access to the TUN device:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \
|
docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \
|
||||||
yuezk/globalprotect-openconnect:<version> \
|
yuezk/globalprotect-openconnect:latest \
|
||||||
connect <portal>
|
connect <portal> --browser manual
|
||||||
```
|
```
|
||||||
|
|
||||||
For browser authentication in a headless environment, use remote browser authentication:
|
*(Add `--network host` on Linux if VPN routes should apply to the host network).*
|
||||||
|
|
||||||
```bash
|
|
||||||
docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \
|
|
||||||
yuezk/globalprotect-openconnect:<version> \
|
|
||||||
connect <portal> --browser remote
|
|
||||||
```
|
|
||||||
|
|
||||||
On a host with multiple network interfaces, use `--browser-listen` to select the IP address reachable from the browser machine:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
gpclient connect <portal> --browser remote --browser-listen 192.168.107.15
|
|
||||||
```
|
|
||||||
|
|
||||||
On a Linux host, add host networking if the VPN routes should affect the host network namespace:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker run --rm -it --network host --cap-add=NET_ADMIN --device=/dev/net/tun \
|
|
||||||
yuezk/globalprotect-openconnect:<version> \
|
|
||||||
connect <portal> --browser remote
|
|
||||||
```
|
|
||||||
|
|
||||||
Without `--network host`, the VPN connection stays inside the container's network namespace. Docker Desktop on macOS and Windows does not make the host use the VPN through `--network host`; run `gpclient` on the host or use a container gateway setup for host traffic.
|
|
||||||
|
|
||||||
The image includes `gpclient` and `gpauth` only. It does not include embedded webview authentication, `gpgui-helper`, or `gpgui`.
|
|
||||||
|
|
||||||
### Other Distributions
|
### Other Distributions
|
||||||
|
|
||||||
#### Manual Installation
|
Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
||||||
|
|
||||||
1. **Install dependencies:**
|
```bash
|
||||||
- WebKitGTK 4.1 (for example, `libwebkit2gtk-4.1-0` on Debian/Ubuntu)
|
tar -xJf globalprotect-openconnect_*.bin.tar.xz
|
||||||
- `libsecret`
|
cd globalprotect-openconnect_*
|
||||||
- `libayatana-appindicator` or `libappindicator-gtk3`
|
sudo make install
|
||||||
- polkit (`pkexec`) for GUI-launched VPN connections
|
```
|
||||||
|
|
||||||
2. **Download and extract:**
|
|
||||||
Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
|
|
||||||
```bash
|
|
||||||
tar -xJf globalprotect-openconnect_${version}_${arch}.bin.tar.xz
|
|
||||||
cd globalprotect-openconnect_${version}
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Install:**
|
|
||||||
```bash
|
|
||||||
sudo make install
|
|
||||||
```
|
|
||||||
|
|
||||||
## Building from Source
|
## Building from Source
|
||||||
|
|
||||||
The instructions below build the open-source components on Linux. For FreeBSD and OpenBSD, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md).
|
### Prerequisites (Linux)
|
||||||
|
|
||||||
### Method 1: Using DevContainer
|
- [Rust](https://www.rust-lang.org/tools/install) 1.91 or later
|
||||||
|
- Build tools: `make`, `pkg-config`, `autoconf`, `automake`, `libtool`, `gettext`
|
||||||
|
- Libraries: `gmp`, `gnutls`, `nettle`, `libxml2`, `zlib`, `lz4`, `p11-kit`, `libsecret`, and `webkit2gtk-4.1` (or GTK 4 for Native Shell)
|
||||||
|
- Polkit (`pkexec`) for privileged tunnel setup
|
||||||
|
|
||||||
This project includes a DevContainer configuration for Linux development. The repository's `rust-toolchain.toml` selects the Rust toolchain; rustup may need to download it on the first build.
|
*(For FreeBSD and OpenBSD instructions, see [Building from Source on FreeBSD and OpenBSD](docs/bsd-source-build.md)).*
|
||||||
|
|
||||||
#### Prerequisites
|
### Build Steps
|
||||||
|
|
||||||
- [Docker](https://docs.docker.com/get-docker/)
|
|
||||||
- [Visual Studio Code](https://code.visualstudio.com/) (optional, for IDE support)
|
|
||||||
- [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) (if using VS Code)
|
|
||||||
|
|
||||||
#### Build Steps
|
|
||||||
|
|
||||||
1. **Clone the repository:**
|
|
||||||
```bash
|
|
||||||
git clone https://github.com/yuezk/GlobalProtect-openconnect.git
|
|
||||||
cd GlobalProtect-openconnect
|
|
||||||
git submodule update --init --recursive
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Build the DevContainer image:**
|
|
||||||
```bash
|
|
||||||
docker build -t gpoc-devcontainer .devcontainer/
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Build the project:**
|
|
||||||
|
|
||||||
To build the open-source components, including the GUI helper, run:
|
|
||||||
```bash
|
|
||||||
docker run --privileged --cap-add=NET_ADMIN --device=/dev/net/tun \
|
|
||||||
--tty -v "$(pwd)":/workspace -w /workspace gpoc-devcontainer \
|
|
||||||
bash -c "export PATH=/usr/local/cargo/bin:\$PATH && make build"
|
|
||||||
```
|
|
||||||
To build without the GUI helper run the same command as above, but with `BUILD_GUI_HELPER=0` passed as an argument to `make`.
|
|
||||||
|
|
||||||
4. **Locate build artifacts:**
|
|
||||||
|
|
||||||
The compiled binaries will be available in `target/release/`:
|
|
||||||
- `gpclient` – CLI client
|
|
||||||
- `gpservice` – Background service
|
|
||||||
- `gpauth` – Authentication helper
|
|
||||||
- `gpgui-helper` – GUI helper
|
|
||||||
- `gp-hip-script-installer` – Privileged HIP script installer
|
|
||||||
- `gp-vpnc-script-installer` – Privileged VPN script installer
|
|
||||||
|
|
||||||
The proprietary GP Connect desktop application is distributed separately. Use `INCLUDE_GUI=1` with `make build` to download its matching published Linux build for installation.
|
|
||||||
|
|
||||||
#### Alternative: Using VS Code
|
|
||||||
|
|
||||||
1. Open the project in VS Code
|
|
||||||
2. When prompted, click "Reopen in Container" (or run **Dev Containers: Reopen in Container**)
|
|
||||||
3. Once the container is ready, open a terminal and run:
|
|
||||||
```bash
|
|
||||||
make build
|
|
||||||
```
|
|
||||||
|
|
||||||
### Method 2: Local Development Build
|
|
||||||
|
|
||||||
#### Prerequisites
|
|
||||||
|
|
||||||
- [Rust 1.91 or later](https://www.rust-lang.org/tools/install)
|
|
||||||
- [Tauri dependencies](https://tauri.app/start/prerequisites/)
|
|
||||||
- OpenConnect source-build dependencies: `autoconf`, `automake`, `autopoint`/`gettext`, `libtool`, `patch`, `pkg-config`, `libxml2`, `zlib`, `lz4`, `gnutls`, `p11-kit`, `nettle`, and `gmp` development packages
|
|
||||||
- `pkexec` and `gnome-keyring` (or `pam_kwallet` on KDE)
|
|
||||||
- Node.js and pnpm if rebuilding the GUI helper frontend
|
|
||||||
|
|
||||||
#### Build Steps
|
|
||||||
|
|
||||||
1. **Download source code:**
|
|
||||||
|
|
||||||
Download `globalprotect-openconnect-${version}.tar.gz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
|
|
||||||
|
|
||||||
2. **Extract and build:**
|
|
||||||
```bash
|
|
||||||
tar -xzf globalprotect-openconnect-${version}.tar.gz
|
|
||||||
cd globalprotect-openconnect-${version}
|
|
||||||
make build
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Install:**
|
|
||||||
```bash
|
|
||||||
sudo make install
|
|
||||||
```
|
|
||||||
|
|
||||||
To stage the files for packaging instead of installing them into the system, use `make install DESTDIR=/absolute/path/to/staging`.
|
|
||||||
|
|
||||||
### Testing Your Build
|
|
||||||
|
|
||||||
Verify the CLI client is working correctly:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./target/release/gpclient --help
|
git clone --recursive https://github.com/yuezk/GlobalProtect-openconnect.git
|
||||||
|
cd GlobalProtect-openconnect
|
||||||
|
make build
|
||||||
|
sudo make install
|
||||||
```
|
```
|
||||||
|
|
||||||
### Build Options
|
**Build Options:**
|
||||||
|
|
||||||
- `BUILD_GUI_HELPER=0` – Skip building and installing the GUI helper
|
- `INCLUDE_GUI=1` – Download and install the matching desktop application bundle.
|
||||||
- `BUILD_WEBVIEW_AUTH=0` – Build `gpauth` without embedded browser authentication; use an external or remote browser
|
- `BUILD_WEBVIEW_AUTH=0` – Build `gpauth` without embedded browser authentication (uses external browser or manual mode).
|
||||||
- `INCLUDE_GUI=1` – Download the matching published Linux desktop application for installation
|
- `BUILD_GUI_HELPER=0` – Skip building the helper UI.
|
||||||
- `OFFLINE=1` – Build in offline mode using vendored dependencies
|
|
||||||
|
|
||||||
## Frequently Asked Questions
|
## Troubleshooting
|
||||||
|
|
||||||
When reporting a problem, follow the [diagnostics collection instructions](docs/diagnostics.md). A standalone script is available for versions without the diagnostics command; you do not need to upgrade first.
|
- **Headless / Remote Login**: When running without a desktop display or over SSH, use `--browser manual`. Open the printed URL in any browser and paste the callback URL back into the terminal.
|
||||||
|
- **Diagnostics**: If you encounter issues, run `gpclient diagnostics` or follow the [diagnostics guide](docs/diagnostics.md) when opening an issue.
|
||||||
### Q: How do I resolve the "Secure Storage not ready" error?
|
|
||||||
|
|
||||||
Unlock your desktop keyring and ensure the application can access it. On Linux and BSD, check that a keyring service such as GNOME Keyring is installed and running in your desktop session. On macOS, check Keychain access.
|
|
||||||
|
|
||||||
Linux and BSD can use file storage when secure storage is unavailable during initial setup. An existing configuration that uses the keyring still needs access to that keyring.
|
|
||||||
|
|
||||||
See related issues: [#321](https://github.com/yuezk/GlobalProtect-openconnect/issues/321), [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)
|
|
||||||
|
|
||||||
### Q: How do I fix the "cannot open display" error when using CLI?
|
|
||||||
|
|
||||||
Run the client from a terminal in your normal desktop session and use an external browser:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo gpclient connect <portal> --browser
|
|
||||||
```
|
|
||||||
|
|
||||||
See related issue: [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)
|
|
||||||
|
|
||||||
On a headless server, use `--browser remote` and complete authentication from another machine.
|
|
||||||
|
|
||||||
## NetworkManager Integration
|
## NetworkManager Integration
|
||||||
|
|
||||||
@@ -548,14 +276,10 @@ On a headless server, use `--browser remote` and complete authentication from an
|
|||||||
|
|
||||||
## Licensing
|
## Licensing
|
||||||
|
|
||||||
### Trial and Pricing
|
- **CLI (`gpclient`)**: Free and open source (GPL-3.0).
|
||||||
|
- **GUI (GP Connect)**: Commercial desktop application with a free trial.
|
||||||
|
|
||||||
The **CLI version** is completely free and open source.
|
### Open Source Components
|
||||||
The **GUI version** is a paid application with a **7-day trial**. Start the trial in the app by verifying your email address with a one-time code. Installing the app alone does not start the trial.
|
|
||||||
|
|
||||||
### Open Source Licenses
|
|
||||||
|
|
||||||
This project consists of multiple components, each with its own license:
|
|
||||||
|
|
||||||
| Component | Type | License |
|
| Component | Type | License |
|
||||||
|-----------|------|---------|
|
|-----------|------|---------|
|
||||||
|
|||||||
@@ -21,11 +21,8 @@ clap.workspace = true
|
|||||||
log.workspace = true
|
log.workspace = true
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
tokio = { workspace = true, features = ["rt-multi-thread"] }
|
tokio = { workspace = true, features = ["rt-multi-thread"] }
|
||||||
tempfile.workspace = true
|
|
||||||
compile-time.workspace = true
|
compile-time.workspace = true
|
||||||
|
|
||||||
home = "0.5.12"
|
|
||||||
|
|
||||||
# webview auth dependencies
|
# webview auth dependencies
|
||||||
tauri = { workspace = true, optional = true }
|
tauri = { workspace = true, optional = true }
|
||||||
|
|
||||||
@@ -33,3 +30,6 @@ tauri = { workspace = true, optional = true }
|
|||||||
default = ["webview-auth"]
|
default = ["webview-auth"]
|
||||||
webview-auth = ["auth/webview-auth", "dep:tauri", "dep:tauri-build"]
|
webview-auth = ["auth/webview-auth", "dep:tauri", "dep:tauri-build"]
|
||||||
release-devtools = ["auth/release-devtools"]
|
release-devtools = ["auth/release-devtools"]
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
tempfile.workspace = true
|
||||||
@@ -16,6 +16,9 @@ fn main() {
|
|||||||
resolve_commit(&repo_root, &source_commit)
|
resolve_commit(&repo_root, &source_commit)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
#[cfg(all(windows, feature = "webview-auth"))]
|
||||||
|
println!("cargo:rerun-if-changed=icons/windows/icon.ico");
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
tauri_build::build()
|
tauri_build::build()
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 58 KiB |
|
After Width: | Height: | Size: 47 KiB |
@@ -1,23 +1,23 @@
|
|||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
use auth::forward_auth_callback;
|
use auth::forward_auth_callback;
|
||||||
use auth::{BrowserAuthenticator, auth_prelogin};
|
use auth::{BrowserAuthenticator, auth_prelogin};
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
use clap::Subcommand;
|
use clap::Subcommand;
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
use gpapi::auth::AuthWindowTheme;
|
use gpapi::auth::AuthWindowTheme;
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
auth::{AuthenticationCancelled, SamlAuthData, SamlAuthResult},
|
auth::{AuthenticationCancelled, SamlAuthData, SamlAuthResult},
|
||||||
clap::{Args, InfoLevelVerbosity, args::Os, handle_error},
|
clap::{Args, InfoLevelVerbosity, args::Os, handle_error},
|
||||||
|
error::ServerTlsError,
|
||||||
gp_params::GpParams,
|
gp_params::GpParams,
|
||||||
log_format::LogFormat,
|
log_format::LogFormat,
|
||||||
os_profile::{ClientOs, OsProfile},
|
os_profile::{ClientOs, OsProfile},
|
||||||
utils::{normalize_server, openssl},
|
utils::normalize_server,
|
||||||
};
|
};
|
||||||
use log::info;
|
use log::info;
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
use tempfile::NamedTempFile;
|
|
||||||
|
|
||||||
const VERSION: &str = concat!(
|
const VERSION: &str = concat!(
|
||||||
env!("CARGO_PKG_VERSION"),
|
env!("CARGO_PKG_VERSION"),
|
||||||
@@ -49,7 +49,7 @@ See 'gpauth -h' for more information.
|
|||||||
"
|
"
|
||||||
)]
|
)]
|
||||||
struct Cli {
|
struct Cli {
|
||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
command: Option<CliCommand>,
|
command: Option<CliCommand>,
|
||||||
|
|
||||||
@@ -84,7 +84,8 @@ struct Cli {
|
|||||||
#[arg(short = 'p', long, help = "The key passphrase of the private key")]
|
#[arg(short = 'p', long, help = "The key passphrase of the private key")]
|
||||||
key_password: Option<String>,
|
key_password: Option<String>,
|
||||||
|
|
||||||
#[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
#[arg(long, hide = true)]
|
||||||
fix_openssl: bool,
|
fix_openssl: bool,
|
||||||
|
|
||||||
#[arg(long, help = "Ignore TLS errors")]
|
#[arg(long, help = "Ignore TLS errors")]
|
||||||
@@ -104,13 +105,13 @@ struct Cli {
|
|||||||
|
|
||||||
#[arg(
|
#[arg(
|
||||||
long,
|
long,
|
||||||
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.",
|
help = "Use a browser; omit the value to auto-select. Use `manual` to open the URL and paste the callback.",
|
||||||
default_missing_value = "auto",
|
default_missing_value = "auto",
|
||||||
num_args=0..=1
|
num_args=0..=1
|
||||||
)]
|
)]
|
||||||
browser: Option<String>,
|
browser: Option<String>,
|
||||||
|
|
||||||
#[arg(long, help = "Listen on this IP address when using '--browser remote'")]
|
#[arg(long, help = "Listen on this IP address when using '--browser manual'")]
|
||||||
browser_listen: Option<IpAddr>,
|
browser_listen: Option<IpAddr>,
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
@@ -133,7 +134,7 @@ struct Cli {
|
|||||||
verbose: InfoLevelVerbosity,
|
verbose: InfoLevelVerbosity,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
#[derive(Subcommand)]
|
#[derive(Subcommand)]
|
||||||
enum CliCommand {
|
enum CliCommand {
|
||||||
#[command(hide = true)]
|
#[command(hide = true)]
|
||||||
@@ -144,10 +145,6 @@ enum CliCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Args for Cli {
|
impl Args for Cli {
|
||||||
fn fix_openssl(&self) -> bool {
|
|
||||||
self.fix_openssl
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ignore_tls_errors(&self) -> bool {
|
fn ignore_tls_errors(&self) -> bool {
|
||||||
self.ignore_tls_errors
|
self.ignore_tls_errors
|
||||||
}
|
}
|
||||||
@@ -158,32 +155,24 @@ impl Args for Cli {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Cli {
|
impl Cli {
|
||||||
fn prepare_env(&self) -> anyhow::Result<Option<NamedTempFile>> {
|
async fn run(&self) -> anyhow::Result<()> {
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(not(target_os = "macos"))]
|
||||||
gpapi::utils::env_utils::patch_gui_runtime_env(self.hidpi);
|
|
||||||
|
|
||||||
if self.fix_openssl {
|
if self.fix_openssl {
|
||||||
info!("Fixing OpenSSL environment");
|
log::warn!("--fix-openssl is deprecated and has no effect. It will be removed in a future release.");
|
||||||
let file = openssl::fix_openssl_env()?;
|
|
||||||
|
|
||||||
return Ok(Some(file));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn run(&self) -> anyhow::Result<()> {
|
|
||||||
if self.browser_listen.is_some()
|
if self.browser_listen.is_some()
|
||||||
&& !matches!(self.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("remote"))
|
&& !matches!(self.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("manual") || browser.eq_ignore_ascii_case("remote"))
|
||||||
{
|
{
|
||||||
anyhow::bail!("The '--browser-listen' option requires '--browser remote'");
|
anyhow::bail!("The '--browser-listen' option requires '--browser manual'");
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.ignore_tls_errors {
|
if self.ignore_tls_errors {
|
||||||
info!("TLS errors will be ignored");
|
info!("TLS errors will be ignored");
|
||||||
}
|
}
|
||||||
|
|
||||||
let openssl_conf = self.prepare_env()?;
|
#[cfg(feature = "webview-auth")]
|
||||||
|
gpapi::utils::env_utils::patch_gui_runtime_env(self.hidpi);
|
||||||
|
|
||||||
let server = normalize_server(self.server.as_deref().expect("server is required for authentication"))?;
|
let server = normalize_server(self.server.as_deref().expect("server is required for authentication"))?;
|
||||||
let gp_params = self.build_gp_params();
|
let gp_params = self.build_gp_params();
|
||||||
@@ -194,7 +183,17 @@ 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(), self.gateway).await?,
|
None => match auth_prelogin(&server, &gp_params, self.external_browser_requested(), self.gateway).await {
|
||||||
|
Ok(request) => request,
|
||||||
|
Err(error) => {
|
||||||
|
let Some(tls) = error.downcast_ref::<ServerTlsError>().cloned() else {
|
||||||
|
return Err(error);
|
||||||
|
};
|
||||||
|
handle_error(error, self);
|
||||||
|
print_auth_result(Err(tls.into()), None);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
@@ -213,8 +212,6 @@ impl Cli {
|
|||||||
|
|
||||||
print_auth_result(auth_result, Some(&auth_host_id));
|
print_auth_result(auth_result, Some(&auth_host_id));
|
||||||
|
|
||||||
// explicitly drop openssl_conf to avoid the unused variable warning
|
|
||||||
drop(openssl_conf);
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,7 +223,6 @@ impl Cli {
|
|||||||
self.clean,
|
self.clean,
|
||||||
self.window_title.clone(),
|
self.window_title.clone(),
|
||||||
self.window_theme,
|
self.window_theme,
|
||||||
openssl_conf,
|
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
@@ -245,13 +241,10 @@ impl Cli {
|
|||||||
|
|
||||||
fn build_os_profile(&self) -> OsProfile {
|
fn build_os_profile(&self) -> OsProfile {
|
||||||
let mut builder = OsProfile::builder(ClientOs::from(self.os));
|
let mut builder = OsProfile::builder(ClientOs::from(self.os));
|
||||||
if let Some(host_id) = self.host_id.as_deref() {
|
|
||||||
builder = builder.host_id_override(host_id);
|
|
||||||
}
|
|
||||||
if let Some(client_version) = self.client_version.as_deref() {
|
if let Some(client_version) = self.client_version.as_deref() {
|
||||||
builder = builder.client_version(client_version);
|
builder = builder.client_version(client_version);
|
||||||
}
|
}
|
||||||
builder.build()
|
gpapi::os_profile::desktop::collect_profile(builder, self.host_id.as_deref())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn external_browser_requested(&self) -> bool {
|
fn external_browser_requested(&self) -> bool {
|
||||||
@@ -279,7 +272,7 @@ fn init_logger(cli: &Cli) {
|
|||||||
pub async fn run() {
|
pub async fn run() {
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
if let Some(CliCommand::AuthCallback { callback }) = &cli.command {
|
if let Some(CliCommand::AuthCallback { callback }) = &cli.command {
|
||||||
if let Err(err) = forward_auth_callback(callback).await {
|
if let Err(err) = forward_auth_callback(callback).await {
|
||||||
eprintln!("Failed to forward authentication callback: {err}");
|
eprintln!("Failed to forward authentication callback: {err}");
|
||||||
@@ -298,7 +291,11 @@ pub async fn run() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn print_auth_result(auth_result: anyhow::Result<SamlAuthData>, host_id: Option<&str>) {
|
pub fn print_auth_result(auth_result: anyhow::Result<SamlAuthData>, host_id: Option<&str>) {
|
||||||
let auth_result = match auth_result {
|
println!("{}", json!(auth_outcome(auth_result, host_id)));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn auth_outcome(auth_result: anyhow::Result<SamlAuthData>, host_id: Option<&str>) -> SamlAuthResult {
|
||||||
|
match auth_result {
|
||||||
Ok(auth_data) => {
|
Ok(auth_data) => {
|
||||||
let auth_data = match host_id {
|
let auth_data = match host_id {
|
||||||
Some(host_id) => auth_data.with_host_id(host_id),
|
Some(host_id) => auth_data.with_host_id(host_id),
|
||||||
@@ -307,16 +304,58 @@ pub fn print_auth_result(auth_result: anyhow::Result<SamlAuthData>, host_id: Opt
|
|||||||
SamlAuthResult::Success(auth_data)
|
SamlAuthResult::Success(auth_data)
|
||||||
}
|
}
|
||||||
Err(err) if err.downcast_ref::<AuthenticationCancelled>().is_some() => SamlAuthResult::Cancelled,
|
Err(err) if err.downcast_ref::<AuthenticationCancelled>().is_some() => SamlAuthResult::Cancelled,
|
||||||
Err(err) => SamlAuthResult::Failure(format!("{}", err)),
|
Err(err) => match err.downcast::<ServerTlsError>() {
|
||||||
};
|
Ok(tls) => SamlAuthResult::ServerTlsError(tls),
|
||||||
|
Err(err) => SamlAuthResult::Failure(err.to_string()),
|
||||||
println!("{}", json!(auth_result));
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn deprecated_openssl_option_remains_supported_but_hidden() {
|
||||||
|
let result = Cli::try_parse_from(["gpauth", "portal.example.com", "--fix-openssl"]);
|
||||||
|
assert_eq!(result.is_ok(), !cfg!(target_os = "macos"));
|
||||||
|
for flag in ["-h", "--help"] {
|
||||||
|
let help = Cli::try_parse_from(["gpauth", flag]).err().unwrap().to_string();
|
||||||
|
assert!(!help.contains("--fix-openssl"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn result_keeps_server_tls_kind_and_generic_failure_format() {
|
||||||
|
use gpapi::error::ServerTlsErrorKind;
|
||||||
|
let tls = ServerTlsError {
|
||||||
|
server: "https://vpn.example.com".into(),
|
||||||
|
kind: ServerTlsErrorKind::Certificate,
|
||||||
|
};
|
||||||
|
let outcome = auth_outcome(Err(anyhow::Error::new(tls).context("retry failed")), None);
|
||||||
|
assert_eq!(
|
||||||
|
serde_json::to_value(outcome).unwrap(),
|
||||||
|
json!({"serverTlsError": {"server": "https://vpn.example.com", "kind": "certificate"}})
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
serde_json::to_value(auth_outcome(Err(anyhow::anyhow!("rejected")), None)).unwrap(),
|
||||||
|
json!({"failure": "rejected"})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn retry_result_preserves_client_certificate_requirement() {
|
||||||
|
let error = ServerTlsError {
|
||||||
|
server: "https://vpn.example.com".into(),
|
||||||
|
kind: gpapi::error::ServerTlsErrorKind::ClientCertificateRequired,
|
||||||
|
};
|
||||||
|
let outcome = auth_outcome(Err(anyhow::Error::new(error).context("retry failed")), None);
|
||||||
|
assert_eq!(
|
||||||
|
serde_json::to_value(outcome).unwrap(),
|
||||||
|
json!({"serverTlsError": {"server": "https://vpn.example.com", "kind": "clientCertificateRequired"}})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// gpauth's own result already goes to stdout as JSON; this makes its *logs*
|
/// gpauth's own result already goes to stdout as JSON; this makes its *logs*
|
||||||
/// readable the same way, so a caller driving it does not have to parse prose
|
/// readable the same way, so a caller driving it does not have to parse prose
|
||||||
/// on stderr to find out why an attempt failed.
|
/// on stderr to find out why an attempt failed.
|
||||||
@@ -343,7 +382,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
fn callback_arguments_parse_separately() {
|
fn callback_arguments_parse_separately() {
|
||||||
let cli = Cli::try_parse_from([
|
let cli = Cli::try_parse_from([
|
||||||
"gpauth",
|
"gpauth",
|
||||||
@@ -399,7 +438,7 @@ mod tests {
|
|||||||
"gpauth",
|
"gpauth",
|
||||||
"portal.example.com",
|
"portal.example.com",
|
||||||
"--browser",
|
"--browser",
|
||||||
"remote",
|
"manual",
|
||||||
"--browser-listen",
|
"--browser-listen",
|
||||||
"192.168.107.15",
|
"192.168.107.15",
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
use auth::{WebviewAuthenticator, apply_auth_theme};
|
use auth::{WebviewAuthenticator, apply_auth_theme};
|
||||||
use gpapi::{auth::AuthWindowTheme, gp_params::GpParams};
|
use gpapi::{auth::AuthWindowTheme, gp_params::GpParams};
|
||||||
use log::info;
|
|
||||||
use tauri::RunEvent;
|
|
||||||
use tempfile::NamedTempFile;
|
|
||||||
|
|
||||||
use crate::cli::print_auth_result;
|
use crate::cli::print_auth_result;
|
||||||
|
|
||||||
@@ -13,7 +10,6 @@ pub async fn authenticate(
|
|||||||
clean: bool,
|
clean: bool,
|
||||||
window_title: Option<String>,
|
window_title: Option<String>,
|
||||||
window_theme: AuthWindowTheme,
|
window_theme: AuthWindowTheme,
|
||||||
mut openssl_conf: Option<NamedTempFile>,
|
|
||||||
) -> anyhow::Result<()> {
|
) -> anyhow::Result<()> {
|
||||||
let auth_host_id = gp_params.os_profile().host_identity().host_id().to_string();
|
let auth_host_id = gp_params.os_profile().host_identity().host_id().to_string();
|
||||||
|
|
||||||
@@ -43,15 +39,7 @@ pub async fn authenticate(
|
|||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
.build(crate::tauri_context::get())?
|
.build(crate::tauri_context::get())?
|
||||||
.run(move |_app_handle, event| {
|
.run(|_, _| {});
|
||||||
if let RunEvent::Exit = event {
|
|
||||||
if let Some(file) = openssl_conf.take() {
|
|
||||||
if let Err(err) = file.close() {
|
|
||||||
info!("Error closing OpenSSL config file: {}", err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"bundle": {
|
||||||
|
"icon": ["icons/windows/icon.ico"]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
#![cfg(not(target_os = "macos"))]
|
||||||
|
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn deprecated_flag_warns_without_changing_auth_output_or_configuration() {
|
||||||
|
const WARNING: &str = "--fix-openssl is deprecated and has no effect. It will be removed in a future release.";
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let configuration = directory.path().join("openssl.cnf");
|
||||||
|
std::fs::write(&configuration, "existing user configuration").unwrap();
|
||||||
|
for deprecated in [false, true] {
|
||||||
|
let mut command = Command::new(env!("CARGO_BIN_EXE_gpauth"));
|
||||||
|
command.arg("portal.example.com");
|
||||||
|
if deprecated {
|
||||||
|
command.arg("--fix-openssl");
|
||||||
|
}
|
||||||
|
// Reject invalid options before authentication, without making a network request.
|
||||||
|
let output = command
|
||||||
|
.args(["--browser-listen", "127.0.0.1", "--log-format", "json"])
|
||||||
|
.env("OPENSSL_CONF", &configuration)
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
assert!(!output.status.success());
|
||||||
|
assert!(output.stdout.is_empty());
|
||||||
|
let logs = String::from_utf8(output.stderr).unwrap();
|
||||||
|
let records = logs
|
||||||
|
.lines()
|
||||||
|
.map(|line| serde_json::from_str::<serde_json::Value>(line).unwrap())
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
assert_eq!(
|
||||||
|
records.iter().filter(|record| record["message"] == WARNING).count(),
|
||||||
|
usize::from(deprecated)
|
||||||
|
);
|
||||||
|
assert!(logs.contains("requires '--browser manual'"));
|
||||||
|
assert_eq!(
|
||||||
|
std::fs::read_to_string(&configuration).unwrap(),
|
||||||
|
"existing user configuration"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#![cfg(windows)]
|
||||||
|
|
||||||
|
use auth::AuthCallbackReceiver;
|
||||||
|
use std::{process::Stdio, time::Duration};
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn callback_command_forwards_between_processes() {
|
||||||
|
let receiver = AuthCallbackReceiver::bind().unwrap();
|
||||||
|
let child = tokio::process::Command::new(env!("CARGO_BIN_EXE_gpauth"))
|
||||||
|
.args([
|
||||||
|
"auth-callback",
|
||||||
|
"globalprotectcallback:cas-as=1&un=windows-fixture&token=callback-command-test",
|
||||||
|
])
|
||||||
|
.stdout(Stdio::piped())
|
||||||
|
.stderr(Stdio::piped())
|
||||||
|
.kill_on_drop(true)
|
||||||
|
.spawn()
|
||||||
|
.unwrap();
|
||||||
|
let (data, output) = tokio::time::timeout(Duration::from_secs(10), async {
|
||||||
|
tokio::join!(receiver.receive(), child.wait_with_output())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("callback executable did not complete");
|
||||||
|
let output = output.unwrap();
|
||||||
|
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
let data = data.unwrap();
|
||||||
|
assert_eq!(data.username(), "windows-fixture");
|
||||||
|
assert_eq!(data.token(), Some("callback-command-test"));
|
||||||
|
}
|
||||||
@@ -11,21 +11,23 @@ common = { path = "../../crates/common" }
|
|||||||
gpapi = { path = "../../crates/gpapi", features = ["clap"] }
|
gpapi = { path = "../../crates/gpapi", features = ["clap"] }
|
||||||
gphip = { path = "../../crates/gphip" }
|
gphip = { path = "../../crates/gphip" }
|
||||||
openconnect = { path = "../../crates/openconnect" }
|
openconnect = { path = "../../crates/openconnect" }
|
||||||
|
gptunnel = { path = "../../crates/gptunnel" }
|
||||||
|
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
clap.workspace = true
|
clap.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
inquire = "0.9"
|
inquire = "0.9"
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
nix = { version = "0.31", features = ["fs", "signal", "process"] }
|
nix = { version = "0.31", features = ["fs", "signal", "process", "poll", "term"] }
|
||||||
|
ratatui = { version = "=0.30.2", default-features = false, features = ["crossterm", "unstable-rendered-line-info"] }
|
||||||
|
crossterm = { version = "0.29", features = ["use-dev-tty"] }
|
||||||
|
strip-ansi-escapes = "0.2"
|
||||||
tokio = { workspace = true, features = ["rt-multi-thread"] }
|
tokio = { workspace = true, features = ["rt-multi-thread"] }
|
||||||
tokio-util.workspace = true
|
tokio-util.workspace = true
|
||||||
sysinfo.workspace = true
|
sysinfo.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
whoami.workspace = true
|
whoami.workspace = true
|
||||||
tempfile.workspace = true
|
|
||||||
reqwest.workspace = true
|
|
||||||
directories.workspace = true
|
directories.workspace = true
|
||||||
compile-time.workspace = true
|
compile-time.workspace = true
|
||||||
uzers.workspace = true
|
uzers.workspace = true
|
||||||
@@ -33,3 +35,9 @@ uzers.workspace = true
|
|||||||
[features]
|
[features]
|
||||||
default = ["webview-auth"]
|
default = ["webview-auth"]
|
||||||
webview-auth = ["gpapi/webview-auth"]
|
webview-auth = ["gpapi/webview-auth"]
|
||||||
|
|
||||||
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
|
gpvpnc = { path = "../../crates/gpvpnc" }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
tempfile.workspace = true
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
//! No process is forked after authentication or OpenConnect has started its threads.
|
//! No process is forked after authentication or OpenConnect has started its threads.
|
||||||
|
|
||||||
use std::{
|
use std::{
|
||||||
|
cell::RefCell,
|
||||||
ffi::OsString,
|
ffi::OsString,
|
||||||
fs::{File, OpenOptions},
|
fs::{File, OpenOptions},
|
||||||
io::{self, Write},
|
io::{self, Write},
|
||||||
@@ -27,7 +28,8 @@ use tokio::{io::AsyncReadExt, process::Command};
|
|||||||
const READY: u8 = 1;
|
const READY: u8 = 1;
|
||||||
|
|
||||||
pub(crate) struct BackgroundWorker {
|
pub(crate) struct BackgroundWorker {
|
||||||
ready: UnixStream,
|
// Consumed after detachment; later tunnels stay in the same background session.
|
||||||
|
ready: RefCell<Option<UnixStream>>,
|
||||||
log: File,
|
log: File,
|
||||||
input: File,
|
input: File,
|
||||||
}
|
}
|
||||||
@@ -82,10 +84,17 @@ impl BackgroundWorker {
|
|||||||
"Background log must not be readable or writable by other users"
|
"Background log must not be readable or writable by other users"
|
||||||
);
|
);
|
||||||
let input = File::open("/dev/null")?;
|
let input = File::open("/dev/null")?;
|
||||||
Ok(Self { ready, log, input })
|
Ok(Self {
|
||||||
|
ready: RefCell::new(Some(ready)),
|
||||||
|
log,
|
||||||
|
input,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn redirect_stdio(&self) -> anyhow::Result<BackgroundStdio> {
|
pub(crate) fn redirect_stdio(&self) -> anyhow::Result<BackgroundStdio> {
|
||||||
|
if self.ready.borrow().is_none() {
|
||||||
|
return Ok(BackgroundStdio { saved: None });
|
||||||
|
}
|
||||||
io::stdout().flush()?;
|
io::stdout().flush()?;
|
||||||
io::stderr().flush()?;
|
io::stderr().flush()?;
|
||||||
let save = |fd| -> anyhow::Result<OwnedFd> {
|
let save = |fd| -> anyhow::Result<OwnedFd> {
|
||||||
@@ -107,13 +116,18 @@ impl BackgroundWorker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn detach(&self, stdio: &mut BackgroundStdio) -> anyhow::Result<()> {
|
pub(crate) fn detach(&self, stdio: &mut BackgroundStdio) -> anyhow::Result<()> {
|
||||||
|
let mut ready = self.ready.borrow_mut();
|
||||||
|
let Some(socket) = ready.as_mut() else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
// The worker inherited the launcher's foreground group, so it can prompt normally.
|
// The worker inherited the launcher's foreground group, so it can prompt normally.
|
||||||
// It becomes a session leader only when sign-in and tunnel configuration are done.
|
// It becomes a session leader only when sign-in and tunnel configuration are done.
|
||||||
setsid().context("Cannot detach the VPN session from the terminal")?;
|
setsid().context("Cannot detach the VPN session from the terminal")?;
|
||||||
(&self.ready)
|
socket
|
||||||
.write_all(&[READY])
|
.write_all(&[READY])
|
||||||
.context("Background launcher exited before tunnel setup")?;
|
.context("Background launcher exited before tunnel setup")?;
|
||||||
stdio.saved.take();
|
stdio.saved.take();
|
||||||
|
ready.take();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -205,12 +219,13 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn detached_worker_survives_launcher_and_disconnects_by_pid() {
|
async fn detached_worker_reconnects_after_launcher_exits() {
|
||||||
let directory = tempfile::tempdir().unwrap();
|
let directory = tempfile::tempdir().unwrap();
|
||||||
tokio::time::timeout(Duration::from_secs(5), launch(fixture(directory.path()), &[]))
|
tokio::time::timeout(Duration::from_secs(5), launch(fixture(directory.path()), &[]))
|
||||||
.await
|
.await
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
std::fs::write(directory.path().join("reconnect"), "").unwrap();
|
||||||
let pid = std::fs::read_to_string(directory.path().join("pid"))
|
let pid = std::fs::read_to_string(directory.path().join("pid"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.parse::<i32>()
|
.parse::<i32>()
|
||||||
@@ -222,18 +237,19 @@ mod tests {
|
|||||||
"Worker must own a terminal-independent session"
|
"Worker must own a terminal-independent session"
|
||||||
);
|
);
|
||||||
kill(pid, None).unwrap();
|
kill(pid, None).unwrap();
|
||||||
tokio::time::timeout(Duration::from_secs(5), async {
|
let reconnected = tokio::time::timeout(Duration::from_secs(5), async {
|
||||||
while !std::fs::read_to_string(directory.path().join("worker.log"))
|
while !std::fs::read_to_string(directory.path().join("worker.log"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.contains("helper-output")
|
.contains("reconnected-output")
|
||||||
{
|
{
|
||||||
tokio::time::sleep(Duration::from_millis(10)).await;
|
tokio::time::sleep(Duration::from_millis(10)).await;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.await
|
.await;
|
||||||
.unwrap();
|
|
||||||
let log = std::fs::read_to_string(directory.path().join("worker.log")).unwrap();
|
let log = std::fs::read_to_string(directory.path().join("worker.log")).unwrap();
|
||||||
|
assert!(reconnected.is_ok(), "Worker did not reconnect:\n{log}");
|
||||||
assert!(log.contains("failed-attempt-output"));
|
assert!(log.contains("failed-attempt-output"));
|
||||||
|
assert!(log.contains("helper-output"));
|
||||||
assert!(!log.contains("restored-foreground-output"));
|
assert!(!log.contains("restored-foreground-output"));
|
||||||
#[derive(clap::Parser)]
|
#[derive(clap::Parser)]
|
||||||
struct Disconnect {
|
struct Disconnect {
|
||||||
@@ -295,8 +311,20 @@ mod tests {
|
|||||||
worker.detach(&mut stdio).unwrap();
|
worker.detach(&mut stdio).unwrap();
|
||||||
println!("detached-output");
|
println!("detached-output");
|
||||||
io::stdout().flush().unwrap();
|
io::stdout().flush().unwrap();
|
||||||
interrupt.recv().await;
|
tokio::time::timeout(Duration::from_secs(5), async {
|
||||||
|
while !directory.join("reconnect").exists() {
|
||||||
|
tokio::time::sleep(Duration::from_millis(10)).await;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
helper.wait().unwrap();
|
helper.wait().unwrap();
|
||||||
|
let mut stdio = worker.redirect_stdio().unwrap();
|
||||||
|
worker.detach(&mut stdio).unwrap();
|
||||||
|
assert_eq!(getsid(None).unwrap(), getpid());
|
||||||
|
println!("reconnected-output");
|
||||||
|
io::stdout().flush().unwrap();
|
||||||
|
interrupt.recv().await;
|
||||||
std::fs::write(directory.join("stopped"), "stopped").unwrap();
|
std::fs::write(directory.join("stopped"), "stopped").unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,11 +8,9 @@ use clap::{Parser, Subcommand};
|
|||||||
use gpapi::{
|
use gpapi::{
|
||||||
clap::{Args, InfoLevelVerbosity, handle_error},
|
clap::{Args, InfoLevelVerbosity, handle_error},
|
||||||
log_format::{LogFormat, write_json_record},
|
log_format::{LogFormat, write_json_record},
|
||||||
utils::openssl,
|
|
||||||
};
|
};
|
||||||
use log::info;
|
use log::info;
|
||||||
use sysinfo::{Pid, System};
|
use sysinfo::{Pid, System};
|
||||||
use tempfile::NamedTempFile;
|
|
||||||
use tokio::fs;
|
use tokio::fs;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
@@ -34,7 +32,6 @@ const VERSION: &str = concat!(
|
|||||||
);
|
);
|
||||||
|
|
||||||
pub(crate) struct SharedArgs<'a> {
|
pub(crate) struct SharedArgs<'a> {
|
||||||
pub(crate) fix_openssl: bool,
|
|
||||||
pub(crate) ignore_tls_errors: bool,
|
pub(crate) ignore_tls_errors: bool,
|
||||||
pub(crate) lock_file: &'a Path,
|
pub(crate) lock_file: &'a Path,
|
||||||
pub(crate) verbose: &'a InfoLevelVerbosity,
|
pub(crate) verbose: &'a InfoLevelVerbosity,
|
||||||
@@ -92,10 +89,8 @@ struct Cli {
|
|||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
command: CliCommand,
|
command: CliCommand,
|
||||||
|
|
||||||
#[arg(
|
#[cfg(not(target_os = "macos"))]
|
||||||
long,
|
#[arg(long, hide = true)]
|
||||||
help = "Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats."
|
|
||||||
)]
|
|
||||||
fix_openssl: bool,
|
fix_openssl: bool,
|
||||||
#[arg(long, help = "Ignore the TLS errors")]
|
#[arg(long, help = "Ignore the TLS errors")]
|
||||||
ignore_tls_errors: bool,
|
ignore_tls_errors: bool,
|
||||||
@@ -123,10 +118,6 @@ struct Cli {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Args for Cli {
|
impl Args for Cli {
|
||||||
fn fix_openssl(&self) -> bool {
|
|
||||||
self.fix_openssl
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ignore_tls_errors(&self) -> bool {
|
fn ignore_tls_errors(&self) -> bool {
|
||||||
self.ignore_tls_errors
|
self.ignore_tls_errors
|
||||||
}
|
}
|
||||||
@@ -164,16 +155,19 @@ impl Cli {
|
|||||||
.unwrap_or(false)
|
.unwrap_or(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fix_openssl(&self) -> anyhow::Result<Option<NamedTempFile>> {
|
async fn run(&self) -> anyhow::Result<()> {
|
||||||
if self.fix_openssl {
|
#[cfg(not(target_os = "macos"))]
|
||||||
let file = openssl::fix_openssl_env()?;
|
if self.fix_openssl
|
||||||
return Ok(Some(file));
|
&& !(matches!(&self.command, CliCommand::Connect(args) if args.background) && self.background_worker_fd.is_none())
|
||||||
|
{
|
||||||
|
log::warn!("--fix-openssl is deprecated and has no effect. It will be removed in a future release.");
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(None)
|
if let CliCommand::Connect(args) = &self.command {
|
||||||
}
|
if args.dashboard {
|
||||||
|
crate::dashboard::validate(self.log_format)?;
|
||||||
async fn run(&self) -> anyhow::Result<()> {
|
}
|
||||||
|
}
|
||||||
if self.background_worker_fd.is_some() && !matches!(&self.command, CliCommand::Connect(args) if args.background) {
|
if self.background_worker_fd.is_some() && !matches!(&self.command, CliCommand::Connect(args) if args.background) {
|
||||||
bail!("Background worker requires connect --background");
|
bail!("Background worker requires connect --background");
|
||||||
}
|
}
|
||||||
@@ -203,11 +197,7 @@ impl Cli {
|
|||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
// The temp file will be dropped automatically when the file handle is dropped
|
|
||||||
// So, declare it here to ensure it's not dropped
|
|
||||||
let _file = self.fix_openssl()?;
|
|
||||||
let shared_args = SharedArgs {
|
let shared_args = SharedArgs {
|
||||||
fix_openssl: self.fix_openssl,
|
|
||||||
ignore_tls_errors: self.ignore_tls_errors,
|
ignore_tls_errors: self.ignore_tls_errors,
|
||||||
lock_file: &self.lock_file,
|
lock_file: &self.lock_file,
|
||||||
verbose: &self.verbose,
|
verbose: &self.verbose,
|
||||||
@@ -230,7 +220,7 @@ impl Cli {
|
|||||||
CliCommand::Hip(args) => HipHandler::new(args).handle().await,
|
CliCommand::Hip(args) => HipHandler::new(args).handle().await,
|
||||||
CliCommand::Diagnostics(_) => unreachable!("diagnostics is dispatched before VPN setup"),
|
CliCommand::Diagnostics(_) => unreachable!("diagnostics is dispatched before VPN setup"),
|
||||||
CliCommand::DetectInternalHost { address, hostname } => {
|
CliCommand::DetectInternalHost { address, hostname } => {
|
||||||
let internal = gpapi::session::network::native::detect_in_helper(*address, hostname)?;
|
let internal = gpapi::session::desktop::network::native::detect_in_helper(*address, hostname)?;
|
||||||
println!("{}", serde_json::to_string(&internal)?);
|
println!("{}", serde_json::to_string(&internal)?);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -239,7 +229,7 @@ impl Cli {
|
|||||||
port,
|
port,
|
||||||
disable_ipv6,
|
disable_ipv6,
|
||||||
} => {
|
} => {
|
||||||
let addresses = gpapi::session::network::native::lookup_in_helper(host, *port, *disable_ipv6)?;
|
let addresses = gpapi::session::desktop::network::native::lookup_in_helper(host, *port, *disable_ipv6)?;
|
||||||
println!("{}", serde_json::to_string(&addresses)?);
|
println!("{}", serde_json::to_string(&addresses)?);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -263,7 +253,13 @@ fn build_logger(cli: &Cli) -> env_logger::Builder {
|
|||||||
pub(crate) async fn run() {
|
pub(crate) async fn run() {
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
|
|
||||||
build_logger(&cli).init();
|
if matches!(&cli.command, CliCommand::Connect(args) if args.dashboard) {
|
||||||
|
let logger = build_logger(&cli).build();
|
||||||
|
log::set_max_level(logger.filter());
|
||||||
|
log::set_boxed_logger(Box::new(crate::dashboard::NoticeLogger::new(logger))).expect("failed to initialize logger");
|
||||||
|
} else {
|
||||||
|
build_logger(&cli).init();
|
||||||
|
}
|
||||||
|
|
||||||
info!("gpclient started: {}", VERSION);
|
info!("gpclient started: {}", VERSION);
|
||||||
|
|
||||||
@@ -325,10 +321,46 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn dashboard_is_opt_in_and_conflicts_with_noninteractive_connection_modes() {
|
||||||
|
for option in ["--background", "--cookie-only"] {
|
||||||
|
assert!(Cli::try_parse_from(["gpclient", "connect", "portal.example.com", "--dashboard", option]).is_err());
|
||||||
|
}
|
||||||
|
assert!(Cli::try_parse_from(["gpclient", "connect", "portal.example.com", "--stats"]).is_err());
|
||||||
|
let cli = Cli::try_parse_from([
|
||||||
|
"gpclient",
|
||||||
|
"connect",
|
||||||
|
"portal.example.com",
|
||||||
|
"--dashboard",
|
||||||
|
"--cookie-on-stdin",
|
||||||
|
])
|
||||||
|
.unwrap();
|
||||||
|
assert!(matches!(cli.command, CliCommand::Connect(args) if args.dashboard));
|
||||||
|
let cli = Cli::try_parse_from(["gpclient", "connect", "portal.example.com"]).unwrap();
|
||||||
|
assert!(matches!(cli.command, CliCommand::Connect(args) if !args.dashboard));
|
||||||
|
assert!(
|
||||||
|
crate::dashboard::validate(LogFormat::Json)
|
||||||
|
.unwrap_err()
|
||||||
|
.to_string()
|
||||||
|
.contains("--log-format json")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn deprecated_openssl_option_remains_supported_but_hidden() {
|
||||||
|
let result = Cli::try_parse_from(["gpclient", "--fix-openssl", "diagnostics"]);
|
||||||
|
assert_eq!(result.is_ok(), !cfg!(target_os = "macos"));
|
||||||
|
for flag in ["-h", "--help"] {
|
||||||
|
let help = Cli::try_parse_from(["gpclient", flag]).err().unwrap().to_string();
|
||||||
|
assert!(!help.contains("--fix-openssl"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn diagnostics_accepts_output_options_and_runs_alongside_the_client() {
|
fn diagnostics_accepts_output_options_and_runs_alongside_the_client() {
|
||||||
let cli = Cli::try_parse_from([
|
let cli = Cli::try_parse_from([
|
||||||
"gpclient",
|
"gpclient",
|
||||||
|
#[cfg(not(target_os = "macos"))]
|
||||||
"--fix-openssl",
|
"--fix-openssl",
|
||||||
"diagnostics",
|
"diagnostics",
|
||||||
"--json",
|
"--json",
|
||||||
@@ -501,6 +533,40 @@ mod tests {
|
|||||||
captured.contents()
|
captured.contents()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unicode_property_log_filters_keep_matching_and_excluding_records() {
|
||||||
|
for (pattern, matching, excluded) in [
|
||||||
|
(r"\p{Greek}", "α", "plain ASCII"),
|
||||||
|
(r"\p{Mark}", "\u{0301}", "plain ASCII"),
|
||||||
|
(r"\p{Alphabetic}", "α", "123"),
|
||||||
|
(r"\p{Grapheme_Extend}", "\u{0301}", "plain ASCII"),
|
||||||
|
] {
|
||||||
|
let captured = Captured::default();
|
||||||
|
let logger = build_logger(&parse_cli(&["gpclient", "disconnect"]))
|
||||||
|
.parse_filters(&format!("info/{pattern}"))
|
||||||
|
.target(env_logger::Target::Pipe(Box::new(captured.clone())))
|
||||||
|
.build();
|
||||||
|
for message in [excluded, matching] {
|
||||||
|
logger.log(
|
||||||
|
&log::Record::builder()
|
||||||
|
.level(log::Level::Info)
|
||||||
|
.target("gpclient")
|
||||||
|
.args(format_args!("{message}"))
|
||||||
|
.build(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let output = captured.contents();
|
||||||
|
assert!(
|
||||||
|
output.contains(matching),
|
||||||
|
"filter {pattern} dropped its matching record"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!output.contains(excluded),
|
||||||
|
"filter {pattern} allowed an excluded record"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// The point of the flag: with `json`, a caller gets fields, and gets them one
|
/// The point of the flag: with `json`, a caller gets fields, and gets them one
|
||||||
/// record per line so the stream can be read incrementally.
|
/// record per line so the stream can be read incrementally.
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -20,6 +20,13 @@ pub(crate) struct ConnectArgs {
|
|||||||
)]
|
)]
|
||||||
pub(crate) background: bool,
|
pub(crate) background: bool,
|
||||||
|
|
||||||
|
#[arg(
|
||||||
|
long,
|
||||||
|
conflicts_with_all = ["background", "cookie_only"],
|
||||||
|
help = "Show an interactive connection dashboard after sign-in (requires a foreground terminal)"
|
||||||
|
)]
|
||||||
|
pub(crate) dashboard: bool,
|
||||||
|
|
||||||
#[arg(
|
#[arg(
|
||||||
long,
|
long,
|
||||||
requires = "background",
|
requires = "background",
|
||||||
@@ -105,7 +112,15 @@ pub(crate) struct ConnectArgs {
|
|||||||
#[arg(short, long, help = "Request MTU from server (legacy servers only)")]
|
#[arg(short, long, help = "Request MTU from server (legacy servers only)")]
|
||||||
pub(super) mtu: Option<u32>,
|
pub(super) mtu: Option<u32>,
|
||||||
|
|
||||||
#[arg(long, help = "Do not ask for IPv6 connectivity")]
|
#[arg(
|
||||||
|
long,
|
||||||
|
value_enum,
|
||||||
|
default_value = "auto",
|
||||||
|
help = "Choose which IP version to try first when connecting to the gateway"
|
||||||
|
)]
|
||||||
|
pub(super) ip_preference: gpapi::gateway::GatewayIpPreference,
|
||||||
|
|
||||||
|
#[arg(long, help = "Use only IPv4 for traffic inside the VPN tunnel")]
|
||||||
pub(super) disable_ipv6: bool,
|
pub(super) disable_ipv6: bool,
|
||||||
|
|
||||||
#[arg(long = "user-agent", hide = true)]
|
#[arg(long = "user-agent", hide = true)]
|
||||||
@@ -158,13 +173,13 @@ pub(crate) struct ConnectArgs {
|
|||||||
|
|
||||||
#[arg(
|
#[arg(
|
||||||
long,
|
long,
|
||||||
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.",
|
help = "Use a browser; omit the value to auto-select. Use `manual` to open the URL and paste the callback.",
|
||||||
default_missing_value = "auto",
|
default_missing_value = "auto",
|
||||||
num_args=0..=1
|
num_args=0..=1
|
||||||
)]
|
)]
|
||||||
pub(super) browser: Option<String>,
|
pub(super) browser: Option<String>,
|
||||||
|
|
||||||
#[arg(long, help = "Listen on this IP address when using '--browser remote'")]
|
#[arg(long, help = "Listen on this IP address when using '--browser manual'")]
|
||||||
pub(super) browser_listen: Option<IpAddr>,
|
pub(super) browser_listen: Option<IpAddr>,
|
||||||
|
|
||||||
#[arg(
|
#[arg(
|
||||||
@@ -188,10 +203,7 @@ pub(super) fn build_os_profile_with_host_id(args: &ConnectArgs, host_id: Option<
|
|||||||
if let Some(local_hostname) = args.local_hostname.as_deref() {
|
if let Some(local_hostname) = args.local_hostname.as_deref() {
|
||||||
builder = builder.computer_name_override(local_hostname.to_string());
|
builder = builder.computer_name_override(local_hostname.to_string());
|
||||||
}
|
}
|
||||||
if let Some(host_id) = host_id {
|
gpapi::os_profile::desktop::collect_profile(builder, host_id)
|
||||||
builder = builder.host_id_override(host_id);
|
|
||||||
}
|
|
||||||
builder.build()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn cookie_cache_path(args: &ConnectArgs) -> Option<PathBuf> {
|
pub(super) fn cookie_cache_path(args: &ConnectArgs) -> Option<PathBuf> {
|
||||||
@@ -299,7 +311,7 @@ mod tests {
|
|||||||
"test",
|
"test",
|
||||||
"portal.example.com",
|
"portal.example.com",
|
||||||
"--browser",
|
"--browser",
|
||||||
"remote",
|
"manual",
|
||||||
"--browser-listen",
|
"--browser-listen",
|
||||||
"192.168.107.15",
|
"192.168.107.15",
|
||||||
])
|
])
|
||||||
@@ -462,4 +474,23 @@ mod tests {
|
|||||||
|
|
||||||
assert!(!cli.args.cookie_only);
|
assert!(!cli.args.cookie_only);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ip_preference_parses_independently_of_tunnel_ipv6() {
|
||||||
|
use clap::Parser;
|
||||||
|
use gpapi::gateway::GatewayIpPreference;
|
||||||
|
let default = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com"]).unwrap();
|
||||||
|
assert_eq!(default.args.ip_preference, GatewayIpPreference::Auto);
|
||||||
|
for (value, expected) in [
|
||||||
|
("auto", GatewayIpPreference::Auto),
|
||||||
|
("ipv4", GatewayIpPreference::Ipv4),
|
||||||
|
("ipv6", GatewayIpPreference::Ipv6),
|
||||||
|
] {
|
||||||
|
let cli =
|
||||||
|
ConnectArgsTestCli::try_parse_from(["test", "portal.example.com", "--ip-preference", value, "--disable-ipv6"])
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(cli.args.ip_preference, expected);
|
||||||
|
assert!(cli.args.disable_ipv6);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -129,7 +129,6 @@ impl ConnectHandler<'_> {
|
|||||||
.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)
|
|
||||||
.ignore_tls_errors(self.shared_args.ignore_tls_errors)
|
.ignore_tls_errors(self.shared_args.ignore_tls_errors)
|
||||||
.certificate(self.args.certificate.as_deref())
|
.certificate(self.args.certificate.as_deref())
|
||||||
.sslkey(self.args.sslkey.as_deref())
|
.sslkey(self.args.sslkey.as_deref())
|
||||||
|
|||||||
@@ -36,6 +36,27 @@ fn login_response() -> String {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn read_request(stream: &mut tokio::net::TcpStream) -> String {
|
||||||
|
let mut request = Vec::new();
|
||||||
|
loop {
|
||||||
|
let mut buf = [0; 4096];
|
||||||
|
let count = stream.read(&mut buf).await.unwrap();
|
||||||
|
assert_ne!(count, 0, "Request ended before its body");
|
||||||
|
request.extend_from_slice(&buf[..count]);
|
||||||
|
if let Some(end) = request.windows(4).position(|bytes| bytes == b"\r\n\r\n") {
|
||||||
|
let headers = String::from_utf8_lossy(&request[..end]).to_ascii_lowercase();
|
||||||
|
let length = headers
|
||||||
|
.lines()
|
||||||
|
.find_map(|line| line.strip_prefix("content-length:"))
|
||||||
|
.map(|value| value.trim().parse::<usize>().unwrap())
|
||||||
|
.unwrap_or(0);
|
||||||
|
if request.len() >= end + 4 + length {
|
||||||
|
return String::from_utf8(request).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async fn gateway(responses: Vec<(&'static str, String)>) -> (String, tokio::task::JoinHandle<Vec<String>>) {
|
async fn gateway(responses: Vec<(&'static str, String)>) -> (String, tokio::task::JoinHandle<Vec<String>>) {
|
||||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
let origin = format!("http://{}", listener.local_addr().unwrap());
|
let origin = format!("http://{}", listener.local_addr().unwrap());
|
||||||
@@ -44,25 +65,7 @@ async fn gateway(responses: Vec<(&'static str, String)>) -> (String, tokio::task
|
|||||||
let mut requests = Vec::new();
|
let mut requests = Vec::new();
|
||||||
for (status, body) in responses {
|
for (status, body) in responses {
|
||||||
let (mut stream, _) = listener.accept().await.unwrap();
|
let (mut stream, _) = listener.accept().await.unwrap();
|
||||||
let mut request = Vec::new();
|
requests.push(read_request(&mut stream).await);
|
||||||
loop {
|
|
||||||
let mut buf = [0; 4096];
|
|
||||||
let count = stream.read(&mut buf).await.unwrap();
|
|
||||||
assert_ne!(count, 0, "Request ended before its body");
|
|
||||||
request.extend_from_slice(&buf[..count]);
|
|
||||||
if let Some(end) = request.windows(4).position(|bytes| bytes == b"\r\n\r\n") {
|
|
||||||
let headers = String::from_utf8_lossy(&request[..end]).to_ascii_lowercase();
|
|
||||||
let length = headers
|
|
||||||
.lines()
|
|
||||||
.find_map(|line| line.strip_prefix("content-length:"))
|
|
||||||
.map(|value| value.trim().parse::<usize>().unwrap())
|
|
||||||
.unwrap_or(0);
|
|
||||||
if request.len() >= end + 4 + length {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
requests.push(String::from_utf8(request).unwrap());
|
|
||||||
stream
|
stream
|
||||||
.write_all(
|
.write_all(
|
||||||
format!(
|
format!(
|
||||||
@@ -98,7 +101,6 @@ async fn cached_tunnel_authentication_does_not_require_portal_discovery() {
|
|||||||
let lock = directory.path().join("client.pid");
|
let lock = directory.path().join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -127,6 +129,154 @@ async fn cached_tunnel_authentication_does_not_require_portal_discovery() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn unreachable_gateway_keeps_cached_cookie() {
|
||||||
|
// Nothing listens here: the cached gateway login gets no answer at all.
|
||||||
|
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
|
let gateway = format!("http://{}", listener.local_addr().unwrap());
|
||||||
|
drop(listener);
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let cache = directory.path().join("cookie.json");
|
||||||
|
let args = TestArgs::parse_from([
|
||||||
|
"test",
|
||||||
|
"http://unavailable-portal.invalid",
|
||||||
|
"--cookie-only",
|
||||||
|
"--cookie-cache",
|
||||||
|
cache.to_str().unwrap(),
|
||||||
|
])
|
||||||
|
.connect;
|
||||||
|
let lock = directory.path().join("client.pid");
|
||||||
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
|
let shared = SharedArgs {
|
||||||
|
ignore_tls_errors: true,
|
||||||
|
lock_file: &lock,
|
||||||
|
verbose: &verbose,
|
||||||
|
log_format: LogFormat::Text,
|
||||||
|
};
|
||||||
|
let handler = ConnectHandler::new(&args, &shared);
|
||||||
|
cookie_store::save(
|
||||||
|
&cache,
|
||||||
|
&StoredCookie::new(
|
||||||
|
args.server.clone(),
|
||||||
|
"alice".into(),
|
||||||
|
handler.os_profile.borrow().host_identity().host_id().into(),
|
||||||
|
gateway,
|
||||||
|
AuthCookieCredential::new("alice", "portal-cookie", ""),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(handler.handle_impl().await.is_err());
|
||||||
|
assert!(
|
||||||
|
cache.exists(),
|
||||||
|
"a login that got no answer must not delete the cookie cache"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn gateway_closing_without_response_keeps_cached_cookie() {
|
||||||
|
closed_connection_keeps_cached_cookie(false, false).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn portal_closing_without_response_keeps_cached_cookie() {
|
||||||
|
closed_connection_keeps_cached_cookie(true, false).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn partial_responses_keep_cached_cookie() {
|
||||||
|
closed_connection_keeps_cached_cookie(false, true).await;
|
||||||
|
closed_connection_keeps_cached_cookie(true, true).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn closed_connection_keeps_cached_cookie(portal_discovery: bool, partial_body: bool) {
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let origin = format!("http://{}", listener.local_addr().unwrap());
|
||||||
|
let worker = tokio::spawn(async move {
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), async move {
|
||||||
|
if portal_discovery {
|
||||||
|
let (mut stream, _) = listener.accept().await.unwrap();
|
||||||
|
assert!(read_request(&mut stream).await.contains("/global-protect/prelogin.esp"));
|
||||||
|
let body = "<prelogin-response><status>Success</status></prelogin-response>";
|
||||||
|
stream
|
||||||
|
.write_all(
|
||||||
|
format!(
|
||||||
|
"HTTP/1.1 200 OK\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}",
|
||||||
|
body.len()
|
||||||
|
)
|
||||||
|
.as_bytes(),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
let (mut stream, _) = listener.accept().await.unwrap();
|
||||||
|
let request = read_request(&mut stream).await;
|
||||||
|
if partial_body {
|
||||||
|
stream
|
||||||
|
.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 100\r\n\r\n<response>")
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
request
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("Connection-closing fixture timed out")
|
||||||
|
});
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let cache = directory.path().join("cookie.json");
|
||||||
|
let args = TestArgs::parse_from([
|
||||||
|
"test",
|
||||||
|
&origin,
|
||||||
|
"--cookie-only",
|
||||||
|
"--cookie-cache",
|
||||||
|
cache.to_str().unwrap(),
|
||||||
|
])
|
||||||
|
.connect;
|
||||||
|
let lock = directory.path().join("client.pid");
|
||||||
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
|
let shared = SharedArgs {
|
||||||
|
ignore_tls_errors: true,
|
||||||
|
lock_file: &lock,
|
||||||
|
verbose: &verbose,
|
||||||
|
log_format: LogFormat::Text,
|
||||||
|
};
|
||||||
|
let handler = ConnectHandler::new(&args, &shared);
|
||||||
|
cookie_store::save(
|
||||||
|
&cache,
|
||||||
|
&StoredCookie::new(
|
||||||
|
args.server.clone(),
|
||||||
|
"alice".into(),
|
||||||
|
handler.os_profile.borrow().host_identity().host_id().into(),
|
||||||
|
origin.clone(),
|
||||||
|
AuthCookieCredential::new("alice", "portal-cookie", ""),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let result = if portal_discovery {
|
||||||
|
handler.connect_portal_with_prelogin(&origin).await
|
||||||
|
} else {
|
||||||
|
handler.handle_impl().await
|
||||||
|
};
|
||||||
|
let error = result.unwrap_err();
|
||||||
|
let Some(gpapi::error::PortalError::NetworkError(network)) = error.downcast_ref() else {
|
||||||
|
panic!("Expected a network error, got {error:?}");
|
||||||
|
};
|
||||||
|
if partial_body {
|
||||||
|
assert!(network.is_body() || network.is_decode());
|
||||||
|
} else {
|
||||||
|
assert!(network.is_request());
|
||||||
|
}
|
||||||
|
assert!(!network.is_connect());
|
||||||
|
assert!(!network.is_timeout());
|
||||||
|
assert!(cache.exists(), "an unanswered request must not delete the cookie cache");
|
||||||
|
let request = worker.await.unwrap();
|
||||||
|
assert!(request.contains("portal-cookie"));
|
||||||
|
if portal_discovery {
|
||||||
|
assert!(request.starts_with("POST /global-protect/getconfig.esp "));
|
||||||
|
} else {
|
||||||
|
assert!(request.starts_with("POST /ssl-vpn/login.esp "));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn internal_tunnel_keeps_gateway_authentication_after_portal_cookie_rejection() {
|
async fn internal_tunnel_keeps_gateway_authentication_after_portal_cookie_rejection() {
|
||||||
let (origin, worker) = gateway(vec![
|
let (origin, worker) = gateway(vec![
|
||||||
@@ -143,7 +293,6 @@ async fn internal_tunnel_keeps_gateway_authentication_after_portal_cookie_reject
|
|||||||
let lock = directory.path().join("client.pid");
|
let lock = directory.path().join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -190,7 +339,6 @@ async fn rendering_recovery_fetches_new_prelogin_metadata_and_preserves_gateway_
|
|||||||
let lock = directory.path().join("client.pid");
|
let lock = directory.path().join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -224,7 +372,6 @@ async fn cancellation_during_recovery_prelogin_stops_request() {
|
|||||||
let lock = directory.path().join("client.pid");
|
let lock = directory.path().join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -291,7 +438,6 @@ async fn auth_crash_uses_fresh_saml_and_clean_once_with_shared_budget() {
|
|||||||
let lock = directory.path().join("client.pid");
|
let lock = directory.path().join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -350,7 +496,6 @@ async fn exhausted_auth_recovery_is_terminal_before_portal_gateway_fallback() {
|
|||||||
let lock = directory.path().join("client.pid");
|
let lock = directory.path().join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -497,7 +642,6 @@ printf '%s\n' '{"success":{"username":"alice","preloginCookie":"new-cookie"}}'
|
|||||||
let lock = directory.join("client.pid");
|
let lock = directory.join("client.pid");
|
||||||
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
let shared = SharedArgs {
|
let shared = SharedArgs {
|
||||||
fix_openssl: false,
|
|
||||||
ignore_tls_errors: true,
|
ignore_tls_errors: true,
|
||||||
lock_file: &lock,
|
lock_file: &lock,
|
||||||
verbose: &verbose,
|
verbose: &verbose,
|
||||||
@@ -518,3 +662,62 @@ printf '%s\n' '{"success":{"username":"alice","preloginCookie":"new-cookie"}}'
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn unsupported_and_malformed_identities_fail_before_password_prompt_or_network_connection() {
|
||||||
|
use gpapi::utils::request::RequestIdentityError;
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let malformed = directory.path().join("invalid.p12");
|
||||||
|
std::fs::write(&malformed, b"not a certificate archive").unwrap();
|
||||||
|
let fixtures =
|
||||||
|
std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../crates/gpapi/tests/files/client-identity");
|
||||||
|
|
||||||
|
for (certificate, key, expected) in [
|
||||||
|
(
|
||||||
|
fixtures.join("rsa-pss-cert.pem"),
|
||||||
|
Some(fixtures.join("rsa-pss.pem")),
|
||||||
|
"algorithm",
|
||||||
|
),
|
||||||
|
(fixtures.join("legacy-RC2-128.p12"), None, "encryption"),
|
||||||
|
(malformed, None, "malformed"),
|
||||||
|
] {
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let server = format!("https://{}", listener.local_addr().unwrap());
|
||||||
|
let mut argv = vec![
|
||||||
|
"test".to_owned(),
|
||||||
|
server,
|
||||||
|
"--as-gateway".to_owned(),
|
||||||
|
"--certificate".to_owned(),
|
||||||
|
certificate.to_string_lossy().into_owned(),
|
||||||
|
];
|
||||||
|
if let Some(key) = key {
|
||||||
|
argv.extend(["--sslkey".to_owned(), key.to_string_lossy().into_owned()]);
|
||||||
|
}
|
||||||
|
let args = TestArgs::parse_from(argv).connect;
|
||||||
|
let lock = directory.path().join("client.pid");
|
||||||
|
let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0);
|
||||||
|
let shared = SharedArgs {
|
||||||
|
ignore_tls_errors: false,
|
||||||
|
lock_file: &lock,
|
||||||
|
verbose: &verbose,
|
||||||
|
log_format: LogFormat::Text,
|
||||||
|
};
|
||||||
|
let handler = ConnectHandler::new(&args, &shared);
|
||||||
|
let error = tokio::time::timeout(Duration::from_secs(2), handler.handle_attempt())
|
||||||
|
.await
|
||||||
|
.expect("identity failure must not wait for a password or server")
|
||||||
|
.unwrap_err();
|
||||||
|
match (expected, error.downcast_ref::<RequestIdentityError>()) {
|
||||||
|
("algorithm", Some(RequestIdentityError::UnsupportedKeyAlgorithm("RSA-PSS"))) => {}
|
||||||
|
("encryption", Some(RequestIdentityError::UnsupportedEncryption)) => {}
|
||||||
|
("malformed", Some(RequestIdentityError::InvalidPkcs12(_) | RequestIdentityError::InvalidCertificate)) => {}
|
||||||
|
_ => panic!("{expected}: unexpected failure {error:#}"),
|
||||||
|
}
|
||||||
|
assert!(
|
||||||
|
tokio::time::timeout(Duration::from_millis(20), listener.accept())
|
||||||
|
.await
|
||||||
|
.is_err(),
|
||||||
|
"{expected}: local identity failure must precede network access"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,14 +20,14 @@ use gpapi::{
|
|||||||
};
|
};
|
||||||
use inquire::Text;
|
use inquire::Text;
|
||||||
use log::{Level, info, warn};
|
use log::{Level, info, warn};
|
||||||
use openconnect::{HipScript, HipSource, Vpn, VpnBuilder};
|
use openconnect::{HipScript, HipSource, VpnBuilder};
|
||||||
use tokio::{runtime::Handle, task::JoinHandle};
|
use tokio::{runtime::Handle, task::JoinHandle};
|
||||||
|
|
||||||
use crate::session::{
|
use crate::session::{
|
||||||
SessionContextInput, build_session_context, session_info_from_vpn, spawn_session_runtime_with_info,
|
SessionContextInput, build_session_context, session_info_from_vpn, spawn_session_runtime_with_info,
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{ConnectHandler, args::cookie_cache_path};
|
use super::{ConnectHandler, args::cookie_cache_path, vpn_script};
|
||||||
|
|
||||||
const OPENCONNECT_INTERRUPTED_EXIT_CODE: i32 = -4;
|
const OPENCONNECT_INTERRUPTED_EXIT_CODE: i32 = -4;
|
||||||
|
|
||||||
@@ -101,6 +101,11 @@ impl ConnectHandler<'_> {
|
|||||||
{
|
{
|
||||||
return Some(Err(error));
|
return Some(Err(error));
|
||||||
}
|
}
|
||||||
|
// A failed request does not establish that the cookie was rejected.
|
||||||
|
if is_network_error(&error) {
|
||||||
|
warn!("Cached gateway authentication request failed: {error}");
|
||||||
|
return Some(Err(error));
|
||||||
|
}
|
||||||
cookie_store::clear(&path);
|
cookie_store::clear(&path);
|
||||||
warn!("Cached gateway authentication failed: {error}");
|
warn!("Cached gateway authentication failed: {error}");
|
||||||
return None;
|
return None;
|
||||||
@@ -360,22 +365,26 @@ impl ConnectHandler<'_> {
|
|||||||
match login {
|
match login {
|
||||||
GatewayLogin::Authenticated(authentication) => {
|
GatewayLogin::Authenticated(authentication) => {
|
||||||
let descriptor = Gateway::new(gateway.to_string(), gateway.to_string());
|
let descriptor = Gateway::new(gateway.to_string(), gateway.to_string());
|
||||||
client.register_session(
|
self
|
||||||
descriptor.clone(),
|
.sessions
|
||||||
authentication.clone(),
|
.borrow_mut()
|
||||||
&mut self.sessions.borrow_mut(),
|
.register_login(descriptor.clone(), authentication.clone(), &client);
|
||||||
);
|
|
||||||
self.check_cancelled()?;
|
self.check_cancelled()?;
|
||||||
if internal && authentication.mode() == SessionMode::NonTunnel && !self.args.cookie_only {
|
let binding = if internal && authentication.mode() == SessionMode::NonTunnel && !self.args.cookie_only {
|
||||||
client
|
Some(
|
||||||
.bind_non_tunnel(self.args.disable_ipv6, None, &cancellation)
|
self
|
||||||
.await
|
.sessions
|
||||||
.map_err(|error| error.context(gpapi::gateway::GatewayLoginProtocolError))?;
|
.borrow_mut()
|
||||||
client.update_registered_session(&descriptor, &authentication, &mut self.sessions.borrow_mut());
|
.bind_non_tunnel(&descriptor, &client, self.args.disable_ipv6, None, &cancellation)
|
||||||
}
|
.await
|
||||||
|
.map_err(|error| error.context(gpapi::gateway::GatewayLoginProtocolError))?,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
return Ok(GatewayLoginSession {
|
return Ok(GatewayLoginSession {
|
||||||
authentication,
|
authentication,
|
||||||
extension_auth: SessionExtensionAuth::new(cred.clone(), client),
|
extension_auth: SessionExtensionAuth::new(cred.clone(), client).with_binding(binding),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
GatewayLogin::Mfa(message, input_str) => {
|
GatewayLogin::Mfa(message, input_str) => {
|
||||||
@@ -443,10 +452,8 @@ impl ConnectHandler<'_> {
|
|||||||
disable_ipv6: self.args.disable_ipv6,
|
disable_ipv6: self.args.disable_ipv6,
|
||||||
extension_auth: Some(extension_auth),
|
extension_auth: Some(extension_auth),
|
||||||
});
|
});
|
||||||
let vpn_builder = Vpn::builder(gateway, cookie)
|
let vpn_builder = vpn_script::builder(gateway, cookie, self.args)
|
||||||
.script(self.args.script.clone())
|
|
||||||
.interface(self.args.interface.clone())
|
.interface(self.args.interface.clone())
|
||||||
.script_tun(self.args.script_tun)
|
|
||||||
.certificate(certificate)
|
.certificate(certificate)
|
||||||
.sslkey(sslkey)
|
.sslkey(sslkey)
|
||||||
.key_password(key_password)
|
.key_password(key_password)
|
||||||
@@ -454,19 +461,15 @@ impl ConnectHandler<'_> {
|
|||||||
.reconnect_timeout(self.args.reconnect_timeout)
|
.reconnect_timeout(self.args.reconnect_timeout)
|
||||||
.mtu(mtu)
|
.mtu(mtu)
|
||||||
.disable_ipv6(self.args.disable_ipv6)
|
.disable_ipv6(self.args.disable_ipv6)
|
||||||
|
.gateway_ip_preference(match self.args.ip_preference {
|
||||||
|
gpapi::gateway::GatewayIpPreference::Auto => openconnect::GatewayIpPreference::Auto,
|
||||||
|
gpapi::gateway::GatewayIpPreference::Ipv4 => openconnect::GatewayIpPreference::Ipv4,
|
||||||
|
gpapi::gateway::GatewayIpPreference::Ipv6 => openconnect::GatewayIpPreference::Ipv6,
|
||||||
|
})
|
||||||
.no_dtls(self.args.no_dtls)
|
.no_dtls(self.args.no_dtls)
|
||||||
.local_hostname(self.args.local_hostname.clone())
|
.local_hostname(self.args.local_hostname.clone())
|
||||||
.dpd_interval(self.args.dpd_interval.unwrap_or(0))
|
.dpd_interval(self.args.dpd_interval.unwrap_or(0))
|
||||||
.no_xmlpost(self.args.no_xmlpost);
|
.no_xmlpost(self.args.no_xmlpost);
|
||||||
#[cfg(target_os = "macos")]
|
|
||||||
let vpn_builder = if self.args.script.is_none()
|
|
||||||
&& std::env::var_os("GP_VPNC_SCRIPT").is_none_or(|value| value.is_empty())
|
|
||||||
&& let Some(script) = common::binary_paths::bundled_vpnc_script()
|
|
||||||
{
|
|
||||||
vpn_builder.script_path(script.to_string_lossy().into_owned())
|
|
||||||
} else {
|
|
||||||
vpn_builder
|
|
||||||
};
|
|
||||||
let vpn = apply_os_profile(vpn_builder, &os_profile)
|
let vpn = apply_os_profile(vpn_builder, &os_profile)
|
||||||
.build()
|
.build()
|
||||||
.map_err(|err| GatewayConnectError::before_establishment(err.into()))?;
|
.map_err(|err| GatewayConnectError::before_establishment(err.into()))?;
|
||||||
@@ -491,6 +494,16 @@ impl ConnectHandler<'_> {
|
|||||||
.transpose()
|
.transpose()
|
||||||
.map_err(GatewayConnectError::before_establishment)?;
|
.map_err(GatewayConnectError::before_establishment)?;
|
||||||
|
|
||||||
|
let mut dashboard = if self.args.dashboard {
|
||||||
|
Some(
|
||||||
|
crate::dashboard::Dashboard::prepare(gateway.to_owned(), self.cancellation.clone())
|
||||||
|
.map_err(GatewayConnectError::before_establishment)?,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
let monitor = gptunnel::TunnelMonitor::attach(vpn.clone());
|
||||||
|
|
||||||
let disconnect_task = tokio::spawn(async move {
|
let disconnect_task = tokio::spawn(async move {
|
||||||
cancellation.cancelled().await;
|
cancellation.cancelled().await;
|
||||||
info!("Received the interrupt signal, disconnecting...");
|
info!("Received the interrupt signal, disconnecting...");
|
||||||
@@ -523,7 +536,7 @@ impl ConnectHandler<'_> {
|
|||||||
session_task_on_connect.lock().unwrap().replace(task);
|
session_task_on_connect.lock().unwrap().replace(task);
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
let mut background_error = None;
|
let mut output_error = None;
|
||||||
let connect_result = tokio::select! {
|
let connect_result = tokio::select! {
|
||||||
result = &mut worker => result,
|
result = &mut worker => result,
|
||||||
established = established_rx => {
|
established = established_rx => {
|
||||||
@@ -537,6 +550,12 @@ impl ConnectHandler<'_> {
|
|||||||
self.logout_gateway(&server).await;
|
self.logout_gateway(&server).await;
|
||||||
}
|
}
|
||||||
}, || {
|
}, || {
|
||||||
|
if let Some(dashboard) = &mut dashboard {
|
||||||
|
if let Err(error) = dashboard.start_tunnel(monitor.clone()) {
|
||||||
|
self.cancellation.cancel();
|
||||||
|
output_error = Some(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
if let (Some(background), Some(stdio)) = (&self.background, &mut background_stdio) {
|
if let (Some(background), Some(stdio)) = (&self.background, &mut background_stdio) {
|
||||||
let detach = if self.pid_written.load(Ordering::SeqCst) {
|
let detach = if self.pid_written.load(Ordering::SeqCst) {
|
||||||
background.detach(stdio)
|
background.detach(stdio)
|
||||||
@@ -545,7 +564,7 @@ impl ConnectHandler<'_> {
|
|||||||
};
|
};
|
||||||
if let Err(error) = detach {
|
if let Err(error) = detach {
|
||||||
self.cancellation.cancel();
|
self.cancellation.cancel();
|
||||||
background_error = Some(error);
|
output_error = Some(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}).await
|
}).await
|
||||||
@@ -554,6 +573,12 @@ impl ConnectHandler<'_> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
monitor.stop().await;
|
||||||
|
if let Some(dashboard) = &mut dashboard {
|
||||||
|
if let Err(error) = dashboard.finish() {
|
||||||
|
output_error = Some(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
let tunnel_established = tunnel_established.load(Ordering::SeqCst);
|
let tunnel_established = tunnel_established.load(Ordering::SeqCst);
|
||||||
disconnect_task.abort();
|
disconnect_task.abort();
|
||||||
let _ = disconnect_task.await;
|
let _ = disconnect_task.await;
|
||||||
@@ -564,7 +589,7 @@ impl ConnectHandler<'_> {
|
|||||||
let _ = task.await;
|
let _ = task.await;
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(error) = background_error {
|
if let Some(error) = output_error {
|
||||||
return Err(GatewayConnectError::after_establishment(error));
|
return Err(GatewayConnectError::after_establishment(error));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -765,9 +790,8 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn explicit_hip_user_resolves_to_the_selected_account() {
|
fn explicit_hip_user_resolves_to_the_selected_account() {
|
||||||
let current = uzers::get_user_by_uid(uzers::get_effective_uid()).unwrap();
|
// Build sandboxes may use a UID without an entry in the user database.
|
||||||
let name = current.name().to_string_lossy().into_owned();
|
assert_eq!(get_uid(&Some("root".to_string())).unwrap(), Some(0));
|
||||||
assert_eq!(get_uid(&Some(name)).unwrap(), Some(current.uid()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -811,3 +835,11 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A failed request says nothing about whether a cached cookie is still valid.
|
||||||
|
pub(super) fn is_network_error(error: &anyhow::Error) -> bool {
|
||||||
|
matches!(
|
||||||
|
error.downcast_ref::<gpapi::error::PortalError>(),
|
||||||
|
Some(gpapi::error::PortalError::NetworkError(_))
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -2,14 +2,14 @@ use std::sync::Arc;
|
|||||||
|
|
||||||
use anyhow::{Context, bail, ensure};
|
use anyhow::{Context, bail, ensure};
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
|
collection::CollectionControl,
|
||||||
credential::AuthCookieCredential,
|
credential::AuthCookieCredential,
|
||||||
gateway::{Gateway, GatewayLoginContext, GatewaySelection},
|
gateway::{Gateway, GatewayLoginContext, GatewaySelection},
|
||||||
portal::PortalConfig,
|
portal::PortalConfig,
|
||||||
process::collection::CollectionControl,
|
|
||||||
session::{
|
session::{
|
||||||
MaintenanceState, SessionEndReason, SessionMode,
|
MaintenanceState, SessionEndReason, SessionMode,
|
||||||
network::PhysicalNetwork,
|
desktop::network::PhysicalNetwork,
|
||||||
non_tunnel::{SessionCallbacks, SessionExit, maintain_non_tunnel_sessions},
|
desktop::non_tunnel::{SessionCallbacks, SessionExit, maintain_non_tunnel_sessions},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
@@ -112,19 +112,34 @@ impl ConnectHandler<'_> {
|
|||||||
let source = Arc::new(source);
|
let source = Arc::new(source);
|
||||||
let validate_network = network.clone();
|
let validate_network = network.clone();
|
||||||
let validate_detection = detection.clone();
|
let validate_detection = detection.clone();
|
||||||
|
let members = crate::dashboard::InternalMembers::default();
|
||||||
|
let dashboard_members = members.clone();
|
||||||
|
let (established_tx, established_rx) = tokio::sync::oneshot::channel();
|
||||||
|
let established_tx = std::sync::Mutex::new(Some(established_tx));
|
||||||
|
let mut dashboard = if self.args.dashboard {
|
||||||
|
Some(crate::dashboard::Dashboard::prepare(
|
||||||
|
authenticated[0].0.server().to_owned(),
|
||||||
|
cancellation.clone(),
|
||||||
|
)?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
let callbacks = SessionCallbacks {
|
let callbacks = SessionCallbacks {
|
||||||
produce_report: Arc::new(move |request, control| {
|
produce_report: Arc::new(move |request, control| {
|
||||||
control.check()?;
|
control.check()?;
|
||||||
if matches!(source.as_ref(), openconnect::HipSource::Disabled) {
|
if matches!(source.as_ref(), openconnect::HipSource::Disabled) {
|
||||||
return gphip::generate_identity_report(&gphip::ReportInput {
|
return gphip::generate_identity_report(
|
||||||
profile: profile.clone(),
|
&gphip::ReportInput {
|
||||||
context: gphip::ReportContext::Connected {
|
profile: profile.clone(),
|
||||||
cookie: request.cookie.clone(),
|
context: gphip::ReportContext::Connected {
|
||||||
client_ip: request.client_ip.clone(),
|
cookie: request.cookie.clone(),
|
||||||
client_ipv6: request.client_ipv6.clone(),
|
client_ip: request.client_ip.clone(),
|
||||||
md5: request.md5.clone(),
|
client_ipv6: request.client_ipv6.clone(),
|
||||||
|
md5: request.md5.clone(),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
})
|
control,
|
||||||
|
)
|
||||||
.map_err(std::io::Error::other);
|
.map_err(std::io::Error::other);
|
||||||
}
|
}
|
||||||
source.collect(
|
source.collect(
|
||||||
@@ -143,12 +158,23 @@ impl ConnectHandler<'_> {
|
|||||||
)
|
)
|
||||||
}),
|
}),
|
||||||
report_submitted: Arc::new(|_, _| {}),
|
report_submitted: Arc::new(|_, _| {}),
|
||||||
status_changed: Arc::new(|member| match member.maintenance {
|
status_changed: Arc::new(move |member| {
|
||||||
MaintenanceState::Healthy => info!(
|
match member.maintenance {
|
||||||
"Internal network — authenticated: {} (IPv4: {:?}, IPv6: {:?})",
|
MaintenanceState::Healthy => {
|
||||||
member.gateway, member.client_ip, member.client_ipv6
|
info!(
|
||||||
),
|
"Internal network — authenticated: {} (IPv4: {:?}, IPv6: {:?})",
|
||||||
state => info!("Internal gateway {}: {state:?}", member.gateway),
|
member.gateway, member.client_ip, member.client_ipv6
|
||||||
|
);
|
||||||
|
if let Some(established) = established_tx.lock().unwrap().take() {
|
||||||
|
let _ = established.send(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
state => info!("Internal gateway {}: {state:?}", member.gateway),
|
||||||
|
}
|
||||||
|
members.lock().unwrap().insert(
|
||||||
|
member.gateway.server().to_owned(),
|
||||||
|
format!("{}: {:?}", member.gateway, member.maintenance),
|
||||||
|
);
|
||||||
}),
|
}),
|
||||||
validate_network: Arc::new(move |cancellation| {
|
validate_network: Arc::new(move |cancellation| {
|
||||||
let network = validate_network.clone();
|
let network = validate_network.clone();
|
||||||
@@ -183,13 +209,38 @@ impl ConnectHandler<'_> {
|
|||||||
std::sync::atomic::Ordering::SeqCst,
|
std::sync::atomic::Ordering::SeqCst,
|
||||||
);
|
);
|
||||||
let mut sessions = self.sessions.take();
|
let mut sessions = self.sessions.take();
|
||||||
let result = maintain_non_tunnel_sessions(&mut sessions, policy, callbacks, cancellation, async move {
|
let mut dashboard_error = None;
|
||||||
network_signal.await.unwrap_or(SessionEndReason::NetworkChanged)
|
let result = {
|
||||||
})
|
let maintenance = maintain_non_tunnel_sessions(&mut sessions, policy, callbacks, cancellation, async move {
|
||||||
.await;
|
network_signal.await.unwrap_or(SessionEndReason::NetworkChanged)
|
||||||
|
});
|
||||||
|
tokio::pin!(maintenance);
|
||||||
|
tokio::select! {
|
||||||
|
result = &mut maintenance => result,
|
||||||
|
established = established_rx => {
|
||||||
|
if established.is_ok() {
|
||||||
|
if let Some(dashboard) = &mut dashboard {
|
||||||
|
if let Err(error) = dashboard.start_internal(dashboard_members) {
|
||||||
|
self.cancellation.cancel();
|
||||||
|
dashboard_error = Some(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
maintenance.await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if let Some(dashboard) = &mut dashboard {
|
||||||
|
if let Err(error) = dashboard.finish() {
|
||||||
|
dashboard_error = Some(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
self.sessions.replace(sessions);
|
self.sessions.replace(sessions);
|
||||||
monitor_cancel.cancel();
|
monitor_cancel.cancel();
|
||||||
monitor.await.context("Internal network monitor failed")?;
|
monitor.await.context("Internal network monitor failed")?;
|
||||||
|
if let Some(error) = dashboard_error {
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
match result? {
|
match result? {
|
||||||
SessionExit::Disconnected => Ok(()),
|
SessionExit::Disconnected => Ok(()),
|
||||||
SessionExit::Failed(reason) => bail!("Internal session ended: {reason:?}. Connect again to authenticate."),
|
SessionExit::Failed(reason) => bail!("Internal session ended: {reason:?}. Connect again to authenticate."),
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ mod credential;
|
|||||||
mod flow_tests;
|
mod flow_tests;
|
||||||
mod gateway;
|
mod gateway;
|
||||||
mod internal;
|
mod internal;
|
||||||
|
mod vpn_script;
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::sync::{
|
use std::sync::{
|
||||||
@@ -18,8 +19,8 @@ use gpapi::{
|
|||||||
gateway::GatewaySelection,
|
gateway::GatewaySelection,
|
||||||
gp_params::GpParams,
|
gp_params::GpParams,
|
||||||
os_profile::OsProfile,
|
os_profile::OsProfile,
|
||||||
portal::{PreloginOptions, prelogin, retrieve_config},
|
portal::{PreloginOptions, discovery::discover, prelogin},
|
||||||
session::GatewaySessions,
|
session::desktop::GatewaySessions,
|
||||||
utils::request::RequestIdentityError,
|
utils::request::RequestIdentityError,
|
||||||
};
|
};
|
||||||
use inquire::{Password, PasswordDisplayMode, Select};
|
use inquire::{Password, PasswordDisplayMode, Select};
|
||||||
@@ -153,9 +154,9 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
|
|
||||||
async fn handle_attempt(&self) -> anyhow::Result<()> {
|
async fn handle_attempt(&self) -> anyhow::Result<()> {
|
||||||
if self.args.browser_listen.is_some()
|
if self.args.browser_listen.is_some()
|
||||||
&& !matches!(self.args.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("remote"))
|
&& !matches!(self.args.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("manual") || browser.eq_ignore_ascii_case("remote"))
|
||||||
{
|
{
|
||||||
bail!("The '--browser-listen' option requires '--browser remote'");
|
bail!("The '--browser-listen' option requires '--browser manual'");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
@@ -178,11 +179,20 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
{
|
{
|
||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
let Some(root_cause) = err.root_cause().downcast_ref::<RequestIdentityError>() else {
|
let Some(identity_error) = err.downcast_ref::<RequestIdentityError>() else {
|
||||||
return Err(err);
|
return Err(err);
|
||||||
};
|
};
|
||||||
|
|
||||||
match root_cause {
|
match identity_error {
|
||||||
|
RequestIdentityError::UnsupportedEncryption
|
||||||
|
| RequestIdentityError::UnsupportedKeyFormat
|
||||||
|
| RequestIdentityError::UnsupportedKeyAlgorithm(_)
|
||||||
|
| RequestIdentityError::KeyMismatch
|
||||||
|
| RequestIdentityError::InvalidKey
|
||||||
|
| RequestIdentityError::InvalidCertificate
|
||||||
|
| RequestIdentityError::IncompletePkcs12
|
||||||
|
| RequestIdentityError::AmbiguousPkcs12
|
||||||
|
| RequestIdentityError::InvalidPkcs12(_) => return Err(err),
|
||||||
RequestIdentityError::NoKey => {
|
RequestIdentityError::NoKey => {
|
||||||
let format = self.shared_args.log_format;
|
let format = self.shared_args.log_format;
|
||||||
report(
|
report(
|
||||||
@@ -198,8 +208,12 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
RequestIdentityError::NoPassphrase(cert_type) | RequestIdentityError::DecryptError(cert_type) => {
|
RequestIdentityError::NoPassphrase(cert_type) | RequestIdentityError::DecryptError(cert_type) => {
|
||||||
let message = format!("Enter the {} passphrase:", cert_type);
|
let message = if *cert_type == "PKCS#12" {
|
||||||
let password = Password::new(&message)
|
"Enter the certificate file password:"
|
||||||
|
} else {
|
||||||
|
"Enter the private key password:"
|
||||||
|
};
|
||||||
|
let password = Password::new(message)
|
||||||
.without_confirmation()
|
.without_confirmation()
|
||||||
.with_display_mode(PasswordDisplayMode::Masked)
|
.with_display_mode(PasswordDisplayMode::Masked)
|
||||||
.prompt()?;
|
.prompt()?;
|
||||||
@@ -274,10 +288,15 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
|
|
||||||
let cached = self.cached_portal_credential(portal);
|
let cached = self.cached_portal_credential(portal);
|
||||||
let cached_config = match cached {
|
let cached_config = match cached {
|
||||||
Some(cred) => match retrieve_config(portal, &cred, &gp_params, &self.cancellation).await {
|
Some(cred) => match discover(portal, &cred, &gp_params, &self.cancellation).await {
|
||||||
Ok(config) => Some((cred, config)),
|
Ok(config) => Some((cred, config)),
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
self.check_cancelled()?;
|
self.check_cancelled()?;
|
||||||
|
// A failed request does not establish that the cookie was rejected.
|
||||||
|
if gateway::is_network_error(&error) {
|
||||||
|
warn!("Cached portal authentication request failed: {error}");
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
warn!("Cached portal authentication failed: {error}");
|
warn!("Cached portal authentication failed: {error}");
|
||||||
self.clear_cookie_cache();
|
self.clear_cookie_cache();
|
||||||
None
|
None
|
||||||
@@ -293,7 +312,7 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
.await?;
|
.await?;
|
||||||
prelogin = replacement;
|
prelogin = replacement;
|
||||||
self.check_cancelled()?;
|
self.check_cancelled()?;
|
||||||
let config = retrieve_config(portal, &cred, &gp_params, &self.cancellation).await?;
|
let config = discover(portal, &cred, &gp_params, &self.cancellation).await?;
|
||||||
(cred, config)
|
(cred, config)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
use openconnect::{Vpn, VpnBuilder};
|
||||||
|
|
||||||
|
use crate::connect::ConnectArgs;
|
||||||
|
|
||||||
|
pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> VpnBuilder {
|
||||||
|
Vpn::builder(server, cookie)
|
||||||
|
.script(args.script.clone())
|
||||||
|
.script_tun(args.script_tun)
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
use std::ffi::OsStr;
|
||||||
|
|
||||||
|
use openconnect::{Vpn, VpnBuilder};
|
||||||
|
|
||||||
|
use crate::connect::ConnectArgs;
|
||||||
|
|
||||||
|
pub(crate) fn builder(server: &str, cookie: &str, args: &ConnectArgs) -> VpnBuilder {
|
||||||
|
let configured_script = std::env::var_os("GP_VPNC_SCRIPT");
|
||||||
|
configure_builder(server, cookie, args, configured_script.as_deref())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn configure_builder(server: &str, cookie: &str, args: &ConnectArgs, configured_script: Option<&OsStr>) -> VpnBuilder {
|
||||||
|
let builder = Vpn::builder(server, cookie)
|
||||||
|
.script(args.script.clone())
|
||||||
|
.script_tun(args.script_tun);
|
||||||
|
let has_environment_script = configured_script.is_some_and(|value| !value.is_empty());
|
||||||
|
if args.script.is_none() && !args.script_tun && !has_environment_script {
|
||||||
|
builder.network_configuration_handler(|configuration| {
|
||||||
|
gpvpnc::macos::configure_network(&configuration.reason, &configuration.environment)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
builder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use clap::Parser;
|
||||||
|
|
||||||
|
#[derive(Parser)]
|
||||||
|
struct TestCli {
|
||||||
|
#[command(flatten)]
|
||||||
|
args: ConnectArgs,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn args(options: &[&str]) -> ConnectArgs {
|
||||||
|
TestCli::try_parse_from(
|
||||||
|
["connect", "vpn.example.com"]
|
||||||
|
.into_iter()
|
||||||
|
.chain(options.iter().copied()),
|
||||||
|
)
|
||||||
|
.unwrap()
|
||||||
|
.args
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn default_does_not_require_an_installed_script() {
|
||||||
|
for configured in [None, Some(OsStr::new(""))] {
|
||||||
|
assert!(
|
||||||
|
configure_builder("server", "cookie", &args(&[]), configured)
|
||||||
|
.build()
|
||||||
|
.is_ok()
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
configure_builder("server", "cookie", &args(&[]), configured)
|
||||||
|
.script("/bin/sh".to_string())
|
||||||
|
.script_tun(true)
|
||||||
|
.build()
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn explicit_commands_and_script_tunnels_remain_supported() {
|
||||||
|
for options in [
|
||||||
|
vec!["--script", "exec /bin/sh"],
|
||||||
|
vec!["--script", "/bin/sh", "--script-tun"],
|
||||||
|
] {
|
||||||
|
assert!(
|
||||||
|
configure_builder("server", "cookie", &args(&options), None)
|
||||||
|
.build()
|
||||||
|
.is_ok()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn environment_override_does_not_install_default_callback() {
|
||||||
|
let builder = configure_builder("server", "cookie", &args(&[]), Some(OsStr::new("/bin/sh")));
|
||||||
|
// Converting the selected builder to an explicit packet script would fail
|
||||||
|
// if the embedded configuration callback had replaced the environment override.
|
||||||
|
assert!(builder.script("/bin/sh".to_string()).script_tun(true).build().is_ok());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
#[path = "macos.rs"]
|
||||||
|
mod platform;
|
||||||
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
#[path = "default.rs"]
|
||||||
|
mod platform;
|
||||||
|
|
||||||
|
pub(super) use platform::builder;
|
||||||
@@ -0,0 +1,627 @@
|
|||||||
|
//! Dashboard presentation only; connection ownership and sampling stay outside this module.
|
||||||
|
use crossterm::event::KeyCode;
|
||||||
|
use gpapi::session::desktop::tunnel::{
|
||||||
|
TunnelList, TunnelPhase, TunnelState, TunnelStatisticsSnapshot, TunnelStatisticsState,
|
||||||
|
};
|
||||||
|
use ratatui::{
|
||||||
|
Frame,
|
||||||
|
buffer::Buffer,
|
||||||
|
layout::Rect,
|
||||||
|
style::{Color, Modifier, Style},
|
||||||
|
text::{Line, Span},
|
||||||
|
widgets::{Paragraph, Widget, Wrap},
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::output::plain_text;
|
||||||
|
|
||||||
|
const MAX_CONTENT_WIDTH: u16 = 120;
|
||||||
|
const LABEL_WIDTH: usize = 12;
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub(super) struct DetailScroll {
|
||||||
|
offset: u16,
|
||||||
|
maximum: u16,
|
||||||
|
page: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DetailScroll {
|
||||||
|
pub(super) fn handle_key(&mut self, key: KeyCode) {
|
||||||
|
self.offset = match key {
|
||||||
|
KeyCode::Up => self.offset.saturating_sub(1),
|
||||||
|
KeyCode::Down => self.offset.saturating_add(1),
|
||||||
|
KeyCode::PageUp => self.offset.saturating_sub(self.page),
|
||||||
|
KeyCode::PageDown => self.offset.saturating_add(self.page),
|
||||||
|
KeyCode::Home => 0,
|
||||||
|
KeyCode::End => self.maximum,
|
||||||
|
_ => self.offset,
|
||||||
|
}
|
||||||
|
.min(self.maximum);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn can_scroll(&self) -> bool {
|
||||||
|
self.maximum > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update(&mut self, content_height: u16, viewport_height: u16) {
|
||||||
|
self.maximum = if viewport_height == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
content_height.saturating_sub(viewport_height)
|
||||||
|
};
|
||||||
|
self.offset = self.offset.min(self.maximum);
|
||||||
|
self.page = viewport_height.saturating_sub(1).max(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn phase_label(phase: TunnelPhase) -> &'static str {
|
||||||
|
match phase {
|
||||||
|
TunnelPhase::Establishing => "Establishing",
|
||||||
|
TunnelPhase::Connected => "Connected",
|
||||||
|
TunnelPhase::Reconnecting => "Reconnecting",
|
||||||
|
TunnelPhase::Ended => "Disconnected",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn uptime(milliseconds: u64) -> String {
|
||||||
|
let seconds = milliseconds / 1000;
|
||||||
|
format!("{:02}:{:02}:{:02}", seconds / 3600, (seconds / 60) % 60, seconds % 60)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bytes(value: u64) -> String {
|
||||||
|
const UNITS: [&str; 7] = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"];
|
||||||
|
let mut amount = value as f64;
|
||||||
|
let mut unit = 0;
|
||||||
|
while amount >= 1024.0 && unit < UNITS.len() - 1 {
|
||||||
|
amount /= 1024.0;
|
||||||
|
unit += 1;
|
||||||
|
}
|
||||||
|
if unit == 0 {
|
||||||
|
format!("{value} B")
|
||||||
|
} else {
|
||||||
|
format!("{amount:.1} {}", UNITS[unit])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn muted(text: impl Into<String>) -> Span<'static> {
|
||||||
|
Span::styled(text.into(), Style::default().fg(Color::DarkGray))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn heading(text: impl Into<String>) -> Line<'static> {
|
||||||
|
Line::styled(
|
||||||
|
text.into(),
|
||||||
|
Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn row(label: &str, value: impl Into<String>) -> Line<'static> {
|
||||||
|
Line::from(vec![
|
||||||
|
muted(format!("{label:<LABEL_WIDTH$} ")),
|
||||||
|
Span::raw(plain_text(value.into().as_bytes())),
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
fn paragraph(lines: Vec<Line<'static>>) -> Paragraph<'static> {
|
||||||
|
Paragraph::new(lines).wrap(Wrap { trim: false })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn summary(server: &str, state: &TunnelState, width: u16) -> Paragraph<'static> {
|
||||||
|
let status = Span::styled(
|
||||||
|
format!("{:<LABEL_WIDTH$} ", phase_label(state.phase)),
|
||||||
|
Style::default().fg(if state.phase == TunnelPhase::Connected {
|
||||||
|
Color::Green
|
||||||
|
} else {
|
||||||
|
Color::Yellow
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
let mut lines = if width >= 64 {
|
||||||
|
vec![Line::from(vec![
|
||||||
|
status,
|
||||||
|
Span::raw(format!(
|
||||||
|
"{} Uptime {}",
|
||||||
|
state.transport.label(),
|
||||||
|
uptime(state.elapsed_ms)
|
||||||
|
)),
|
||||||
|
])]
|
||||||
|
} else {
|
||||||
|
vec![
|
||||||
|
Line::from(status),
|
||||||
|
row("Transport", state.transport.label()),
|
||||||
|
row("Uptime", uptime(state.elapsed_ms)),
|
||||||
|
]
|
||||||
|
};
|
||||||
|
lines.insert(0, row("Server", server));
|
||||||
|
paragraph(lines)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn traffic(statistics: &TunnelStatisticsSnapshot, width: u16) -> Paragraph<'static> {
|
||||||
|
let mut lines = vec![heading("TRAFFIC")];
|
||||||
|
if let Some(view) = statistics.view() {
|
||||||
|
let label = match view.state {
|
||||||
|
TunnelStatisticsState::Disabled => "disabled",
|
||||||
|
TunnelStatisticsState::Waiting => "waiting for sample",
|
||||||
|
TunnelStatisticsState::Fresh => "live",
|
||||||
|
TunnelStatisticsState::Stale => "stale",
|
||||||
|
TunnelStatisticsState::Ended => "ended",
|
||||||
|
};
|
||||||
|
lines[0] = heading(format!("TRAFFIC · {label}"));
|
||||||
|
if let Some(sample) = &view.sample {
|
||||||
|
if width >= 56 {
|
||||||
|
let rows = [
|
||||||
|
("Bytes", bytes(sample.received_bytes), bytes(sample.sent_bytes)),
|
||||||
|
(
|
||||||
|
"Packets",
|
||||||
|
sample.received_packets.to_string(),
|
||||||
|
sample.sent_packets.to_string(),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
// Size to the values, while keeping room for full u64 counters and a
|
||||||
|
// visible gap even when both numeric columns are filled.
|
||||||
|
let numeric_width = rows
|
||||||
|
.iter()
|
||||||
|
.flat_map(|(_, received, sent)| [received.len(), sent.len()])
|
||||||
|
.max()
|
||||||
|
.unwrap_or(0)
|
||||||
|
.max(10);
|
||||||
|
lines.push(Line::from(muted(format!(
|
||||||
|
"{:<10}{:>numeric_width$} {:>numeric_width$}",
|
||||||
|
"", "Received", "Sent"
|
||||||
|
))));
|
||||||
|
for (label, received, sent) in rows {
|
||||||
|
lines.push(Line::from(vec![
|
||||||
|
muted(format!("{label:<10}")),
|
||||||
|
Span::raw(format!("{received:>numeric_width$} {sent:>numeric_width$}")),
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
lines.push(row("Received", bytes(sample.received_bytes)));
|
||||||
|
lines.push(row("Sent", bytes(sample.sent_bytes)));
|
||||||
|
lines.push(row("Packets in", sample.received_packets.to_string()));
|
||||||
|
lines.push(row("Packets out", sample.sent_packets.to_string()));
|
||||||
|
}
|
||||||
|
if view.state != TunnelStatisticsState::Fresh {
|
||||||
|
if let Some(age) = view.sample_age_ms {
|
||||||
|
lines.push(row("Sample age", format!("{} seconds", age / 1000)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
lines.push(row("Statistics", "unavailable"));
|
||||||
|
}
|
||||||
|
paragraph(lines)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn list_rows(lines: &mut Vec<Line<'static>>, label: &str, value: &TunnelList) {
|
||||||
|
if value.items.is_empty() && !value.truncated {
|
||||||
|
lines.push(row(label, "none"));
|
||||||
|
} else {
|
||||||
|
for (index, item) in value.items.iter().enumerate() {
|
||||||
|
lines.push(row(if index == 0 { label } else { "" }, item));
|
||||||
|
}
|
||||||
|
if value.truncated {
|
||||||
|
lines.push(row("", format!("[truncated; {} total]", value.total_count)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn routes(lines: &mut Vec<Line<'static>>, label: &str, list: &TunnelList, width: u16) {
|
||||||
|
lines.push(row(label, list.total_count.to_string()));
|
||||||
|
// Only whole entries move between columns. Long individual entries wrap through
|
||||||
|
// Paragraph rather than disappearing off the edge of a narrow terminal.
|
||||||
|
let entries: Vec<_> = list.items.iter().map(|item| plain_text(item.as_bytes())).collect();
|
||||||
|
let cell_width = entries.iter().map(|item| Line::raw(item).width()).max().unwrap_or(0) + 3;
|
||||||
|
let columns = (width as usize / cell_width).clamp(1, 3);
|
||||||
|
for chunk in entries.chunks(columns) {
|
||||||
|
let mut spans = Vec::new();
|
||||||
|
for (index, entry) in chunk.iter().enumerate() {
|
||||||
|
spans.push(Span::raw(entry.clone()));
|
||||||
|
if index + 1 < chunk.len() {
|
||||||
|
spans.push(Span::raw(" ".repeat(cell_width - Line::raw(entry).width())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lines.push(Line::from(spans));
|
||||||
|
}
|
||||||
|
if list.truncated {
|
||||||
|
lines.push(Line::raw(format!(
|
||||||
|
"[truncated; showing {} of {}]",
|
||||||
|
list.items.len(),
|
||||||
|
list.total_count
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn details(state: &TunnelState, statistics: &TunnelStatisticsSnapshot, width: u16) -> Buffer {
|
||||||
|
let traffic = traffic(statistics, width);
|
||||||
|
let traffic_height = traffic.line_count(width) as u16;
|
||||||
|
let mut tunnel = vec![heading("TUNNEL")];
|
||||||
|
let mut dns = vec![heading("DNS")];
|
||||||
|
let mut route_lines = vec![heading("ROUTES")];
|
||||||
|
if let Some(config) = &state.configuration {
|
||||||
|
tunnel.extend([
|
||||||
|
row("Interface", config.interface.as_deref().unwrap_or("none")),
|
||||||
|
row(
|
||||||
|
"IPv4",
|
||||||
|
config
|
||||||
|
.ipv4
|
||||||
|
.as_ref()
|
||||||
|
.map(|address| address.display())
|
||||||
|
.unwrap_or_else(|| "none".into()),
|
||||||
|
),
|
||||||
|
row(
|
||||||
|
"IPv6",
|
||||||
|
config
|
||||||
|
.ipv6
|
||||||
|
.as_ref()
|
||||||
|
.map(|address| address.display())
|
||||||
|
.unwrap_or_else(|| "none".into()),
|
||||||
|
),
|
||||||
|
row("Gateway", config.server_ip.as_deref().unwrap_or("none")),
|
||||||
|
row(
|
||||||
|
"MTU",
|
||||||
|
config.mtu.map(|mtu| mtu.to_string()).unwrap_or_else(|| "none".into()),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
list_rows(&mut dns, "Servers", &config.dns);
|
||||||
|
list_rows(&mut dns, "Domains", &config.search_domains);
|
||||||
|
list_rows(&mut dns, "Split DNS", &config.split_dns);
|
||||||
|
routes(&mut route_lines, "Included", &config.included_routes, width);
|
||||||
|
routes(&mut route_lines, "Excluded", &config.excluded_routes, width);
|
||||||
|
if config.truncated {
|
||||||
|
route_lines.push(row("Configuration", "truncated"));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
tunnel.push(row("Configuration", "unavailable"));
|
||||||
|
}
|
||||||
|
let tunnel = paragraph(tunnel);
|
||||||
|
let dns = paragraph(dns);
|
||||||
|
let routes = paragraph(route_lines);
|
||||||
|
let columns = width >= 88;
|
||||||
|
let column_width = if columns { (width - 4) / 2 } else { width };
|
||||||
|
let tunnel_height = tunnel.line_count(column_width) as u16;
|
||||||
|
let dns_height = dns.line_count(column_width) as u16;
|
||||||
|
let network_height = if columns {
|
||||||
|
tunnel_height.max(dns_height)
|
||||||
|
} else {
|
||||||
|
tunnel_height + 1 + dns_height
|
||||||
|
};
|
||||||
|
let network_y = traffic_height + 1;
|
||||||
|
let routes_y = network_y + network_height + 1;
|
||||||
|
let height = routes_y + routes.line_count(width) as u16;
|
||||||
|
let mut buffer = Buffer::empty(Rect::new(0, 0, width, height));
|
||||||
|
traffic.render(Rect::new(0, 0, width, traffic_height), &mut buffer);
|
||||||
|
tunnel.render(Rect::new(0, network_y, column_width, tunnel_height), &mut buffer);
|
||||||
|
let (dns_x, dns_y) = if columns {
|
||||||
|
(column_width + 4, network_y)
|
||||||
|
} else {
|
||||||
|
(0, network_y + tunnel_height + 1)
|
||||||
|
};
|
||||||
|
dns.render(Rect::new(dns_x, dns_y, column_width, dns_height), &mut buffer);
|
||||||
|
routes.render(Rect::new(0, routes_y, width, height - routes_y), &mut buffer);
|
||||||
|
buffer
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn render_tunnel(
|
||||||
|
frame: &mut Frame,
|
||||||
|
area: Rect,
|
||||||
|
server: &str,
|
||||||
|
state: &TunnelState,
|
||||||
|
statistics: &TunnelStatisticsSnapshot,
|
||||||
|
scroll: &mut DetailScroll,
|
||||||
|
) {
|
||||||
|
if area.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let area = Rect {
|
||||||
|
width: area.width.min(MAX_CONTENT_WIDTH),
|
||||||
|
..area
|
||||||
|
};
|
||||||
|
let full_summary = summary(server, state, area.width);
|
||||||
|
let summary = if full_summary.line_count(area.width) + 2 > area.height as usize {
|
||||||
|
Paragraph::new(phase_label(state.phase))
|
||||||
|
} else {
|
||||||
|
full_summary
|
||||||
|
};
|
||||||
|
let summary_height = (summary.line_count(area.width) as u16).min(area.height);
|
||||||
|
frame.render_widget(summary, Rect::new(area.x, area.y, area.width, summary_height));
|
||||||
|
let body_y = summary_height.saturating_add(1).min(area.height);
|
||||||
|
let viewport = Rect::new(area.x, area.y + body_y, area.width, area.height - body_y);
|
||||||
|
let buffer = details(state, statistics, area.width);
|
||||||
|
scroll.update(buffer.area.height, viewport.height);
|
||||||
|
// Render the full detail layout with Ratatui, then expose just the scrolled rows.
|
||||||
|
// This preserves wrapped fields and aligned columns through terminal resizes.
|
||||||
|
for y in 0..viewport.height {
|
||||||
|
if y + scroll.offset >= buffer.area.height {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
for x in 0..viewport.width {
|
||||||
|
frame.buffer_mut()[(viewport.x + x, viewport.y + y)] = buffer[(x, y + scroll.offset)].clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use gpapi::session::desktop::tunnel::{TunnelStatistics, TunnelStatisticsView, TunnelTransport};
|
||||||
|
use ratatui::{Terminal, backend::TestBackend};
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn state() -> TunnelState {
|
||||||
|
serde_json::from_value(serde_json::json!({
|
||||||
|
"tunnelId": "00000000-0000-0000-0000-000000000001",
|
||||||
|
"sequence": "1", "phase": "connected", "configurationRevision": "1",
|
||||||
|
"transport": "ipsecEsp", "elapsedMs": "177000",
|
||||||
|
"configuration": {
|
||||||
|
"interface": "tun0", "serverIp": "220.191.185.154",
|
||||||
|
"ipv4": {"address": "10.197.121.152", "prefixLength": 32, "netmask": null},
|
||||||
|
"ipv6": null, "mtu": 1439, "truncated": false,
|
||||||
|
"dns": {"items": ["10.197.82.140", "10.15.70.11"], "totalCount": 2, "truncated": false},
|
||||||
|
"searchDomains": {"items": ["corp.microstrategy.com"], "totalCount": 1, "truncated": false},
|
||||||
|
"splitDns": {"items": [], "totalCount": 0, "truncated": false},
|
||||||
|
"includedRoutes": {"items": ["10.15.70.11/32", "10.197.82.140/32", "185.199.108.0/22", "2001:db8:1234:5678::/64"], "totalCount": 5, "truncated": true},
|
||||||
|
"excludedRoutes": {"items": ["192.168.0.0/16"], "totalCount": 1, "truncated": false}
|
||||||
|
}
|
||||||
|
})).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn statistics(state: &TunnelState) -> TunnelStatisticsSnapshot {
|
||||||
|
TunnelStatisticsSnapshot::Available(TunnelStatisticsView {
|
||||||
|
sequence: 1,
|
||||||
|
tunnel_id: state.tunnel_id,
|
||||||
|
state_sequence: 1,
|
||||||
|
phase: state.phase,
|
||||||
|
transport: TunnelTransport::IpsecEsp,
|
||||||
|
state: TunnelStatisticsState::Fresh,
|
||||||
|
elapsed_ms: state.elapsed_ms,
|
||||||
|
sample_age_ms: Some(0),
|
||||||
|
sample: Some(TunnelStatistics {
|
||||||
|
tunnel_id: state.tunnel_id,
|
||||||
|
sequence: 1,
|
||||||
|
state_sequence: 1,
|
||||||
|
configuration_revision: 1,
|
||||||
|
elapsed_ms: state.elapsed_ms,
|
||||||
|
received_bytes: 1_258_291,
|
||||||
|
sent_bytes: 71_578,
|
||||||
|
received_packets: u64::MAX,
|
||||||
|
sent_packets: 702,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn text(buffer: &Buffer) -> String {
|
||||||
|
(0..buffer.area.height)
|
||||||
|
.map(|y| {
|
||||||
|
(0..buffer.area.width)
|
||||||
|
.map(|x| buffer[(x, y)].symbol())
|
||||||
|
.collect::<String>()
|
||||||
|
.trim_end()
|
||||||
|
.to_string()
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn server_and_transport_share_a_column_through_status_changes() {
|
||||||
|
let mut state = state();
|
||||||
|
for width in [40, 64, 120] {
|
||||||
|
for phase in [
|
||||||
|
TunnelPhase::Establishing,
|
||||||
|
TunnelPhase::Connected,
|
||||||
|
TunnelPhase::Reconnecting,
|
||||||
|
TunnelPhase::Ended,
|
||||||
|
] {
|
||||||
|
state.phase = phase;
|
||||||
|
let mut buffer = Buffer::empty(Rect::new(0, 0, width, 8));
|
||||||
|
summary("vpn.example.com", &state, width).render(buffer.area, &mut buffer);
|
||||||
|
let rendered = text(&buffer);
|
||||||
|
let server = rendered.lines().find(|line| line.contains("vpn.example.com")).unwrap();
|
||||||
|
let transport = rendered.lines().find(|line| line.contains("IPsec (ESP)")).unwrap();
|
||||||
|
assert_eq!(server.find("vpn.example.com"), Some(14));
|
||||||
|
assert_eq!(
|
||||||
|
transport.find("IPsec (ESP)"),
|
||||||
|
server.find("vpn.example.com"),
|
||||||
|
"{phase:?} at width {width}"
|
||||||
|
);
|
||||||
|
assert!(rendered.lines().any(|line| line.starts_with(phase_label(phase))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn wide_layout_groups_settings_and_keeps_routes_and_counters_intact() {
|
||||||
|
let state = state();
|
||||||
|
let buffer = details(&state, &statistics(&state), 100);
|
||||||
|
let text = text(&buffer);
|
||||||
|
let headings = text.lines().find(|line| line.starts_with("TUNNEL")).unwrap();
|
||||||
|
assert!(headings.contains("DNS"));
|
||||||
|
assert!(text.contains("18446744073709551615"));
|
||||||
|
assert!(text.contains("1.2 MiB"));
|
||||||
|
assert!(text.contains("69.9 KiB"));
|
||||||
|
assert!(text.contains("2001:db8:1234:5678::/64"));
|
||||||
|
assert!(text.contains("[truncated; showing 4 of 5]"));
|
||||||
|
assert!(text.contains("192.168.0.0/16"));
|
||||||
|
let received_column = text
|
||||||
|
.lines()
|
||||||
|
.find(|line| line.contains("Received"))
|
||||||
|
.unwrap()
|
||||||
|
.find("Received")
|
||||||
|
.unwrap()
|
||||||
|
+ "Received".len();
|
||||||
|
let bytes_column = text
|
||||||
|
.lines()
|
||||||
|
.find(|line| line.starts_with("Bytes"))
|
||||||
|
.unwrap()
|
||||||
|
.find("1.2 MiB")
|
||||||
|
.unwrap()
|
||||||
|
+ "1.2 MiB".len();
|
||||||
|
assert_eq!(received_column, bytes_column);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn traffic_columns_stay_compact_with_a_visible_gap() {
|
||||||
|
let state = state();
|
||||||
|
let mut stats = statistics(&state);
|
||||||
|
let TunnelStatisticsSnapshot::Available(view) = &mut stats else {
|
||||||
|
unreachable!()
|
||||||
|
};
|
||||||
|
view.sample.as_mut().unwrap().received_packets = 6518;
|
||||||
|
let mut buffer = Buffer::empty(Rect::new(0, 0, 120, 4));
|
||||||
|
traffic(&stats, 120).render(buffer.area, &mut buffer);
|
||||||
|
let rendered = text(&buffer);
|
||||||
|
for line in rendered.lines() {
|
||||||
|
assert!(
|
||||||
|
line.len() <= 40,
|
||||||
|
"traffic row should not expand with the terminal: {line}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let TunnelStatisticsSnapshot::Available(view) = &mut stats else {
|
||||||
|
unreachable!()
|
||||||
|
};
|
||||||
|
view.sample.as_mut().unwrap().received_packets = u64::MAX;
|
||||||
|
view.sample.as_mut().unwrap().sent_packets = u64::MAX;
|
||||||
|
let mut buffer = Buffer::empty(Rect::new(0, 0, 56, 4));
|
||||||
|
traffic(&stats, 56).render(buffer.area, &mut buffer);
|
||||||
|
assert!(text(&buffer).contains("18446744073709551615 18446744073709551615"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn wide_terminal_keeps_content_left_aligned_and_within_120_columns() {
|
||||||
|
let state = state();
|
||||||
|
let stats = statistics(&state);
|
||||||
|
let mut terminal = Terminal::new(TestBackend::new(220, 40)).unwrap();
|
||||||
|
let mut scroll = DetailScroll::default();
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &stats, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
let wide = terminal.backend().buffer().clone();
|
||||||
|
terminal.backend_mut().resize(120, 40);
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &stats, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
for y in 0..40 {
|
||||||
|
for x in 0..220 {
|
||||||
|
if x < 120 {
|
||||||
|
assert_eq!(wide[(x, y)], terminal.backend().buffer()[(x, y)]);
|
||||||
|
} else {
|
||||||
|
assert_eq!(wide[(x, y)].symbol(), " ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn routes_use_at_most_three_columns_and_keep_every_entry() {
|
||||||
|
let list = TunnelList {
|
||||||
|
items: (1..=7).map(|n| format!("10.0.{n}.0/24")).collect(),
|
||||||
|
total_count: 7,
|
||||||
|
truncated: false,
|
||||||
|
};
|
||||||
|
let mut lines = Vec::new();
|
||||||
|
routes(&mut lines, "Included", &list, 220);
|
||||||
|
let mut buffer = Buffer::empty(Rect::new(0, 0, 220, 4));
|
||||||
|
paragraph(lines).render(buffer.area, &mut buffer);
|
||||||
|
let rendered = text(&buffer);
|
||||||
|
let route_rows: Vec<_> = rendered.lines().skip(1).collect();
|
||||||
|
assert_eq!(route_rows.len(), 3);
|
||||||
|
for line in route_rows {
|
||||||
|
assert!(line.split_whitespace().count() <= 3);
|
||||||
|
}
|
||||||
|
for entry in &list.items {
|
||||||
|
assert!(rendered.contains(entry));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn narrow_layout_stacks_sections_without_losing_routes() {
|
||||||
|
let state = state();
|
||||||
|
for width in [24, 60, 87] {
|
||||||
|
let text = text(&details(&state, &statistics(&state), width));
|
||||||
|
assert!(text.lines().any(|line| line == "TUNNEL"));
|
||||||
|
assert!(text.lines().any(|line| line == "DNS"));
|
||||||
|
assert!(text.contains("2001:db8:1234:5678::/64"));
|
||||||
|
assert!(text.contains("192.168.0.0/16"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn scrolling_reaches_last_route_and_resize_clamps_offset_with_summary_pinned() {
|
||||||
|
let state = state();
|
||||||
|
let statistics = statistics(&state);
|
||||||
|
let mut terminal = Terminal::new(TestBackend::new(60, 14)).unwrap();
|
||||||
|
let mut scroll = DetailScroll::default();
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &statistics, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
assert!(scroll.can_scroll());
|
||||||
|
scroll.handle_key(KeyCode::End);
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &statistics, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
let rendered = text(terminal.backend().buffer());
|
||||||
|
assert!(rendered.contains("Connected"));
|
||||||
|
assert!(rendered.contains("vpn.example.com"));
|
||||||
|
assert!(rendered.contains("192.168.0.0/16"));
|
||||||
|
terminal.backend_mut().resize(100, 50);
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &statistics, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
assert!(!scroll.can_scroll());
|
||||||
|
assert_eq!(scroll.offset, 0);
|
||||||
|
assert!(text(terminal.backend().buffer()).contains("TRAFFIC · live"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn very_short_body_keeps_status_and_scrollable_details_visible() {
|
||||||
|
let state = state();
|
||||||
|
for (width, height) in [(60, 6), (24, 3)] {
|
||||||
|
let mut terminal = Terminal::new(TestBackend::new(width, height)).unwrap();
|
||||||
|
let mut scroll = DetailScroll::default();
|
||||||
|
let stats = statistics(&state);
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &stats, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
assert!(text(terminal.backend().buffer()).contains("Connected"));
|
||||||
|
assert!(text(terminal.backend().buffer()).contains("TRAFFIC"));
|
||||||
|
scroll.handle_key(KeyCode::End);
|
||||||
|
terminal
|
||||||
|
.draw(|frame| render_tunnel(frame, frame.area(), "vpn.example.com", &state, &stats, &mut scroll))
|
||||||
|
.unwrap();
|
||||||
|
assert!(text(terminal.backend().buffer()).contains("192.168.0.0/16"));
|
||||||
|
scroll.handle_key(KeyCode::PageUp);
|
||||||
|
let page_up = scroll.offset;
|
||||||
|
assert!(page_up < scroll.maximum);
|
||||||
|
scroll.handle_key(KeyCode::Up);
|
||||||
|
assert!(scroll.offset < page_up);
|
||||||
|
scroll.handle_key(KeyCode::Down);
|
||||||
|
assert_eq!(scroll.offset, page_up);
|
||||||
|
scroll.handle_key(KeyCode::PageDown);
|
||||||
|
assert_eq!(scroll.offset, scroll.maximum);
|
||||||
|
scroll.handle_key(KeyCode::Home);
|
||||||
|
assert_eq!(scroll.offset, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn stale_and_missing_configuration_remain_explicit() {
|
||||||
|
let mut state = state();
|
||||||
|
let mut statistics = statistics(&state);
|
||||||
|
let TunnelStatisticsSnapshot::Available(view) = &mut statistics else {
|
||||||
|
unreachable!()
|
||||||
|
};
|
||||||
|
view.state = TunnelStatisticsState::Stale;
|
||||||
|
view.sample_age_ms = Some(12_000);
|
||||||
|
state.configuration = None;
|
||||||
|
let rendered = text(&details(&state, &statistics, 100));
|
||||||
|
assert!(rendered.contains("TRAFFIC · stale"));
|
||||||
|
assert!(rendered.contains("12 seconds"));
|
||||||
|
assert!(rendered.contains("unavailable"));
|
||||||
|
assert!(rendered.contains("1.2 MiB"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn units_and_long_sessions_are_explicit() {
|
||||||
|
assert_eq!(bytes(1024), "1.0 KiB");
|
||||||
|
assert_eq!(bytes(0), "0 B");
|
||||||
|
assert_eq!(uptime(90_061_000), "25:01:01");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
//! Optional foreground presentation. Connection ownership stays with ConnectHandler.
|
||||||
|
mod layout;
|
||||||
|
mod notice;
|
||||||
|
mod output;
|
||||||
|
mod restoration;
|
||||||
|
mod screen;
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests;
|
||||||
|
|
||||||
|
use std::{
|
||||||
|
fs::{File, OpenOptions},
|
||||||
|
io::IsTerminal,
|
||||||
|
os::fd::AsRawFd,
|
||||||
|
sync::{
|
||||||
|
Arc, Mutex,
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
mpsc,
|
||||||
|
},
|
||||||
|
thread::JoinHandle,
|
||||||
|
};
|
||||||
|
|
||||||
|
use anyhow::{Context, ensure};
|
||||||
|
use gpapi::log_format::LogFormat;
|
||||||
|
use nix::unistd::{getpgrp, tcgetpgrp};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
pub(crate) use notice::{NoticeLogger, session_notice};
|
||||||
|
use output::OutputRouting;
|
||||||
|
|
||||||
|
pub(crate) type InternalMembers = Arc<Mutex<std::collections::BTreeMap<String, String>>>;
|
||||||
|
|
||||||
|
pub(crate) fn validate(format: LogFormat) -> anyhow::Result<()> {
|
||||||
|
ensure!(
|
||||||
|
format == LogFormat::Text,
|
||||||
|
"--dashboard conflicts with --log-format json"
|
||||||
|
);
|
||||||
|
ensure!(
|
||||||
|
std::env::var_os("TERM").is_some_and(|term| term != "dumb"),
|
||||||
|
"--dashboard requires a capable terminal (TERM must not be dumb)"
|
||||||
|
);
|
||||||
|
let tty = terminal()?;
|
||||||
|
ensure!(
|
||||||
|
std::io::stderr().is_terminal(),
|
||||||
|
"--dashboard requires stderr attached to the controlling terminal"
|
||||||
|
);
|
||||||
|
let stderr = output::duplicate(2)?;
|
||||||
|
ensure!(
|
||||||
|
same_terminal(&stderr, &tty),
|
||||||
|
"--dashboard requires stderr attached to the controlling terminal"
|
||||||
|
);
|
||||||
|
ensure!(
|
||||||
|
tcgetpgrp(&tty)? == getpgrp(),
|
||||||
|
"--dashboard requires a foreground terminal"
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn terminal() -> anyhow::Result<File> {
|
||||||
|
OpenOptions::new()
|
||||||
|
.read(true)
|
||||||
|
.write(true)
|
||||||
|
.open("/dev/tty")
|
||||||
|
.context("--dashboard requires a controlling terminal")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn same_terminal(first: &File, second: &File) -> bool {
|
||||||
|
// /dev/tty is a multiplexor node, so its st_rdev differs from the underlying
|
||||||
|
// PTY. A session has one controlling terminal; compare terminal session IDs.
|
||||||
|
let first_session = unsafe { nix::libc::tcgetsid(first.as_raw_fd()) };
|
||||||
|
let second_session = unsafe { nix::libc::tcgetsid(second.as_raw_fd()) };
|
||||||
|
first_session >= 0 && first_session == second_session
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) enum Content {
|
||||||
|
Tunnel(Arc<gptunnel::TunnelMonitor>),
|
||||||
|
Internal(InternalMembers),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) enum Command {
|
||||||
|
Suspend,
|
||||||
|
Resume,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) struct Dashboard {
|
||||||
|
routing: OutputRouting,
|
||||||
|
server: String,
|
||||||
|
cancellation: CancellationToken,
|
||||||
|
stop: Arc<AtomicBool>,
|
||||||
|
worker: Option<JoinHandle<()>>,
|
||||||
|
signals: Vec<tokio::task::JoinHandle<()>>,
|
||||||
|
error: Arc<Mutex<Option<String>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Dashboard {
|
||||||
|
/// Install before native startup so persistent children inherit captured descriptors.
|
||||||
|
pub(crate) fn prepare(server: String, cancellation: CancellationToken) -> anyhow::Result<Self> {
|
||||||
|
let capture_stdout =
|
||||||
|
std::io::stdout().is_terminal() && same_terminal(&output::duplicate(1)?, &output::duplicate(2)?);
|
||||||
|
Ok(Self {
|
||||||
|
routing: OutputRouting::install(capture_stdout, cancellation.clone())?,
|
||||||
|
server,
|
||||||
|
cancellation,
|
||||||
|
stop: Arc::default(),
|
||||||
|
worker: None,
|
||||||
|
signals: Vec::new(),
|
||||||
|
error: Arc::default(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn start_tunnel(&mut self, monitor: Arc<gptunnel::TunnelMonitor>) -> anyhow::Result<()> {
|
||||||
|
self.start(Content::Tunnel(monitor.clone()))?;
|
||||||
|
monitor.set_statistics_enabled(true);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn start_internal(&mut self, members: InternalMembers) -> anyhow::Result<()> {
|
||||||
|
self.start(Content::Internal(members))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn start(&mut self, content: Content) -> anyhow::Result<()> {
|
||||||
|
ensure!(self.worker.is_none(), "Dashboard already started");
|
||||||
|
let (commands, receiver) = mpsc::channel();
|
||||||
|
for (kind, command) in [
|
||||||
|
(
|
||||||
|
tokio::signal::unix::SignalKind::from_raw(nix::libc::SIGTSTP),
|
||||||
|
Command::Suspend,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
tokio::signal::unix::SignalKind::from_raw(nix::libc::SIGCONT),
|
||||||
|
Command::Resume,
|
||||||
|
),
|
||||||
|
] {
|
||||||
|
let mut signal = tokio::signal::unix::signal(kind)?;
|
||||||
|
let commands = commands.clone();
|
||||||
|
self.signals.push(tokio::spawn(async move {
|
||||||
|
while signal.recv().await.is_some() {
|
||||||
|
let command = match command {
|
||||||
|
Command::Suspend => Command::Suspend,
|
||||||
|
Command::Resume => Command::Resume,
|
||||||
|
};
|
||||||
|
if commands.send(command).is_err() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
let mut hangup = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::hangup())?;
|
||||||
|
let cancellation = self.cancellation.clone();
|
||||||
|
self.signals.push(tokio::spawn(async move {
|
||||||
|
if hangup.recv().await.is_some() {
|
||||||
|
cancellation.cancel();
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
let (ready, started) = mpsc::sync_channel(1);
|
||||||
|
let context = screen::Context {
|
||||||
|
terminal: terminal()?,
|
||||||
|
output: self.routing.original_error.clone(),
|
||||||
|
saved_stdout: self.routing.saved_output(),
|
||||||
|
saved_stdin_flags: self.routing.saved_input_flags(),
|
||||||
|
history: self.routing.history(),
|
||||||
|
passthrough: self.routing.passthrough(),
|
||||||
|
gate: self.routing.gate(),
|
||||||
|
stop: self.stop.clone(),
|
||||||
|
cancellation: self.cancellation.clone(),
|
||||||
|
notice: notice::slot(),
|
||||||
|
server: self.server.clone(),
|
||||||
|
content,
|
||||||
|
commands: receiver,
|
||||||
|
};
|
||||||
|
let error = self.error.clone();
|
||||||
|
let cancellation = self.cancellation.clone();
|
||||||
|
self.worker = Some(std::thread::Builder::new().name("dashboard".into()).spawn(move || {
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| screen::run(context, ready)));
|
||||||
|
let failure = match result {
|
||||||
|
Ok(Ok(())) => None,
|
||||||
|
Ok(Err(failure)) => Some(format!("{failure:#}")),
|
||||||
|
Err(_) => Some("Dashboard renderer panicked".into()),
|
||||||
|
};
|
||||||
|
if let Some(failure) = failure {
|
||||||
|
*error.lock().unwrap_or_else(|error| error.into_inner()) = Some(failure);
|
||||||
|
cancellation.cancel();
|
||||||
|
}
|
||||||
|
})?);
|
||||||
|
started.recv().context("Dashboard stopped during initialization")??;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Called after native shutdown and network cleanup, while capture still drains.
|
||||||
|
pub(crate) fn finish(&mut self) -> anyhow::Result<()> {
|
||||||
|
self.stop.store(true, Ordering::Release);
|
||||||
|
if let Some(worker) = self.worker.take() {
|
||||||
|
let _ = worker.join();
|
||||||
|
}
|
||||||
|
for signal in self.signals.drain(..) {
|
||||||
|
signal.abort();
|
||||||
|
}
|
||||||
|
self.routing.restore();
|
||||||
|
if let Some(error) = self.routing.take_error() {
|
||||||
|
anyhow::bail!("Dashboard failed: {error}");
|
||||||
|
}
|
||||||
|
if let Some(error) = self.error.lock().unwrap_or_else(|error| error.into_inner()).take() {
|
||||||
|
anyhow::bail!("Dashboard failed: {error}");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Dashboard {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = self.finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
use std::sync::{Arc, Mutex, OnceLock};
|
||||||
|
|
||||||
|
use log::{Level, Log};
|
||||||
|
|
||||||
|
use super::output::plain_text;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub(super) struct Notice {
|
||||||
|
pub(super) level: Level,
|
||||||
|
pub(super) message: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) type NoticeSlot = Arc<Mutex<Option<Notice>>>;
|
||||||
|
static NOTICES: OnceLock<NoticeSlot> = OnceLock::new();
|
||||||
|
|
||||||
|
pub(super) fn slot() -> NoticeSlot {
|
||||||
|
NOTICES.get_or_init(Arc::default).clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn session_notice(level: Level, message: &str) {
|
||||||
|
if let Some(slot) = NOTICES.get() {
|
||||||
|
let mut end = message.len().min(8192);
|
||||||
|
while !message.is_char_boundary(end) {
|
||||||
|
end -= 1;
|
||||||
|
}
|
||||||
|
*slot.lock().unwrap_or_else(|error| error.into_inner()) = Some(Notice {
|
||||||
|
level,
|
||||||
|
message: plain_text(message[..end].as_bytes()),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Metadata goes to the notice slot; descriptor capture owns the sole history entry.
|
||||||
|
pub(crate) struct NoticeLogger {
|
||||||
|
inner: env_logger::Logger,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NoticeLogger {
|
||||||
|
pub(crate) fn new(inner: env_logger::Logger) -> Self {
|
||||||
|
let _ = slot();
|
||||||
|
Self { inner }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Log for NoticeLogger {
|
||||||
|
fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
|
||||||
|
self.inner.enabled(metadata)
|
||||||
|
}
|
||||||
|
fn log(&self, record: &log::Record<'_>) {
|
||||||
|
if self.inner.matches(record) {
|
||||||
|
if record.level() <= Level::Warn {
|
||||||
|
session_notice(record.level(), &record.args().to_string());
|
||||||
|
}
|
||||||
|
self.inner.log(record);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn flush(&self) {
|
||||||
|
self.inner.flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn notice_tap_honors_message_filters_and_keeps_warning_severity() {
|
||||||
|
let logger = NoticeLogger::new(
|
||||||
|
env_logger::Builder::new()
|
||||||
|
.parse_filters("warn/allowed")
|
||||||
|
.target(env_logger::Target::Pipe(Box::new(std::io::sink())))
|
||||||
|
.build(),
|
||||||
|
);
|
||||||
|
session_notice(Level::Info, "previous event");
|
||||||
|
logger.log(
|
||||||
|
&log::Record::builder()
|
||||||
|
.level(Level::Warn)
|
||||||
|
.args(format_args!("filtered warning"))
|
||||||
|
.build(),
|
||||||
|
);
|
||||||
|
assert_eq!(slot().lock().unwrap().as_ref().unwrap().message, "previous event");
|
||||||
|
logger.log(
|
||||||
|
&log::Record::builder()
|
||||||
|
.level(Level::Warn)
|
||||||
|
.args(format_args!("allowed warning"))
|
||||||
|
.build(),
|
||||||
|
);
|
||||||
|
let current = slot();
|
||||||
|
let notice = current.lock().unwrap();
|
||||||
|
assert_eq!(notice.as_ref().unwrap().level, Level::Warn);
|
||||||
|
assert_eq!(notice.as_ref().unwrap().message, "allowed warning");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,338 @@
|
|||||||
|
//! Own terminal output while the native worker and its children are running.
|
||||||
|
use std::{
|
||||||
|
collections::VecDeque,
|
||||||
|
fs::File,
|
||||||
|
io::{self, Read, Write},
|
||||||
|
os::fd::{AsFd, FromRawFd},
|
||||||
|
sync::{
|
||||||
|
Arc, Mutex,
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
},
|
||||||
|
thread::{self, JoinHandle},
|
||||||
|
time::{Duration, Instant},
|
||||||
|
};
|
||||||
|
|
||||||
|
use anyhow::Context;
|
||||||
|
use nix::{
|
||||||
|
fcntl::{FcntlArg, FdFlag, OFlag, fcntl},
|
||||||
|
poll::{PollFd, PollFlags, poll},
|
||||||
|
unistd::{dup2_stderr, dup2_stdout},
|
||||||
|
};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
const MAX_LINES: usize = 2_000;
|
||||||
|
const MAX_BYTES: usize = 1_048_576;
|
||||||
|
const MAX_LINE_BYTES: usize = 8_192;
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub(super) struct History {
|
||||||
|
lines: VecDeque<String>,
|
||||||
|
bytes: usize,
|
||||||
|
discarded: u64,
|
||||||
|
partial: [String; 2],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl History {
|
||||||
|
fn push(&mut self, line: String) {
|
||||||
|
self.bytes += line.len();
|
||||||
|
self.lines.push_back(line);
|
||||||
|
while self.lines.len() > MAX_LINES || self.bytes > MAX_BYTES {
|
||||||
|
if let Some(line) = self.lines.pop_front() {
|
||||||
|
self.bytes -= line.len();
|
||||||
|
self.discarded = self.discarded.saturating_add(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn tail(&self, count: usize) -> Vec<String> {
|
||||||
|
if count == 0 {
|
||||||
|
return Vec::new();
|
||||||
|
}
|
||||||
|
let mut lines = Vec::new();
|
||||||
|
if self.discarded > 0 {
|
||||||
|
lines.push(format!("[{} older log lines discarded]", self.discarded));
|
||||||
|
}
|
||||||
|
let partial_count = self.partial.iter().filter(|line| !line.is_empty()).count();
|
||||||
|
let retained_count = count.saturating_sub(lines.len() + partial_count);
|
||||||
|
lines.extend(
|
||||||
|
self
|
||||||
|
.lines
|
||||||
|
.iter()
|
||||||
|
.skip(self.lines.len().saturating_sub(retained_count))
|
||||||
|
.cloned(),
|
||||||
|
);
|
||||||
|
lines.extend(self.partial.iter().filter(|line| !line.is_empty()).cloned());
|
||||||
|
lines.truncate(count);
|
||||||
|
lines
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn plain_text(bytes: &[u8]) -> String {
|
||||||
|
String::from_utf8_lossy(&strip_ansi_escapes::strip(bytes))
|
||||||
|
.chars()
|
||||||
|
.filter(|ch| !ch.is_control() || *ch == '\t')
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
struct LineDecoder {
|
||||||
|
bytes: Vec<u8>,
|
||||||
|
truncated: bool,
|
||||||
|
stream: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LineDecoder {
|
||||||
|
fn new(stream: usize) -> Self {
|
||||||
|
Self {
|
||||||
|
bytes: Vec::new(),
|
||||||
|
truncated: false,
|
||||||
|
stream,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn text(&self) -> String {
|
||||||
|
let suffix = if self.truncated { " [line truncated]" } else { "" };
|
||||||
|
format!("{}{suffix}", plain_text(&self.bytes))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ingest(&mut self, bytes: &[u8], history: &mut History) {
|
||||||
|
for byte in bytes {
|
||||||
|
if *byte == b'\n' {
|
||||||
|
history.push(self.text());
|
||||||
|
self.bytes.clear();
|
||||||
|
self.truncated = false;
|
||||||
|
} else if self.bytes.len() < MAX_LINE_BYTES {
|
||||||
|
self.bytes.push(*byte);
|
||||||
|
} else {
|
||||||
|
self.truncated = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
history.partial[self.stream] = if self.bytes.is_empty() && !self.truncated {
|
||||||
|
String::new()
|
||||||
|
} else {
|
||||||
|
self.text()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
fn finish(&mut self, history: &mut History) {
|
||||||
|
if !self.bytes.is_empty() || self.truncated {
|
||||||
|
history.push(self.text());
|
||||||
|
}
|
||||||
|
history.partial[self.stream].clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The duplicate is close-on-exec: helpers inherit the capture pipe, never the renderer.
|
||||||
|
pub(super) fn duplicate(fd: i32) -> io::Result<File> {
|
||||||
|
let duplicate = unsafe { nix::libc::fcntl(fd, nix::libc::F_DUPFD_CLOEXEC, 3) };
|
||||||
|
if duplicate < 0 {
|
||||||
|
return Err(io::Error::last_os_error());
|
||||||
|
}
|
||||||
|
Ok(unsafe { File::from_raw_fd(duplicate) })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) struct OutputRouting {
|
||||||
|
pub(super) original_error: Arc<File>,
|
||||||
|
original_input_flags: FdFlag,
|
||||||
|
original_output: Option<Arc<File>>,
|
||||||
|
history: Arc<Mutex<History>>,
|
||||||
|
passthrough: Arc<AtomicBool>,
|
||||||
|
stop: Arc<AtomicBool>,
|
||||||
|
readers: Vec<JoinHandle<()>>,
|
||||||
|
gate: Arc<Mutex<()>>,
|
||||||
|
error: Arc<Mutex<Option<String>>>,
|
||||||
|
restored: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OutputRouting {
|
||||||
|
pub(super) fn install(capture_stdout: bool, cancellation: CancellationToken) -> anyhow::Result<Self> {
|
||||||
|
io::stdout().flush()?;
|
||||||
|
io::stderr().flush()?;
|
||||||
|
unsafe {
|
||||||
|
nix::libc::fflush(std::ptr::null_mut());
|
||||||
|
}
|
||||||
|
let mut routing = Self {
|
||||||
|
original_error: Arc::new(duplicate(2)?),
|
||||||
|
original_input_flags: FdFlag::from_bits_truncate(fcntl(io::stdin(), FcntlArg::F_GETFD)?),
|
||||||
|
original_output: capture_stdout.then(|| duplicate(1).map(Arc::new)).transpose()?,
|
||||||
|
history: Arc::default(),
|
||||||
|
passthrough: Arc::new(AtomicBool::new(true)),
|
||||||
|
stop: Arc::default(),
|
||||||
|
readers: Vec::new(),
|
||||||
|
gate: Arc::default(),
|
||||||
|
error: Arc::default(),
|
||||||
|
restored: false,
|
||||||
|
};
|
||||||
|
routing.capture(1, routing.original_error.clone(), cancellation.clone())?;
|
||||||
|
if let Some(original) = routing.original_output.clone() {
|
||||||
|
routing.capture(0, original, cancellation)?;
|
||||||
|
}
|
||||||
|
// Authentication may have initialized Crossterm's global reader with fd 0.
|
||||||
|
// Keep that descriptor stable, but do not let executed helpers inherit it.
|
||||||
|
// Script-TUN packet I/O continues through its separate VPNFD socket.
|
||||||
|
fcntl(
|
||||||
|
io::stdin(),
|
||||||
|
FcntlArg::F_SETFD(routing.original_input_flags | FdFlag::FD_CLOEXEC),
|
||||||
|
)?;
|
||||||
|
Ok(routing)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn capture(&mut self, stream: usize, destination: Arc<File>, cancellation: CancellationToken) -> anyhow::Result<()> {
|
||||||
|
let (reader, writer) = io::pipe()?;
|
||||||
|
// Polling plus nonblocking reads lets teardown bound inherited pipe lifetimes.
|
||||||
|
fcntl(&reader, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
|
||||||
|
let history = self.history.clone();
|
||||||
|
let passthrough = self.passthrough.clone();
|
||||||
|
let stop = self.stop.clone();
|
||||||
|
let gate = self.gate.clone();
|
||||||
|
let error = self.error.clone();
|
||||||
|
let thread = thread::Builder::new()
|
||||||
|
.name(format!("dashboard-output-{stream}"))
|
||||||
|
.spawn(move || {
|
||||||
|
let mut reader = reader;
|
||||||
|
let mut decoder = LineDecoder::new(stream);
|
||||||
|
let mut buffer = [0; 4096];
|
||||||
|
let mut deadline = None;
|
||||||
|
loop {
|
||||||
|
if stop.load(Ordering::Acquire) && deadline.is_none() {
|
||||||
|
deadline = Some(Instant::now() + Duration::from_millis(250));
|
||||||
|
}
|
||||||
|
if deadline.is_some_and(|deadline| Instant::now() >= deadline) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let mut descriptors = [PollFd::new(reader.as_fd(), PollFlags::POLLIN)];
|
||||||
|
match poll(&mut descriptors, 50u16) {
|
||||||
|
Ok(0) => {
|
||||||
|
if deadline.is_some() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Ok(_) => {}
|
||||||
|
Err(nix::errno::Errno::EINTR) => continue,
|
||||||
|
Err(failure) => {
|
||||||
|
*error.lock().unwrap_or_else(|error| error.into_inner()) =
|
||||||
|
Some(format!("Cannot poll dashboard output: {failure}"));
|
||||||
|
cancellation.cancel();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match reader.read(&mut buffer) {
|
||||||
|
Ok(0) => break,
|
||||||
|
Ok(length) => {
|
||||||
|
{
|
||||||
|
let _gate = gate.lock().unwrap_or_else(|error| error.into_inner());
|
||||||
|
if passthrough.load(Ordering::Acquire) {
|
||||||
|
if let Err(failure) = (&*destination).write_all(&buffer[..length]) {
|
||||||
|
*error.lock().unwrap_or_else(|error| error.into_inner()) =
|
||||||
|
Some(format!("Cannot forward dashboard output: {failure}"));
|
||||||
|
cancellation.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
decoder.ingest(
|
||||||
|
&buffer[..length],
|
||||||
|
&mut history.lock().unwrap_or_else(|error| error.into_inner()),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Err(error) if matches!(error.kind(), io::ErrorKind::WouldBlock | io::ErrorKind::Interrupted) => continue,
|
||||||
|
Err(failure) => {
|
||||||
|
*error.lock().unwrap_or_else(|error| error.into_inner()) =
|
||||||
|
Some(format!("Cannot read dashboard output: {failure}"));
|
||||||
|
cancellation.cancel();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
decoder.finish(&mut history.lock().unwrap_or_else(|error| error.into_inner()));
|
||||||
|
})
|
||||||
|
.context("Cannot start dashboard output reader")?;
|
||||||
|
self.readers.push(thread);
|
||||||
|
if stream == 0 {
|
||||||
|
dup2_stdout(&writer)?;
|
||||||
|
} else {
|
||||||
|
dup2_stderr(&writer)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn history(&self) -> Arc<Mutex<History>> {
|
||||||
|
self.history.clone()
|
||||||
|
}
|
||||||
|
pub(super) fn passthrough(&self) -> Arc<AtomicBool> {
|
||||||
|
self.passthrough.clone()
|
||||||
|
}
|
||||||
|
pub(super) fn gate(&self) -> Arc<Mutex<()>> {
|
||||||
|
self.gate.clone()
|
||||||
|
}
|
||||||
|
pub(super) fn saved_output(&self) -> Option<Arc<File>> {
|
||||||
|
self.original_output.clone()
|
||||||
|
}
|
||||||
|
pub(super) fn saved_input_flags(&self) -> FdFlag {
|
||||||
|
self.original_input_flags
|
||||||
|
}
|
||||||
|
pub(super) fn take_error(&self) -> Option<String> {
|
||||||
|
self.error.lock().unwrap_or_else(|error| error.into_inner()).take()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn restore(&mut self) {
|
||||||
|
if self.restored {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let _ = io::stdout().flush();
|
||||||
|
let _ = io::stderr().flush();
|
||||||
|
unsafe {
|
||||||
|
nix::libc::fflush(std::ptr::null_mut());
|
||||||
|
}
|
||||||
|
let _ = dup2_stderr(&*self.original_error);
|
||||||
|
let _ = fcntl(io::stdin(), FcntlArg::F_SETFD(self.original_input_flags));
|
||||||
|
if let Some(output) = &self.original_output {
|
||||||
|
let _ = dup2_stdout(&**output);
|
||||||
|
}
|
||||||
|
self.stop.store(true, Ordering::Release);
|
||||||
|
for reader in self.readers.drain(..) {
|
||||||
|
let _ = reader.join();
|
||||||
|
}
|
||||||
|
self.restored = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for OutputRouting {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
self.restore();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn split_utf8_and_unterminated_lines_are_preserved_without_escape_commands() {
|
||||||
|
for stream in [0, 1] {
|
||||||
|
let mut history = History::default();
|
||||||
|
let mut decoder = LineDecoder::new(stream);
|
||||||
|
let bytes = "connected 日本語\x1b[2J\npartial".as_bytes();
|
||||||
|
for byte in bytes {
|
||||||
|
decoder.ingest(&[*byte], &mut history);
|
||||||
|
}
|
||||||
|
assert_eq!(history.tail(10), ["connected 日本語", "partial"]);
|
||||||
|
decoder.finish(&mut history);
|
||||||
|
assert_eq!(history.tail(10), ["connected 日本語", "partial"]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hostile_long_lines_and_history_are_bounded() {
|
||||||
|
let mut history = History::default();
|
||||||
|
let mut decoder = LineDecoder::new(0);
|
||||||
|
decoder.ingest(&vec![b'x'; MAX_LINE_BYTES * 3], &mut history);
|
||||||
|
decoder.ingest(b"\n", &mut history);
|
||||||
|
assert!(history.lines[0].ends_with("[line truncated]"));
|
||||||
|
for _ in 0..MAX_LINES + 10 {
|
||||||
|
decoder.ingest(b"line\n", &mut history);
|
||||||
|
}
|
||||||
|
assert!(history.lines.len() <= MAX_LINES);
|
||||||
|
assert!(history.bytes <= MAX_BYTES);
|
||||||
|
assert!(history.tail(10)[0].contains("discarded"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
//! Panic restoration must remain independent of renderer and output-ingestion locks.
|
||||||
|
use std::{
|
||||||
|
fs::File,
|
||||||
|
io,
|
||||||
|
os::fd::AsRawFd,
|
||||||
|
sync::{
|
||||||
|
Arc,
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
pub(super) struct TerminalRestoration {
|
||||||
|
terminal: File,
|
||||||
|
error: Arc<File>,
|
||||||
|
output: Option<Arc<File>>,
|
||||||
|
input_flags: nix::fcntl::FdFlag,
|
||||||
|
termios: nix::libc::termios,
|
||||||
|
active: AtomicBool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TerminalRestoration {
|
||||||
|
pub(super) fn install(
|
||||||
|
terminal: File,
|
||||||
|
error: Arc<File>,
|
||||||
|
output: Option<Arc<File>>,
|
||||||
|
input_flags: nix::fcntl::FdFlag,
|
||||||
|
) -> io::Result<Arc<Self>> {
|
||||||
|
let mut termios = std::mem::MaybeUninit::uninit();
|
||||||
|
if unsafe { nix::libc::tcgetattr(terminal.as_raw_fd(), termios.as_mut_ptr()) } != 0 {
|
||||||
|
return Err(io::Error::last_os_error());
|
||||||
|
}
|
||||||
|
let restoration = Arc::new(Self {
|
||||||
|
terminal,
|
||||||
|
error,
|
||||||
|
output,
|
||||||
|
input_flags,
|
||||||
|
termios: unsafe { termios.assume_init() },
|
||||||
|
active: AtomicBool::new(false),
|
||||||
|
});
|
||||||
|
let previous = std::panic::take_hook();
|
||||||
|
let panic_restoration = restoration.clone();
|
||||||
|
std::panic::set_hook(Box::new(move |panic| {
|
||||||
|
panic_restoration.restore();
|
||||||
|
previous(panic);
|
||||||
|
}));
|
||||||
|
Ok(restoration)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn arm(&self) {
|
||||||
|
self.active.store(true, Ordering::Release);
|
||||||
|
}
|
||||||
|
pub(super) fn disarm(&self) {
|
||||||
|
self.active.store(false, Ordering::Release);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn restore(&self) {
|
||||||
|
if !self.active.swap(false, Ordering::AcqRel) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
unsafe {
|
||||||
|
nix::libc::tcsetattr(self.terminal.as_raw_fd(), nix::libc::TCSANOW, &self.termios);
|
||||||
|
let sequence = b"\x1b[?25h\x1b[?1049l";
|
||||||
|
nix::libc::write(self.error.as_raw_fd(), sequence.as_ptr().cast(), sequence.len());
|
||||||
|
nix::libc::dup2(self.error.as_raw_fd(), 2);
|
||||||
|
nix::libc::fcntl(0, nix::libc::F_SETFD, self.input_flags.bits());
|
||||||
|
if let Some(output) = &self.output {
|
||||||
|
nix::libc::dup2(output.as_raw_fd(), 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,359 @@
|
|||||||
|
use std::{
|
||||||
|
fs::File,
|
||||||
|
sync::{
|
||||||
|
Arc, Mutex,
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
mpsc,
|
||||||
|
},
|
||||||
|
time::{Duration, Instant},
|
||||||
|
};
|
||||||
|
|
||||||
|
use anyhow::{Context as _, ensure};
|
||||||
|
use crossterm::{
|
||||||
|
cursor::Show,
|
||||||
|
event::{self, Event, KeyCode, KeyEventKind, KeyModifiers},
|
||||||
|
execute,
|
||||||
|
terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
|
||||||
|
};
|
||||||
|
use gpapi::session::desktop::tunnel::TunnelPhase;
|
||||||
|
use log::Level;
|
||||||
|
use nix::unistd::{getpgrp, tcgetpgrp};
|
||||||
|
use ratatui::{
|
||||||
|
Terminal,
|
||||||
|
backend::CrosstermBackend,
|
||||||
|
layout::{Constraint, Layout},
|
||||||
|
style::{Color, Modifier, Style},
|
||||||
|
text::Line,
|
||||||
|
widgets::{Block, Borders, Paragraph, Wrap},
|
||||||
|
};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
use super::{
|
||||||
|
Command, Content,
|
||||||
|
layout::{DetailScroll, phase_label, render_tunnel, row},
|
||||||
|
notice::{Notice, NoticeSlot},
|
||||||
|
output::{History, plain_text},
|
||||||
|
restoration::TerminalRestoration,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub(super) struct Context {
|
||||||
|
pub(super) terminal: File,
|
||||||
|
pub(super) output: Arc<File>,
|
||||||
|
pub(super) saved_stdout: Option<Arc<File>>,
|
||||||
|
pub(super) saved_stdin_flags: nix::fcntl::FdFlag,
|
||||||
|
pub(super) history: Arc<Mutex<History>>,
|
||||||
|
pub(super) passthrough: Arc<AtomicBool>,
|
||||||
|
pub(super) gate: Arc<Mutex<()>>,
|
||||||
|
pub(super) stop: Arc<AtomicBool>,
|
||||||
|
pub(super) cancellation: CancellationToken,
|
||||||
|
pub(super) notice: NoticeSlot,
|
||||||
|
pub(super) server: String,
|
||||||
|
pub(super) content: Content,
|
||||||
|
pub(super) commands: mpsc::Receiver<Command>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Screen {
|
||||||
|
terminal: Terminal<CrosstermBackend<File>>,
|
||||||
|
restore: Arc<TerminalRestoration>,
|
||||||
|
controlling_terminal: File,
|
||||||
|
passthrough: Arc<AtomicBool>,
|
||||||
|
gate: Arc<Mutex<()>>,
|
||||||
|
active: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Screen {
|
||||||
|
fn new(context: &Context) -> anyhow::Result<Self> {
|
||||||
|
let restore = TerminalRestoration::install(
|
||||||
|
context.terminal.try_clone()?,
|
||||||
|
context.output.clone(),
|
||||||
|
context.saved_stdout.clone(),
|
||||||
|
context.saved_stdin_flags,
|
||||||
|
)?;
|
||||||
|
let terminal = Terminal::new(CrosstermBackend::new(context.output.try_clone()?))?;
|
||||||
|
let mut screen = Self {
|
||||||
|
terminal,
|
||||||
|
restore,
|
||||||
|
controlling_terminal: context.terminal.try_clone()?,
|
||||||
|
passthrough: context.passthrough.clone(),
|
||||||
|
gate: context.gate.clone(),
|
||||||
|
active: false,
|
||||||
|
};
|
||||||
|
screen.enter()?;
|
||||||
|
Ok(screen)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn enter(&mut self) -> anyhow::Result<()> {
|
||||||
|
if self.active {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
ensure!(
|
||||||
|
tcgetpgrp(&self.controlling_terminal)? == getpgrp(),
|
||||||
|
"Dashboard is no longer in the foreground"
|
||||||
|
);
|
||||||
|
let _gate = self.gate.lock().unwrap_or_else(|error| error.into_inner());
|
||||||
|
self.passthrough.store(false, Ordering::Release);
|
||||||
|
// Arm before changing termios, including partial initialization failures.
|
||||||
|
self.restore.arm();
|
||||||
|
self.active = true;
|
||||||
|
enable_raw_mode()?;
|
||||||
|
execute!(self.terminal.backend_mut(), EnterAlternateScreen)?;
|
||||||
|
// Terminal::clear queries cursor position through process stdout. Fullscreen
|
||||||
|
// resize clears and resets buffers through our saved terminal backend only.
|
||||||
|
self.terminal.resize(self.terminal.size()?.into())?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn leave(&mut self) {
|
||||||
|
if !self.active {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let _gate = self.gate.lock().unwrap_or_else(|error| error.into_inner());
|
||||||
|
let _ = disable_raw_mode();
|
||||||
|
let _ = execute!(self.terminal.backend_mut(), Show, LeaveAlternateScreen);
|
||||||
|
self.restore.disarm();
|
||||||
|
self.passthrough.store(true, Ordering::Release);
|
||||||
|
self.active = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn suspend(&mut self) {
|
||||||
|
self.leave();
|
||||||
|
// SIGSTOP avoids recursion through our SIGTSTP listener. The shell resumes us.
|
||||||
|
unsafe {
|
||||||
|
nix::libc::raise(nix::libc::SIGSTOP);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Screen {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
self.leave();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn run(context: Context, ready: mpsc::SyncSender<anyhow::Result<()>>) -> anyhow::Result<()> {
|
||||||
|
let screen = Screen::new(&context);
|
||||||
|
let mut screen = match screen {
|
||||||
|
Ok(screen) => {
|
||||||
|
let _ = ready.send(Ok(()));
|
||||||
|
screen
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
let _ = ready.send(Err(anyhow::anyhow!("{error:#}")));
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let mut logs = false;
|
||||||
|
let mut scroll = DetailScroll::default();
|
||||||
|
let mut next_draw = Instant::now();
|
||||||
|
let mut dirty = true;
|
||||||
|
while !context.stop.load(Ordering::Acquire) {
|
||||||
|
for command in context.commands.try_iter() {
|
||||||
|
match command {
|
||||||
|
Command::Suspend => screen.suspend(),
|
||||||
|
Command::Resume => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !screen.active {
|
||||||
|
if tcgetpgrp(&context.terminal)? == getpgrp() {
|
||||||
|
screen.enter()?;
|
||||||
|
} else {
|
||||||
|
std::thread::sleep(Duration::from_millis(100));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if dirty || Instant::now() >= next_draw {
|
||||||
|
draw(&mut screen.terminal, &context, logs, &mut scroll)?;
|
||||||
|
next_draw = Instant::now() + Duration::from_secs(1);
|
||||||
|
dirty = false;
|
||||||
|
}
|
||||||
|
if event::poll(Duration::from_millis(100)).context("Cannot read dashboard input")? {
|
||||||
|
if let Event::Key(key) = event::read()? {
|
||||||
|
if key.kind != KeyEventKind::Press {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
match key.code {
|
||||||
|
KeyCode::Tab | KeyCode::BackTab => {
|
||||||
|
logs = !logs;
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
KeyCode::Up | KeyCode::Down | KeyCode::PageUp | KeyCode::PageDown | KeyCode::Home | KeyCode::End if !logs => {
|
||||||
|
scroll.handle_key(key.code);
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
|
||||||
|
context.cancellation.cancel();
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
KeyCode::Char('z') if key.modifiers.contains(KeyModifiers::CONTROL) => screen.suspend(),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw(
|
||||||
|
terminal: &mut Terminal<CrosstermBackend<File>>,
|
||||||
|
context: &Context,
|
||||||
|
logs: bool,
|
||||||
|
scroll: &mut DetailScroll,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
|
terminal.draw(|frame| {
|
||||||
|
let area = frame.area();
|
||||||
|
if area.height < 8 || area.width < 24 {
|
||||||
|
frame.render_widget(
|
||||||
|
Paragraph::new("GP Connect\nCtrl+C Disconnect").wrap(Wrap { trim: false }),
|
||||||
|
area,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let compact = area.height < 18;
|
||||||
|
let footer_height = if area.width < 80 { 2 } else { 1 };
|
||||||
|
let [header, body, notice, footer] = Layout::vertical([
|
||||||
|
Constraint::Length(2),
|
||||||
|
Constraint::Min(1),
|
||||||
|
Constraint::Length(if compact { 1 } else { 3 }),
|
||||||
|
Constraint::Length(footer_height),
|
||||||
|
])
|
||||||
|
.areas(area);
|
||||||
|
let view = if logs { "Live logs" } else { "Dashboard" };
|
||||||
|
frame.render_widget(
|
||||||
|
Paragraph::new(format!(" GP Connect · {view}"))
|
||||||
|
.style(Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD))
|
||||||
|
.block(Block::default().borders(Borders::BOTTOM)),
|
||||||
|
header,
|
||||||
|
);
|
||||||
|
let mut lines = vec![row("Server", context.server.clone()), Line::default()];
|
||||||
|
if logs {
|
||||||
|
let history = context.history.lock().unwrap_or_else(|error| error.into_inner());
|
||||||
|
let tail = history.tail(body.height as usize);
|
||||||
|
lines = tail.into_iter().map(Line::raw).collect();
|
||||||
|
let skip = lines.len().saturating_sub(body.height as usize);
|
||||||
|
lines.drain(..skip);
|
||||||
|
} else {
|
||||||
|
match &context.content {
|
||||||
|
Content::Tunnel(monitor) => {
|
||||||
|
render_tunnel(
|
||||||
|
frame,
|
||||||
|
body,
|
||||||
|
&context.server,
|
||||||
|
&monitor.state(),
|
||||||
|
&monitor.statistics(),
|
||||||
|
scroll,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Content::Internal(members) => {
|
||||||
|
lines.push(row("Status", "Internal network session"));
|
||||||
|
lines.push(Line::raw("Tunnel statistics unavailable (non-tunnel session)"));
|
||||||
|
lines.push(Line::default());
|
||||||
|
lines.extend(
|
||||||
|
members
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|error| error.into_inner())
|
||||||
|
.values()
|
||||||
|
.map(|member| Line::raw(plain_text(member.as_bytes()))),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if logs || matches!(context.content, Content::Internal(_)) {
|
||||||
|
frame.render_widget(Paragraph::new(lines).wrap(Wrap { trim: false }), body);
|
||||||
|
}
|
||||||
|
let current = context.notice.lock().unwrap_or_else(|error| error.into_inner()).clone();
|
||||||
|
let current = match &context.content {
|
||||||
|
Content::Tunnel(monitor) => {
|
||||||
|
let state = monitor.state();
|
||||||
|
Some(notice_for_status(current, state.phase, state.transport))
|
||||||
|
}
|
||||||
|
Content::Internal(_) => current,
|
||||||
|
};
|
||||||
|
if let Some(current) = current {
|
||||||
|
let color = if current.level <= Level::Warn {
|
||||||
|
Color::Yellow
|
||||||
|
} else {
|
||||||
|
Color::Gray
|
||||||
|
};
|
||||||
|
let block = if compact {
|
||||||
|
Block::default()
|
||||||
|
} else {
|
||||||
|
Block::default().title("Latest event").borders(Borders::TOP)
|
||||||
|
};
|
||||||
|
frame.render_widget(
|
||||||
|
Paragraph::new(current.message)
|
||||||
|
.style(Style::default().fg(color))
|
||||||
|
.wrap(Wrap { trim: false })
|
||||||
|
.block(block),
|
||||||
|
notice,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let ending = if context.cancellation.is_cancelled() {
|
||||||
|
"Disconnecting…"
|
||||||
|
} else {
|
||||||
|
"Ctrl+C Disconnect"
|
||||||
|
};
|
||||||
|
frame.render_widget(
|
||||||
|
footer_text(logs, ending, scroll.can_scroll(), area.width).style(Style::default().fg(Color::DarkGray)),
|
||||||
|
footer,
|
||||||
|
);
|
||||||
|
})?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn footer_text(logs: bool, ending: &str, scrollable: bool, width: u16) -> Paragraph<'static> {
|
||||||
|
let view = if logs { "Dashboard" } else { "Logs" };
|
||||||
|
let scrolling = scrollable && !logs;
|
||||||
|
let text = if width < 80 {
|
||||||
|
format!("{ending}\nTab {view}{}", if scrolling { " ↑↓ Scroll" } else { "" })
|
||||||
|
} else {
|
||||||
|
format!(
|
||||||
|
"Tab {view} {ending}{}",
|
||||||
|
if scrolling { " ↑↓/PgUp/PgDn Scroll" } else { "" }
|
||||||
|
)
|
||||||
|
};
|
||||||
|
Paragraph::new(text)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn notice_for_status(
|
||||||
|
notice: Option<Notice>,
|
||||||
|
phase: TunnelPhase,
|
||||||
|
transport: gpapi::session::desktop::tunnel::TunnelTransport,
|
||||||
|
) -> Notice {
|
||||||
|
notice.unwrap_or_else(|| Notice {
|
||||||
|
level: Level::Info,
|
||||||
|
message: format!("{} · {}", phase_label(phase), transport.label()),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn narrow_footer_keeps_disconnect_switch_and_scroll_hints_visible() {
|
||||||
|
use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
|
||||||
|
let area = Rect::new(0, 0, 24, 2);
|
||||||
|
let mut buffer = Buffer::empty(area);
|
||||||
|
footer_text(false, "Ctrl+C Disconnect", true, area.width).render(area, &mut buffer);
|
||||||
|
let lines: Vec<String> = (0..2)
|
||||||
|
.map(|y| (0..24).map(|x| buffer[(x, y)].symbol()).collect())
|
||||||
|
.collect();
|
||||||
|
assert!(lines[0].contains("Ctrl+C Disconnect"));
|
||||||
|
assert!(lines[1].contains("Tab Logs"));
|
||||||
|
assert!(lines[1].contains("↑↓ Scroll"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn status_transitions_cannot_overwrite_an_existing_warning() {
|
||||||
|
use gpapi::session::desktop::tunnel::TunnelTransport;
|
||||||
|
let warning = Notice {
|
||||||
|
level: Level::Warn,
|
||||||
|
message: "ESP unavailable; using SSL".into(),
|
||||||
|
};
|
||||||
|
let first = notice_for_status(Some(warning), TunnelPhase::Connected, TunnelTransport::SslTls);
|
||||||
|
let reconnecting = notice_for_status(Some(first), TunnelPhase::Reconnecting, TunnelTransport::Unavailable);
|
||||||
|
let resumed = notice_for_status(Some(reconnecting), TunnelPhase::Connected, TunnelTransport::IpsecEsp);
|
||||||
|
assert_eq!(resumed.level, Level::Warn);
|
||||||
|
assert_eq!(resumed.message, "ESP unavailable; using SSL");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,456 @@
|
|||||||
|
//! Terminal integration runs in child test processes so descriptor/signal changes
|
||||||
|
//! cannot capture another test's output or change its controlling terminal.
|
||||||
|
use std::{
|
||||||
|
fs::File,
|
||||||
|
io::{self, Read, Write},
|
||||||
|
os::unix::process::CommandExt,
|
||||||
|
process::{Child, Command, Stdio},
|
||||||
|
time::{Duration, Instant},
|
||||||
|
};
|
||||||
|
|
||||||
|
use nix::{
|
||||||
|
fcntl::{FcntlArg, OFlag, fcntl},
|
||||||
|
pty::{Winsize, openpty},
|
||||||
|
sys::signal::{Signal, kill},
|
||||||
|
unistd::Pid,
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
struct Fixture {
|
||||||
|
child: Child,
|
||||||
|
master: File,
|
||||||
|
slave: File,
|
||||||
|
output: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Fixture {
|
||||||
|
fn start(piped: bool) -> Self {
|
||||||
|
Self::start_mode(if piped { "piped" } else { "terminal" }, piped)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn start_mode(mode: &str, piped: bool) -> Self {
|
||||||
|
let mut command = Command::new(std::env::current_exe().unwrap());
|
||||||
|
command
|
||||||
|
.args([
|
||||||
|
"--exact",
|
||||||
|
"dashboard::tests::terminal_fixture",
|
||||||
|
"--ignored",
|
||||||
|
"--nocapture",
|
||||||
|
])
|
||||||
|
.env("GPCLIENT_DASHBOARD_FIXTURE", mode);
|
||||||
|
Self::spawn(command, piped)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn spawn(mut command: Command, piped: bool) -> Self {
|
||||||
|
let pty = openpty(
|
||||||
|
Some(&Winsize {
|
||||||
|
ws_row: 40,
|
||||||
|
ws_col: 100,
|
||||||
|
ws_xpixel: 0,
|
||||||
|
ws_ypixel: 0,
|
||||||
|
}),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let master = File::from(pty.master);
|
||||||
|
let slave = File::from(pty.slave);
|
||||||
|
fcntl(&master, FcntlArg::F_SETFL(OFlag::O_NONBLOCK)).unwrap();
|
||||||
|
command
|
||||||
|
.env("TERM", "xterm-256color")
|
||||||
|
.stdin(if piped {
|
||||||
|
Stdio::piped()
|
||||||
|
} else {
|
||||||
|
Stdio::from(slave.try_clone().unwrap())
|
||||||
|
})
|
||||||
|
.stdout(if piped {
|
||||||
|
Stdio::piped()
|
||||||
|
} else {
|
||||||
|
Stdio::from(slave.try_clone().unwrap())
|
||||||
|
})
|
||||||
|
.stderr(Stdio::from(slave.try_clone().unwrap()));
|
||||||
|
unsafe {
|
||||||
|
command.pre_exec(|| {
|
||||||
|
if nix::libc::setsid() < 0 {
|
||||||
|
return Err(io::Error::last_os_error());
|
||||||
|
}
|
||||||
|
if nix::libc::ioctl(2, nix::libc::TIOCSCTTY as _, 0) < 0 {
|
||||||
|
return Err(io::Error::last_os_error());
|
||||||
|
}
|
||||||
|
let no_core = nix::libc::rlimit {
|
||||||
|
rlim_cur: 0,
|
||||||
|
rlim_max: 0,
|
||||||
|
};
|
||||||
|
nix::libc::setrlimit(nix::libc::RLIMIT_CORE, &no_core);
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let mut child = command.spawn().unwrap();
|
||||||
|
if piped {
|
||||||
|
child.stdin.take().unwrap().write_all(b"fixture-cookie\n").unwrap();
|
||||||
|
}
|
||||||
|
Self {
|
||||||
|
child,
|
||||||
|
master,
|
||||||
|
slave,
|
||||||
|
output: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn drain(&mut self) {
|
||||||
|
let mut bytes = [0; 8192];
|
||||||
|
loop {
|
||||||
|
match self.master.read(&mut bytes) {
|
||||||
|
Ok(0) => break,
|
||||||
|
Ok(length) => self.output.extend_from_slice(&bytes[..length]),
|
||||||
|
Err(error) if error.kind() == io::ErrorKind::WouldBlock => break,
|
||||||
|
Err(error) if error.raw_os_error() == Some(nix::libc::EIO) => break,
|
||||||
|
Err(error) => panic!("PTY read: {error}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn wait_text(&mut self, text: &str) {
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(10);
|
||||||
|
loop {
|
||||||
|
self.drain();
|
||||||
|
let plain = strip_ansi_escapes::strip(&self.output);
|
||||||
|
if String::from_utf8_lossy(&plain).contains(text) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if let Some(status) = self.child.try_wait().unwrap() {
|
||||||
|
panic!(
|
||||||
|
"Fixture exited {status} before {text:?}: {}",
|
||||||
|
String::from_utf8_lossy(&self.output)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assert!(
|
||||||
|
Instant::now() < deadline,
|
||||||
|
"Missing {text:?}: {}",
|
||||||
|
String::from_utf8_lossy(&self.output)
|
||||||
|
);
|
||||||
|
std::thread::sleep(Duration::from_millis(20));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn finish(&mut self) {
|
||||||
|
self.wait_text("DASHBOARD_RESTORED");
|
||||||
|
let attrs = nix::sys::termios::tcgetattr(&self.slave).unwrap();
|
||||||
|
assert!(attrs.local_flags.contains(nix::sys::termios::LocalFlags::ICANON));
|
||||||
|
assert!(attrs.local_flags.contains(nix::sys::termios::LocalFlags::ECHO));
|
||||||
|
self.master.write_all(b"\n").unwrap();
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(10);
|
||||||
|
loop {
|
||||||
|
self.drain();
|
||||||
|
if let Some(status) = self.child.try_wait().unwrap() {
|
||||||
|
assert!(
|
||||||
|
status.success(),
|
||||||
|
"Fixture failed {status}: {}",
|
||||||
|
String::from_utf8_lossy(&self.output)
|
||||||
|
);
|
||||||
|
self.drain();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
assert!(Instant::now() < deadline, "Fixture did not restore/exit");
|
||||||
|
std::thread::sleep(Duration::from_millis(20));
|
||||||
|
}
|
||||||
|
assert!(String::from_utf8_lossy(&self.output).contains("DASHBOARD_RESTORED"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Fixture {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
// A failed assertion must not leave a suspended child or its helper alive.
|
||||||
|
let _ = kill(Pid::from_raw(self.child.id() as i32), Signal::SIGCONT);
|
||||||
|
let _ = self.child.kill();
|
||||||
|
let _ = self.child.wait();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn panel_switches_to_captured_child_logs_and_ctrl_c_restores_terminal() {
|
||||||
|
let mut fixture = Fixture::start(false);
|
||||||
|
fixture.wait_text("Internal");
|
||||||
|
fixture.master.write_all(b"\t").unwrap();
|
||||||
|
fixture.wait_text("Live logs");
|
||||||
|
fixture.wait_text("child-stderr-after-entry");
|
||||||
|
fixture.master.write_all(b"\x03").unwrap();
|
||||||
|
fixture.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn warning_before_first_tunnel_frame_remains_visible() {
|
||||||
|
let mut fixture = Fixture::start_mode("tunnel", false);
|
||||||
|
fixture.wait_text("initial-fallback-warning");
|
||||||
|
fixture.master.write_all(b"\x03").unwrap();
|
||||||
|
fixture.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn connected_tunnel_samples_statistics_and_accepts_ctrl_c() {
|
||||||
|
let mut fixture = Fixture::start_mode("active-tunnel", false);
|
||||||
|
fixture.wait_text("IPsec");
|
||||||
|
fixture.wait_text("(ESP)");
|
||||||
|
fixture.wait_text("Received");
|
||||||
|
fixture.wait_text("4.0");
|
||||||
|
fixture.master.write_all(b"\x03").unwrap();
|
||||||
|
fixture.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn authenticated_terminal_input_remains_usable_after_dashboard_entry() {
|
||||||
|
let mut fixture = Fixture::start_mode("prompted-tunnel", false);
|
||||||
|
fixture.wait_text("Received");
|
||||||
|
fixture.master.write_all(b"\t").unwrap();
|
||||||
|
fixture.wait_text("Live logs");
|
||||||
|
fixture.master.write_all(b"\x03").unwrap();
|
||||||
|
fixture.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn piped_credentials_and_stdout_redirection_preserve_their_streams() {
|
||||||
|
let mut fixture = Fixture::start(true);
|
||||||
|
fixture.wait_text("Internal");
|
||||||
|
fixture.master.write_all(b"\x03").unwrap();
|
||||||
|
fixture.finish();
|
||||||
|
let mut output = String::new();
|
||||||
|
fixture
|
||||||
|
.child
|
||||||
|
.stdout
|
||||||
|
.take()
|
||||||
|
.unwrap()
|
||||||
|
.read_to_string(&mut output)
|
||||||
|
.unwrap();
|
||||||
|
assert!(output.contains("redirected-stdout"));
|
||||||
|
assert!(!output.contains('\x1b'));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn external_termination_and_suspend_resume_restore_terminal() {
|
||||||
|
let mut fixture = Fixture::start(false);
|
||||||
|
fixture.wait_text("Internal");
|
||||||
|
kill(Pid::from_raw(fixture.child.id() as i32), Signal::SIGTSTP).unwrap();
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(5);
|
||||||
|
loop {
|
||||||
|
let attrs = nix::sys::termios::tcgetattr(&fixture.slave).unwrap();
|
||||||
|
if attrs.local_flags.contains(nix::sys::termios::LocalFlags::ICANON) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
assert!(Instant::now() < deadline, "suspend did not restore termios");
|
||||||
|
std::thread::sleep(Duration::from_millis(20));
|
||||||
|
}
|
||||||
|
kill(Pid::from_raw(fixture.child.id() as i32), Signal::SIGCONT).unwrap();
|
||||||
|
std::thread::sleep(Duration::from_millis(200));
|
||||||
|
kill(Pid::from_raw(fixture.child.id() as i32), Signal::SIGTERM).unwrap();
|
||||||
|
fixture.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn actual_panic_hook_restores_terminal_with_panic_abort() {
|
||||||
|
let dependencies = std::env::current_exe().unwrap().parent().unwrap().to_path_buf();
|
||||||
|
let nix = std::fs::read_dir(&dependencies)
|
||||||
|
.unwrap()
|
||||||
|
.filter_map(Result::ok)
|
||||||
|
.map(|entry| entry.path())
|
||||||
|
.find(|path| {
|
||||||
|
path.file_name().unwrap().to_string_lossy().starts_with("libnix-")
|
||||||
|
&& path.extension().is_some_and(|ext| ext == "rlib")
|
||||||
|
})
|
||||||
|
.expect("compiled nix rlib");
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let binary = directory.path().join("dashboard-abort");
|
||||||
|
let build = Command::new("rustc")
|
||||||
|
.args(["--edition=2024", "-C", "panic=abort", "-A", "dead_code"])
|
||||||
|
.arg(format!(
|
||||||
|
"{}/tests/fixtures/dashboard_abort.rs",
|
||||||
|
env!("CARGO_MANIFEST_DIR")
|
||||||
|
))
|
||||||
|
.arg("--extern")
|
||||||
|
.arg(format!("nix={}", nix.display()))
|
||||||
|
.arg("-L")
|
||||||
|
.arg(format!("dependency={}", dependencies.display()))
|
||||||
|
.arg("-o")
|
||||||
|
.arg(&binary)
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
assert!(
|
||||||
|
build.status.success(),
|
||||||
|
"Abort fixture compilation failed: {}",
|
||||||
|
String::from_utf8_lossy(&build.stderr)
|
||||||
|
);
|
||||||
|
let mut fixture = Fixture::spawn(Command::new(binary), false);
|
||||||
|
fixture.wait_text("ABORT_FIXTURE_READY");
|
||||||
|
fixture.master.write_all(b"x").unwrap();
|
||||||
|
fixture.wait_text("ABORT_HOOK_RESTORED");
|
||||||
|
let attrs = nix::sys::termios::tcgetattr(&fixture.slave).unwrap();
|
||||||
|
assert!(attrs.local_flags.contains(nix::sys::termios::LocalFlags::ICANON));
|
||||||
|
assert!(attrs.local_flags.contains(nix::sys::termios::LocalFlags::ECHO));
|
||||||
|
fixture.master.write_all(b"\n").unwrap();
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(5);
|
||||||
|
loop {
|
||||||
|
fixture.drain();
|
||||||
|
if let Some(status) = fixture.child.try_wait().unwrap() {
|
||||||
|
assert!(!status.success(), "panic=abort fixture unexpectedly succeeded");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
assert!(Instant::now() < deadline, "abort fixture did not exit");
|
||||||
|
std::thread::sleep(Duration::from_millis(20));
|
||||||
|
}
|
||||||
|
fixture.drain();
|
||||||
|
assert!(String::from_utf8_lossy(&fixture.output).contains("intentional abort-hook fixture panic"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore = "runs in an isolated PTY subprocess"]
|
||||||
|
fn terminal_fixture() {
|
||||||
|
let mode = std::env::var("GPCLIENT_DASHBOARD_FIXTURE").expect("subprocess fixture only");
|
||||||
|
if mode == "active-tunnel" || mode == "prompted-tunnel" {
|
||||||
|
env_logger::builder()
|
||||||
|
.filter_level(log::LevelFilter::Info)
|
||||||
|
.try_init()
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
if mode == "piped" {
|
||||||
|
let mut credentials = String::new();
|
||||||
|
std::io::stdin().read_to_string(&mut credentials).unwrap();
|
||||||
|
assert_eq!(credentials, "fixture-cookie\n");
|
||||||
|
}
|
||||||
|
validate(LogFormat::Text).unwrap();
|
||||||
|
if mode == "prompted-tunnel" {
|
||||||
|
// Authentication prompts use Crossterm before dashboard output routing.
|
||||||
|
// Exercise its real global reader initialization while stdin is the TTY.
|
||||||
|
let _ = crossterm::event::poll(Duration::from_millis(1)).unwrap();
|
||||||
|
}
|
||||||
|
let runtime = tokio::runtime::Runtime::new().unwrap();
|
||||||
|
runtime.block_on(async {
|
||||||
|
let cancellation = CancellationToken::new();
|
||||||
|
let signal_cancel = cancellation.clone();
|
||||||
|
let signals = tokio::spawn(async move {
|
||||||
|
gpapi::utils::shutdown_signal().await;
|
||||||
|
signal_cancel.cancel();
|
||||||
|
});
|
||||||
|
let input_flags = fcntl(std::io::stdin(), FcntlArg::F_GETFD).unwrap();
|
||||||
|
let mut dashboard = Dashboard::prepare("vpn.example.com".into(), cancellation.clone()).unwrap();
|
||||||
|
eprintln!("child-stderr-before-entry");
|
||||||
|
// Native VPN helpers exec /bin/sh without Rust's standard-fd repair.
|
||||||
|
let mut child = Command::new("/bin/sh")
|
||||||
|
.args([
|
||||||
|
"-c",
|
||||||
|
r#"
|
||||||
|
sleep 1
|
||||||
|
if test -t 0; then exit 1; fi
|
||||||
|
if read -r input 2>/dev/null; then exit 1; fi
|
||||||
|
printf '%s\n' child-stderr-after-entry >&2
|
||||||
|
"#,
|
||||||
|
])
|
||||||
|
.spawn()
|
||||||
|
.unwrap();
|
||||||
|
let members = InternalMembers::default();
|
||||||
|
members
|
||||||
|
.lock()
|
||||||
|
.unwrap()
|
||||||
|
.insert("internal.example.com".into(), "internal.example.com: Healthy".into());
|
||||||
|
let mut native = None;
|
||||||
|
let monitor = if mode == "tunnel" || mode == "active-tunnel" || mode == "prompted-tunnel" {
|
||||||
|
let vpn = Arc::new(
|
||||||
|
openconnect::Vpn::builder("vpn.example.com", "fixture-cookie")
|
||||||
|
.network_configuration_handler(|_| Ok(()))
|
||||||
|
.build()
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
let monitor = gptunnel::TunnelMonitor::attach(vpn.clone());
|
||||||
|
if mode == "active-tunnel" || mode == "prompted-tunnel" {
|
||||||
|
native = Some(active_native_fixture(vpn, cancellation.clone()));
|
||||||
|
}
|
||||||
|
let _ = notice::slot();
|
||||||
|
session_notice(log::Level::Warn, "initial-fallback-warning");
|
||||||
|
dashboard.start_tunnel(monitor.clone()).unwrap();
|
||||||
|
Some(monitor)
|
||||||
|
} else {
|
||||||
|
dashboard.start_internal(members).unwrap();
|
||||||
|
None
|
||||||
|
};
|
||||||
|
println!("redirected-stdout");
|
||||||
|
tokio::time::timeout(Duration::from_secs(15), cancellation.cancelled())
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert!(
|
||||||
|
child.wait().unwrap().success(),
|
||||||
|
"helper must not inherit dashboard input"
|
||||||
|
);
|
||||||
|
if let Some(monitor) = monitor {
|
||||||
|
monitor.stop().await;
|
||||||
|
}
|
||||||
|
if let Some(native) = native {
|
||||||
|
native.join().unwrap();
|
||||||
|
}
|
||||||
|
dashboard.finish().unwrap();
|
||||||
|
assert_eq!(fcntl(std::io::stdin(), FcntlArg::F_GETFD).unwrap(), input_flags);
|
||||||
|
signals.abort();
|
||||||
|
eprintln!("DASHBOARD_RESTORED");
|
||||||
|
let mut acknowledgement = String::new();
|
||||||
|
let mut tty = std::fs::OpenOptions::new().read(true).open("/dev/tty").unwrap();
|
||||||
|
use std::io::BufRead;
|
||||||
|
std::io::BufReader::new(&mut tty)
|
||||||
|
.read_line(&mut acknowledgement)
|
||||||
|
.unwrap();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn active_native_fixture(vpn: Arc<openconnect::Vpn>, cancellation: CancellationToken) -> std::thread::JoinHandle<()> {
|
||||||
|
use std::{
|
||||||
|
ffi::{c_int, c_void},
|
||||||
|
os::fd::AsRawFd,
|
||||||
|
os::unix::net::UnixStream,
|
||||||
|
};
|
||||||
|
#[repr(C)]
|
||||||
|
struct Statistics {
|
||||||
|
tx_pkts: u64,
|
||||||
|
tx_bytes: u64,
|
||||||
|
rx_pkts: u64,
|
||||||
|
rx_bytes: u64,
|
||||||
|
}
|
||||||
|
unsafe extern "C" {
|
||||||
|
fn vpn_attach_command_pipe(vpn: *mut c_void, fd: c_int) -> c_int;
|
||||||
|
fn vpn_detach_command_pipe(vpn: *mut c_void);
|
||||||
|
fn vpn_tunnel_event(vpn: *mut c_void, event: c_int);
|
||||||
|
fn vpn_tunnel_statistics(vpn: *mut c_void, statistics: *const Statistics);
|
||||||
|
}
|
||||||
|
let (sender, mut receiver) = UnixStream::pair().unwrap();
|
||||||
|
receiver.set_nonblocking(true).unwrap();
|
||||||
|
let pointer = Arc::as_ptr(&vpn).cast_mut().cast();
|
||||||
|
// SAFETY: the fixture retains Vpn and both endpoints through detach; event
|
||||||
|
// numbers and statistics layout match the native bridge used in production.
|
||||||
|
unsafe {
|
||||||
|
assert_eq!(vpn_attach_command_pipe(pointer, sender.as_raw_fd()), 0);
|
||||||
|
vpn_tunnel_event(pointer, 1);
|
||||||
|
vpn_tunnel_event(pointer, 5);
|
||||||
|
}
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let pointer = Arc::as_ptr(&vpn).cast_mut().cast();
|
||||||
|
let mut command = [0];
|
||||||
|
while !cancellation.is_cancelled() {
|
||||||
|
match receiver.read(&mut command) {
|
||||||
|
Ok(1) if command[0] == b's' => unsafe {
|
||||||
|
vpn_tunnel_statistics(
|
||||||
|
pointer,
|
||||||
|
&Statistics {
|
||||||
|
tx_pkts: 2,
|
||||||
|
tx_bytes: 1024,
|
||||||
|
rx_pkts: 4,
|
||||||
|
rx_bytes: 4096,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
Err(error) if error.kind() == io::ErrorKind::WouldBlock => std::thread::sleep(Duration::from_millis(10)),
|
||||||
|
other => panic!("Unexpected native fixture command: {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// SAFETY: all native observations finish before the retained Vpn is freed.
|
||||||
|
unsafe {
|
||||||
|
vpn_detach_command_pipe(pointer);
|
||||||
|
vpn_tunnel_event(pointer, 7);
|
||||||
|
}
|
||||||
|
drop(sender);
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -3,8 +3,8 @@ use std::time::Duration;
|
|||||||
use clap::Args;
|
use clap::Args;
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
clap::args::Os,
|
clap::args::Os,
|
||||||
|
collection::CollectionBudget,
|
||||||
os_profile::{ClientOs, OsProfileBuilder},
|
os_profile::{ClientOs, OsProfileBuilder},
|
||||||
process::collection::CollectionBudget,
|
|
||||||
};
|
};
|
||||||
use gphip::{ReportContext, ReportInput, generate_report_with_control};
|
use gphip::{ReportContext, ReportInput, generate_report_with_control};
|
||||||
|
|
||||||
@@ -51,11 +51,12 @@ impl<'a> HipHandler<'a> {
|
|||||||
if let Some(os_version) = self.args.os_version.as_deref() {
|
if let Some(os_version) = self.args.os_version.as_deref() {
|
||||||
builder = builder.os_version(os_version);
|
builder = builder.os_version(os_version);
|
||||||
}
|
}
|
||||||
if let Some(host_id) = self.args.host_id.as_deref() {
|
|
||||||
builder = builder.host_id_override(host_id);
|
|
||||||
}
|
|
||||||
let input = ReportInput {
|
let input = ReportInput {
|
||||||
profile: builder.build_with_control(&budget)?,
|
profile: gpapi::os_profile::desktop::collect_profile_with_control(
|
||||||
|
builder,
|
||||||
|
self.args.host_id.as_deref(),
|
||||||
|
&budget,
|
||||||
|
)?,
|
||||||
context: ReportContext::Connected {
|
context: ReportContext::Connected {
|
||||||
cookie: self.args.cookie.clone(),
|
cookie: self.args.cookie.clone(),
|
||||||
client_ip: self.args.client_ip.clone(),
|
client_ip: self.args.client_ip.clone(),
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ use clap::Args;
|
|||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))]
|
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))]
|
||||||
use common::binary_paths;
|
use common::binary_paths;
|
||||||
use directories::ProjectDirs;
|
use directories::ProjectDirs;
|
||||||
use gpapi::{process::desktop_launcher::DesktopLauncher, utils::endpoint::http_endpoint};
|
use gpapi::process::desktop_launcher::DesktopLauncher;
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
#[derive(Args)]
|
#[derive(Args)]
|
||||||
@@ -61,7 +61,7 @@ impl<'a> LaunchGuiHandler<'a> {
|
|||||||
return forward_auth_callback(callback);
|
return forward_auth_callback(callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
if try_active_gui().await.is_ok() {
|
if DesktopLauncher::activate_existing().await.is_ok() {
|
||||||
info!("The GUI is already running");
|
info!("The GUI is already running");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
@@ -115,18 +115,6 @@ fn parse_auth_callback(callback: &str) -> Result<String, String> {
|
|||||||
.ok_or_else(|| "callback URL must use the globalprotectcallback scheme".to_owned())
|
.ok_or_else(|| "callback URL must use the globalprotectcallback scheme".to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn try_active_gui() -> anyhow::Result<()> {
|
|
||||||
let service_endpoint = http_endpoint().await?;
|
|
||||||
|
|
||||||
reqwest::Client::default()
|
|
||||||
.post(format!("{}/active-gui", service_endpoint))
|
|
||||||
.send()
|
|
||||||
.await?
|
|
||||||
.error_for_status()?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_log_file() -> anyhow::Result<PathBuf> {
|
fn get_log_file() -> anyhow::Result<PathBuf> {
|
||||||
let dirs = ProjectDirs::from("com.yuezk", "GlobalProtect-openconnect", "gpclient")
|
let dirs = ProjectDirs::from("com.yuezk", "GlobalProtect-openconnect", "gpclient")
|
||||||
.ok_or_else(|| anyhow::anyhow!("Failed to get project dirs"))?;
|
.ok_or_else(|| anyhow::anyhow!("Failed to get project dirs"))?;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
mod background;
|
mod background;
|
||||||
mod cli;
|
mod cli;
|
||||||
mod connect;
|
mod connect;
|
||||||
|
mod dashboard;
|
||||||
mod diagnostics;
|
mod diagnostics;
|
||||||
mod disconnect;
|
mod disconnect;
|
||||||
mod hip;
|
mod hip;
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ async fn run_session_runtime(session_ctx: SessionContext, mut session_info: Sess
|
|||||||
|
|
||||||
tokio::time::sleep(schedule.delay).await;
|
tokio::time::sleep(schedule.delay).await;
|
||||||
|
|
||||||
|
crate::dashboard::session_notice(Level::Warn, &schedule.message);
|
||||||
report(log_format, Level::Warn, &format!("\nWARNING: {}", schedule.message));
|
report(log_format, Level::Warn, &format!("\nWARNING: {}", schedule.message));
|
||||||
|
|
||||||
if !schedule.should_auto_extend {
|
if !schedule.should_auto_extend {
|
||||||
@@ -90,6 +91,7 @@ async fn run_session_runtime(session_ctx: SessionContext, mut session_info: Sess
|
|||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
crate::dashboard::session_notice(Level::Info, "Session extended.");
|
||||||
report(log_format, Level::Info, "Session extended.");
|
report(log_format, Level::Info, "Session extended.");
|
||||||
session_info = next_session_info;
|
session_info = next_session_info;
|
||||||
}
|
}
|
||||||
@@ -180,9 +182,10 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn builds_session_context_from_os_profile() {
|
fn builds_session_context_from_os_profile() {
|
||||||
let profile = OsProfile::builder(gpapi::os_profile::ClientOs::Mac)
|
let profile = gpapi::os_profile::desktop::collect_profile(
|
||||||
.client_version("6.3.1-12".to_string())
|
OsProfile::builder(gpapi::os_profile::ClientOs::Mac).client_version("6.3.1-12".to_string()),
|
||||||
.build();
|
None,
|
||||||
|
);
|
||||||
let expected_user_agent = profile.user_agent().to_string();
|
let expected_user_agent = profile.user_agent().to_string();
|
||||||
|
|
||||||
let ctx = build_session_context(SessionContextInput {
|
let ctx = build_session_context(SessionContextInput {
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
#![cfg(not(target_os = "macos"))]
|
||||||
|
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn background_worker_warns_once_for_the_deprecated_flag() {
|
||||||
|
const WARNING: &str = "--fix-openssl is deprecated and has no effect. It will be removed in a future release.";
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
for deprecated in [false, true] {
|
||||||
|
let log = directory.path().join(format!("background-{deprecated}.log"));
|
||||||
|
let mut command = Command::new(env!("CARGO_BIN_EXE_gpclient"));
|
||||||
|
if deprecated {
|
||||||
|
command.arg("--fix-openssl");
|
||||||
|
}
|
||||||
|
let output = command
|
||||||
|
.arg("--lock-file")
|
||||||
|
.arg(directory.path().join("client.pid"))
|
||||||
|
.args([
|
||||||
|
"--log-format",
|
||||||
|
"json",
|
||||||
|
"connect",
|
||||||
|
"vpn.example.test",
|
||||||
|
"--background",
|
||||||
|
"--certificate",
|
||||||
|
])
|
||||||
|
// Fail identity preparation before authentication or a network connection.
|
||||||
|
.arg(directory.path().join("missing.pem"))
|
||||||
|
.arg("--log-file")
|
||||||
|
.arg(&log)
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
assert!(!output.status.success());
|
||||||
|
let mut records = String::from_utf8(output.stderr).unwrap();
|
||||||
|
records.push_str(&std::fs::read_to_string(log).unwrap());
|
||||||
|
assert!(records.contains("Failed to read client identity"), "{records}");
|
||||||
|
assert_eq!(records.matches(WARNING).count(), usize::from(deprecated), "{records}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,7 +30,13 @@ async fn embedded_collector_reports_missing_helpers_without_recursing_or_exposin
|
|||||||
let output = tokio::time::timeout(
|
let output = tokio::time::timeout(
|
||||||
Duration::from_secs(30),
|
Duration::from_secs(30),
|
||||||
Command::new(env!("CARGO_BIN_EXE_gpclient"))
|
Command::new(env!("CARGO_BIN_EXE_gpclient"))
|
||||||
.args(["--fix-openssl", "diagnostics", "--json", "--output"])
|
.args([
|
||||||
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
"--fix-openssl",
|
||||||
|
"diagnostics",
|
||||||
|
"--json",
|
||||||
|
"--output",
|
||||||
|
])
|
||||||
.arg(&report_file)
|
.arg(&report_file)
|
||||||
.env("PATH", format!("{}:/usr/bin:/bin", bin.display()))
|
.env("PATH", format!("{}:/usr/bin:/bin", bin.display()))
|
||||||
.env("GP_AUTH_BINARY", dir.path().join("missing-gpauth"))
|
.env("GP_AUTH_BINARY", dir.path().join("missing-gpauth"))
|
||||||
@@ -67,5 +73,11 @@ async fn embedded_collector_reports_missing_helpers_without_recursing_or_exposin
|
|||||||
report["fields"]["env.XDG_CURRENT_DESKTOP"]["value"],
|
report["fields"]["env.XDG_CURRENT_DESKTOP"]["value"],
|
||||||
"TestDesktop Injected: secret"
|
"TestDesktop Injected: secret"
|
||||||
);
|
);
|
||||||
assert!(!String::from_utf8_lossy(&output.stderr).contains("Using 'UnsafeLegacyServerConnect'"));
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
assert_eq!(
|
||||||
|
String::from_utf8_lossy(&output.stderr)
|
||||||
|
.matches("--fix-openssl is deprecated and has no effect. It will be removed in a future release.")
|
||||||
|
.count(),
|
||||||
|
1
|
||||||
|
);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
//! Compiled by the PTY test with -C panic=abort against the production hook.
|
||||||
|
#[path = "../../src/dashboard/restoration.rs"]
|
||||||
|
mod restoration;
|
||||||
|
|
||||||
|
use std::{fs::{File, OpenOptions}, io::{Read, Write}, os::fd::{AsRawFd, FromRawFd}, sync::Arc};
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let tty = OpenOptions::new().read(true).write(true).open("/dev/tty").unwrap();
|
||||||
|
let error = Arc::new(unsafe { File::from_raw_fd(nix::libc::fcntl(2, nix::libc::F_DUPFD_CLOEXEC, 3)) });
|
||||||
|
let input_flags = nix::fcntl::FdFlag::from_bits_truncate(unsafe { nix::libc::fcntl(0, nix::libc::F_GETFD) });
|
||||||
|
let previous = std::panic::take_hook();
|
||||||
|
std::panic::set_hook(Box::new(move |panic| {
|
||||||
|
assert_eq!(unsafe { nix::libc::fcntl(0, nix::libc::F_GETFD) }, input_flags.bits());
|
||||||
|
previous(panic);
|
||||||
|
eprintln!("ABORT_HOOK_RESTORED");
|
||||||
|
let mut acknowledgement = String::new();
|
||||||
|
std::io::stdin().read_line(&mut acknowledgement).unwrap();
|
||||||
|
}));
|
||||||
|
let restore = restoration::TerminalRestoration::install(tty.try_clone().unwrap(), error.clone(), None, input_flags).unwrap();
|
||||||
|
restore.arm();
|
||||||
|
unsafe { nix::libc::fcntl(0, nix::libc::F_SETFD, input_flags.bits() | nix::libc::FD_CLOEXEC); }
|
||||||
|
let mut termios = std::mem::MaybeUninit::uninit();
|
||||||
|
unsafe {
|
||||||
|
assert_eq!(nix::libc::tcgetattr(tty.as_raw_fd(), termios.as_mut_ptr()), 0);
|
||||||
|
let mut raw = termios.assume_init();
|
||||||
|
nix::libc::cfmakeraw(&mut raw);
|
||||||
|
assert_eq!(nix::libc::tcsetattr(tty.as_raw_fd(), nix::libc::TCSANOW, &raw), 0);
|
||||||
|
}
|
||||||
|
(&*error).write_all(b"\x1b[?1049hABORT_FIXTURE_READY").unwrap();
|
||||||
|
let mut trigger = [0];
|
||||||
|
(&tty).read_exact(&mut trigger).unwrap();
|
||||||
|
panic!("intentional abort-hook fixture panic");
|
||||||
|
}
|
||||||
@@ -1,7 +1,36 @@
|
|||||||
# Tauri + React + Typescript
|
# GP Connect download helper
|
||||||
|
|
||||||
This template should help get you started developing with Tauri, React and Typescript in Vite.
|
The desktop supervisor launches this window when the selected GUI is missing or
|
||||||
|
has an incompatible version. It downloads the selected Tauri or Native Shell
|
||||||
|
interface and requests installation through the service. Launches require the
|
||||||
|
existing service credential and lifetime channel on stdin.
|
||||||
|
|
||||||
## Recommended IDE Setup
|
## Appearance
|
||||||
|
|
||||||
- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)
|
`--theme system|light|dark` controls this window only. The default is `system`,
|
||||||
|
which follows system appearance and changes while the window is open. Explicit
|
||||||
|
`light` and `dark` modes override system appearance for that launch. Nothing is
|
||||||
|
saved by the helper.
|
||||||
|
|
||||||
|
Initial downloads follow the system. During Linux Tauri/Native Shell switches,
|
||||||
|
Desktop Core supplies the running app's saved theme choice to the supervisor,
|
||||||
|
which forwards it to the helper. There is no `--helper-theme` option on
|
||||||
|
`gpclient launch-gui`.
|
||||||
|
|
||||||
|
The native window and web content use the selected appearance before the window
|
||||||
|
is shown. Browser previews follow the system when no native mode is supplied.
|
||||||
|
|
||||||
|
## Development
|
||||||
|
|
||||||
|
```sh
|
||||||
|
pnpm build
|
||||||
|
pnpm test
|
||||||
|
```
|
||||||
|
|
||||||
|
The built `dist/` assets are tracked and must be rebuilt after frontend changes.
|
||||||
|
Run Rust checks and helper tests from the `gp` repository:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cargo check -p gpgui-helper
|
||||||
|
cargo test -p gpgui-helper --lib
|
||||||
|
```
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
|
|
||||||
<defs>
|
|
||||||
<linearGradient id="ocean" x1="245" y1="170" x2="770" y2="770" gradientUnits="userSpaceOnUse">
|
|
||||||
<stop stop-color="#579bc1"/>
|
|
||||||
<stop offset=".52" stop-color="#438fbd"/>
|
|
||||||
<stop offset="1" stop-color="#2f719e"/>
|
|
||||||
</linearGradient>
|
|
||||||
<linearGradient id="land" x1="260" y1="190" x2="750" y2="735" gradientUnits="userSpaceOnUse">
|
|
||||||
<stop stop-color="#56c78a"/>
|
|
||||||
<stop offset=".55" stop-color="#3bbf78"/>
|
|
||||||
<stop offset="1" stop-color="#279b5d"/>
|
|
||||||
</linearGradient>
|
|
||||||
<linearGradient id="lock" x1="385" y1="400" x2="650" y2="700" gradientUnits="userSpaceOnUse">
|
|
||||||
<stop stop-color="#f3b84c"/>
|
|
||||||
<stop offset=".55" stop-color="#e8a12f"/>
|
|
||||||
<stop offset="1" stop-color="#d4871e"/>
|
|
||||||
</linearGradient>
|
|
||||||
<clipPath id="globe-clip">
|
|
||||||
<circle cx="512" cy="455" r="315"/>
|
|
||||||
</clipPath>
|
|
||||||
</defs>
|
|
||||||
|
|
||||||
<g transform="translate(512 512) scale(1.44) translate(-512 -455)">
|
|
||||||
<circle cx="512" cy="455" r="315" fill="url(#ocean)"/>
|
|
||||||
<g clip-path="url(#globe-clip)" fill="url(#land)">
|
|
||||||
<path d="M177 326c74-121 177-185 302-190-13 51-49 84-105 98-4 45-32 79-86 101-37 17-75 14-111-9Z"/>
|
|
||||||
<path d="M564 135c129 18 229 103 273 220-69-3-121 15-157 54-51-14-83-50-95-107-38-36-45-92-21-167Z"/>
|
|
||||||
<path d="M189 467c63-39 125-34 187 16 57 25 73 73 48 144-45 90-108 146-189 166-58-88-73-197-46-326Z"/>
|
|
||||||
<path d="M612 572c78-38 157-18 238 59-45 89-122 144-231 164-20-67-22-122-7-165-22-17-22-36 0-58Z"/>
|
|
||||||
</g>
|
|
||||||
<circle cx="512" cy="455" r="308" fill="none" stroke="#9ccde2" stroke-width="11" stroke-opacity=".4"/>
|
|
||||||
|
|
||||||
<g transform="translate(512 490) scale(.82) translate(-512 -490)">
|
|
||||||
<path d="M405 429v-75c0-142 214-142 214 0v75" fill="none" stroke="#eef1f2" stroke-width="58" stroke-linecap="round"/>
|
|
||||||
<rect x="340" y="403" width="344" height="278" rx="62" fill="url(#lock)"/>
|
|
||||||
<rect x="346" y="409" width="332" height="266" rx="56" fill="none" stroke="#f7cb75" stroke-width="10" stroke-opacity=".45"/>
|
|
||||||
<g fill="#85500f" opacity=".85">
|
|
||||||
<path d="M501 538h22l16 69h-54Z"/>
|
|
||||||
<circle cx="512" cy="521" r="27"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 2.2 KiB |
@@ -0,0 +1,44 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="ocean" x1="210.49524" y1="190.80952" x2="802.16190" y2="867.00000" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop stop-color="#579bc1"/>
|
||||||
|
<stop offset=".52" stop-color="#438fbd"/>
|
||||||
|
<stop offset="1" stop-color="#2f719e"/>
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient id="land" x1="227.40000" y1="213.34921" x2="779.62222" y2="827.55556" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop stop-color="#56c78a"/>
|
||||||
|
<stop offset=".55" stop-color="#3bbf78"/>
|
||||||
|
<stop offset="1" stop-color="#279b5d"/>
|
||||||
|
</linearGradient>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<linearGradient id="shipped-lock" x1="385" y1="400" x2="650" y2="700" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop stop-color="#f3b84c"/>
|
||||||
|
<stop offset=".55" stop-color="#e8a12f"/>
|
||||||
|
<stop offset="1" stop-color="#d4871e"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<g transform="translate(512 512) scale(1.1535211267605634) translate(-511.4 -512)">
|
||||||
|
<g>
|
||||||
|
<circle cx="511.4" cy="512" r="355" fill="url(#ocean)"/>
|
||||||
|
<path d="m341.5 202.8c-83.71 44.8-148.5 123-170.9 210.4 10.88 28.67 32.13 48.77 54.14 63.49 13.18 8.96 18.94 19.84 17.15 31.87-3.84 26.5-46.85 37.89-50.3 71.3-2.688 27.78 17.54 52.74 46.46 67.71 21.76 11.39 35.2 25.73 41.34 44.29 13.44 39.17 32.64 82.56 68.99 105.5 30.08 18.94 46.85 12.67 41.09-1.92-6.144-15.36-26.37-32.13-26.24-53.63 0.128-27.39 26.5-41.98 31.49-62.72v-87.3c-18.69-0.896-30.59-9.216-40.19-19.71-16.51-17.41-37.76-29.44-55.68-36.86-10.37-4.352-12.67-12.8-13.7-22.66-0.896-11.39-6.144-20.74-15.1-28.16-12.8-10.62-19.97-22.53-18.3-34.82 1.92-15.62 17.28-26.5 36.74-29.44 37.25-6.144 70.53-34.69 74.11-63.49 1.792-14.46-5.504-24.32-2.816-33.66 4.864-21.12 34.18-38.14 65.02-51.71 24.83-10.88 45.7-20.61 45.95-39.81 0.256-20.22-20.74-32.9-60.03-33.41-22.53 0.128-46.08 2.56-69.25 4.736z" fill="url(#land)"/>
|
||||||
|
<path d="m663.7 191.5c-50.43 5.376-89.34 38.4-89.34 68.61 0 26.75 27.78 42.88 62.98 46.98 31.36 3.712 48.9 15.36 49.79 34.18 0.896 20.74-17.15 34.18-16.77 51.71 0.512 36.35 51.84 71.04 107.4 71.17 31.74 0.128 62.59-11.39 79.74-28.54-24.32-107.8-99.2-199.3-193.8-244.1z" fill="url(#land)"/>
|
||||||
|
<path d="m866.2 532c-19.46-9.216-42.62-13.7-66.18-13.7-57.47 0-102.1 34.05-102.1 60.8 0 11.9 6.144 19.97 13.06 26.75 11.52 11.52 17.66 25.73 17.66 42.24 0 29.18-22.53 45.06-22.53 73.34 0 26.88 18.69 47.36 39.04 57.73 71.42-61.31 117.6-154.6 121.1-247.2z" fill="url(#land)"/>
|
||||||
|
<circle cx="511.4" cy="512" r="347.111111" fill="none" stroke="#9ccde2" stroke-width="12.396825" stroke-opacity=".4"/>
|
||||||
|
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g transform="translate(512 512) scale(1.3) translate(-512 -455)">
|
||||||
|
<g transform="translate(512 490) scale(.82) translate(-512 -490)">
|
||||||
|
<path d="M405 429v-75c0-142 214-142 214 0v75" fill="none" stroke="#eef1f2" stroke-width="58" stroke-linecap="round"/>
|
||||||
|
<rect x="340" y="403" width="344" height="278" rx="62" fill="url(#shipped-lock)"/>
|
||||||
|
<rect x="346" y="409" width="332" height="266" rx="56" fill="none" stroke="#f7cb75" stroke-width="10" stroke-opacity=".3"/>
|
||||||
|
<g fill="#85500f" opacity=".78" transform="translate(512 550.5) scale(1.2) translate(-512 -550.5)">
|
||||||
|
<path d="M501 538h22l16 69h-54Z"/>
|
||||||
|
<circle cx="512" cy="521" r="27"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 3.2 KiB |
@@ -1,9 +1,9 @@
|
|||||||
var e=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t),e=null),t.exports);(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),t.credentials=e.crossOrigin===`use-credentials`?`include`:e.crossOrigin===`anonymous`?`omit`:`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var t=e((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0<n;){var r=n-1>>>1,a=e[r];if(0<i(a,t))e[r]=t,e[n]=a,n=r;else break a}}function n(e){return e.length===0?null:e[0]}function r(e){if(e.length===0)return null;var t=e[0],n=e.pop();if(n!==t){e[0]=n;a:for(var r=0,a=e.length,o=a>>>1;r<o;){var s=2*(r+1)-1,c=e[s],l=s+1,u=e[l];if(0>i(c,n))l<a&&0>i(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(l<a&&0>i(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function ee(e){if(h=!1,b(e),!m){if(n(c)!==null)m=!0,x||(x=!0,ie());else{var t=n(l);t!==null&&se(ee,t.startTime-e)}}}var x=!1,te=-1,ne=5,S=-1;function re(){return g?!0:!(e.unstable_now()-S<ne)}function C(){if(g=!1,x){var t=e.unstable_now();S=t;var i=!0;try{a:{m=!1,h&&(h=!1,v(te),te=-1),p=!0;var a=f;try{b:{for(b(t),d=n(c);d!==null&&!(d.expirationTime>t&&re());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&se(ee,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?ie():x=!1}}}var ie;if(typeof y==`function`)ie=function(){y(C)};else if(typeof MessageChannel<`u`){var ae=new MessageChannel,oe=ae.port2;ae.port1.onmessage=C,ie=function(){oe.postMessage(null)}}else ie=function(){_(C,0)};function se(t,n){te=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125<e?console.error(`forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported`):ne=0<e?Math.floor(1e3/e):5},e.unstable_getCurrentPriorityLevel=function(){return f},e.unstable_next=function(e){switch(f){case 1:case 2:case 3:var t=3;break;default:t=f}var n=f;f=t;try{return e()}finally{f=n}},e.unstable_requestPaint=function(){g=!0},e.unstable_runWithPriority=function(e,t){switch(e){case 1:case 2:case 3:case 4:case 5:break;default:e=3}var n=f;f=e;try{return t()}finally{f=n}},e.unstable_scheduleCallback=function(r,i,a){var o=e.unstable_now();switch(typeof a==`object`&&a?(a=a.delay,a=typeof a==`number`&&0<a?o+a:o):a=o,r){case 1:var s=-1;break;case 2:s=250;break;case 5:s=1073741823;break;case 4:s=1e4;break;default:s=5e3}return s=a+s,r={id:u++,callback:i,priorityLevel:r,startTime:a,expirationTime:s,sortIndex:-1},a>o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(te),te=-1):h=!0,se(ee,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,x||(x=!0,ie()))),r},e.unstable_shouldYield=re,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),n=e(((e,n)=>{n.exports=t()})),r=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.for(`react.view_transition`),m=Symbol.iterator;function h(e){return typeof e!=`object`||!e?null:(e=m&&e[m]||e[`@@iterator`],typeof e==`function`?e:null)}var g={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},_=Object.assign,v={};function y(e,t,n){Line truncated
|
var e=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t,t.exports),e=null),t.exports);(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),t.credentials=e.crossOrigin===`use-credentials`?`include`:e.crossOrigin===`anonymous`?`omit`:`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var t=e((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0<n;){var r=n-1>>>1,a=e[r];if(0<i(a,t))e[r]=t,e[n]=a,n=r;else break a}}function n(e){return e.length===0?null:e[0]}function r(e){if(e.length===0)return null;var t=e[0],n=e.pop();if(n!==t){e[0]=n;a:for(var r=0,a=e.length,o=a>>>1;r<o;){var s=2*(r+1)-1,c=e[s],l=s+1,u=e[l];if(0>i(c,n))l<a&&0>i(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(l<a&&0>i(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function ee(e){if(h=!1,b(e),!m){if(n(c)!==null)m=!0,x||(x=!0,ie());else{var t=n(l);t!==null&&se(ee,t.startTime-e)}}}var x=!1,te=-1,ne=5,S=-1;function re(){return g?!0:!(e.unstable_now()-S<ne)}function C(){if(g=!1,x){var t=e.unstable_now();S=t;var i=!0;try{a:{m=!1,h&&(h=!1,v(te),te=-1),p=!0;var a=f;try{b:{for(b(t),d=n(c);d!==null&&!(d.expirationTime>t&&re());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&se(ee,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?ie():x=!1}}}var ie;if(typeof y==`function`)ie=function(){y(C)};else if(typeof MessageChannel<`u`){var ae=new MessageChannel,oe=ae.port2;ae.port1.onmessage=C,ie=function(){oe.postMessage(null)}}else ie=function(){_(C,0)};function se(t,n){te=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125<e?console.error(`forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported`):ne=0<e?Math.floor(1e3/e):5},e.unstable_getCurrentPriorityLevel=function(){return f},e.unstable_next=function(e){switch(f){case 1:case 2:case 3:var t=3;break;default:t=f}var n=f;f=t;try{return e()}finally{f=n}},e.unstable_requestPaint=function(){g=!0},e.unstable_runWithPriority=function(e,t){switch(e){case 1:case 2:case 3:case 4:case 5:break;default:e=3}var n=f;f=e;try{return t()}finally{f=n}},e.unstable_scheduleCallback=function(r,i,a){var o=e.unstable_now();switch(typeof a==`object`&&a?(a=a.delay,a=typeof a==`number`&&0<a?o+a:o):a=o,r){case 1:var s=-1;break;case 2:s=250;break;case 5:s=1073741823;break;case 4:s=1e4;break;default:s=5e3}return s=a+s,r={id:u++,callback:i,priorityLevel:r,startTime:a,expirationTime:s,sortIndex:-1},a>o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(te),te=-1):h=!0,se(ee,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,x||(x=!0,ie()))),r},e.unstable_shouldYield=re,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),n=e(((e,n)=>{n.exports=t()})),r=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.for(`react.view_transition`),m=Symbol.iterator;function h(e){return typeof e!=`object`||!e?null:(e=m&&e[m]||e[`@@iterator`],typeof e==`function`?e:null)}var g={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},_=Object.assign,v={};functionLine truncated
|
||||||
at`)?` (<anonymous>)`:-1<e.stack.indexOf(`@`)?`@unknown:0:0`:``}return`
|
at`)?` (<anonymous>)`:-1<e.stack.indexOf(`@`)?`@unknown:0:0`:``}return`
|
||||||
`+ze+e+Be}var He=!1;function Ue(e,t){if(!e||He)return``;He=!0;var n=Error.prepareStackTrace;Error.prepareStackTrace=void 0;try{var r={DetermineComponentFrameRoot:function(){try{if(t){var n=function(){throw Error()};if(Object.defineProperty(n.prototype,"props",{set:function(){throw Error()}}),typeof Reflect==`object`&&Reflect.construct){try{Reflect.construct(n,[])}catch(e){var r=e}Reflect.construct(e,[],n)}else{try{n.call()}catch(e){r=e}n=!1;try{var i=Object.getOwnPropertyDescriptor(e.prototype,`props`);Object.defineProperty(e.prototype,"props",{configurable:!0,set:function(){throw Error()}}),n=!0,new e}finally{n&&(i===void 0?delete e.prototype.props:Object.defineProperty(e.prototype,"props",i))}}}else{try{throw Error()}catch(e){r=e}(n=e())&&typeof n.catch==`function`&&n.catch(function(){})}}catch(e){if(e&&r&&typeof e.stack==`string`)return[e.stack,r.stack]}return[null,null]}};r.DetermineComponentFrameRoot.displayName=`DetermineComponentFrameRoot`;var i=Object.getOwnPropertyDescriptor(r.DetermineComponentFrameRoot,`name`);i&&i.configurable&&Object.defineProperty(r.DetermineComponentFrameRoot,"name",{value:`DetermineComponentFrameRoot`});var a=r.DetermineComponentFrameRoot(),o=a[0],s=a[1];if(o&&s){var c=o.split(`
|
`+ze+e+Be}var He=!1;function Ue(e,t){if(!e||He)return``;He=!0;var n=Error.prepareStackTrace;Error.prepareStackTrace=void 0;try{var r={DetermineComponentFrameRoot:function(){try{if(t){var n=function(){throw Error()};if(Object.defineProperty(n.prototype,"props",{set:function(){throw Error()}}),typeof Reflect==`object`&&Reflect.construct){try{Reflect.construct(n,[])}catch(e){var r=e}Reflect.construct(e,[],n)}else{try{n.call()}catch(e){r=e}n=!1;try{var i=Object.getOwnPropertyDescriptor(e.prototype,`props`);Object.defineProperty(e.prototype,"props",{configurable:!0,set:function(){throw Error()}}),n=!0,new e}finally{n&&(i===void 0?delete e.prototype.props:Object.defineProperty(e.prototype,"props",i))}}}else{try{throw Error()}catch(e){r=e}(n=e())&&typeof n.catch==`function`&&n.catch(function(){})}}catch(e){if(e&&r&&typeof e.stack==`string`)return[e.stack,r.stack]}return[null,null]}};r.DetermineComponentFrameRoot.displayName=`DetermineComponentFrameRoot`;var i=Object.getOwnPropertyDescriptor(r.DetermineComponentFrameRoot,`name`);i&&i.configurable&&Object.defineProperty(r.DetermineComponentFrameRoot,"name",{value:`DetermineComponentFrameRoot`});var a=r.DetermineComponentFrameRoot(),o=a[0],s=a[1];if(o&&s){var c=o.split(`
|
||||||
`),l=s.split(`
|
`),l=s.split(`
|
||||||
`);for(i=r=0;r<c.length&&!c[r].includes(`DetermineComponentFrameRoot`);)r++;for(;i<l.length&&!l[i].includes(`DetermineComponentFrameRoot`);)i++;if(r===c.length||i===l.length)for(r=c.length-1,i=l.length-1;1<=r&&0<=i&&c[r]!==l[i];)i--;for(;1<=r&&0<=i;r--,i--)if(c[r]!==l[i]){if(r!==1||i!==1)do if(r--,i--,0>i||c[r]!==l[i]){var u=`
|
`);for(i=r=0;r<c.length&&!c[r].includes(`DetermineComponentFrameRoot`);)r++;for(;i<l.length&&!l[i].includes(`DetermineComponentFrameRoot`);)i++;if(r===c.length||i===l.length)for(r=c.length-1,i=l.length-1;1<=r&&0<=i&&c[r]!==l[i];)i--;for(;1<=r&&0<=i;r--,i--)if(c[r]!==l[i]){if(r!==1||i!==1)do if(r--,i--,0>i||c[r]!==l[i]){var u=`
|
||||||
`+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(`<anonymous>`)&&(u=u.replace(`<anonymous>`,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{He=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?Ve(n):``}function We(e,t){switch(e.tag){case 26:case 27:case 5:return Ve(e.type);case 16:return Ve(`Lazy`);case 13:return e.child!==t&&t!==null?Ve(`Suspense Fallback`):Ve(`Suspense`);case 19:return Ve(`SuspenseList`);case 0:case 15:return Ue(e.type,!1);case 11:return Ue(e.type.render,!1);case 1:return Ue(e.type,!0);case 31:return Ve(`Activity`);case 30:return Ve(`ViewTransition`);default:return``}}function Ge(e){try{var t=``,n=null;do t+=We(e,n),n=e,e=e.return;while(e);return t}catch(e){return`
|
`+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(`<anonymous>`)&&(u=u.replace(`<anonymous>`,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{He=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?Ve(n):``}function We(e,t){switch(e.tag){case 26:case 27:case 5:return Ve(e.type);case 16:return Ve(`Lazy`);case 13:return e.child!==t&&t!==null?Ve(`Suspense Fallback`):Ve(`Suspense`);case 19:return Ve(`SuspenseList`);case 0:case 15:return Ue(e.type,!1);case 11:return Ue(e.type.render,!1);case 1:return Ue(e.type,!0);case 31:return Ve(`Activity`);case 30:return Ve(`ViewTransition`);default:return``}}function Ge(e){try{var t=``,n=null;do t+=We(e,n),n=e,e=e.return;while(e);return t}catch(e){return`
|
||||||
Error generating stack: `+e.message+`
|
Error generating stack: `+e.message+`
|
||||||
`+e.stack}}var Ke=Object.prototype.hasOwnProperty,qe=t.unstable_scheduleCallback,Je=t.unstable_cancelCallback,Ye=t.unstable_shouldYield,Xe=t.unstable_requestPaint,Ze=t.unstable_now,Qe=t.unstable_getCurrentPriorityLevel,$e=t.unstable_ImmediatePriority,et=t.unstable_UserBlockingPriority,tt=t.unstable_NormalPriority,nt=t.unstable_LowPriority,rt=t.unstable_IdlePriority,it=t.log,at=t.unstable_setDisableYieldValue,ot=null,st=null;function ct(e){if(typeof it==`function`&&at(e),st&&typeof st.setStrictMode==`function`)try{st.setStrictMode(ot,e)}catch{}}var lt=Math.clz32?Math.clz32:ft,ut=Math.log,dt=Math.LN2;function ft(e){return e>>>=0,e===0?32:31-(ut(e)/dt|0)|0}var pt=256,mt=262144,ht=4194304;function gt(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&-e;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function _t(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=gt(n))):i=gt(o):i=gt(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=gt(n))):i=gt(o)):i=gt(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function vt(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function yt(e,t){t&8&&(t|=t&32);var n=e.entangledLanes;if(n!==0)for(e=e.entanglements,n&=t;0<n;){var r=31-lt(n),i=1<<r;t|=e[r],n&=~i}return t}function bt(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function xt(){var e=ht;return ht<<=1,!(ht&62914560)&&(ht=4194304),e}function St(e){for(var t=[],n=0;31>n;n++)t.push(e);return t}function Ct(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function wt(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0<n;){var u=31-lt(n),d=1<<u;s[u]=0,c[u]=-1;var f=l[u];if(f!==null)for(l[u]=null,u=0;u<f.length;u++){var p=f[u];p!==null&&(p.lane&=-536870913)}n&=~d}r!==0&&Tt(e,r,0),a!==0&&i===0&&e.tag!==0&&(e.suspendedLanes|=a&~(o&~t))}function Tt(e,t,n){e.pendingLanes|=t,e.suspendedLanes&=~t;var r=31-lt(t);e.entangledLanes|=t,e.entanglements[r]=e.entanglements[r]|1073741824|n&261930}function Et(e,t){var n=e.entangledLanes|=t;for(e=e.entanglements;n;){var r=31-lt(n),i=1<<r;i&t|e[r]&t&&(e[r]|=t),n&=~i}}function Dt(e,t){var n=t&-t;return n=n&42?1:Ot(n),(n&(e.suspendedLanes|t))===0?n:0}function Ot(e){switch(e){case 2:e=1;break;case 8:e=4;break;case 32:e=16;break;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:case 4194304:case 8388608:case 16777216:case 33554432:e=128;break;case 268435456:e=134217728;break;default:e=0}return e}function kt(e){return e&=-e,2<e?8<e?e&134217727?32:268435456:8:2}function At(){var e=E.p;return e===0?(e=window.event,e===void 0?32:Ch(e.type)):e}function jt(e,t){var n=E.p;try{return E.p=e,t()}finally{E.p=n}}var Mt=Math.random().toString(36).slice(2),Nt=`__reactFiber$`+Mt,Pt=`__reactProps$`+Mt,Ft=`__reactContainer$`+Mt,It=`__reactEvents$`+Mt,Lt=`__reactListeners$`+Mt,Rt=`__reactHandles$`+Mt,zt=`__reactResources$`+Mt,Bt=`__reactMarker$`+Mt,Vt=`__reactLoad$`+Mt;function Ht(e){delete e[Nt],delete e[Pt],delete e[Lt],delete e[Rt]}function Ut(e){var t;if(t=e[Nt])return t;for(var n=e.parentNode;n;){if(t=n[Ft]||n[Nt]){if(n=t.alternate,t.child!==null||n!==null&&n.child!==null)for(e=fm(e);e!==null;){if(n=e[Nt])return n;e=fm(e)}return t}e=n,n=e.parentNode}return null}function Wt(e){if(e=e[Nt]||e[Ft]){var t=e.tag;if(t===5||t===6||t===13||t===31||t===26||t===27||t===3)return e}return null}function Gt(e){var t=e.tag;if(t===5||t===26||t===27||t===6)return e.stateNode;throw Error(s(33))}function Kt(e){var t=e[zt];return t||=e[zt]={hoistableStyles:new Map,hoistableScripts:new Map},t}function qt(e){e[Bt]=!0}function Jt(e){e[Vt]=void 0}var Yt=new Set,Xt={};function Zt(e,t){Qt(e,t),Qt(e+`Capture`,t)}function Qt(e,t){for(Xt[e]=t,e=0;e<t.le
Line truncated
|
`+e.stack}}var Ke=Object.prototype.hasOwnProperty,qe=t.unstable_scheduleCallback,Je=t.unstable_cancelCallback,Ye=t.unstable_shouldYield,Xe=t.unstable_requestPaint,Ze=t.unstable_now,Qe=t.unstable_getCurrentPriorityLevel,$e=t.unstable_ImmediatePriority,et=t.unstable_UserBlockingPriority,tt=t.unstable_NormalPriority,nt=t.unstable_LowPriority,rt=t.unstable_IdlePriority,it=t.log,at=t.unstable_setDisableYieldValue,ot=null,st=null;function ct(e){if(typeof it==`function`&&at(e),st&&typeof st.setStrictMode==`function`)try{st.setStrictMode(ot,e)}catch{}}var lt=Math.clz32?Math.clz32:ft,ut=Math.log,dt=Math.LN2;function ft(e){return e>>>=0,e===0?32:31-(ut(e)/dt|0)|0}var pt=256,mt=262144,ht=4194304;function gt(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&-e;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function _t(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=gt(n))):i=gt(o):i=gt(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=gt(n))):i=gt(o)):i=gt(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function vt(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function yt(e,t){t&8&&(t|=t&32);var n=e.entangledLanes;if(n!==0)for(e=e.entanglements,n&=t;0<n;){var r=31-lt(n),i=1<<r;t|=e[r],n&=~i}return t}function bt(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function xt(){var e=ht;return ht<<=1,!(ht&62914560)&&(ht=4194304),e}function St(e){for(var t=[],n=0;31>n;n++)t.push(e);return t}function Ct(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function wt(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0<n;){var u=31-lt(n),d=1<<u;s[u]=0,c[u]=-1;var f=l[u];if(f!==null)for(l[u]=null,u=0;u<f.length;u++){var p=f[u];p!==null&&(p.lane&=-536870913)}n&=~d}r!==0&&Tt(e,r,0),a!==0&&i===0&&e.tag!==0&&(e.suspendedLanes|=a&~(o&~t))}function Tt(e,t,n){e.pendingLanes|=t,e.suspendedLanes&=~t;var r=31-lt(t);e.entangledLanes|=t,e.entanglements[r]=e.entanglements[r]|1073741824|n&261930}function Et(e,t){var n=e.entangledLanes|=t;for(e=e.entanglements;n;){var r=31-lt(n),i=1<<r;i&t|e[r]&t&&(e[r]|=t),n&=~i}}function Dt(e,t){var n=t&-t;return n=n&42?1:Ot(n),(n&(e.suspendedLanes|t))===0?n:0}function Ot(e){switch(e){case 2:e=1;break;case 8:e=4;break;case 32:e=16;break;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:case 4194304:case 8388608:case 16777216:case 33554432:e=128;break;case 268435456:e=134217728;break;default:e=0}return e}function kt(e){return e&=-e,2<e?8<e?e&134217727?32:268435456:8:2}function At(){var e=E.p;return e===0?(e=window.event,e===void 0?32:Ch(e.type)):e}function jt(e,t){var n=E.p;try{return E.p=e,t()}finally{E.p=n}}var Mt=Math.random().toString(36).slice(2),Nt=`__reactFiber$`+Mt,Pt=`__reactProps$`+Mt,Ft=`__reactContainer$`+Mt,It=`__reactEvents$`+Mt,Lt=`__reactListeners$`+Mt,Rt=`__reactHandles$`+Mt,zt=`__reactResources$`+Mt,Bt=`__reactMarker$`+Mt,Vt=`__reactLoad$`+Mt;function Ht(e){delete e[Nt],delete e[Pt],delete e[Lt],delete e[Rt]}function Ut(e){var t;if(t=e[Nt])return t;for(var n=e.parentNode;n;){if(t=n[Ft]||n[Nt]){if(n=t.alternate,t.child!==null||n!==null&&n.child!==null)for(e=fm(e);e!==null;){if(n=e[Nt])return n;e=fm(e)}return t}e=n,n=e.parentNode}return null}function Wt(e){if(e=e[Nt]||e[Ft]){var t=e.tag;if(t===5||t===6||t===13||t===31||t===26||t===27||t===3)return e}return null}function Gt(e){var t=e.tag;if(t===5||t===26||t===27||t===6)return e.stateNode;throw Error(s(33))}function Kt(e){var t=e[zt];return t||=e[zt]={hoistableStyles:new Map,hoistableScripts:new Map},t}function qt(e){e[Bt]=!0}function Jt(e){e[Vt]=void 0}var Yt=new Set,Xt={};function Zt(e,t){Qt(e,t),Qt(e+`Capture`,t)}function Qt(e,t){for(Xt[e]=t,e=0;e<t.le
Line truncated
|
||||||
`).replace(Qf,``)}function ep(e,t){return t=$f(t),$f(e)===t}function $(e,t,n,r,i,a){switch(n){case`children`:if(typeof r==`string`)t===`body`||t===`textarea`&&r===``||xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)t!==`body`&&xn(e,``+r);else return;break;case`className`:on(e,`class`,r);break;case`tabIndex`:on(e,`tabindex`,r);break;case`dir`:case`role`:case`viewBox`:case`width`:case`height`:on(e,n,r);break;case`style`:wn(e,r,a);return;case`data`:if(t!==`object`){on(e,`data`,r);break}case`src`:case`href`:if(r===``&&(t!==`a`||n!==`href`)||r==null||typeof r==`function`||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`action`:case`formAction`:if(typeof r==`function`){e.setAttribute(n,`javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')`);break}if(typeof a==`function`&&(n===`formAction`?(t!==`input`&&$(e,t,`name`,i.name,i,null),$(e,t,`formEncType`,i.formEncType,i,null),$(e,t,`formMethod`,i.formMethod,i,null),$(e,t,`formTarget`,i.formTarget,i,null)):($(e,t,`encType`,i.encType,i,null),$(e,t,`method`,i.method,i,null),$(e,t,`target`,i.target,i,null))),r==null||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`onClick`:r!=null&&(e.onclick=kn);return;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`dangerouslySetInnerHTML`:if(r!=null){if(typeof r!=`object`||!(`__html`in r))throw Error(s(61));if(n=r.__html,n!=null){if(i.children!=null)throw Error(s(60));a?.__html!==n&&(e.innerHTML=n)}}break;case`multiple`:e.multiple=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`muted`:e.muted=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`suppressContentEditableWarning`:case`suppressHydrationWarning`:case`defaultValue`:case`defaultChecked`:case`innerHTML`:case`ref`:break;case`autoFocus`:break;case`xlinkHref`:if(r==null||typeof r==`function`||typeof r==`boolean`||typeof r==`symbol`){e.removeAttribute(`xlink:href`);break}n=On(r),e.setAttributeNS(`http://www.w3.org/1999/xlink`,`xlink:href`,n);break;case`contentEditable`:case`spellCheck`:case`draggable`:case`value`:case`autoReverse`:case`externalResourcesRequired`:case`focusable`:case`preserveAlpha`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`inert`:case`allowFullScreen`:case`async`:case`autoPlay`:case`controls`:case`credentialless`:case`default`:case`defer`:case`disabled`:case`disablePictureInPicture`:case`disableRemotePlayback`:case`formNoValidate`:case`hidden`:case`loop`:case`noModule`:case`noValidate`:case`open`:case`playsInline`:case`readOnly`:case`required`:case`reversed`:case`scoped`:case`seamless`:case`itemScope`:r&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,``):e.removeAttribute(n);break;case`capture`:case`download`:!0===r?e.setAttribute(n,``):!1!==r&&r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`cols`:case`rows`:case`size`:case`span`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`&&!isNaN(r)&&1<=r?e.setAttribute(n,r):e.removeAttribute(n);break;case`rowSpan`:case`start`:r==null||typeof r==`function`||typeof r==`symbol`||isNaN(r)?e.removeAttribute(n):e.setAttribute(n,r);break;case`popover`:Q(`beforetoggle`,e),Q(`toggle`,e),an(e,`popover`,r);break;case`xlinkActuate`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:actuate`,r);break;case`xlinkArcrole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:arcrole`,r);break;case`xlinkRole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:role`,r);break;case`xlinkShow`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:show`,r);break;case`xlinkTitle`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:title`,r);break;case`xlinkType`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:type`,r);break;case`xmlBase`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:base`,r);break;case`xmlLang`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:lang`,r);break;case`xmlSpace`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:space`,r);break;case`is`:an(e,`is`,r);break;case`innerText`:case`textContent`:return;default:if(!(2<n.length)||n[0]!==`o`&&n[0]!==`O`||n[1]!==`n`&&n[1]!==`N`)n=En.get(n)||n,an(e,n,r);else return}O=!0}function tp(e,t,n,r,i,a){switch(n){case`style`:wn(e,r,a);return;case`dangerouslySetInnerHTML`:if(r!=null){if(typeof r!=`object`||!(`__html`in r))throw Error(s(61));if(n=r.__html,n!=null){if(i.children!=null)throw Error(s(60));a?.__html!==n&&(e.innerHTML=n)}}break;case`children`:if(typeof r==`string`)xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)xn(e,``+r);else return;break;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`onClick`:r!=null&&(e.onclick=kn);return;case`suppressContent
Line truncated
|
`).replace(Qf,``)}function ep(e,t){return t=$f(t),$f(e)===t}function $(e,t,n,r,i,a){switch(n){case`children`:if(typeof r==`string`)t===`body`||t===`textarea`&&r===``||xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)t!==`body`&&xn(e,``+r);else return;break;case`className`:on(e,`class`,r);break;case`tabIndex`:on(e,`tabindex`,r);break;case`dir`:case`role`:case`viewBox`:case`width`:case`height`:on(e,n,r);break;case`style`:wn(e,r,a);return;case`data`:if(t!==`object`){on(e,`data`,r);break}case`src`:case`href`:if(r===``&&(t!==`a`||n!==`href`)||r==null||typeof r==`function`||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`action`:case`formAction`:if(typeof r==`function`){e.setAttribute(n,`javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')`);break}if(typeof a==`function`&&(n===`formAction`?(t!==`input`&&$(e,t,`name`,i.name,i,null),$(e,t,`formEncType`,i.formEncType,i,null),$(e,t,`formMethod`,i.formMethod,i,null),$(e,t,`formTarget`,i.formTarget,i,null)):($(e,t,`encType`,i.encType,i,null),$(e,t,`method`,i.method,i,null),$(e,t,`target`,i.target,i,null))),r==null||typeof r==`symbol`||typeof r==`boolean`){e.removeAttribute(n);break}r=On(r),e.setAttribute(n,r);break;case`onClick`:r!=null&&(e.onclick=kn);return;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`dangerouslySetInnerHTML`:if(r!=null){if(typeof r!=`object`||!(`__html`in r))throw Error(s(61));if(n=r.__html,n!=null){if(i.children!=null)throw Error(s(60));a?.__html!==n&&(e.innerHTML=n)}}break;case`multiple`:e.multiple=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`muted`:e.muted=r&&typeof r!=`function`&&typeof r!=`symbol`;break;case`suppressContentEditableWarning`:case`suppressHydrationWarning`:case`defaultValue`:case`defaultChecked`:case`innerHTML`:case`ref`:break;case`autoFocus`:break;case`xlinkHref`:if(r==null||typeof r==`function`||typeof r==`boolean`||typeof r==`symbol`){e.removeAttribute(`xlink:href`);break}n=On(r),e.setAttributeNS(`http://www.w3.org/1999/xlink`,`xlink:href`,n);break;case`contentEditable`:case`spellCheck`:case`draggable`:case`value`:case`autoReverse`:case`externalResourcesRequired`:case`focusable`:case`preserveAlpha`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`inert`:case`allowFullScreen`:case`async`:case`autoPlay`:case`controls`:case`credentialless`:case`default`:case`defer`:case`disabled`:case`disablePictureInPicture`:case`disableRemotePlayback`:case`formNoValidate`:case`hidden`:case`loop`:case`noModule`:case`noValidate`:case`open`:case`playsInline`:case`readOnly`:case`required`:case`reversed`:case`scoped`:case`seamless`:case`itemScope`:r&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,``):e.removeAttribute(n);break;case`capture`:case`download`:!0===r?e.setAttribute(n,``):!1!==r&&r!=null&&typeof r!=`function`&&typeof r!=`symbol`?e.setAttribute(n,r):e.removeAttribute(n);break;case`cols`:case`rows`:case`size`:case`span`:r!=null&&typeof r!=`function`&&typeof r!=`symbol`&&!isNaN(r)&&1<=r?e.setAttribute(n,r):e.removeAttribute(n);break;case`rowSpan`:case`start`:r==null||typeof r==`function`||typeof r==`symbol`||isNaN(r)?e.removeAttribute(n):e.setAttribute(n,r);break;case`popover`:Q(`beforetoggle`,e),Q(`toggle`,e),an(e,`popover`,r);break;case`xlinkActuate`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:actuate`,r);break;case`xlinkArcrole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:arcrole`,r);break;case`xlinkRole`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:role`,r);break;case`xlinkShow`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:show`,r);break;case`xlinkTitle`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:title`,r);break;case`xlinkType`:sn(e,`http://www.w3.org/1999/xlink`,`xlink:type`,r);break;case`xmlBase`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:base`,r);break;case`xmlLang`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:lang`,r);break;case`xmlSpace`:sn(e,`http://www.w3.org/XML/1998/namespace`,`xml:space`,r);break;case`is`:an(e,`is`,r);break;case`innerText`:case`textContent`:return;default:if(!(2<n.length)||n[0]!==`o`&&n[0]!==`O`||n[1]!==`n`&&n[1]!==`N`)n=En.get(n)||n,an(e,n,r);else return}O=!0}function tp(e,t,n,r,i,a){switch(n){case`style`:wn(e,r,a);return;case`dangerouslySetInnerHTML`:if(r!=null){if(typeof r!=`object`||!(`__html`in r))throw Error(s(61));if(n=r.__html,n!=null){if(i.children!=null)throw Error(s(60));a?.__html!==n&&(e.innerHTML=n)}}break;case`children`:if(typeof r==`string`)xn(e,r);else if(typeof r==`number`||typeof r==`bigint`)xn(e,``+r);else return;break;case`onScroll`:r!=null&&Q(`scroll`,e);return;case`onScrollEnd`:r!=null&&Q(`scrollend`,e);return;case`onClick`:r!=null&&(e.onclick=kn);return;case`suppressContent
Line truncated
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
:root{--lightningcss-light:initial;--lightningcss-dark: ;color-scheme:light;--background:#f6f5f4;--foreground:#2e3436;--muted-foreground:#5e5c64;--progress-label:#3d3846;--progress-track:#d5d3d1;--progress-fill:#3584e4;--error:#9c2f2f;--button:#1c71d8;--button-hover:#1a5fb4;--button-active:#174a8b;--focus-ring:#1a5fb4}:root[data-theme=dark]{--lightningcss-light: ;--lightningcss-dark:initial;color-scheme:dark;--background:#242424;--foreground:#fff;--muted-foreground:#c0bfbc;--progress-label:#deddda;--progress-track:#454545;--progress-fill:#78aeed;--error:#ffb4ab;--button:#1c71d8;--button-hover:#3584e4;--button-active:#1a5fb4;--focus-ring:#78aeed}html,body,#root{box-sizing:border-box;-webkit-user-select:none;user-select:none;cursor:default;height:100%;margin:0;padding:0;overflow:hidden}body{background:var(--background);color:var(--foreground);font-family:Inter,ui-sans-serif,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif}button{font:inherit}.update-window{box-sizing:border-box;background:var(--background);align-items:center;gap:15px;width:100%;height:100%;padding:16px 18px;display:flex}.update-logo{flex:none;width:48px;height:48px}.update-content,.update-status{width:100%;min-width:0}.update-title{color:var(--foreground);letter-spacing:-.01em;margin:0;font-size:16px;font-weight:600;line-height:1.25}.update-description{color:var(--muted-foreground);margin:3px 0 0;font-size:12px;line-height:1.4}.progress-summary{justify-content:space-between;align-items:baseline;gap:12px;margin-top:3px;display:flex}.progress-summary .update-description{margin:0}.progress-bar{background-color:var(--progress-track);border-radius:3px;width:100%;height:6px;margin-top:9px;position:relative;overflow:hidden}.progress-fill{background:var(--progress-fill);border-radius:3px;height:100%;transition:width .18s ease-out}.progress-bar-indeterminate .progress-fill{width:35%;animation:1.4s ease-in-out infinite progress-indeterminate}@keyframes progress-indeterminate{0%{transform:translate(-110%)}to{transform:translate(300%)}}@media (prefers-reduced-motion:reduce){.progress-fill{transition:none}.progress-bar-indeterminate .progress-fill{animation:none;transform:translate(90%)}}.progress-label{color:var(--progress-label);font-variant-numeric:tabular-nums;text-align:right;white-space:nowrap;flex:none;font-size:12px;font-weight:500}.error-status{justify-content:space-between;align-items:center;gap:16px;display:flex}.error-status .update-title{color:var(--error)}.error-copy{min-width:0}.retry-button{background:var(--button);color:#fff;cursor:default;border:0;border-radius:8px;min-width:68px;padding:4px 14px;font-size:12px;font-weight:600;line-height:1.5}.retry-button:hover{background:var(--button-hover)}.retry-button:active{background:var(--button-active)}.retry-button:focus-visible{outline:2px solid var(--focus-ring);outline-offset:2px}
|
||||||
@@ -1 +0,0 @@
|
|||||||
html,body,#root{box-sizing:border-box;-webkit-user-select:none;user-select:none;cursor:default;height:100%;margin:0;padding:0;overflow:hidden}body{color:#2e3436;background:#f6f5f4;font-family:Inter,ui-sans-serif,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif}button{font:inherit}.update-window{box-sizing:border-box;background:#f6f5f4;align-items:center;gap:15px;width:100%;height:100%;padding:16px 18px;display:flex}.update-logo{flex:none;width:48px;height:48px}.update-content,.update-status{width:100%;min-width:0}.update-title{color:#2e3436;letter-spacing:-.01em;margin:0;font-size:16px;font-weight:600;line-height:1.25}.update-description{color:#5e5c64;margin:3px 0 0;font-size:12px;line-height:1.4}.progress-summary{justify-content:space-between;align-items:baseline;gap:12px;margin-top:3px;display:flex}.progress-summary .update-description{margin:0}.progress-bar{background-color:#d5d3d1;border-radius:3px;width:100%;height:6px;margin-top:9px;position:relative;overflow:hidden}.progress-fill{background:#3584e4;border-radius:3px;height:100%;transition:width .18s ease-out}.progress-bar-indeterminate .progress-fill{width:35%;animation:1.4s ease-in-out infinite progress-indeterminate}@keyframes progress-indeterminate{0%{transform:translate(-110%)}to{transform:translate(300%)}}@media (prefers-reduced-motion:reduce){.progress-fill{transition:none}.progress-bar-indeterminate .progress-fill{animation:none;transform:translate(90%)}}.progress-label{color:#3d3846;font-variant-numeric:tabular-nums;text-align:right;white-space:nowrap;flex:none;font-size:12px;font-weight:500}.error-status{justify-content:space-between;align-items:center;gap:16px;display:flex}.error-status .update-title{color:#9c2f2f}.error-copy{min-width:0}.retry-button{color:#fff;cursor:pointer;background:#1c71d8;border:0;border-radius:8px;min-width:68px;padding:4px 14px;font-size:12px;font-weight:600;line-height:1.5}.retry-button:hover{background:#1a5fb4}.retry-button:active{background:#174a8b}.retry-button:focus-visible{outline-offset:2px;outline:2px solid #1a5fb4}
|
|
||||||
@@ -2,11 +2,21 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/assets/icon-small-B3qZg5R1.svg" />
|
<script>
|
||||||
|
const theme = window.__GP_HELPER_THEME__ || "system";
|
||||||
|
const systemTheme = matchMedia("(prefers-color-scheme: dark)");
|
||||||
|
const applyTheme = () => {
|
||||||
|
document.documentElement.dataset.theme =
|
||||||
|
theme === "system" ? (systemTheme.matches ? "dark" : "light") : theme;
|
||||||
|
};
|
||||||
|
applyTheme();
|
||||||
|
if (theme === "system") systemTheme.addEventListener("change", applyTheme);
|
||||||
|
</script>
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/assets/icon-small-DFuJkDph.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<title>GPGUI Downloader</title>
|
<title>GPGUI Downloader</title>
|
||||||
<script type="module" crossorigin src="/assets/main-B-fzjiz0.js"></script>
|
<script type="module" crossorigin src="/assets/main-BJvLW_Ih.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/main-DiWGniCh.css">
|
<link rel="stylesheet" crossorigin href="/assets/main-CVTp2z3I.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -2,6 +2,16 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
<script>
|
||||||
|
const theme = window.__GP_HELPER_THEME__ || "system";
|
||||||
|
const systemTheme = matchMedia("(prefers-color-scheme: dark)");
|
||||||
|
const applyTheme = () => {
|
||||||
|
document.documentElement.dataset.theme =
|
||||||
|
theme === "system" ? (systemTheme.matches ? "dark" : "light") : theme;
|
||||||
|
};
|
||||||
|
applyTheme();
|
||||||
|
if (theme === "system") systemTheme.addEventListener("change", applyTheme);
|
||||||
|
</script>
|
||||||
<link rel="icon" type="image/svg+xml" href="/src/assets/icon-small.svg" />
|
<link rel="icon" type="image/svg+xml" href="/src/assets/icon-small.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<title>GPGUI Downloader</title>
|
<title>GPGUI Downloader</title>
|
||||||
|
|||||||
@@ -5,29 +5,30 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc && vite build",
|
"build": "tsc && vite build",
|
||||||
|
"test": "node --test tests/*.test.mjs",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.12.3",
|
"@tauri-apps/api": "^2.12.4",
|
||||||
"react": "^19.3.0",
|
"react": "^19.3.1",
|
||||||
"react-dom": "^19.3.0"
|
"react-dom": "^19.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tauri-apps/cli": "^2.12.2",
|
"@tauri-apps/cli": "^2.12.4",
|
||||||
"@types/node": "^26.6.5",
|
"@types/node": "^26.6.6",
|
||||||
"@types/react": "^19.3.0",
|
"@types/react": "^19.3.0",
|
||||||
"@types/react-dom": "^19.3.0",
|
"@types/react-dom": "^19.3.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.71.1",
|
"@typescript-eslint/eslint-plugin": "^8.72.1",
|
||||||
"@typescript-eslint/parser": "^8.71.1",
|
"@typescript-eslint/parser": "^8.72.1",
|
||||||
"@vitejs/plugin-react": "^6.1.2",
|
"@vitejs/plugin-react": "^6.1.2",
|
||||||
"eslint": "^9.39.5",
|
"eslint": "^9.39.5",
|
||||||
"eslint-config-prettier": "^10.1.8",
|
"eslint-config-prettier": "^10.1.8",
|
||||||
"eslint-plugin-react": "^7.37.5",
|
"eslint-plugin-react": "^7.37.5",
|
||||||
"eslint-plugin-react-hooks": "^7.1.1",
|
"eslint-plugin-react-hooks": "^7.1.1",
|
||||||
"prettier": "3.9.9",
|
"prettier": "3.9.10",
|
||||||
"typescript": "^6.0.3",
|
"typescript": "^6.0.3",
|
||||||
"vite": "^8.3.4"
|
"vite": "^8.3.5"
|
||||||
},
|
},
|
||||||
"packageManager": "[email protected]"
|
"packageManager": "[email protected]"
|
||||||
}
|
}
|
||||||
@@ -9,21 +9,21 @@ importers:
|
|||||||
.:
|
.:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@tauri-apps/api':
|
'@tauri-apps/api':
|
||||||
specifier: ^2.12.3
|
specifier: ^2.12.4
|
||||||
version: 2.12.3
|
version: 2.12.4
|
||||||
react:
|
react:
|
||||||
specifier: ^19.3.0
|
specifier: ^19.3.1
|
||||||
version: 19.3.0
|
version: 19.3.1
|
||||||
react-dom:
|
react-dom:
|
||||||
specifier: ^19.3.0
|
specifier: ^19.3.1
|
||||||
version: 19.3.0([email protected].0)
|
version: 19.3.1([email protected].1)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@tauri-apps/cli':
|
'@tauri-apps/cli':
|
||||||
specifier: ^2.12.2
|
specifier: ^2.12.4
|
||||||
version: 2.12.2
|
version: 2.12.4
|
||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^26.6.5
|
specifier: ^26.6.6
|
||||||
version: 26.6.5
|
version: 26.6.6
|
||||||
'@types/react':
|
'@types/react':
|
||||||
specifier: ^19.3.0
|
specifier: ^19.3.0
|
||||||
version: 19.3.0
|
version: 19.3.0
|
||||||
@@ -31,14 +31,14 @@ importers:
|
|||||||
specifier: ^19.3.0
|
specifier: ^19.3.0
|
||||||
version: 19.3.0(@types/[email protected])
|
version: 19.3.0(@types/[email protected])
|
||||||
'@typescript-eslint/eslint-plugin':
|
'@typescript-eslint/eslint-plugin':
|
||||||
specifier: ^8.71.1
|
specifier: ^8.72.1
|
||||||
version: 8.71.1(@typescript-eslint/[email protected]1.1([email protected])([email protected]))([email protected])([email protected])
|
version: 8.72.1(@typescript-eslint/[email protected]2.1([email protected])([email protected]))([email protected])([email protected])
|
||||||
'@typescript-eslint/parser':
|
'@typescript-eslint/parser':
|
||||||
specifier: ^8.71.1
|
specifier: ^8.72.1
|
||||||
version: 8.71.1([email protected])([email protected])
|
version: 8.72.1([email protected])([email protected])
|
||||||
'@vitejs/plugin-react':
|
'@vitejs/plugin-react':
|
||||||
specifier: ^6.1.2
|
specifier: ^6.1.2
|
||||||
version: 6.1.2([email protected].4(@types/[email protected].5)([email protected]))
|
version: 6.1.2([email protected].5(@types/[email protected].6)([email protected]))
|
||||||
eslint:
|
eslint:
|
||||||
specifier: ^9.39.5
|
specifier: ^9.39.5
|
||||||
version: 9.39.5
|
version: 9.39.5
|
||||||
@@ -52,14 +52,14 @@ importers:
|
|||||||
specifier: ^7.1.1
|
specifier: ^7.1.1
|
||||||
version: 7.1.1([email protected])
|
version: 7.1.1([email protected])
|
||||||
prettier:
|
prettier:
|
||||||
specifier: 3.9.9
|
specifier: 3.9.10
|
||||||
version: 3.9.9
|
version: 3.9.10
|
||||||
typescript:
|
typescript:
|
||||||
specifier: ^6.0.3
|
specifier: ^6.0.3
|
||||||
version: 6.0.3
|
version: 6.0.3
|
||||||
vite:
|
vite:
|
||||||
specifier: ^8.3.4
|
specifier: ^8.3.5
|
||||||
version: 8.3.4(@types/[email protected].5)([email protected])
|
version: 8.3.5(@types/[email protected].6)([email protected])
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
|
|
||||||
@@ -360,95 +360,95 @@ packages:
|
|||||||
'@jridgewell/[email protected]':
|
'@jridgewell/[email protected]':
|
||||||
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
|
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
|
||||||
|
|
||||||
'@oxc-project/[email protected]3.0':
|
'@oxc-project/[email protected]6.0':
|
||||||
resolution: {integrity: sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==}
|
resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==}
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==}
|
resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [android]
|
os: [android]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==}
|
resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [android]
|
os: [android]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==}
|
resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [darwin]
|
os: [darwin]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==}
|
resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [darwin]
|
os: [darwin]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==}
|
resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [freebsd]
|
os: [freebsd]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==}
|
resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==}
|
resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==}
|
resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==}
|
resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [ppc64]
|
cpu: [ppc64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==}
|
resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==}
|
resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==}
|
resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==}
|
resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [openharmony]
|
os: [openharmony]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==}
|
resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [win32]
|
os: [win32]
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
resolution: {integrity: sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==}
|
resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [win32]
|
os: [win32]
|
||||||
@@ -456,77 +456,77 @@ packages:
|
|||||||
'@rolldown/[email protected]':
|
'@rolldown/[email protected]':
|
||||||
resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}
|
resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}
|
||||||
|
|
||||||
'@tauri-apps/[email protected].3':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-9s0PKw0p4r3kFq92jhpivYSp+cSht15o0gXpZxuQd0+dV9KCexEVkNaLELVoLdJWyoH4KlfQo5h3W2LIM8siJg==}
|
resolution: {integrity: sha512-pVmfis+4zT8H0Qhp3xPZx9Ju7kpzvA6rr/PSJPyuwfvucTQ8sVt61NYU9KMkK703UFlYadFmjKA4HhybOtN0gg==}
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-Lk3zaBTfzNvA7670Al5PNgo2M/95uaDPe1yp+ILJeDOmol87XiYuK5E5+FUbK5e6U6OORx9qpZdOo2U+5tETtQ==}
|
resolution: {integrity: sha512-OxqKSckIkoJ6vX2AjifIJpTasFC0Hbdoo7gEiCmAjauABO3U8m2MRsLWe+QTiBwDx1mIrvgA+rvI7tvDnbnHVg==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [darwin]
|
os: [darwin]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-2CyYjJ833JB3sKRz4B0W/Tv4oOVC16ws1bxdSCWj1XvrmanWwvZi99e5tNIoCHwHhcOm0jh+sh0PCGQyls6Z+w==}
|
resolution: {integrity: sha512-fz76/77wMMJOaaUN6n3CybRG0P/MTEjjqYk81mGPyhi9m6Ue5T+LWBnJP/AkPooNatBPI2vtulGqomyMJ44lCQ==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [darwin]
|
os: [darwin]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-uvt2xbone4JftKarelssi86Kqnl7JiG1Smh5+Ae+nZmtM+JUhTGmqkcqfUPXRW8Ygwog92POZvd4oGDN9j8eXQ==}
|
resolution: {integrity: sha512-K0w8Bof6Lt8QKLAYhRy0yy36ZH5iA/35VuSOvnxyjvCUZ+A3JKsUTlALviH/sVgAlisaPzzmeJSH8XOn4Q2HBA==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-DZlDJ24u3tlocKOYqzR+b2M+Qr+5WFcoMBZ7EfdhHN5j3ZXwBBpms4G4gyNvPCrak5vMzmdZ65ecBXPJcC+5sA==}
|
resolution: {integrity: sha512-j5rOnjmRUwWrm1oosf0zBYl4D+fqydgUROFCk0hvKZxvbTT8SOERes0QB7rBV/XWNy+kM6pCKzb3oSm2sRglzg==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-pb+RTZUYH/p0gR4j4ecCCq+FNfz3W3eKuUQvVEBn7MQZx6DzfLO7FaYzt2NyDKWpdNN3lP10mdzOvw3R5P5aAQ==}
|
resolution: {integrity: sha512-aOue3Fy6Jb7+oWcfAVUsVHfeTybSCt2CZoU06aO4jv4d2Ks/KnaTPwMAK3CLEduGOvBLY1lbBBrIyomqLLH5Sg==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-nidEvDUJyHYNbIv9MUk6KiEix8IXfRh4Wj2G2SA5g8nFmgbBCwazUNWYiG/LhNeNbfZpBMLerRBUtoQ5K0GidA==}
|
resolution: {integrity: sha512-Fx6GShY/RvST+t6LMlTHAwd66+1tEaAAGrnU7cysVfaiRP1BKng5Vl6rVmO6rSLOA1Sp1dRzNYM4f0OWQGb7qA==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [riscv64]
|
cpu: [riscv64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-gkXyYn3w+Xfc8nz/DleEbkm1M7bBuU2cejqUXNmI98cA2P5kp+oPmS4ALTorb1FaNWjpsKoYZBWsbS9BXxYFkQ==}
|
resolution: {integrity: sha512-tNzZSa79Z1nRpHxEpQ38lsAFpKlFlYvoXzjTV+lRRn/zSf3wrdUC3wnLcq2XEadchPu4ttK0zivhYzr+XGD19Q==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-MrjgoZ09s8Hsn99XvxSNvK8NQTZxi7XiyK3FxxytzfHgz2jb3qUT69CZtsokRkN/zdi9rCgrMtq+w9XNICjcfQ==}
|
resolution: {integrity: sha512-jmZ1pr0xEqUhuEusWtt9Yt+GF6lCnGHUmIL+KIknpbjK/XQ2qkhDBhaxK/JMHM2A8dAacVXCxXJk2EXpwhQUfA==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-BR+CYM7iF3lkfyTtVkwMQU/s9hwegLpj3UqDjaxKCPmixQCa1csBBPy3C75V+FhLtOjIXNna4Gt6Vm9oxbV+qA==}
|
resolution: {integrity: sha512-fGo8pgEHZxdSYgZ/J98m1usJ7NHKmKbq7k6uT0x1rpOq6Bg2YVzzpaAblWk710f5LHYBJIL5QIFS5IrD+4gmTg==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [win32]
|
os: [win32]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-zODJo9l3TbNBM+GrO/yPqGeELNMK5cjIc+QHh1WQc3l8tD+jDZGTQyYuAxViCsM6Uh5uWJ//RnCZG9LXrvsXww==}
|
resolution: {integrity: sha512-ezl8sQIcjYsye3TUnTH5VcWmWzccZASlQm7hlZt0dYyj1XD0qpVW47u2xYVrIKui0F8uQv/7QGZixdWiClBsbg==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [ia32]
|
cpu: [ia32]
|
||||||
os: [win32]
|
os: [win32]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-cQXI2ZaZmwBDt0XATCqASVanYizxkEE3ceQVlVHXaQ51HzsQUWA04c9Nz7LrrY2lgAu3jFMyat+8Yz3Z2R2qBA==}
|
resolution: {integrity: sha512-DJhDeCqjLDNMWYFy7ZS8cfeAHX2RK0RbQMLiA3bMVVkXRDJ4NBYiHriGqsUhsr9iG41aTb+dJGkFPmPw1gWwVw==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [win32]
|
os: [win32]
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
resolution: {integrity: sha512-PMSppzAnlT+BvZtRKuidxjRSm2r5t8kDpJ/czmmQUa0AtDNTwrjLE8vApK3phCWGg7isfnYL46Dl1jB4ArI0hA==}
|
resolution: {integrity: sha512-JI9bHfudSRJikGOrjbXEm6RjzzvmKuLc+JixB1NE8hNzQkNlCCIC3pTES3uypkR9lxHrsbxzcnSwhI2IxBQphw==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@@ -536,8 +536,8 @@ packages:
|
|||||||
'@types/[email protected]':
|
'@types/[email protected]':
|
||||||
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
|
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
|
||||||
|
|
||||||
'@types/[email protected].5':
|
'@types/[email protected].6':
|
||||||
resolution: {integrity: sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==}
|
resolution: {integrity: sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==}
|
||||||
|
|
||||||
'@types/[email protected]':
|
'@types/[email protected]':
|
||||||
resolution: {integrity: sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==}
|
resolution: {integrity: sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==}
|
||||||
@@ -547,63 +547,63 @@ packages:
|
|||||||
'@types/[email protected]':
|
'@types/[email protected]':
|
||||||
resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==}
|
resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==}
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-nNlBf6HuotqMgZvSkWD5hNdemiBIxQ2NmrlgfcUIeZRs+BbakjscCQRq/Hb74EFVnFiSWWdL12JruqwBy3ERDw==}
|
resolution: {integrity: sha512-5CokTWXpmbylfFabsbvHC0CAw3XLaGnoa+nFJX5FR592h/LoZsENUE6p/rg5xvkKrFEXz6pYmgI29AgXc2N3BQ==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@typescript-eslint/parser': ^8.71.1
|
'@typescript-eslint/parser': ^8.72.1
|
||||||
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-oM/5sAqz/l1v/zYK1qTOPrn2+JIrBGC1V6uNYucRO5gh6eT9vWJ/RhPbGE59byvZEUQ4VP6XkLBaS5Jti5jpvw==}
|
resolution: {integrity: sha512-ZGwZP4OCfyA0AQTpEAMWz+rtX01DRhQWW5hB0ucKDEIX5U7jdmPSaMx94rQfaPAQzIYz2BimOgKOJtjfpRFQ9g==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-Oijc9RUsohHjncg6iGi7gCtjnEjYt9FWv9u6ygK8uKcHK5eLjLAkqERQ9BaytbpceOFdk6kifPCS/zAZE+A99g==}
|
resolution: {integrity: sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-1YUDZXdTnXLlob03SFHBipdyMBsDVm7zoSz0ytTJ39dk5J1TgsTK03VlR/dLXG/RLLUrPcYbD4rp23BmHxHP0w==}
|
resolution: {integrity: sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-oTvkml5SxXhgg+WWKhod5qWQICDXtOB+/Hi9VdPKFAANJ2b7YOgMffgvzXuqog7R6A/JtrzRf128dsxummyWhg==}
|
resolution: {integrity: sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-kH3t3jZCYv2PZSBEWPKTariLrCaoF1CLoPitYFBJOhAGEwWnSRAtGEifrfrpBa4K9JlwWNZotgA5w3/wLSk/FQ==}
|
resolution: {integrity: sha512-iY2wlmyrXJmx4yxUGP3aYCFF3cA/6ShddOKmLU2dx7LnEykbAM8WThlxZEfd1NddqceF6eJmZUayxx9oKIYNlg==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-ybYnPTUwg3VQQOFEiBPLs8Jxl1ry2vXdn1kVKguomBbvxpetdu3MKTNDqFNUrlG8ylP9MpZosmXMFYlGQHk1oQ==}
|
resolution: {integrity: sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-pSKSEK1JJpHs6KiKVtABCE4iJK5d7FLFzDXQNBQ2oRY7LEd3UwOt3TZemTgu9syTIf56dJWlTn/pdmrO9oKUXQ==}
|
resolution: {integrity: sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-CBjT6gfAz3DW2j9Q4moFnqt208Aq+506sVGXfpRcyAeqn0EpayL0mjdWoCO2t3RC7GewNrFxdeehuEaPg6DMzQ==}
|
resolution: {integrity: sha512-5v5liypurJBFHCBNqh/RjsymAD+VWcE0djuGY/BUqp5fC3Qn+luWDEksjuTtWjPn6i5zQlUtkZCRG/CYG0yCkA==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
|
||||||
typescript: '>=4.8.4 <6.1.0'
|
typescript: '>=4.8.4 <6.1.0'
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
resolution: {integrity: sha512-0GxiUGqMU0qXJt58cBsiG3DP8lUmBaFo2vChtUX+CT7PnR3v/VGLLrzVP4K9r1lNiZXjHYefMBbPunplr09v6w==}
|
resolution: {integrity: sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
|
|
||||||
'@vitejs/[email protected]':
|
'@vitejs/[email protected]':
|
||||||
@@ -1031,8 +1031,8 @@ packages:
|
|||||||
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
|
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
|
||||||
engines: {node: '>= 4'}
|
engines: {node: '>= 4'}
|
||||||
|
|
||||||
[email protected]2:
|
[email protected]4:
|
||||||
resolution: {integrity: sha512-/8UvqAPU9DGTI9k4mxtf49U37Isfwr8Uts96+SBHIkFxPJnHS0Ew4f00sM4Scd8V8EjM0jUNtVDdv1kPdt35lg==}
|
resolution: {integrity: sha512-wCBiZ77u1tuWde6G/nfOtLaCTYcFDU5yCzARzK10y+rLhzYoL7a7yEemcopcc2Mzow7gZOIjnV2ym1NYmdiJOQ==}
|
||||||
engines: {node: '>= 4'}
|
engines: {node: '>= 4'}
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
@@ -1378,16 +1378,16 @@ packages:
|
|||||||
resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
|
resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
|
|
||||||
[email protected]9:
|
[email protected].32:
|
||||||
resolution: {integrity: sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==}
|
resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==}
|
||||||
engines: {node: ^10 || ^12 || >=14}
|
engines: {node: ^10 || ^12 || >=14}
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
|
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
|
||||||
engines: {node: '>= 0.8.0'}
|
engines: {node: '>= 0.8.0'}
|
||||||
|
|
||||||
[email protected].9:
|
[email protected].10:
|
||||||
resolution: {integrity: sha512-Z/CJHIkdujO/OtN7nXUii0Rf3VT5SRuhjBA82Xvu2XhBUgX3nhP67T0LHceBdQLex7OOFGTox+Q5Yg8Jk2Qivg==}
|
resolution: {integrity: sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==}
|
||||||
engines: {node: '>=14'}
|
engines: {node: '>=14'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@@ -1398,16 +1398,16 @@ packages:
|
|||||||
resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
|
resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
|
||||||
engines: {node: '>=6'}
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
[email protected].0:
|
[email protected].1:
|
||||||
resolution: {integrity: sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==}
|
resolution: {integrity: sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
react: ^19.3.0
|
react: ^19.3.1
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
|
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
|
||||||
|
|
||||||
[email protected].0:
|
[email protected].1:
|
||||||
resolution: {integrity: sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==}
|
resolution: {integrity: sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
@@ -1427,8 +1427,8 @@ packages:
|
|||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
[email protected]3:
|
[email protected]6:
|
||||||
resolution: {integrity: sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==}
|
resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@@ -1582,13 +1582,13 @@ packages:
|
|||||||
[email protected]:
|
[email protected]:
|
||||||
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
|
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
|
||||||
|
|
||||||
[email protected].4:
|
[email protected].5:
|
||||||
resolution: {integrity: sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==}
|
resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@types/node': ^20.19.0 || >=22.12.0
|
'@types/node': ^20.19.0 || >=22.12.0
|
||||||
'@vitejs/devtools': ^0.7.1
|
'@vitejs/devtools': ^0.7.1 || ^0.8.0
|
||||||
esbuild: ^0.27.0 || ^0.28.0
|
esbuild: ^0.27.0 || ^0.28.0
|
||||||
jiti: '>=1.21.0'
|
jiti: '>=1.21.0'
|
||||||
less: ^4.0.0
|
less: ^4.0.0
|
||||||
@@ -1927,109 +1927,109 @@ snapshots:
|
|||||||
'@jridgewell/resolve-uri': 3.1.2
|
'@jridgewell/resolve-uri': 3.1.2
|
||||||
'@jridgewell/sourcemap-codec': 1.6.0
|
'@jridgewell/sourcemap-codec': 1.6.0
|
||||||
|
|
||||||
'@oxc-project/[email protected]3.0': {}
|
'@oxc-project/[email protected]6.0': {}
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]3':
|
'@rolldown/[email protected]6':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@rolldown/[email protected]': {}
|
'@rolldown/[email protected]': {}
|
||||||
|
|
||||||
'@tauri-apps/[email protected].3': {}
|
'@tauri-apps/[email protected].4': {}
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@tauri-apps/[email protected].2':
|
'@tauri-apps/[email protected].4':
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@tauri-apps/cli-darwin-arm64': 2.12.2
|
'@tauri-apps/cli-darwin-arm64': 2.12.4
|
||||||
'@tauri-apps/cli-darwin-x64': 2.12.2
|
'@tauri-apps/cli-darwin-x64': 2.12.4
|
||||||
'@tauri-apps/cli-linux-arm-gnueabihf': 2.12.2
|
'@tauri-apps/cli-linux-arm-gnueabihf': 2.12.4
|
||||||
'@tauri-apps/cli-linux-arm64-gnu': 2.12.2
|
'@tauri-apps/cli-linux-arm64-gnu': 2.12.4
|
||||||
'@tauri-apps/cli-linux-arm64-musl': 2.12.2
|
'@tauri-apps/cli-linux-arm64-musl': 2.12.4
|
||||||
'@tauri-apps/cli-linux-riscv64-gnu': 2.12.2
|
'@tauri-apps/cli-linux-riscv64-gnu': 2.12.4
|
||||||
'@tauri-apps/cli-linux-x64-gnu': 2.12.2
|
'@tauri-apps/cli-linux-x64-gnu': 2.12.4
|
||||||
'@tauri-apps/cli-linux-x64-musl': 2.12.2
|
'@tauri-apps/cli-linux-x64-musl': 2.12.4
|
||||||
'@tauri-apps/cli-win32-arm64-msvc': 2.12.2
|
'@tauri-apps/cli-win32-arm64-msvc': 2.12.4
|
||||||
'@tauri-apps/cli-win32-ia32-msvc': 2.12.2
|
'@tauri-apps/cli-win32-ia32-msvc': 2.12.4
|
||||||
'@tauri-apps/cli-win32-x64-msvc': 2.12.2
|
'@tauri-apps/cli-win32-x64-msvc': 2.12.4
|
||||||
|
|
||||||
'@types/[email protected]': {}
|
'@types/[email protected]': {}
|
||||||
|
|
||||||
'@types/[email protected]': {}
|
'@types/[email protected]': {}
|
||||||
|
|
||||||
'@types/[email protected].5':
|
'@types/[email protected].6':
|
||||||
dependencies:
|
dependencies:
|
||||||
undici-types: 8.9.0
|
undici-types: 8.9.0
|
||||||
|
|
||||||
@@ -2041,57 +2041,57 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
csstype: 3.2.3
|
csstype: 3.2.3
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1(@typescript-eslint/[email protected]1.1([email protected])([email protected]))([email protected])([email protected])':
|
'@typescript-eslint/[email protected]2.1(@typescript-eslint/[email protected]2.1([email protected])([email protected]))([email protected])([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@eslint-community/regexpp': 4.12.2
|
'@eslint-community/regexpp': 4.12.2
|
||||||
'@typescript-eslint/parser': 8.71.1([email protected])([email protected])
|
'@typescript-eslint/parser': 8.72.1([email protected])([email protected])
|
||||||
'@typescript-eslint/scope-manager': 8.71.1
|
'@typescript-eslint/scope-manager': 8.72.1
|
||||||
'@typescript-eslint/type-utils': 8.71.1([email protected])([email protected])
|
'@typescript-eslint/type-utils': 8.72.1([email protected])([email protected])
|
||||||
'@typescript-eslint/utils': 8.71.1([email protected])([email protected])
|
'@typescript-eslint/utils': 8.72.1([email protected])([email protected])
|
||||||
'@typescript-eslint/visitor-keys': 8.71.1
|
'@typescript-eslint/visitor-keys': 8.72.1
|
||||||
eslint: 9.39.5
|
eslint: 9.39.5
|
||||||
ignore: 7.0.12
|
ignore: 7.0.14
|
||||||
natural-compare: 1.4.0
|
natural-compare: 1.4.0
|
||||||
ts-api-utils: 2.5.0([email protected])
|
ts-api-utils: 2.5.0([email protected])
|
||||||
typescript: 6.0.3
|
typescript: 6.0.3
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1([email protected])([email protected])':
|
'@typescript-eslint/[email protected]2.1([email protected])([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@typescript-eslint/scope-manager': 8.71.1
|
'@typescript-eslint/scope-manager': 8.72.1
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
'@typescript-eslint/typescript-estree': 8.71.1([email protected])
|
'@typescript-eslint/typescript-estree': 8.72.1([email protected])
|
||||||
'@typescript-eslint/visitor-keys': 8.71.1
|
'@typescript-eslint/visitor-keys': 8.72.1
|
||||||
debug: 4.4.3
|
debug: 4.4.3
|
||||||
eslint: 9.39.5
|
eslint: 9.39.5
|
||||||
typescript: 6.0.3
|
typescript: 6.0.3
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1([email protected])':
|
'@typescript-eslint/[email protected]2.1([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@typescript-eslint/tsconfig-utils': 8.71.1([email protected])
|
'@typescript-eslint/tsconfig-utils': 8.72.1([email protected])
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
debug: 4.4.3
|
debug: 4.4.3
|
||||||
typescript: 6.0.3
|
typescript: 6.0.3
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
'@typescript-eslint/visitor-keys': 8.71.1
|
'@typescript-eslint/visitor-keys': 8.72.1
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1([email protected])':
|
'@typescript-eslint/[email protected]2.1([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
typescript: 6.0.3
|
typescript: 6.0.3
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1([email protected])([email protected])':
|
'@typescript-eslint/[email protected]2.1([email protected])([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
'@typescript-eslint/typescript-estree': 8.71.1([email protected])
|
'@typescript-eslint/typescript-estree': 8.72.1([email protected])
|
||||||
'@typescript-eslint/utils': 8.71.1([email protected])([email protected])
|
'@typescript-eslint/utils': 8.72.1([email protected])([email protected])
|
||||||
debug: 4.4.3
|
debug: 4.4.3
|
||||||
eslint: 9.39.5
|
eslint: 9.39.5
|
||||||
ts-api-utils: 2.5.0([email protected])
|
ts-api-utils: 2.5.0([email protected])
|
||||||
@@ -2099,14 +2099,14 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1': {}
|
'@typescript-eslint/[email protected]2.1': {}
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1([email protected])':
|
'@typescript-eslint/[email protected]2.1([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@typescript-eslint/project-service': 8.71.1([email protected])
|
'@typescript-eslint/project-service': 8.72.1([email protected])
|
||||||
'@typescript-eslint/tsconfig-utils': 8.71.1([email protected])
|
'@typescript-eslint/tsconfig-utils': 8.72.1([email protected])
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
'@typescript-eslint/visitor-keys': 8.71.1
|
'@typescript-eslint/visitor-keys': 8.72.1
|
||||||
debug: 4.4.3
|
debug: 4.4.3
|
||||||
minimatch: 10.2.6
|
minimatch: 10.2.6
|
||||||
semver: 7.8.5
|
semver: 7.8.5
|
||||||
@@ -2116,26 +2116,26 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1([email protected])([email protected])':
|
'@typescript-eslint/[email protected]2.1([email protected])([email protected])':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@eslint-community/eslint-utils': 4.10.1([email protected])
|
'@eslint-community/eslint-utils': 4.10.1([email protected])
|
||||||
'@typescript-eslint/scope-manager': 8.71.1
|
'@typescript-eslint/scope-manager': 8.72.1
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
'@typescript-eslint/typescript-estree': 8.71.1([email protected])
|
'@typescript-eslint/typescript-estree': 8.72.1([email protected])
|
||||||
eslint: 9.39.5
|
eslint: 9.39.5
|
||||||
typescript: 6.0.3
|
typescript: 6.0.3
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@typescript-eslint/[email protected]1.1':
|
'@typescript-eslint/[email protected]2.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@typescript-eslint/types': 8.71.1
|
'@typescript-eslint/types': 8.72.1
|
||||||
eslint-visitor-keys: 5.0.1
|
eslint-visitor-keys: 5.0.1
|
||||||
|
|
||||||
'@vitejs/[email protected]([email protected].4(@types/[email protected].5)([email protected]))':
|
'@vitejs/[email protected]([email protected].5(@types/[email protected].6)([email protected]))':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@rolldown/pluginutils': 1.0.1
|
'@rolldown/pluginutils': 1.0.1
|
||||||
vite: 8.3.4(@types/[email protected].5)([email protected])
|
vite: 8.3.5(@types/[email protected].6)([email protected])
|
||||||
|
|
||||||
[email protected]([email protected]):
|
[email protected]([email protected]):
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -2706,7 +2706,7 @@ snapshots:
|
|||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
[email protected]2: {}
|
[email protected]4: {}
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3040,7 +3040,7 @@ snapshots:
|
|||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
[email protected]9:
|
[email protected].32:
|
||||||
dependencies:
|
dependencies:
|
||||||
nanoid: 3.3.20
|
nanoid: 3.3.20
|
||||||
picocolors: 1.1.1
|
picocolors: 1.1.1
|
||||||
@@ -3048,7 +3048,7 @@ snapshots:
|
|||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
[email protected].9: {}
|
[email protected].10: {}
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3058,14 +3058,14 @@ snapshots:
|
|||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
[email protected].0([email protected].0):
|
[email protected].1([email protected].1):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.3.0
|
react: 19.3.1
|
||||||
scheduler: 0.28.0
|
scheduler: 0.28.0
|
||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
[email protected].0: {}
|
[email protected].1: {}
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3098,26 +3098,26 @@ snapshots:
|
|||||||
path-parse: 1.0.7
|
path-parse: 1.0.7
|
||||||
supports-preserve-symlinks-flag: 1.0.0
|
supports-preserve-symlinks-flag: 1.0.0
|
||||||
|
|
||||||
[email protected]3:
|
[email protected]6:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@oxc-project/types': 0.153.0
|
'@oxc-project/types': 0.156.0
|
||||||
'@rolldown/pluginutils': 1.0.1
|
'@rolldown/pluginutils': 1.0.1
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@rolldown/binding-android-arm-eabi': 1.2.13
|
'@rolldown/binding-android-arm-eabi': 1.2.16
|
||||||
'@rolldown/binding-android-arm64': 1.2.13
|
'@rolldown/binding-android-arm64': 1.2.16
|
||||||
'@rolldown/binding-darwin-arm64': 1.2.13
|
'@rolldown/binding-darwin-arm64': 1.2.16
|
||||||
'@rolldown/binding-darwin-x64': 1.2.13
|
'@rolldown/binding-darwin-x64': 1.2.16
|
||||||
'@rolldown/binding-freebsd-x64': 1.2.13
|
'@rolldown/binding-freebsd-x64': 1.2.16
|
||||||
'@rolldown/binding-linux-arm-gnueabihf': 1.2.13
|
'@rolldown/binding-linux-arm-gnueabihf': 1.2.16
|
||||||
'@rolldown/binding-linux-arm64-gnu': 1.2.13
|
'@rolldown/binding-linux-arm64-gnu': 1.2.16
|
||||||
'@rolldown/binding-linux-arm64-musl': 1.2.13
|
'@rolldown/binding-linux-arm64-musl': 1.2.16
|
||||||
'@rolldown/binding-linux-ppc64-gnu': 1.2.13
|
'@rolldown/binding-linux-ppc64-gnu': 1.2.16
|
||||||
'@rolldown/binding-linux-s390x-gnu': 1.2.13
|
'@rolldown/binding-linux-s390x-gnu': 1.2.16
|
||||||
'@rolldown/binding-linux-x64-gnu': 1.2.13
|
'@rolldown/binding-linux-x64-gnu': 1.2.16
|
||||||
'@rolldown/binding-linux-x64-musl': 1.2.13
|
'@rolldown/binding-linux-x64-musl': 1.2.16
|
||||||
'@rolldown/binding-openharmony-arm64': 1.2.13
|
'@rolldown/binding-openharmony-arm64': 1.2.16
|
||||||
'@rolldown/binding-win32-arm64-msvc': 1.2.13
|
'@rolldown/binding-win32-arm64-msvc': 1.2.16
|
||||||
'@rolldown/binding-win32-x64-msvc': 1.2.13
|
'@rolldown/binding-win32-x64-msvc': 1.2.16
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3326,15 +3326,15 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
punycode: 2.3.1
|
punycode: 2.3.1
|
||||||
|
|
||||||
[email protected].4(@types/[email protected].5)([email protected]):
|
[email protected].5(@types/[email protected].6)([email protected]):
|
||||||
dependencies:
|
dependencies:
|
||||||
lightningcss: 1.33.0
|
lightningcss: 1.33.0
|
||||||
picomatch: 4.0.7
|
picomatch: 4.0.7
|
||||||
postcss: 8.5.29
|
postcss: 8.5.32
|
||||||
rolldown: 1.2.13
|
rolldown: 1.2.16
|
||||||
tinyglobby: 0.2.17
|
tinyglobby: 0.2.17
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@types/node': 26.6.5
|
'@types/node': 26.6.6
|
||||||
esbuild: 0.27.2
|
esbuild: 0.27.2
|
||||||
fsevents: 2.3.3
|
fsevents: 2.3.3
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 58 KiB |
@@ -1,51 +1,56 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
|
||||||
<defs>
|
<defs>
|
||||||
<linearGradient id="ocean" x1="245" y1="170" x2="770" y2="770" gradientUnits="userSpaceOnUse">
|
<linearGradient id="ocean" x1="210.49524" y1="190.80952" x2="802.16190" y2="867.00000" gradientUnits="userSpaceOnUse">
|
||||||
<stop stop-color="#579bc1"/>
|
<stop stop-color="#579bc1"/>
|
||||||
<stop offset=".52" stop-color="#438fbd"/>
|
<stop offset=".52" stop-color="#438fbd"/>
|
||||||
<stop offset="1" stop-color="#2f719e"/>
|
<stop offset="1" stop-color="#2f719e"/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<linearGradient id="land" x1="260" y1="190" x2="750" y2="735" gradientUnits="userSpaceOnUse">
|
<linearGradient id="land" x1="227.40000" y1="213.34921" x2="779.62222" y2="827.55556" gradientUnits="userSpaceOnUse">
|
||||||
<stop stop-color="#56c78a"/>
|
<stop stop-color="#56c78a"/>
|
||||||
<stop offset=".55" stop-color="#3bbf78"/>
|
<stop offset=".55" stop-color="#3bbf78"/>
|
||||||
<stop offset="1" stop-color="#279b5d"/>
|
<stop offset="1" stop-color="#279b5d"/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<linearGradient id="lock" x1="385" y1="400" x2="650" y2="700" gradientUnits="userSpaceOnUse">
|
|
||||||
|
<filter id="globe-shadow" x="-20%" y="-20%" width="140%" height="150%" color-interpolation-filters="sRGB">
|
||||||
|
<feGaussianBlur in="SourceAlpha" stdDeviation="7" result="blur"/>
|
||||||
|
<feOffset in="blur" dy="6" result="offsetBlur"/>
|
||||||
|
<feFlood flood-color="#174D6F" flood-opacity="0.14" result="shadowColor"/>
|
||||||
|
<feComposite in="shadowColor" in2="offsetBlur" operator="in" result="shadow"/>
|
||||||
|
<feMerge><feMergeNode in="shadow"/><feMergeNode in="SourceGraphic"/></feMerge>
|
||||||
|
</filter>
|
||||||
|
|
||||||
|
|
||||||
|
<linearGradient id="shipped-lock" x1="385" y1="400" x2="650" y2="700" gradientUnits="userSpaceOnUse">
|
||||||
<stop stop-color="#f3b84c"/>
|
<stop stop-color="#f3b84c"/>
|
||||||
<stop offset=".55" stop-color="#e8a12f"/>
|
<stop offset=".55" stop-color="#e8a12f"/>
|
||||||
<stop offset="1" stop-color="#d4871e"/>
|
<stop offset="1" stop-color="#d4871e"/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<clipPath id="globe-clip">
|
<filter id="shipped-lock-shadow" x="280" y="210" width="470" height="540" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||||
<circle cx="512" cy="455" r="315"/>
|
<feGaussianBlur in="SourceAlpha" stdDeviation="18" result="blur"/>
|
||||||
</clipPath>
|
<feOffset in="blur" dx="0" dy="18" result="offsetBlur"/>
|
||||||
<filter id="globe-shadow" x="150" y="90" width="730" height="760" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
<feFlood flood-color="#70430c" flood-opacity=".2" result="shadowColor"/>
|
||||||
<feDropShadow dx="0" dy="8" stdDeviation="12" flood-color="#174d6f" flood-opacity=".14"/>
|
<feComposite in="shadowColor" in2="offsetBlur" operator="in" result="shadow"/>
|
||||||
</filter>
|
<feMerge><feMergeNode in="shadow"/><feMergeNode in="SourceGraphic"/></feMerge>
|
||||||
<filter id="lock-shadow" x="280" y="210" width="470" height="540" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
</filter></defs>
|
||||||
<feDropShadow dx="0" dy="18" stdDeviation="18" flood-color="#70430c" flood-opacity=".2"/>
|
<g transform="translate(512 512) scale(1.1535211267605634) translate(-511.4 -512)">
|
||||||
</filter>
|
<g filter="url(#globe-shadow)">
|
||||||
</defs>
|
<circle cx="511.4" cy="512" r="355" fill="url(#ocean)"/>
|
||||||
|
<path d="m341.5 202.8c-83.71 44.8-148.5 123-170.9 210.4 10.88 28.67 32.13 48.77 54.14 63.49 13.18 8.96 18.94 19.84 17.15 31.87-3.84 26.5-46.85 37.89-50.3 71.3-2.688 27.78 17.54 52.74 46.46 67.71 21.76 11.39 35.2 25.73 41.34 44.29 13.44 39.17 32.64 82.56 68.99 105.5 30.08 18.94 46.85 12.67 41.09-1.92-6.144-15.36-26.37-32.13-26.24-53.63 0.128-27.39 26.5-41.98 31.49-62.72v-87.3c-18.69-0.896-30.59-9.216-40.19-19.71-16.51-17.41-37.76-29.44-55.68-36.86-10.37-4.352-12.67-12.8-13.7-22.66-0.896-11.39-6.144-20.74-15.1-28.16-12.8-10.62-19.97-22.53-18.3-34.82 1.92-15.62 17.28-26.5 36.74-29.44 37.25-6.144 70.53-34.69 74.11-63.49 1.792-14.46-5.504-24.32-2.816-33.66 4.864-21.12 34.18-38.14 65.02-51.71 24.83-10.88 45.7-20.61 45.95-39.81 0.256-20.22-20.74-32.9-60.03-33.41-22.53 0.128-46.08 2.56-69.25 4.736z" fill="url(#land)"/>
|
||||||
|
<path d="m663.7 191.5c-50.43 5.376-89.34 38.4-89.34 68.61 0 26.75 27.78 42.88 62.98 46.98 31.36 3.712 48.9 15.36 49.79 34.18 0.896 20.74-17.15 34.18-16.77 51.71 0.512 36.35 51.84 71.04 107.4 71.17 31.74 0.128 62.59-11.39 79.74-28.54-24.32-107.8-99.2-199.3-193.8-244.1z" fill="url(#land)"/>
|
||||||
|
<path d="m866.2 532c-19.46-9.216-42.62-13.7-66.18-13.7-57.47 0-102.1 34.05-102.1 60.8 0 11.9 6.144 19.97 13.06 26.75 11.52 11.52 17.66 25.73 17.66 42.24 0 29.18-22.53 45.06-22.53 73.34 0 26.88 18.69 47.36 39.04 57.73 71.42-61.31 117.6-154.6 121.1-247.2z" fill="url(#land)"/>
|
||||||
|
<circle cx="511.4" cy="512" r="347.111111" fill="none" stroke="#9ccde2" stroke-width="12.396825" stroke-opacity=".24"/>
|
||||||
|
|
||||||
<g transform="translate(512 512) scale(1.44) translate(-512 -455)">
|
</g>
|
||||||
<g filter="url(#globe-shadow)">
|
</g>
|
||||||
<circle cx="512" cy="455" r="315" fill="url(#ocean)"/>
|
<g transform="translate(512 512) scale(1.3) translate(-512 -455)">
|
||||||
<g clip-path="url(#globe-clip)" fill="url(#land)">
|
<g transform="translate(512 490) scale(.82) translate(-512 -490)" filter="url(#shipped-lock-shadow)">
|
||||||
<path d="M177 326c74-121 177-185 302-190-13 51-49 84-105 98-4 45-32 79-86 101-37 17-75 14-111-9Z"/>
|
|
||||||
<path d="M564 135c129 18 229 103 273 220-69-3-121 15-157 54-51-14-83-50-95-107-38-36-45-92-21-167Z"/>
|
|
||||||
<path d="M189 467c63-39 125-34 187 16 57 25 73 73 48 144-45 90-108 146-189 166-58-88-73-197-46-326Z"/>
|
|
||||||
<path d="M612 572c78-38 157-18 238 59-45 89-122 144-231 164-20-67-22-122-7-165-22-17-22-36 0-58Z"/>
|
|
||||||
</g>
|
|
||||||
<circle cx="512" cy="455" r="308" fill="none" stroke="#9ccde2" stroke-width="11" stroke-opacity=".24"/>
|
|
||||||
</g>
|
|
||||||
|
|
||||||
<g transform="translate(512 490) scale(.82) translate(-512 -490)" filter="url(#lock-shadow)">
|
|
||||||
<path d="M405 429v-75c0-142 214-142 214 0v75" fill="none" stroke="#eef1f2" stroke-width="58" stroke-linecap="round"/>
|
<path d="M405 429v-75c0-142 214-142 214 0v75" fill="none" stroke="#eef1f2" stroke-width="58" stroke-linecap="round"/>
|
||||||
<rect x="340" y="403" width="344" height="278" rx="62" fill="url(#lock)"/>
|
<rect x="340" y="403" width="344" height="278" rx="62" fill="url(#shipped-lock)"/>
|
||||||
<rect x="346" y="409" width="332" height="266" rx="56" fill="none" stroke="#f7cb75" stroke-width="10" stroke-opacity=".3"/>
|
<rect x="346" y="409" width="332" height="266" rx="56" fill="none" stroke="#f7cb75" stroke-width="10" stroke-opacity=".3"/>
|
||||||
<g fill="#85500f" opacity=".78">
|
<g fill="#85500f" opacity=".78" transform="translate(512 550.5) scale(1.2) translate(-512 -550.5)">
|
||||||
<path d="M501 538h22l16 69h-54Z"/>
|
<path d="M501 538h22l16 69h-54Z"/>
|
||||||
<circle cx="512" cy="521" r="27"/>
|
<circle cx="512" cy="521" r="27"/>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 4.2 KiB |
@@ -1,6 +1,6 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use gpapi::service::transport::SessionCredential;
|
use gpapi::{gui::GuiTheme, service::transport::SessionCredential};
|
||||||
use log::info;
|
use log::info;
|
||||||
use tauri::{Listener, Manager};
|
use tauri::{Listener, Manager};
|
||||||
use tokio::sync::watch;
|
use tokio::sync::watch;
|
||||||
@@ -11,30 +11,68 @@ pub struct App {
|
|||||||
credential: Arc<SessionCredential>,
|
credential: Arc<SessionCredential>,
|
||||||
credential_lease: watch::Receiver<bool>,
|
credential_lease: watch::Receiver<bool>,
|
||||||
gui_version: String,
|
gui_version: String,
|
||||||
|
variant: gpapi::gui::GuiVariant,
|
||||||
|
theme: GuiTheme,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl App {
|
impl App {
|
||||||
pub fn new(credential: Arc<SessionCredential>, credential_lease: watch::Receiver<bool>, gui_version: &str) -> Self {
|
pub fn new(
|
||||||
|
credential: Arc<SessionCredential>,
|
||||||
|
credential_lease: watch::Receiver<bool>,
|
||||||
|
gui_version: &str,
|
||||||
|
variant: gpapi::gui::GuiVariant,
|
||||||
|
theme: GuiTheme,
|
||||||
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
credential,
|
credential,
|
||||||
credential_lease,
|
credential_lease,
|
||||||
gui_version: gui_version.to_string(),
|
gui_version: gui_version.to_string(),
|
||||||
|
variant,
|
||||||
|
theme,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(&self) -> anyhow::Result<()> {
|
pub fn run(&self) -> anyhow::Result<()> {
|
||||||
let gui_version = self.gui_version.clone();
|
let gui_version = self.gui_version.clone();
|
||||||
|
let variant = self.variant;
|
||||||
|
let theme = self.theme;
|
||||||
let credential = Arc::clone(&self.credential);
|
let credential = Arc::clone(&self.credential);
|
||||||
let credential_lease = self.credential_lease.clone();
|
let credential_lease = self.credential_lease.clone();
|
||||||
|
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
|
.on_window_event(move |window, event| {
|
||||||
|
if theme == GuiTheme::System
|
||||||
|
&& let tauri::WindowEvent::ThemeChanged(theme) = event
|
||||||
|
&& let Some(win) = window.get_webview_window(window.label())
|
||||||
|
&& let Err(error) = win.set_background_color(Some(background_color(*theme)))
|
||||||
|
{
|
||||||
|
log::warn!("Could not update helper window background: {error}");
|
||||||
|
}
|
||||||
|
})
|
||||||
.setup(move |app| {
|
.setup(move |app| {
|
||||||
let win = app.get_webview_window("main").expect("no main window");
|
let native_theme = match theme {
|
||||||
|
GuiTheme::System => None,
|
||||||
|
GuiTheme::Light => Some(tauri::Theme::Light),
|
||||||
|
GuiTheme::Dark => Some(tauri::Theme::Dark),
|
||||||
|
};
|
||||||
|
let config = app
|
||||||
|
.config()
|
||||||
|
.app
|
||||||
|
.windows
|
||||||
|
.iter()
|
||||||
|
.find(|window| window.label == "main")
|
||||||
|
.expect("no main window");
|
||||||
|
let win = tauri::WebviewWindowBuilder::from_config(app, config)?
|
||||||
|
.theme(native_theme)
|
||||||
|
.initialization_script(format!("window.__GP_HELPER_THEME__ = {:?};", theme.as_str()))
|
||||||
|
.visible(false)
|
||||||
|
.build()?;
|
||||||
|
win.set_background_color(Some(background_color(win.theme()?)))?;
|
||||||
let _ = win.hide_menu();
|
let _ = win.hide_menu();
|
||||||
|
|
||||||
let notifier = ProgressNotifier::new(win.clone());
|
let notifier = ProgressNotifier::new(win.clone());
|
||||||
let installer = Installer::new(credential, credential_lease.clone());
|
let installer = Installer::new(credential, credential_lease.clone());
|
||||||
let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer));
|
let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer, variant));
|
||||||
|
|
||||||
let app_handle = app.handle().clone();
|
let app_handle = app.handle().clone();
|
||||||
let mut app_credential_lease = credential_lease;
|
let mut app_credential_lease = credential_lease;
|
||||||
@@ -66,6 +104,8 @@ impl App {
|
|||||||
tokio::spawn(async move { updater.update().await });
|
tokio::spawn(async move { updater.update().await });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
win.show()?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
.run(tauri::generate_context!())?;
|
.run(tauri::generate_context!())?;
|
||||||
@@ -73,3 +113,10 @@ impl App {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn background_color(theme: tauri::Theme) -> tauri::window::Color {
|
||||||
|
match theme {
|
||||||
|
tauri::Theme::Dark => tauri::window::Color(36, 36, 36, 255),
|
||||||
|
_ => tauri::window::Color(246, 245, 244, 255),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ use std::{io::Read, sync::Arc};
|
|||||||
use anyhow::{Context, bail};
|
use anyhow::{Context, bail};
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
clap::InfoLevelVerbosity,
|
clap::InfoLevelVerbosity,
|
||||||
|
gui::GuiTheme,
|
||||||
service::transport::{MAX_CREDENTIAL_FRAME, SessionCredential},
|
service::transport::{MAX_CREDENTIAL_FRAME, SessionCredential},
|
||||||
utils::env_utils,
|
utils::env_utils,
|
||||||
};
|
};
|
||||||
@@ -29,6 +30,11 @@ struct Cli {
|
|||||||
|
|
||||||
#[arg(long, default_value = env!("CARGO_PKG_VERSION"), help = "The version of the GUI")]
|
#[arg(long, default_value = env!("CARGO_PKG_VERSION"), help = "The version of the GUI")]
|
||||||
gui_version: String,
|
gui_version: String,
|
||||||
|
#[arg(long, default_value = "tauri", value_parser = ["tauri", "nsh"])]
|
||||||
|
gui_variant: String,
|
||||||
|
|
||||||
|
#[arg(long, value_enum, default_value = "system", help = "Window appearance")]
|
||||||
|
theme: GuiTheme,
|
||||||
|
|
||||||
#[command(flatten)]
|
#[command(flatten)]
|
||||||
verbose: InfoLevelVerbosity,
|
verbose: InfoLevelVerbosity,
|
||||||
@@ -38,7 +44,22 @@ impl Cli {
|
|||||||
fn run(&self) -> anyhow::Result<()> {
|
fn run(&self) -> anyhow::Result<()> {
|
||||||
let credential = self.read_credential()?;
|
let credential = self.read_credential()?;
|
||||||
let credential_lease = monitor_credential_lease().context("Failed to monitor service credential lifetime")?;
|
let credential_lease = monitor_credential_lease().context("Failed to monitor service credential lifetime")?;
|
||||||
let app = App::new(Arc::new(credential), credential_lease, &self.gui_version);
|
let variant = if self.gui_variant == "nsh" {
|
||||||
|
gpapi::gui::GuiVariant::Nsh
|
||||||
|
} else {
|
||||||
|
gpapi::gui::GuiVariant::Tauri
|
||||||
|
};
|
||||||
|
anyhow::ensure!(
|
||||||
|
variant != gpapi::gui::GuiVariant::Nsh || cfg!(target_os = "linux"),
|
||||||
|
"Native Shell is available only on Linux"
|
||||||
|
);
|
||||||
|
let app = App::new(
|
||||||
|
Arc::new(credential),
|
||||||
|
credential_lease,
|
||||||
|
&self.gui_version,
|
||||||
|
variant,
|
||||||
|
self.theme,
|
||||||
|
);
|
||||||
|
|
||||||
env_utils::patch_gui_runtime_env(false);
|
env_utils::patch_gui_runtime_env(false);
|
||||||
|
|
||||||
@@ -110,6 +131,22 @@ mod tests {
|
|||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn theme_defaults_to_system_and_accepts_explicit_modes() {
|
||||||
|
assert_eq!(Cli::try_parse_from(["gpgui-helper"]).unwrap().theme, GuiTheme::System);
|
||||||
|
for (value, expected) in [
|
||||||
|
("system", GuiTheme::System),
|
||||||
|
("light", GuiTheme::Light),
|
||||||
|
("dark", GuiTheme::Dark),
|
||||||
|
] {
|
||||||
|
assert_eq!(
|
||||||
|
Cli::try_parse_from(["gpgui-helper", "--theme", value]).unwrap().theme,
|
||||||
|
expected
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assert!(Cli::try_parse_from(["gpgui-helper", "--theme", "invalid"]).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn credential_lease_closes_at_eof() {
|
fn credential_lease_closes_at_eof() {
|
||||||
let (lease_tx, lease_rx) = watch::channel(true);
|
let (lease_tx, lease_rx) = watch::channel(true);
|
||||||
|
|||||||
@@ -33,7 +33,12 @@ impl<'a> FileDownloader<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn download(&self) -> anyhow::Result<NamedTempFile> {
|
pub async fn download(&self) -> anyhow::Result<NamedTempFile> {
|
||||||
let res = reqwest::get(self.url).await?.error_for_status()?;
|
let res = gpapi::utils::request::client_builder()
|
||||||
|
.build()?
|
||||||
|
.get(self.url)
|
||||||
|
.send()
|
||||||
|
.await?
|
||||||
|
.error_for_status()?;
|
||||||
let content_length = res.content_length().unwrap_or(0);
|
let content_length = res.content_length().unwrap_or(0);
|
||||||
|
|
||||||
info!("Content length: {}", content_length);
|
info!("Content length: {}", content_length);
|
||||||
@@ -79,7 +84,12 @@ impl<'a> ChecksumFetcher<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn fetch(&self) -> anyhow::Result<String> {
|
pub async fn fetch(&self) -> anyhow::Result<String> {
|
||||||
let res = reqwest::get(self.url).await?.error_for_status()?;
|
let res = gpapi::utils::request::client_builder()
|
||||||
|
.build()?
|
||||||
|
.get(self.url)
|
||||||
|
.send()
|
||||||
|
.await?
|
||||||
|
.error_for_status()?;
|
||||||
let checksum = res.text().await?.trim().to_string();
|
let checksum = res.text().await?.trim().to_string();
|
||||||
|
|
||||||
Ok(checksum)
|
Ok(checksum)
|
||||||
|
|||||||
@@ -41,10 +41,20 @@ const GUI_LIBC_SUFFIX: &str = "-musl";
|
|||||||
#[cfg(not(target_env = "musl"))]
|
#[cfg(not(target_env = "musl"))]
|
||||||
const GUI_LIBC_SUFFIX: &str = "";
|
const GUI_LIBC_SUFFIX: &str = "";
|
||||||
|
|
||||||
fn gui_asset_name() -> Option<String> {
|
fn gui_asset_name(variant: gpapi::gui::GuiVariant) -> Option<String> {
|
||||||
|
if variant == gpapi::gui::GuiVariant::Nsh {
|
||||||
|
return nsh_asset_name_for(std::env::consts::OS, std::env::consts::ARCH);
|
||||||
|
}
|
||||||
gui_asset_name_for(std::env::consts::OS, std::env::consts::ARCH, GUI_LIBC_SUFFIX)
|
gui_asset_name_for(std::env::consts::OS, std::env::consts::ARCH, GUI_LIBC_SUFFIX)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn nsh_asset_name_for(os: &str, arch: &str) -> Option<String> {
|
||||||
|
match (os, arch) {
|
||||||
|
("linux", "x86_64" | "aarch64") => Some(format!("gpgui-nsh_{arch}.bin.tar.xz")),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn gui_asset_name_for(os: &str, arch: &str, libc_suffix: &str) -> Option<String> {
|
fn gui_asset_name_for(os: &str, arch: &str, libc_suffix: &str) -> Option<String> {
|
||||||
let name = match (os, arch) {
|
let name = match (os, arch) {
|
||||||
("linux", "x86_64" | "aarch64") => format!("gpgui_{arch}{libc_suffix}.bin.tar.xz"),
|
("linux", "x86_64" | "aarch64") => format!("gpgui_{arch}{libc_suffix}.bin.tar.xz"),
|
||||||
@@ -97,10 +107,11 @@ impl Installer {
|
|||||||
Self { command_tx }
|
Self { command_tx }
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn install(&self, path: &str, checksum: &str) -> anyhow::Result<()> {
|
async fn install(&self, path: &str, checksum: &str, variant: gpapi::gui::GuiVariant) -> anyhow::Result<()> {
|
||||||
let request = UpdateGuiRequest {
|
let request = UpdateGuiRequest {
|
||||||
path: path.to_string(),
|
path: path.to_string(),
|
||||||
checksum: checksum.to_string(),
|
checksum: checksum.to_string(),
|
||||||
|
variant,
|
||||||
};
|
};
|
||||||
let (reply, result) = oneshot::channel();
|
let (reply, result) = oneshot::channel();
|
||||||
self
|
self
|
||||||
@@ -250,7 +261,7 @@ async fn run_installer_connection(
|
|||||||
};
|
};
|
||||||
let _ = command.reply.send(result);
|
let _ = command.reply.send(result);
|
||||||
}
|
}
|
||||||
ServerMessage::Event { .. } | ServerMessage::Snapshot { .. } => {}
|
ServerMessage::Event { .. } | ServerMessage::Snapshot { .. } | ServerMessage::TunnelStatistics { .. } => {}
|
||||||
ServerMessage::Attached { .. } => bail!("Service sent a duplicate attach response"),
|
ServerMessage::Attached { .. } => bail!("Service sent a duplicate attach response"),
|
||||||
},
|
},
|
||||||
Message::Ping(data) => socket.send(Message::Pong(data)).await?,
|
Message::Ping(data) => socket.send(Message::Pong(data)).await?,
|
||||||
@@ -363,6 +374,7 @@ async fn receive_binary(socket: &mut Socket) -> anyhow::Result<Vec<u8>> {
|
|||||||
|
|
||||||
pub struct GuiUpdater {
|
pub struct GuiUpdater {
|
||||||
version: String,
|
version: String,
|
||||||
|
variant: gpapi::gui::GuiVariant,
|
||||||
notifier: Arc<ProgressNotifier>,
|
notifier: Arc<ProgressNotifier>,
|
||||||
installer: Installer,
|
installer: Installer,
|
||||||
in_progress: RwLock<bool>,
|
in_progress: RwLock<bool>,
|
||||||
@@ -370,9 +382,15 @@ pub struct GuiUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl GuiUpdater {
|
impl GuiUpdater {
|
||||||
pub fn new(version: String, notifier: ProgressNotifier, installer: Installer) -> Self {
|
pub fn new(
|
||||||
|
version: String,
|
||||||
|
notifier: ProgressNotifier,
|
||||||
|
installer: Installer,
|
||||||
|
variant: gpapi::gui::GuiVariant,
|
||||||
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
version,
|
version,
|
||||||
|
variant,
|
||||||
notifier: Arc::new(notifier),
|
notifier: Arc::new(notifier),
|
||||||
installer,
|
installer,
|
||||||
in_progress: Default::default(),
|
in_progress: Default::default(),
|
||||||
@@ -381,7 +399,7 @@ impl GuiUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn update(&self) {
|
pub async fn update(&self) {
|
||||||
let Some(asset_name) = gui_asset_name() else {
|
let Some(asset_name) = gui_asset_name(self.variant) else {
|
||||||
info!("GUI updates are not supported on this platform.");
|
info!("GUI updates are not supported on this platform.");
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@@ -438,7 +456,7 @@ impl GuiUpdater {
|
|||||||
|
|
||||||
info!("Checksum success");
|
info!("Checksum success");
|
||||||
|
|
||||||
if let Err(err) = self.installer.install(&file_path, &checksum).await {
|
if let Err(err) = self.installer.install(&file_path, &checksum, self.variant).await {
|
||||||
warn!("Install error: {}", err);
|
warn!("Install error: {}", err);
|
||||||
self.notify_error();
|
self.notify_error();
|
||||||
} else {
|
} else {
|
||||||
@@ -488,13 +506,10 @@ impl GuiUpdater {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use gpapi::{
|
use gpapi::service::{
|
||||||
os_profile::HostIdentity,
|
transport::{ClientPrelude, NoiseResponder},
|
||||||
service::{
|
vpn_env::{HostInfo, VpnEnv},
|
||||||
transport::{ClientPrelude, NoiseResponder},
|
vpn_state::VpnState,
|
||||||
vpn_env::{HostInfo, VpnEnv},
|
|
||||||
vpn_state::VpnState,
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
use tokio_tungstenite::accept_async;
|
use tokio_tungstenite::accept_async;
|
||||||
@@ -522,6 +537,21 @@ mod tests {
|
|||||||
assert_eq!(gui_asset_name_for("macos", "aarch64", ""), None);
|
assert_eq!(gui_asset_name_for("macos", "aarch64", ""), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn nsh_assets_are_linux_only_and_use_the_nsh_binary_archive() {
|
||||||
|
assert_eq!(
|
||||||
|
nsh_asset_name_for("linux", "x86_64"),
|
||||||
|
Some("gpgui-nsh_x86_64.bin.tar.xz".into())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
nsh_asset_name_for("linux", "aarch64"),
|
||||||
|
Some("gpgui-nsh_aarch64.bin.tar.xz".into())
|
||||||
|
);
|
||||||
|
for os in ["freebsd", "openbsd", "macos"] {
|
||||||
|
assert_eq!(nsh_asset_name_for(os, "x86_64"), None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn pending_install_reconnects_with_a_fresh_handshake() {
|
async fn pending_install_reconnects_with_a_fresh_handshake() {
|
||||||
let credential = Arc::new(SessionCredential::generate(Uuid::new_v4(), env!("CARGO_PKG_VERSION")).unwrap());
|
let credential = Arc::new(SessionCredential::generate(Uuid::new_v4(), env!("CARGO_PKG_VERSION")).unwrap());
|
||||||
@@ -532,6 +562,7 @@ mod tests {
|
|||||||
request: UpdateGuiRequest {
|
request: UpdateGuiRequest {
|
||||||
path: "/tmp/gpgui-update".to_owned(),
|
path: "/tmp/gpgui-update".to_owned(),
|
||||||
checksum: "checksum".to_owned(),
|
checksum: "checksum".to_owned(),
|
||||||
|
variant: gpapi::gui::GuiVariant::Tauri,
|
||||||
},
|
},
|
||||||
reply: reply_tx,
|
reply: reply_tx,
|
||||||
})
|
})
|
||||||
@@ -631,10 +662,11 @@ mod tests {
|
|||||||
current_revision: 0,
|
current_revision: 0,
|
||||||
snapshot: VpnEnv {
|
snapshot: VpnEnv {
|
||||||
vpn_state: VpnState::Disconnected,
|
vpn_state: VpnState::Disconnected,
|
||||||
|
tunnel_state: None,
|
||||||
vpnc_script: None,
|
vpnc_script: None,
|
||||||
auth_executable: String::new(),
|
auth_executable: String::new(),
|
||||||
host_info: HostInfo {
|
host_info: HostInfo {
|
||||||
host_identity: HostIdentity::collect(),
|
host_identity: gpapi::os_profile::desktop::collect_identity(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
"maxWidth": 460,
|
"maxWidth": 460,
|
||||||
"maxHeight": 104,
|
"maxHeight": 104,
|
||||||
"label": "main",
|
"label": "main",
|
||||||
|
"create": false,
|
||||||
"decorations": false
|
"decorations": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,43 +1,44 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
|
||||||
<defs>
|
<defs>
|
||||||
<linearGradient id="ocean" x1="245" y1="170" x2="770" y2="770" gradientUnits="userSpaceOnUse">
|
<linearGradient id="ocean" x1="210.49524" y1="190.80952" x2="802.16190" y2="867.00000" gradientUnits="userSpaceOnUse">
|
||||||
<stop stop-color="#579bc1"/>
|
<stop stop-color="#579bc1"/>
|
||||||
<stop offset=".52" stop-color="#438fbd"/>
|
<stop offset=".52" stop-color="#438fbd"/>
|
||||||
<stop offset="1" stop-color="#2f719e"/>
|
<stop offset="1" stop-color="#2f719e"/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<linearGradient id="land" x1="260" y1="190" x2="750" y2="735" gradientUnits="userSpaceOnUse">
|
<linearGradient id="land" x1="227.40000" y1="213.34921" x2="779.62222" y2="827.55556" gradientUnits="userSpaceOnUse">
|
||||||
<stop stop-color="#56c78a"/>
|
<stop stop-color="#56c78a"/>
|
||||||
<stop offset=".55" stop-color="#3bbf78"/>
|
<stop offset=".55" stop-color="#3bbf78"/>
|
||||||
<stop offset="1" stop-color="#279b5d"/>
|
<stop offset="1" stop-color="#279b5d"/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<linearGradient id="lock" x1="385" y1="400" x2="650" y2="700" gradientUnits="userSpaceOnUse">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<linearGradient id="shipped-lock" x1="385" y1="400" x2="650" y2="700" gradientUnits="userSpaceOnUse">
|
||||||
<stop stop-color="#f3b84c"/>
|
<stop stop-color="#f3b84c"/>
|
||||||
<stop offset=".55" stop-color="#e8a12f"/>
|
<stop offset=".55" stop-color="#e8a12f"/>
|
||||||
<stop offset="1" stop-color="#d4871e"/>
|
<stop offset="1" stop-color="#d4871e"/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<clipPath id="globe-clip">
|
</defs>
|
||||||
<circle cx="512" cy="455" r="315"/>
|
<g transform="translate(512 512) scale(1.1535211267605634) translate(-511.4 -512)">
|
||||||
</clipPath>
|
<g>
|
||||||
</defs>
|
<circle cx="511.4" cy="512" r="355" fill="url(#ocean)"/>
|
||||||
|
<path d="m341.5 202.8c-83.71 44.8-148.5 123-170.9 210.4 10.88 28.67 32.13 48.77 54.14 63.49 13.18 8.96 18.94 19.84 17.15 31.87-3.84 26.5-46.85 37.89-50.3 71.3-2.688 27.78 17.54 52.74 46.46 67.71 21.76 11.39 35.2 25.73 41.34 44.29 13.44 39.17 32.64 82.56 68.99 105.5 30.08 18.94 46.85 12.67 41.09-1.92-6.144-15.36-26.37-32.13-26.24-53.63 0.128-27.39 26.5-41.98 31.49-62.72v-87.3c-18.69-0.896-30.59-9.216-40.19-19.71-16.51-17.41-37.76-29.44-55.68-36.86-10.37-4.352-12.67-12.8-13.7-22.66-0.896-11.39-6.144-20.74-15.1-28.16-12.8-10.62-19.97-22.53-18.3-34.82 1.92-15.62 17.28-26.5 36.74-29.44 37.25-6.144 70.53-34.69 74.11-63.49 1.792-14.46-5.504-24.32-2.816-33.66 4.864-21.12 34.18-38.14 65.02-51.71 24.83-10.88 45.7-20.61 45.95-39.81 0.256-20.22-20.74-32.9-60.03-33.41-22.53 0.128-46.08 2.56-69.25 4.736z" fill="url(#land)"/>
|
||||||
|
<path d="m663.7 191.5c-50.43 5.376-89.34 38.4-89.34 68.61 0 26.75 27.78 42.88 62.98 46.98 31.36 3.712 48.9 15.36 49.79 34.18 0.896 20.74-17.15 34.18-16.77 51.71 0.512 36.35 51.84 71.04 107.4 71.17 31.74 0.128 62.59-11.39 79.74-28.54-24.32-107.8-99.2-199.3-193.8-244.1z" fill="url(#land)"/>
|
||||||
|
<path d="m866.2 532c-19.46-9.216-42.62-13.7-66.18-13.7-57.47 0-102.1 34.05-102.1 60.8 0 11.9 6.144 19.97 13.06 26.75 11.52 11.52 17.66 25.73 17.66 42.24 0 29.18-22.53 45.06-22.53 73.34 0 26.88 18.69 47.36 39.04 57.73 71.42-61.31 117.6-154.6 121.1-247.2z" fill="url(#land)"/>
|
||||||
|
<circle cx="511.4" cy="512" r="347.111111" fill="none" stroke="#9ccde2" stroke-width="12.396825" stroke-opacity=".4"/>
|
||||||
|
|
||||||
<g transform="translate(512 512) scale(1.44) translate(-512 -455)">
|
</g>
|
||||||
<circle cx="512" cy="455" r="315" fill="url(#ocean)"/>
|
</g>
|
||||||
<g clip-path="url(#globe-clip)" fill="url(#land)">
|
<g transform="translate(512 512) scale(1.3) translate(-512 -455)">
|
||||||
<path d="M177 326c74-121 177-185 302-190-13 51-49 84-105 98-4 45-32 79-86 101-37 17-75 14-111-9Z"/>
|
<g transform="translate(512 490) scale(.82) translate(-512 -490)">
|
||||||
<path d="M564 135c129 18 229 103 273 220-69-3-121 15-157 54-51-14-83-50-95-107-38-36-45-92-21-167Z"/>
|
|
||||||
<path d="M189 467c63-39 125-34 187 16 57 25 73 73 48 144-45 90-108 146-189 166-58-88-73-197-46-326Z"/>
|
|
||||||
<path d="M612 572c78-38 157-18 238 59-45 89-122 144-231 164-20-67-22-122-7-165-22-17-22-36 0-58Z"/>
|
|
||||||
</g>
|
|
||||||
<circle cx="512" cy="455" r="308" fill="none" stroke="#9ccde2" stroke-width="11" stroke-opacity=".4"/>
|
|
||||||
|
|
||||||
<g transform="translate(512 490) scale(.82) translate(-512 -490)">
|
|
||||||
<path d="M405 429v-75c0-142 214-142 214 0v75" fill="none" stroke="#eef1f2" stroke-width="58" stroke-linecap="round"/>
|
<path d="M405 429v-75c0-142 214-142 214 0v75" fill="none" stroke="#eef1f2" stroke-width="58" stroke-linecap="round"/>
|
||||||
<rect x="340" y="403" width="344" height="278" rx="62" fill="url(#lock)"/>
|
<rect x="340" y="403" width="344" height="278" rx="62" fill="url(#shipped-lock)"/>
|
||||||
<rect x="346" y="409" width="332" height="266" rx="56" fill="none" stroke="#f7cb75" stroke-width="10" stroke-opacity=".45"/>
|
<rect x="346" y="409" width="332" height="266" rx="56" fill="none" stroke="#f7cb75" stroke-width="10" stroke-opacity=".3"/>
|
||||||
<g fill="#85500f" opacity=".85">
|
<g fill="#85500f" opacity=".78" transform="translate(512 550.5) scale(1.2) translate(-512 -550.5)">
|
||||||
<path d="M501 538h22l16 69h-54Z"/>
|
<path d="M501 538h22l16 69h-54Z"/>
|
||||||
<circle cx="512" cy="521" r="27"/>
|
<circle cx="512" cy="521" r="27"/>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3.2 KiB |
@@ -1,3 +1,33 @@
|
|||||||
|
:root {
|
||||||
|
color-scheme: light;
|
||||||
|
--background: #f6f5f4;
|
||||||
|
--foreground: #2e3436;
|
||||||
|
--muted-foreground: #5e5c64;
|
||||||
|
--progress-label: #3d3846;
|
||||||
|
--progress-track: #d5d3d1;
|
||||||
|
--progress-fill: #3584e4;
|
||||||
|
--error: #9c2f2f;
|
||||||
|
--button: #1c71d8;
|
||||||
|
--button-hover: #1a5fb4;
|
||||||
|
--button-active: #174a8b;
|
||||||
|
--focus-ring: #1a5fb4;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme="dark"] {
|
||||||
|
color-scheme: dark;
|
||||||
|
--background: #242424;
|
||||||
|
--foreground: #ffffff;
|
||||||
|
--muted-foreground: #c0bfbc;
|
||||||
|
--progress-label: #deddda;
|
||||||
|
--progress-track: #454545;
|
||||||
|
--progress-fill: #78aeed;
|
||||||
|
--error: #ffb4ab;
|
||||||
|
--button: #1c71d8;
|
||||||
|
--button-hover: #3584e4;
|
||||||
|
--button-active: #1a5fb4;
|
||||||
|
--focus-ring: #78aeed;
|
||||||
|
}
|
||||||
|
|
||||||
html,
|
html,
|
||||||
body,
|
body,
|
||||||
#root {
|
#root {
|
||||||
@@ -12,8 +42,8 @@ body,
|
|||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
background: #f6f5f4;
|
background: var(--background);
|
||||||
color: #2e3436;
|
color: var(--foreground);
|
||||||
font-family:
|
font-family:
|
||||||
Inter,
|
Inter,
|
||||||
ui-sans-serif,
|
ui-sans-serif,
|
||||||
@@ -35,7 +65,7 @@ button {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 16px 18px;
|
padding: 16px 18px;
|
||||||
gap: 15px;
|
gap: 15px;
|
||||||
background: #f6f5f4;
|
background: var(--background);
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-logo {
|
.update-logo {
|
||||||
@@ -52,7 +82,7 @@ button {
|
|||||||
|
|
||||||
.update-title {
|
.update-title {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
color: #2e3436;
|
color: var(--foreground);
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
line-height: 1.25;
|
line-height: 1.25;
|
||||||
@@ -61,7 +91,7 @@ button {
|
|||||||
|
|
||||||
.update-description {
|
.update-description {
|
||||||
margin: 3px 0 0;
|
margin: 3px 0 0;
|
||||||
color: #5e5c64;
|
color: var(--muted-foreground);
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
}
|
}
|
||||||
@@ -85,13 +115,13 @@ button {
|
|||||||
margin-top: 9px;
|
margin-top: 9px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
background-color: #d5d3d1;
|
background-color: var(--progress-track);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-fill {
|
.progress-fill {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
background: #3584e4;
|
background: var(--progress-fill);
|
||||||
transition: width 180ms ease-out;
|
transition: width 180ms ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,7 +153,7 @@ button {
|
|||||||
|
|
||||||
.progress-label {
|
.progress-label {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
color: #3d3846;
|
color: var(--progress-label);
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-variant-numeric: tabular-nums;
|
font-variant-numeric: tabular-nums;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
@@ -139,7 +169,7 @@ button {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.error-status .update-title {
|
.error-status .update-title {
|
||||||
color: #9c2f2f;
|
color: var(--error);
|
||||||
}
|
}
|
||||||
|
|
||||||
.error-copy {
|
.error-copy {
|
||||||
@@ -151,23 +181,23 @@ button {
|
|||||||
padding: 4px 14px;
|
padding: 4px 14px;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
background: #1c71d8;
|
background: var(--button);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
cursor: pointer;
|
cursor: default;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
.retry-button:hover {
|
.retry-button:hover {
|
||||||
background: #1a5fb4;
|
background: var(--button-hover);
|
||||||
}
|
}
|
||||||
|
|
||||||
.retry-button:active {
|
.retry-button:active {
|
||||||
background: #174a8b;
|
background: var(--button-active);
|
||||||
}
|
}
|
||||||
|
|
||||||
.retry-button:focus-visible {
|
.retry-button:focus-visible {
|
||||||
outline: 2px solid #1a5fb4;
|
outline: 2px solid var(--focus-ring);
|
||||||
outline-offset: 2px;
|
outline-offset: 2px;
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
import { runInNewContext } from "node:vm";
|
||||||
|
import { test } from "node:test";
|
||||||
|
import assert from "node:assert/strict";
|
||||||
|
|
||||||
|
const html = readFileSync(new URL("../index.html", import.meta.url), "utf8");
|
||||||
|
const script = html.match(/<script>([\s\S]*?)<\/script>/)[1];
|
||||||
|
|
||||||
|
function load(theme, dark) {
|
||||||
|
const root = { dataset: {} };
|
||||||
|
let changed;
|
||||||
|
const media = {
|
||||||
|
matches: dark,
|
||||||
|
addEventListener(event, listener) {
|
||||||
|
assert.equal(event, "change");
|
||||||
|
changed = listener;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
runInNewContext(script, {
|
||||||
|
window: { __GP_HELPER_THEME__: theme },
|
||||||
|
document: { documentElement: root },
|
||||||
|
matchMedia(query) {
|
||||||
|
assert.equal(query, "(prefers-color-scheme: dark)");
|
||||||
|
return media;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { root, change(dark) { media.matches = dark; changed?.(); } };
|
||||||
|
}
|
||||||
|
|
||||||
|
test("default and explicit system modes follow system changes before React starts", () => {
|
||||||
|
for (const theme of [undefined, "system"]) {
|
||||||
|
for (const dark of [false, true]) {
|
||||||
|
const page = load(theme, dark);
|
||||||
|
assert.equal(page.root.dataset.theme, dark ? "dark" : "light");
|
||||||
|
page.change(!dark);
|
||||||
|
assert.equal(page.root.dataset.theme, dark ? "light" : "dark");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("explicit modes override opposite system appearance and ignore system changes", () => {
|
||||||
|
for (const theme of ["light", "dark"]) {
|
||||||
|
const page = load(theme, theme !== "dark");
|
||||||
|
assert.equal(page.root.dataset.theme, theme);
|
||||||
|
page.change(theme === "dark");
|
||||||
|
assert.equal(page.root.dataset.theme, theme);
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -2,14 +2,15 @@
|
|||||||
name = "gpservice"
|
name = "gpservice"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
common = { path = "../../crates/common" }
|
common = { path = "../../crates/common" }
|
||||||
gpapi = { path = "../../crates/gpapi", features = ["clap", "logger"] }
|
gpapi = { path = "../../crates/gpapi", features = ["clap", "logger"] }
|
||||||
gphip = { path = "../../crates/gphip" }
|
gphip = { path = "../../crates/gphip" }
|
||||||
|
gptunnel = { path = "../../crates/gptunnel" }
|
||||||
base64.workspace = true
|
base64.workspace = true
|
||||||
sha256.workspace = true
|
|
||||||
openconnect = { path = "../../crates/openconnect" }
|
openconnect = { path = "../../crates/openconnect" }
|
||||||
clap.workspace = true
|
clap.workspace = true
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
@@ -29,11 +30,24 @@ uuid = { workspace = true, features = ["v4"] }
|
|||||||
zeroize.workspace = true
|
zeroize.workspace = true
|
||||||
tempfile.workspace = true
|
tempfile.workspace = true
|
||||||
getrandom = "0.4"
|
getrandom = "0.4"
|
||||||
mac_address = "1.2.1"
|
|
||||||
|
|
||||||
[target.'cfg(unix)'.dependencies]
|
[target.'cfg(unix)'.dependencies]
|
||||||
nix = { version = "0.31", features = ["fs", "socket", "user"] }
|
nix = { version = "0.31", features = ["fs", "socket", "user"] }
|
||||||
|
|
||||||
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
|
||||||
|
mac_address = "1.2.1"
|
||||||
|
|
||||||
|
[target.'cfg(unix)'.dev-dependencies]
|
||||||
|
mac_address = "1.2.1"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
openssl.workspace = true
|
openssl.workspace = true
|
||||||
tokio-tungstenite = "0.29"
|
tokio-tungstenite.workspace = true
|
||||||
|
|
||||||
|
[target.'cfg(any(target_os = "macos", windows))'.dependencies]
|
||||||
|
gpvpnc = { path = "../../crates/gpvpnc" }
|
||||||
|
|
||||||
|
[target.'cfg(windows)'.dependencies]
|
||||||
|
file-rotate = "0.8.0"
|
||||||
|
windows-service = "0.8.1"
|
||||||
|
windows-sys = { version = "0.61", features = ["Win32_System_Pipes"] }
|
||||||
@@ -6,7 +6,7 @@ use std::time::Duration;
|
|||||||
|
|
||||||
use anyhow::{Context, bail};
|
use anyhow::{Context, bail};
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use common::constants::GP_SERVICE_LOCK_FILE;
|
use common::paths::service_lock_file;
|
||||||
use gpapi::clap::InfoLevelVerbosity;
|
use gpapi::clap::InfoLevelVerbosity;
|
||||||
use gpapi::logger;
|
use gpapi::logger;
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
@@ -25,14 +25,7 @@ use crate::{
|
|||||||
request_dispatcher::RequestDispatcher, session_registry::SessionRegistry, vpn_task::VpnTask, ws_server::WsServer,
|
request_dispatcher::RequestDispatcher, session_registry::SessionRegistry, vpn_task::VpnTask, ws_server::WsServer,
|
||||||
};
|
};
|
||||||
|
|
||||||
const VERSION: &str = concat!(
|
use crate::VERSION;
|
||||||
env!("CARGO_PKG_VERSION"),
|
|
||||||
" (",
|
|
||||||
env!("GPSERVICE_GIT_COMMIT"),
|
|
||||||
" ",
|
|
||||||
compile_time::date_str!(),
|
|
||||||
")"
|
|
||||||
);
|
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
struct RedactingMacosLogger {
|
struct RedactingMacosLogger {
|
||||||
@@ -119,23 +112,13 @@ impl Cli {
|
|||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
let brokered_scripts_dir = if externally_brokered {
|
|
||||||
let executable = std::env::current_exe().context("Failed to locate the gpservice executable")?;
|
|
||||||
let contents_dir = executable
|
|
||||||
.parent()
|
|
||||||
.and_then(std::path::Path::parent)
|
|
||||||
.context("gpservice is not inside a macOS application bundle")?;
|
|
||||||
Some(contents_dir.join("Resources/Scripts"))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
let (mut vpn_task, lifecycle) = VpnTask::new(vpn_state_tx, externally_brokered, Arc::clone(®istry));
|
let (mut vpn_task, lifecycle) = VpnTask::new(vpn_state_tx, externally_brokered, Arc::clone(®istry));
|
||||||
let dispatcher = Arc::new(RequestDispatcher::new(
|
let dispatcher = Arc::new(RequestDispatcher::new(
|
||||||
lifecycle.clone(),
|
lifecycle.clone(),
|
||||||
Arc::clone(&gui_restart_requested),
|
Arc::clone(&gui_restart_requested),
|
||||||
Arc::clone(&redaction),
|
Arc::clone(&redaction),
|
||||||
!externally_brokered,
|
!externally_brokered,
|
||||||
brokered_scripts_dir,
|
externally_brokered,
|
||||||
));
|
));
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
let idle_vpn_state_rx = vpn_state_rx.clone();
|
let idle_vpn_state_rx = vpn_state_rx.clone();
|
||||||
@@ -281,7 +264,7 @@ impl Cli {
|
|||||||
return Ok(dev_service_lock_file_path(socket));
|
return Ok(dev_service_lock_file_path(socket));
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(PathBuf::from(GP_SERVICE_LOCK_FILE))
|
Ok(service_lock_file())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn init_logger(&self) -> Arc<Redaction> {
|
fn init_logger(&self) -> Arc<Redaction> {
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use clap::Parser;
|
||||||
|
use gpapi::clap::InfoLevelVerbosity;
|
||||||
|
#[derive(Parser)]
|
||||||
|
#[command(version = crate::VERSION)]
|
||||||
|
struct Cli {
|
||||||
|
#[command(flatten)]
|
||||||
|
verbose: InfoLevelVerbosity,
|
||||||
|
}
|
||||||
|
pub fn run() -> anyhow::Result<()> {
|
||||||
|
let cli = Cli::parse();
|
||||||
|
crate::windows_service::dispatch(cli.verbose.log_level_filter().to_level().unwrap_or(log::Level::Info))
|
||||||
|
}
|
||||||
@@ -17,7 +17,10 @@ use tokio::io::unix::AsyncFd;
|
|||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
use crate::session_registry::SessionRegistry;
|
use crate::session_registry::SessionRegistry;
|
||||||
use gpapi::service::transport::{DESKTOP_GUI_EXITED, DESKTOP_RENDERING_RETRY};
|
use gpapi::service::transport::{
|
||||||
|
DESKTOP_GUI_EXITED, DESKTOP_GUI_INSTALLER, DESKTOP_RENDERING_RETRY, DESKTOP_SWITCH_BEGIN, DESKTOP_SWITCH_CANCEL,
|
||||||
|
DESKTOP_SWITCH_COMMIT,
|
||||||
|
};
|
||||||
|
|
||||||
/// Private parent/service pipes; credentials never pass through argv, environment or files.
|
/// Private parent/service pipes; credentials never pass through argv, environment or files.
|
||||||
pub(crate) struct DesktopClient {
|
pub(crate) struct DesktopClient {
|
||||||
@@ -44,7 +47,8 @@ impl DesktopClient {
|
|||||||
fcntl(&fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?;
|
fcntl(&fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?;
|
||||||
let flags = OFlag::from_bits_truncate(fcntl(&fd, FcntlArg::F_GETFL)?);
|
let flags = OFlag::from_bits_truncate(fcntl(&fd, FcntlArg::F_GETFL)?);
|
||||||
fcntl(&fd, FcntlArg::F_SETFL(flags | OFlag::O_NONBLOCK))?;
|
fcntl(&fd, FcntlArg::F_SETFL(flags | OFlag::O_NONBLOCK))?;
|
||||||
Ok(AsyncFd::new(fd)?)
|
// SAFETY: OwnedFd keeps this descriptor open and unchanged until AsyncFd drops it.
|
||||||
|
Ok(unsafe { AsyncFd::register(fd) }?)
|
||||||
}
|
}
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
input: pipe(input)?,
|
input: pipe(input)?,
|
||||||
@@ -62,15 +66,41 @@ impl DesktopClient {
|
|||||||
let mut rendering_renewed = false;
|
let mut rendering_renewed = false;
|
||||||
loop {
|
loop {
|
||||||
let credential = registry.issue(env!("CARGO_PKG_VERSION"), Some(uid))?;
|
let credential = registry.issue(env!("CARGO_PKG_VERSION"), Some(uid))?;
|
||||||
let session_id = credential.session_id();
|
let mut session_id = credential.session_id();
|
||||||
|
let mut pending = None;
|
||||||
let result = tokio::select! {
|
let result = tokio::select! {
|
||||||
_ = cancel.cancelled() => Ok(None),
|
_ = cancel.cancelled() => Ok(None),
|
||||||
result = async {
|
result = async {
|
||||||
self.write_frame(&credential.encode_frame()?).await?;
|
self.write_all(&credential.encode_frame()?).await?;
|
||||||
self.gui_exited().await
|
loop {
|
||||||
|
match self.read_control().await? {
|
||||||
|
Some(DESKTOP_GUI_INSTALLER) => {
|
||||||
|
self.write_all(&[u8::from(crate::gui_installation::installer().is_some())]).await?;
|
||||||
|
}
|
||||||
|
Some(DESKTOP_SWITCH_BEGIN) => {
|
||||||
|
ensure!(pending.is_none(), "A GUI switch is already pending");
|
||||||
|
let credential = registry.issue(env!("CARGO_PKG_VERSION"), Some(uid))?;
|
||||||
|
pending = Some(credential.session_id());
|
||||||
|
self.write_all(&credential.encode_frame()?).await?;
|
||||||
|
}
|
||||||
|
Some(DESKTOP_SWITCH_COMMIT) => {
|
||||||
|
let replacement = pending.take().context("No GUI switch is pending")?;
|
||||||
|
registry.revoke(session_id);
|
||||||
|
session_id = replacement;
|
||||||
|
}
|
||||||
|
Some(DESKTOP_SWITCH_CANCEL) => {
|
||||||
|
let replacement = pending.take().context("No GUI switch is pending")?;
|
||||||
|
registry.revoke(replacement);
|
||||||
|
}
|
||||||
|
message => break Ok(message),
|
||||||
|
}
|
||||||
|
}
|
||||||
} => result,
|
} => result,
|
||||||
};
|
};
|
||||||
registry.revoke(session_id);
|
registry.revoke(session_id);
|
||||||
|
if let Some(session_id) = pending {
|
||||||
|
registry.revoke(session_id);
|
||||||
|
}
|
||||||
let requested = restart.swap(false, Ordering::SeqCst);
|
let requested = restart.swap(false, Ordering::SeqCst);
|
||||||
match result? {
|
match result? {
|
||||||
None => return Ok(()),
|
None => return Ok(()),
|
||||||
@@ -85,7 +115,7 @@ impl DesktopClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn write_frame(&self, mut bytes: &[u8]) -> anyhow::Result<()> {
|
async fn write_all(&self, mut bytes: &[u8]) -> anyhow::Result<()> {
|
||||||
while !bytes.is_empty() {
|
while !bytes.is_empty() {
|
||||||
let mut ready = self.output.writable().await?;
|
let mut ready = self.output.writable().await?;
|
||||||
match ready.try_io(|fd| write(fd.get_ref(), bytes).map_err(io::Error::from)) {
|
match ready.try_io(|fd| write(fd.get_ref(), bytes).map_err(io::Error::from)) {
|
||||||
@@ -100,7 +130,7 @@ impl DesktopClient {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn gui_exited(&self) -> anyhow::Result<Option<u8>> {
|
async fn read_control(&self) -> anyhow::Result<Option<u8>> {
|
||||||
loop {
|
loop {
|
||||||
let mut ready = self.input.readable().await?;
|
let mut ready = self.input.readable().await?;
|
||||||
let mut byte = [0];
|
let mut byte = [0];
|
||||||
@@ -145,7 +175,7 @@ mod tests {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.success()
|
.success()
|
||||||
);
|
);
|
||||||
channel.write_frame(b"PRIVATE_FRAME").await.unwrap();
|
channel.write_all(b"PRIVATE_FRAME").await.unwrap();
|
||||||
}
|
}
|
||||||
use gpapi::service::transport::SessionCredential;
|
use gpapi::service::transport::SessionCredential;
|
||||||
use nix::unistd::pipe;
|
use nix::unistd::pipe;
|
||||||
@@ -253,6 +283,51 @@ mod tests {
|
|||||||
assert!(registry.last_successful_hip_report(issued.session_id()).is_err());
|
assert!(registry.last_successful_hip_report(issued.session_id()).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn switch_cancel_preserves_current_session_and_commit_replaces_it() {
|
||||||
|
let (channel, control, reader) = pipes();
|
||||||
|
let registry = Arc::new(SessionRegistry::for_tests(uuid::Uuid::new_v4()));
|
||||||
|
let task = tokio::spawn(channel.serve(
|
||||||
|
registry.clone(),
|
||||||
|
1000,
|
||||||
|
Arc::new(AtomicBool::new(false)),
|
||||||
|
CancellationToken::new(),
|
||||||
|
));
|
||||||
|
let (reader, first) = credential(reader).await;
|
||||||
|
write(&control, &[DESKTOP_GUI_INSTALLER]).unwrap();
|
||||||
|
let reader = tokio::task::spawn_blocking(move || {
|
||||||
|
let mut reader = reader;
|
||||||
|
let mut capability = [0];
|
||||||
|
reader.read_exact(&mut capability).unwrap();
|
||||||
|
assert_eq!(capability[0], u8::from(crate::gui_installation::installer().is_some()));
|
||||||
|
reader
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
// A capability query leaves the current session intact and the next frame readable.
|
||||||
|
assert!(registry.last_successful_hip_report(first.session_id()).is_ok());
|
||||||
|
write(&control, &[DESKTOP_SWITCH_BEGIN]).unwrap();
|
||||||
|
let (reader, cancelled) = credential(reader).await;
|
||||||
|
assert_ne!(first.session_id(), cancelled.session_id());
|
||||||
|
assert!(registry.last_successful_hip_report(first.session_id()).is_ok());
|
||||||
|
write(&control, &[DESKTOP_SWITCH_CANCEL, DESKTOP_SWITCH_BEGIN]).unwrap();
|
||||||
|
let (reader, replacement) = credential(reader).await;
|
||||||
|
assert!(registry.last_successful_hip_report(cancelled.session_id()).is_err());
|
||||||
|
assert!(registry.last_successful_hip_report(first.session_id()).is_ok());
|
||||||
|
write(&control, &[DESKTOP_SWITCH_COMMIT, DESKTOP_SWITCH_BEGIN]).unwrap();
|
||||||
|
let (_, pending) = credential(reader).await;
|
||||||
|
assert!(registry.last_successful_hip_report(first.session_id()).is_err());
|
||||||
|
assert!(registry.last_successful_hip_report(replacement.session_id()).is_ok());
|
||||||
|
drop(control);
|
||||||
|
tokio::time::timeout(Duration::from_secs(1), task)
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.unwrap()
|
||||||
|
.unwrap();
|
||||||
|
assert!(registry.last_successful_hip_report(replacement.session_id()).is_err());
|
||||||
|
assert!(registry.last_successful_hip_report(pending.session_id()).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn desktop_channel_rejects_invalid_control_messages_and_revokes() {
|
async fn desktop_channel_rejects_invalid_control_messages_and_revokes() {
|
||||||
let (channel, control, reader) = pipes();
|
let (channel, control, reader) = pipes();
|
||||||
|
|||||||
@@ -366,7 +366,7 @@ mod tests {
|
|||||||
r#"{"version":1,"anchor":{"hardware_id":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","source":1}}"#
|
r#"{"version":1,"anchor":{"hardware_id":"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","source":1}}"#
|
||||||
);
|
);
|
||||||
|
|
||||||
for source in [0, 4] {
|
for source in [0, u8::MAX] {
|
||||||
let json = serde_json::json!({
|
let json = serde_json::json!({
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"anchor": {
|
"anchor": {
|
||||||
|
|||||||
@@ -0,0 +1,359 @@
|
|||||||
|
use gpapi::utils::checksum::verify_checksum;
|
||||||
|
use std::{
|
||||||
|
fs::{self, File, OpenOptions, Permissions},
|
||||||
|
io::{BufReader, Read, Write},
|
||||||
|
os::unix::fs::{OpenOptionsExt, PermissionsExt},
|
||||||
|
path::Path,
|
||||||
|
};
|
||||||
|
use tar::Archive;
|
||||||
|
use tempfile::NamedTempFile;
|
||||||
|
use xz2::read::XzDecoder;
|
||||||
|
const MAX_GUI_ARCHIVE_SIZE: u64 = 256 * 1024 * 1024;
|
||||||
|
const MAX_GUI_ARCHIVE_CONTENT_SIZE: u64 = 512 * 1024 * 1024;
|
||||||
|
const MAX_GUI_BINARY_SIZE: u64 = 256 * 1024 * 1024;
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub(crate) enum InstallError {
|
||||||
|
Checksum(anyhow::Error),
|
||||||
|
Install(anyhow::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn installer() -> Option<std::path::PathBuf> {
|
||||||
|
std::env::current_exe()
|
||||||
|
.ok()
|
||||||
|
.and_then(|executable| {
|
||||||
|
executable
|
||||||
|
.parent()?
|
||||||
|
.parent()
|
||||||
|
.map(|prefix| prefix.join("libexec/gpclient/gp-gui-installer"))
|
||||||
|
})
|
||||||
|
.filter(|path| path.is_file())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn install(src: &Path, checksum: &str, target: &Path) -> Result<(), InstallError> {
|
||||||
|
let installer = installer();
|
||||||
|
install_gui_with_installer(src, checksum, target, installer.as_deref())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn install_gui_with_installer(
|
||||||
|
src: &Path,
|
||||||
|
checksum: &str,
|
||||||
|
target: &Path,
|
||||||
|
installer: Option<&Path>,
|
||||||
|
) -> Result<(), InstallError> {
|
||||||
|
let Some(dir) = target.parent() else {
|
||||||
|
return Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"Failed to get parent directory of GUI binary"
|
||||||
|
)));
|
||||||
|
};
|
||||||
|
fs::create_dir_all(dir).map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
|
||||||
|
let staged_archive = stage_gui_archive(src, dir)?;
|
||||||
|
let archive_path = staged_archive.path().to_string_lossy();
|
||||||
|
verify_checksum(&archive_path, checksum).map_err(InstallError::Checksum)?;
|
||||||
|
|
||||||
|
// A package may need to prepare downloaded executables for its runtime.
|
||||||
|
// Resolve this helper beside the running service, never from the request or PATH.
|
||||||
|
if let Some(installer) = installer {
|
||||||
|
let status = std::process::Command::new(installer)
|
||||||
|
.arg(staged_archive.path())
|
||||||
|
.arg(checksum)
|
||||||
|
.arg(target)
|
||||||
|
.stdin(std::process::Stdio::null())
|
||||||
|
.stdout(std::process::Stdio::null())
|
||||||
|
.status()
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
return if status.success() {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"GUI package installation failed: {status}"
|
||||||
|
)))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
let tar = XzDecoder::new(BufReader::new(
|
||||||
|
staged_archive
|
||||||
|
.reopen()
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?,
|
||||||
|
))
|
||||||
|
.take(MAX_GUI_ARCHIVE_CONTENT_SIZE);
|
||||||
|
let mut archive = Archive::new(tar);
|
||||||
|
let binary_name = target.file_name().and_then(|name| name.to_str()).unwrap_or("gpgui");
|
||||||
|
let file = extract_gui_binary(&mut archive, dir, binary_name)?;
|
||||||
|
file
|
||||||
|
.as_file()
|
||||||
|
.set_permissions(Permissions::from_mode(0o755))
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
file
|
||||||
|
.as_file()
|
||||||
|
.sync_all()
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
file.persist(&target).map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
File::open(dir)
|
||||||
|
.and_then(|directory| directory.sync_all())
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stage_gui_archive(src: &Path, dir: &Path) -> Result<NamedTempFile, InstallError> {
|
||||||
|
let mut source = OpenOptions::new()
|
||||||
|
.read(true)
|
||||||
|
.custom_flags(nix::libc::O_NONBLOCK | nix::libc::O_NOFOLLOW)
|
||||||
|
.open(src)
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
let metadata = source.metadata().map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
let source_size = metadata.len();
|
||||||
|
if !metadata.file_type().is_file() || source_size == 0 || source_size > MAX_GUI_ARCHIVE_SIZE {
|
||||||
|
return Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"GUI update archive must be a non-empty regular file no larger than {MAX_GUI_ARCHIVE_SIZE} bytes"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut staged = NamedTempFile::new_in(dir).map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
let copied = std::io::copy(&mut (&mut source).take(MAX_GUI_ARCHIVE_SIZE + 1), &mut staged)
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
if copied != source_size {
|
||||||
|
return Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"GUI update archive changed while it was being read"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
staged.flush().map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
staged
|
||||||
|
.as_file()
|
||||||
|
.sync_all()
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
Ok(staged)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_gui_binary<R: Read>(
|
||||||
|
archive: &mut Archive<R>,
|
||||||
|
dir: &Path,
|
||||||
|
binary_name: &str,
|
||||||
|
) -> Result<NamedTempFile, InstallError> {
|
||||||
|
for entry in archive.entries().map_err(|err| InstallError::Install(err.into()))? {
|
||||||
|
let mut entry = entry.map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
let is_gui = entry
|
||||||
|
.path()
|
||||||
|
.map_err(|err| InstallError::Install(err.into()))?
|
||||||
|
.file_name()
|
||||||
|
.is_some_and(|name| name == binary_name);
|
||||||
|
if is_gui && entry.header().entry_type().is_file() {
|
||||||
|
let declared_size = entry.size();
|
||||||
|
if declared_size == 0 || declared_size > MAX_GUI_BINARY_SIZE {
|
||||||
|
return Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"GUI binary must be non-empty and no larger than {MAX_GUI_BINARY_SIZE} bytes"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
let mut file = NamedTempFile::new_in(dir).map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
let copied = std::io::copy(&mut entry, &mut file).map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
if copied != declared_size {
|
||||||
|
return Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"GUI binary size does not match its archive header"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
file.flush().map_err(|err| InstallError::Install(err.into()))?;
|
||||||
|
return Ok(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(InstallError::Install(anyhow::anyhow!(
|
||||||
|
"GUI update archive does not contain a non-empty regular {binary_name} file"
|
||||||
|
)))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use std::{io::Cursor, os::unix::fs::PermissionsExt};
|
||||||
|
|
||||||
|
use tar::{Builder, EntryType, Header};
|
||||||
|
use xz2::write::XzEncoder;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn archive_with_entry(entry_type: EntryType, contents: &[u8]) -> Vec<u8> {
|
||||||
|
let mut data = Vec::new();
|
||||||
|
{
|
||||||
|
let mut builder = Builder::new(&mut data);
|
||||||
|
let mut header = Header::new_gnu();
|
||||||
|
header.set_entry_type(entry_type);
|
||||||
|
header.set_size(contents.len() as u64);
|
||||||
|
header.set_mode(0o755);
|
||||||
|
header.set_cksum();
|
||||||
|
builder.append_data(&mut header, "gpgui", contents).unwrap();
|
||||||
|
builder.finish().unwrap();
|
||||||
|
}
|
||||||
|
data
|
||||||
|
}
|
||||||
|
|
||||||
|
fn compressed_gui_archive(contents: &[u8]) -> NamedTempFile {
|
||||||
|
let tar = archive_with_entry(EntryType::Regular, contents);
|
||||||
|
let mut encoder = XzEncoder::new(Vec::new(), 6);
|
||||||
|
encoder.write_all(&tar).unwrap();
|
||||||
|
let compressed = encoder.finish().unwrap();
|
||||||
|
let mut archive = NamedTempFile::new().unwrap();
|
||||||
|
archive.write_all(&compressed).unwrap();
|
||||||
|
archive.flush().unwrap();
|
||||||
|
archive
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_non_file_and_empty_gui_entries() {
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
for (entry_type, contents) in [(EntryType::Directory, &[][..]), (EntryType::Regular, &[][..])] {
|
||||||
|
let data = archive_with_entry(entry_type, contents);
|
||||||
|
let mut archive = Archive::new(Cursor::new(data));
|
||||||
|
assert!(extract_gui_binary(&mut archive, output.path(), "gpgui").is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn extracts_non_empty_regular_gui_entry() {
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let data = archive_with_entry(EntryType::Regular, b"gui binary");
|
||||||
|
let mut archive = Archive::new(Cursor::new(data));
|
||||||
|
let extracted = extract_gui_binary(&mut archive, output.path(), "gpgui").unwrap();
|
||||||
|
let contents = std::fs::read(extracted.path()).unwrap();
|
||||||
|
assert_eq!(contents, b"gui binary");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_invalid_archive_sources() {
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
assert!(stage_gui_archive(output.path(), output.path()).is_err());
|
||||||
|
|
||||||
|
let oversized = output.path().join("oversized.tar.xz");
|
||||||
|
File::create(&oversized)
|
||||||
|
.unwrap()
|
||||||
|
.set_len(MAX_GUI_ARCHIVE_SIZE + 1)
|
||||||
|
.unwrap();
|
||||||
|
assert!(stage_gui_archive(&oversized, output.path()).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_oversized_gui_entry() {
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let mut header = Header::new_gnu();
|
||||||
|
header.set_entry_type(EntryType::Regular);
|
||||||
|
header.set_size(MAX_GUI_BINARY_SIZE + 1);
|
||||||
|
header.set_mode(0o755);
|
||||||
|
header.set_path("gpgui").unwrap();
|
||||||
|
header.set_cksum();
|
||||||
|
let mut data = header.as_bytes().to_vec();
|
||||||
|
data.resize(512 * 3, 0);
|
||||||
|
|
||||||
|
let mut archive = Archive::new(Cursor::new(data));
|
||||||
|
assert!(extract_gui_binary(&mut archive, output.path(), "gpgui").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn installs_gui_at_the_supplied_target() {
|
||||||
|
let archive = compressed_gui_archive(b"gui binary");
|
||||||
|
let checksum = gpapi::utils::checksum::file_sha256(archive.path()).unwrap();
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let target = output.path().join("gpclient/gpgui");
|
||||||
|
|
||||||
|
install(archive.path(), &checksum, &target).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(std::fs::read(&target).unwrap(), b"gui binary");
|
||||||
|
assert_eq!(std::fs::metadata(&target).unwrap().permissions().mode() & 0o777, 0o755);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn installs_nsh_beside_tauri_without_replacing_it() {
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let tauri = output.path().join("gpgui");
|
||||||
|
std::fs::write(&tauri, b"tauri").unwrap();
|
||||||
|
let mut encoder = XzEncoder::new(Vec::new(), 1);
|
||||||
|
{
|
||||||
|
let mut archive = Builder::new(&mut encoder);
|
||||||
|
let mut header = Header::new_gnu();
|
||||||
|
header.set_size(3);
|
||||||
|
header.set_mode(0o755);
|
||||||
|
header.set_cksum();
|
||||||
|
archive
|
||||||
|
.append_data(&mut header, "gpgui-nsh_3.2.0/gpgui-nsh", &b"nsh"[..])
|
||||||
|
.unwrap();
|
||||||
|
archive.finish().unwrap();
|
||||||
|
}
|
||||||
|
let mut archive = NamedTempFile::new().unwrap();
|
||||||
|
archive.write_all(&encoder.finish().unwrap()).unwrap();
|
||||||
|
archive.flush().unwrap();
|
||||||
|
let checksum = gpapi::utils::checksum::file_sha256(archive.path()).unwrap();
|
||||||
|
let nsh = output.path().join("gpgui-nsh");
|
||||||
|
install(archive.path(), &checksum, &nsh).unwrap();
|
||||||
|
assert_eq!(std::fs::read(nsh).unwrap(), b"nsh");
|
||||||
|
assert_eq!(std::fs::read(tauri).unwrap(), b"tauri");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn checksum_failure_preserves_the_existing_gui() {
|
||||||
|
let archive = compressed_gui_archive(b"replacement");
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let target = output.path().join("gpclient/gpgui");
|
||||||
|
std::fs::create_dir_all(target.parent().unwrap()).unwrap();
|
||||||
|
std::fs::write(&target, b"existing").unwrap();
|
||||||
|
|
||||||
|
assert!(install(archive.path(), "invalid", &target).is_err());
|
||||||
|
assert_eq!(std::fs::read(target).unwrap(), b"existing");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn package_installer_receives_a_verified_staged_archive() {
|
||||||
|
let archive = compressed_gui_archive(b"gui binary");
|
||||||
|
let checksum = gpapi::utils::checksum::file_sha256(archive.path()).unwrap();
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let target = output.path().join("gpgui-nsh");
|
||||||
|
let installer = output.path().join("installer");
|
||||||
|
std::fs::write(
|
||||||
|
&installer,
|
||||||
|
"#!/bin/sh\nset -eu\ntest -f \"$1\"\nprintf '%s' \"$2\" > \"$3\"\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
std::fs::set_permissions(&installer, Permissions::from_mode(0o755)).unwrap();
|
||||||
|
|
||||||
|
assert!(install_gui_with_installer(archive.path(), "invalid", &target, Some(&installer)).is_err());
|
||||||
|
assert!(!target.exists());
|
||||||
|
install_gui_with_installer(archive.path(), &checksum, &target, Some(&installer)).unwrap();
|
||||||
|
assert_eq!(std::fs::read_to_string(target).unwrap(), checksum);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn package_installation_failure_preserves_the_existing_gui() {
|
||||||
|
let archive = compressed_gui_archive(b"replacement");
|
||||||
|
let checksum = gpapi::utils::checksum::file_sha256(archive.path()).unwrap();
|
||||||
|
let output = tempfile::tempdir().unwrap();
|
||||||
|
let target = output.path().join("gpgui");
|
||||||
|
std::fs::write(&target, b"existing").unwrap();
|
||||||
|
let installer = output.path().join("installer");
|
||||||
|
std::fs::write(&installer, "#!/bin/sh\nexit 1\n").unwrap();
|
||||||
|
std::fs::set_permissions(&installer, Permissions::from_mode(0o755)).unwrap();
|
||||||
|
|
||||||
|
assert!(install_gui_with_installer(archive.path(), &checksum, &target, Some(&installer)).is_err());
|
||||||
|
assert_eq!(std::fs::read(target).unwrap(), b"existing");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore = "requires GP_TEST_GUI_BINARY pointing to a built gpgui"]
|
||||||
|
fn installs_single_gui_binary_for_fresh_and_upgrade_downloads() {
|
||||||
|
let binary = std::fs::read(std::env::var("GP_TEST_GUI_BINARY").expect("GP_TEST_GUI_BINARY")).unwrap();
|
||||||
|
let archive = compressed_gui_archive(&binary);
|
||||||
|
let checksum = gpapi::utils::checksum::file_sha256(archive.path()).unwrap();
|
||||||
|
let temporary = tempfile::tempdir().unwrap();
|
||||||
|
let output = std::env::var_os("GP_TEST_GUI_INSTALL_DIR")
|
||||||
|
.map(std::path::PathBuf::from)
|
||||||
|
.unwrap_or_else(|| temporary.path().to_owned());
|
||||||
|
std::fs::create_dir_all(&output).unwrap();
|
||||||
|
std::fs::set_permissions(&output, std::fs::Permissions::from_mode(0o755)).unwrap();
|
||||||
|
let target = output.join("gpclient/gpgui");
|
||||||
|
for upgrade in [false, true] {
|
||||||
|
if upgrade {
|
||||||
|
std::fs::write(&target, b"old GUI").unwrap();
|
||||||
|
}
|
||||||
|
install(archive.path(), &checksum, &target).unwrap();
|
||||||
|
assert_eq!(std::fs::read_dir(target.parent().unwrap()).unwrap().count(), 1);
|
||||||
|
assert_eq!(std::fs::read(&target).unwrap(), binary);
|
||||||
|
let result = std::process::Command::new(&target).arg("--version").output().unwrap();
|
||||||
|
assert!(result.status.success(), "{}", String::from_utf8_lossy(&result.stderr));
|
||||||
|
assert!(String::from_utf8_lossy(&result.stdout).contains(env!("CARGO_PKG_VERSION")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ use std::{
|
|||||||
|
|
||||||
use anyhow::{Context, ensure};
|
use anyhow::{Context, ensure};
|
||||||
use base64::{Engine, engine::general_purpose::STANDARD};
|
use base64::{Engine, engine::general_purpose::STANDARD};
|
||||||
use gpapi::hip::HipApprovalStatus;
|
use gpapi::{hip::HipApprovalStatus, utils::checksum::sha256_hex};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use tempfile::Builder;
|
use tempfile::Builder;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@@ -87,14 +87,14 @@ pub fn install(request: InstallRequest, approving_uid: u32) -> anyhow::Result<Ap
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn resolve(approval_id: &str, desktop_uid: u32) -> anyhow::Result<ApprovedScript> {
|
pub fn resolve(approval_id: &str, desktop_uid: u32) -> anyhow::Result<ApprovedScript> {
|
||||||
let budget = gpapi::process::collection::CollectionBudget::new(std::time::Duration::from_secs(60));
|
let budget = gpapi::collection::CollectionBudget::new(std::time::Duration::from_secs(60));
|
||||||
resolve_with_control(approval_id, desktop_uid, &budget)
|
resolve_with_control(approval_id, desktop_uid, &budget)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn resolve_with_control(
|
pub fn resolve_with_control(
|
||||||
approval_id: &str,
|
approval_id: &str,
|
||||||
desktop_uid: u32,
|
desktop_uid: u32,
|
||||||
control: &dyn gpapi::process::collection::CollectionControl,
|
control: &dyn gpapi::collection::CollectionControl,
|
||||||
) -> anyhow::Result<ApprovedScript> {
|
) -> anyhow::Result<ApprovedScript> {
|
||||||
control.check()?;
|
control.check()?;
|
||||||
ensure!(desktop_uid != 0, "Root is not a desktop HIP approval owner");
|
ensure!(desktop_uid != 0, "Root is not a desktop HIP approval owner");
|
||||||
@@ -169,7 +169,7 @@ fn install_at(
|
|||||||
let info = ApprovalInfo {
|
let info = ApprovalInfo {
|
||||||
approval_id: approval_id.clone(),
|
approval_id: approval_id.clone(),
|
||||||
owner_uid: approving_uid,
|
owner_uid: approving_uid,
|
||||||
sha256: sha256::digest(contents),
|
sha256: sha256_hex(contents),
|
||||||
original_path,
|
original_path,
|
||||||
};
|
};
|
||||||
let staged = Builder::new().prefix(".install-").tempdir_in(base)?;
|
let staged = Builder::new().prefix(".install-").tempdir_in(base)?;
|
||||||
@@ -199,7 +199,7 @@ fn install_at(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn resolve_at(base: &Path, approval_id: &str, desktop_uid: u32, file_owner: u32) -> anyhow::Result<ApprovedScript> {
|
fn resolve_at(base: &Path, approval_id: &str, desktop_uid: u32, file_owner: u32) -> anyhow::Result<ApprovedScript> {
|
||||||
let budget = gpapi::process::collection::CollectionBudget::new(std::time::Duration::from_secs(60));
|
let budget = gpapi::collection::CollectionBudget::new(std::time::Duration::from_secs(60));
|
||||||
resolve_at_with_control(base, approval_id, desktop_uid, file_owner, &budget)
|
resolve_at_with_control(base, approval_id, desktop_uid, file_owner, &budget)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,7 +208,7 @@ fn resolve_at_with_control(
|
|||||||
approval_id: &str,
|
approval_id: &str,
|
||||||
desktop_uid: u32,
|
desktop_uid: u32,
|
||||||
file_owner: u32,
|
file_owner: u32,
|
||||||
control: &dyn gpapi::process::collection::CollectionControl,
|
control: &dyn gpapi::collection::CollectionControl,
|
||||||
) -> anyhow::Result<ApprovedScript> {
|
) -> anyhow::Result<ApprovedScript> {
|
||||||
control.check()?;
|
control.check()?;
|
||||||
let info = read_metadata_at(base, approval_id, desktop_uid, file_owner)?;
|
let info = read_metadata_at(base, approval_id, desktop_uid, file_owner)?;
|
||||||
@@ -232,7 +232,7 @@ fn resolve_at_with_control(
|
|||||||
}
|
}
|
||||||
ensure!(!contents.is_empty(), "Approved HIP script is empty");
|
ensure!(!contents.is_empty(), "Approved HIP script is empty");
|
||||||
ensure!(
|
ensure!(
|
||||||
sha256::digest(&contents) == info.sha256,
|
sha256_hex(&contents) == info.sha256,
|
||||||
"Approved HIP script digest mismatch"
|
"Approved HIP script digest mismatch"
|
||||||
);
|
);
|
||||||
control.check()?;
|
control.check()?;
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ impl HipPreviews {
|
|||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
let result = match generated {
|
let result = match generated {
|
||||||
Ok(Ok(xml)) => preview_result(®istry, session_id, xml),
|
Ok(Ok(report)) => preview_result(®istry, session_id, report),
|
||||||
Ok(Err(error)) => {
|
Ok(Err(error)) => {
|
||||||
log::warn!("HIP preview failed: {error:#}");
|
log::warn!("HIP preview failed: {error:#}");
|
||||||
ServiceResult::rejected(ServiceErrorCode::Internal, "HIP preview failed")
|
ServiceResult::rejected(ServiceErrorCode::Internal, "HIP preview failed")
|
||||||
@@ -132,17 +132,20 @@ impl HipPreviews {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn preview_result(registry: &SessionRegistry, session_id: Uuid, xml: String) -> ServiceResult {
|
fn preview_result(registry: &SessionRegistry, session_id: Uuid, report: gpapi::hip::HipReport) -> ServiceResult {
|
||||||
let result = registry.store_hip_preview(session_id, xml).and_then(|preview_id| {
|
let result = registry
|
||||||
registry
|
.store_hip_preview(session_id, report.xml)
|
||||||
.hip_preview_chunk(session_id, preview_id, 0)
|
.and_then(|preview_id| {
|
||||||
.map(|(xml, complete)| ServiceResult::HipPreviewChunk {
|
registry
|
||||||
preview_id: preview_id.to_string(),
|
.hip_preview_chunk(session_id, preview_id, 0)
|
||||||
offset: 0,
|
.map(|(xml, complete)| ServiceResult::HipPreviewChunk {
|
||||||
xml,
|
preview_id: preview_id.to_string(),
|
||||||
complete,
|
offset: 0,
|
||||||
})
|
xml,
|
||||||
});
|
complete,
|
||||||
|
windows_updates: report.windows_updates,
|
||||||
|
})
|
||||||
|
});
|
||||||
result.unwrap_or_else(|_| ServiceResult::rejected(ServiceErrorCode::Internal, "HIP preview is unavailable"))
|
result.unwrap_or_else(|_| ServiceResult::rejected(ServiceErrorCode::Internal, "HIP preview is unavailable"))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -152,18 +155,18 @@ fn generate(
|
|||||||
desktop_uid: Option<u32>,
|
desktop_uid: Option<u32>,
|
||||||
identity: HostIdentity,
|
identity: HostIdentity,
|
||||||
cancellation: CancellationToken,
|
cancellation: CancellationToken,
|
||||||
) -> anyhow::Result<String> {
|
) -> anyhow::Result<gpapi::hip::HipReport> {
|
||||||
ensure!(request.client_version.len() <= 64, "Invalid HIP client version");
|
ensure!(request.client_version.len() <= 64, "Invalid HIP client version");
|
||||||
ensure!(
|
ensure!(
|
||||||
request.host_id.as_ref().is_none_or(|id| id.len() <= 256),
|
request.host_id.as_ref().is_none_or(|id| id.len() <= 256),
|
||||||
"Invalid HIP host ID"
|
"Invalid HIP host ID"
|
||||||
);
|
);
|
||||||
let budget = gpapi::process::collection::CollectionBudget::new(PREVIEW_TIMEOUT);
|
let budget = gpapi::collection::CollectionBudget::new(PREVIEW_TIMEOUT);
|
||||||
let check = || {
|
let check = || {
|
||||||
if cancellation.is_cancelled() {
|
if cancellation.is_cancelled() {
|
||||||
return Err(io::Error::new(io::ErrorKind::Interrupted, "HIP preview cancelled"));
|
return Err(io::Error::new(io::ErrorKind::Interrupted, "HIP preview cancelled"));
|
||||||
}
|
}
|
||||||
gpapi::process::collection::CollectionControl::check(&budget)
|
gpapi::collection::CollectionControl::check(&budget)
|
||||||
};
|
};
|
||||||
check()?;
|
check()?;
|
||||||
let profile = crate::hip_source::profile(
|
let profile = crate::hip_source::profile(
|
||||||
@@ -188,7 +191,15 @@ fn generate(
|
|||||||
};
|
};
|
||||||
let xml = match &request.source {
|
let xml = match &request.source {
|
||||||
HipSource::Disabled => bail!("HIP is disabled"),
|
HipSource::Disabled => bail!("HIP is disabled"),
|
||||||
HipSource::Generated => crate::hip_source::generate(&profile, None, &input, &check, true)?,
|
HipSource::Generated => {
|
||||||
|
return gphip::generate_report_details(
|
||||||
|
&gphip::ReportInput {
|
||||||
|
profile,
|
||||||
|
context: gphip::ReportContext::Preview,
|
||||||
|
},
|
||||||
|
&check,
|
||||||
|
);
|
||||||
|
}
|
||||||
HipSource::Edited { .. } => {
|
HipSource::Edited { .. } => {
|
||||||
let xml = edited_report.context("Edited HIP report is unavailable")?;
|
let xml = edited_report.context("Edited HIP report is unavailable")?;
|
||||||
crate::hip_source::generate(&profile, Some(&xml), &input, &check, true)?
|
crate::hip_source::generate(&profile, Some(&xml), &input, &check, true)?
|
||||||
@@ -204,7 +215,10 @@ fn generate(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
check()?;
|
check()?;
|
||||||
Ok(xml)
|
Ok(gpapi::hip::HipReport {
|
||||||
|
xml,
|
||||||
|
windows_updates: None,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -227,7 +241,7 @@ mod tests {
|
|||||||
},
|
},
|
||||||
edited_report: None,
|
edited_report: None,
|
||||||
desktop_uid: None,
|
desktop_uid: None,
|
||||||
identity: HostIdentity::from_parts(
|
identity: gpapi::os_profile::desktop::identity_from_parts(
|
||||||
"device".into(),
|
"device".into(),
|
||||||
"host".into(),
|
"host".into(),
|
||||||
"serial".into(),
|
"serial".into(),
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use std::{fs, io, os::unix::fs::PermissionsExt, path::PathBuf, sync::Arc};
|
use std::{io, sync::Arc};
|
||||||
|
|
||||||
use anyhow::{Context, ensure};
|
use anyhow::{Context, ensure};
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
@@ -6,7 +6,17 @@ use gpapi::{
|
|||||||
os_profile::{ClientOs, HostIdentity, OsProfile, OsProfileBuilder},
|
os_profile::{ClientOs, HostIdentity, OsProfile, OsProfileBuilder},
|
||||||
};
|
};
|
||||||
use gphip::{ReportContext, ReportInput};
|
use gphip::{ReportContext, ReportInput};
|
||||||
use openconnect::{HipRequest, HipScript, HipScriptEnvironment};
|
use openconnect::HipRequest;
|
||||||
|
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
|
use openconnect::HipScript;
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[path = "hip_source/unix.rs"]
|
||||||
|
mod scripts;
|
||||||
|
#[cfg(windows)]
|
||||||
|
#[path = "hip_source/windows.rs"]
|
||||||
|
mod scripts;
|
||||||
|
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
|
use scripts::script_environment;
|
||||||
|
|
||||||
pub(crate) struct HipExecution {
|
pub(crate) struct HipExecution {
|
||||||
pub source: openconnect::HipSource,
|
pub source: openconnect::HipSource,
|
||||||
@@ -36,7 +46,7 @@ impl HipApproval {
|
|||||||
pub(crate) fn resolve(
|
pub(crate) fn resolve(
|
||||||
source: &HipSource,
|
source: &HipSource,
|
||||||
desktop_uid: Option<u32>,
|
desktop_uid: Option<u32>,
|
||||||
brokered_macos: bool,
|
restricted_desktop: bool,
|
||||||
edited_report: Option<Arc<str>>,
|
edited_report: Option<Arc<str>>,
|
||||||
profile: Option<OsProfile>,
|
profile: Option<OsProfile>,
|
||||||
) -> anyhow::Result<HipExecution> {
|
) -> anyhow::Result<HipExecution> {
|
||||||
@@ -63,22 +73,11 @@ pub(crate) fn resolve(
|
|||||||
}
|
}
|
||||||
HipSource::UserScript { path } => {
|
HipSource::UserScript { path } => {
|
||||||
approval = None;
|
approval = None;
|
||||||
ensure_custom_available(brokered_macos)?;
|
ensure_custom_available(restricted_desktop)?;
|
||||||
let uid = desktop_uid.context("HIP custom scripts require a verified desktop user")?;
|
scripts::user_script(path, desktop_uid)?
|
||||||
ensure!(uid != 0, "HIP custom scripts require a non-root desktop user");
|
|
||||||
let path = PathBuf::from(path);
|
|
||||||
ensure!(path.is_absolute(), "HIP custom script path must be absolute");
|
|
||||||
let metadata = fs::symlink_metadata(&path).context("Failed to inspect the HIP script")?;
|
|
||||||
ensure!(
|
|
||||||
metadata.is_file() && !metadata.file_type().is_symlink() && metadata.permissions().mode() & 0o111 != 0,
|
|
||||||
"HIP custom script must be an executable regular file"
|
|
||||||
);
|
|
||||||
let script =
|
|
||||||
HipScript::new(path.to_string_lossy().into_owned(), Some(uid))?.with_environment(script_environment(uid)?)?;
|
|
||||||
openconnect::HipSource::Script(script)
|
|
||||||
}
|
}
|
||||||
HipSource::ApprovedRootScript { approval_id } => {
|
HipSource::ApprovedRootScript { approval_id } => {
|
||||||
ensure_custom_available(brokered_macos)?;
|
ensure_custom_available(restricted_desktop)?;
|
||||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||||
{
|
{
|
||||||
let owner_uid = desktop_uid.context("Root HIP scripts require a verified desktop user")?;
|
let owner_uid = desktop_uid.context("Root HIP scripts require a verified desktop user")?;
|
||||||
@@ -113,10 +112,10 @@ pub(crate) fn resolve(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ensure_custom_available(brokered_macos: bool) -> anyhow::Result<()> {
|
fn ensure_custom_available(restricted_desktop: bool) -> anyhow::Result<()> {
|
||||||
ensure!(
|
ensure!(
|
||||||
!cfg!(target_os = "macos") && !brokered_macos,
|
!cfg!(target_os = "macos") && !restricted_desktop,
|
||||||
"Custom HIP scripts are unavailable on macOS"
|
"Custom HIP scripts are unavailable on this platform"
|
||||||
);
|
);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -125,7 +124,7 @@ pub(crate) fn generate(
|
|||||||
profile: &OsProfile,
|
profile: &OsProfile,
|
||||||
edited: Option<&str>,
|
edited: Option<&str>,
|
||||||
request: &HipRequest,
|
request: &HipRequest,
|
||||||
control: &dyn gpapi::process::collection::CollectionControl,
|
control: &dyn gpapi::collection::CollectionControl,
|
||||||
preview: bool,
|
preview: bool,
|
||||||
) -> anyhow::Result<String> {
|
) -> anyhow::Result<String> {
|
||||||
control.check()?;
|
control.check()?;
|
||||||
@@ -149,27 +148,6 @@ pub(crate) fn generate(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn script_environment(uid: u32) -> anyhow::Result<HipScriptEnvironment> {
|
|
||||||
let user =
|
|
||||||
nix::unistd::User::from_uid(nix::unistd::Uid::from_raw(uid))?.context("HIP execution user is unavailable")?;
|
|
||||||
let home = user.dir.to_string_lossy().into_owned();
|
|
||||||
Ok(HipScriptEnvironment {
|
|
||||||
variables: vec![
|
|
||||||
(
|
|
||||||
"PATH".into(),
|
|
||||||
gpapi::process::collection::command_path(uid == 0)?
|
|
||||||
.into_string()
|
|
||||||
.map_err(|_| anyhow::anyhow!("HIP command path is not valid UTF-8"))?,
|
|
||||||
),
|
|
||||||
("LC_ALL".into(), "C".into()),
|
|
||||||
("HOME".into(), home.clone()),
|
|
||||||
("USER".into(), user.name.clone()),
|
|
||||||
("LOGNAME".into(), user.name),
|
|
||||||
],
|
|
||||||
cwd: home,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn profile(
|
pub(crate) fn profile(
|
||||||
identity: &HostIdentity,
|
identity: &HostIdentity,
|
||||||
os: ClientOs,
|
os: ClientOs,
|
||||||
@@ -177,22 +155,25 @@ pub(crate) fn profile(
|
|||||||
os_version: Option<String>,
|
os_version: Option<String>,
|
||||||
host_id: Option<String>,
|
host_id: Option<String>,
|
||||||
hostname: Option<String>,
|
hostname: Option<String>,
|
||||||
control: &dyn gpapi::process::collection::CollectionControl,
|
control: &dyn gpapi::collection::CollectionControl,
|
||||||
) -> io::Result<OsProfile> {
|
) -> io::Result<OsProfile> {
|
||||||
let identity = HostIdentity::from_parts(
|
let identity = gpapi::os_profile::desktop::identity_from_parts(
|
||||||
hostname.unwrap_or_else(|| identity.computer().into()),
|
hostname.as_deref().unwrap_or(identity.computer()).into(),
|
||||||
host_id.unwrap_or_else(|| identity.host_id().into()),
|
host_id.as_deref().unwrap_or(identity.host_id()).into(),
|
||||||
identity.serialno().into(),
|
identity.serialno().into(),
|
||||||
identity.mac_addr().into(),
|
identity.mac_addr().into(),
|
||||||
);
|
);
|
||||||
let mut builder = OsProfileBuilder::new(os).host_identity(identity);
|
let mut builder = OsProfileBuilder::new(os).host_identity(identity);
|
||||||
|
if let Some(hostname) = hostname {
|
||||||
|
builder = builder.computer_name_override(hostname);
|
||||||
|
}
|
||||||
if let Some(version) = version {
|
if let Some(version) = version {
|
||||||
builder = builder.client_version(version);
|
builder = builder.client_version(version);
|
||||||
}
|
}
|
||||||
if let Some(os_version) = os_version {
|
if let Some(os_version) = os_version {
|
||||||
builder = builder.os_version(os_version);
|
builder = builder.os_version(os_version);
|
||||||
}
|
}
|
||||||
builder.build_with_control(control)
|
gpapi::os_profile::desktop::collect_profile_with_control(builder, host_id.as_deref(), control)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generation_error(error: anyhow::Error) -> io::Error {
|
fn generation_error(error: anyhow::Error) -> io::Error {
|
||||||
@@ -209,7 +190,7 @@ mod tests {
|
|||||||
|
|
||||||
fn fixture_profile() -> OsProfile {
|
fn fixture_profile() -> OsProfile {
|
||||||
profile(
|
profile(
|
||||||
&HostIdentity::from_parts(
|
&gpapi::os_profile::desktop::identity_from_parts(
|
||||||
"device".into(),
|
"device".into(),
|
||||||
"host".into(),
|
"host".into(),
|
||||||
"serial".into(),
|
"serial".into(),
|
||||||
@@ -220,7 +201,7 @@ mod tests {
|
|||||||
Some("negotiated-version".into()),
|
Some("negotiated-version".into()),
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
&gpapi::process::collection::CollectionBudget::new(std::time::Duration::from_secs(60)),
|
&gpapi::collection::CollectionBudget::new(std::time::Duration::from_secs(60)),
|
||||||
)
|
)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
}
|
}
|
||||||
@@ -235,7 +216,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn profile_retains_negotiated_identity_and_os_version() {
|
fn profile_retains_negotiated_identity_and_os_version() {
|
||||||
let identity = HostIdentity::from_parts(
|
let identity = gpapi::os_profile::desktop::identity_from_parts(
|
||||||
"original".into(),
|
"original".into(),
|
||||||
"original-id".into(),
|
"original-id".into(),
|
||||||
"serial".into(),
|
"serial".into(),
|
||||||
@@ -248,7 +229,7 @@ mod tests {
|
|||||||
Some("negotiated-os".into()),
|
Some("negotiated-os".into()),
|
||||||
Some("negotiated-host".into()),
|
Some("negotiated-host".into()),
|
||||||
Some("negotiated-name".into()),
|
Some("negotiated-name".into()),
|
||||||
&gpapi::process::collection::CollectionBudget::new(std::time::Duration::from_secs(60)),
|
&gpapi::collection::CollectionBudget::new(std::time::Duration::from_secs(60)),
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(profile.os_version(), "negotiated-os");
|
assert_eq!(profile.os_version(), "negotiated-os");
|
||||||
@@ -257,6 +238,29 @@ mod tests {
|
|||||||
assert_eq!(profile.host_identity().serialno(), "serial");
|
assert_eq!(profile.host_identity().serialno(), "serial");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
#[test]
|
||||||
|
fn native_windows_profile_retains_negotiated_host_id() {
|
||||||
|
let identity = gpapi::os_profile::HostIdentity::from_parts(
|
||||||
|
"device".into(),
|
||||||
|
"hardware-seed".into(),
|
||||||
|
"serial".into(),
|
||||||
|
"00:11:22:33:44:55".into(),
|
||||||
|
);
|
||||||
|
let profile = profile(
|
||||||
|
&identity,
|
||||||
|
ClientOs::Windows,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
Some("negotiated-host".into()),
|
||||||
|
None,
|
||||||
|
&gpapi::collection::CollectionBudget::new(std::time::Duration::from_secs(60)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(profile.host_id(), "negotiated-host");
|
||||||
|
assert_eq!(profile.host_identity().host_id(), "negotiated-host");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn callback_errors_preserve_cancellation() {
|
fn callback_errors_preserve_cancellation() {
|
||||||
let error = generation_error(io::Error::new(io::ErrorKind::Interrupted, "cancelled").into());
|
let error = generation_error(io::Error::new(io::ErrorKind::Interrupted, "cancelled").into());
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
use anyhow::{Context, ensure};
|
||||||
|
use openconnect::{HipScript, HipScriptEnvironment};
|
||||||
|
use std::{fs, os::unix::fs::PermissionsExt, path::PathBuf};
|
||||||
|
pub(super) fn user_script(path: &str, desktop_uid: Option<u32>) -> anyhow::Result<openconnect::HipSource> {
|
||||||
|
let uid = desktop_uid.context("HIP custom scripts require a verified desktop user")?;
|
||||||
|
ensure!(uid != 0, "HIP custom scripts require a non-root desktop user");
|
||||||
|
let path = PathBuf::from(path);
|
||||||
|
ensure!(path.is_absolute(), "HIP custom script path must be absolute");
|
||||||
|
let metadata = fs::symlink_metadata(&path).context("Failed to inspect the HIP script")?;
|
||||||
|
ensure!(
|
||||||
|
metadata.is_file() && !metadata.file_type().is_symlink() && metadata.permissions().mode() & 0o111 != 0,
|
||||||
|
"HIP custom script must be an executable regular file"
|
||||||
|
);
|
||||||
|
let script =
|
||||||
|
HipScript::new(path.to_string_lossy().into_owned(), Some(uid))?.with_environment(script_environment(uid)?)?;
|
||||||
|
Ok(openconnect::HipSource::Script(script))
|
||||||
|
}
|
||||||
|
pub(crate) fn script_environment(uid: u32) -> anyhow::Result<HipScriptEnvironment> {
|
||||||
|
let user =
|
||||||
|
nix::unistd::User::from_uid(nix::unistd::Uid::from_raw(uid))?.context("HIP execution user is unavailable")?;
|
||||||
|
let home = user.dir.to_string_lossy().into_owned();
|
||||||
|
Ok(HipScriptEnvironment {
|
||||||
|
variables: vec![
|
||||||
|
(
|
||||||
|
"PATH".into(),
|
||||||
|
gpapi::process::collection::command_path(uid == 0)?
|
||||||
|
.into_string()
|
||||||
|
.map_err(|_| anyhow::anyhow!("HIP command path is not valid UTF-8"))?,
|
||||||
|
),
|
||||||
|
("LC_ALL".into(), "C".into()),
|
||||||
|
("HOME".into(), home.clone()),
|
||||||
|
("USER".into(), user.name.clone()),
|
||||||
|
("LOGNAME".into(), user.name),
|
||||||
|
],
|
||||||
|
cwd: home,
|
||||||
|
})
|
||||||
|
}
|
||||||