Compare commits

..
52 Commits
Author SHA1 Message Date
Kevin Yue 1b4ea720a6 Release 2.5.1 2025-12-22 23:16:52 +08:00
Kevin Yue 7d87442f73 feat: add HIP report generation functionality and related dependencies 2025-12-22 23:16:31 +08:00
Kevin Yue f398ccadb7 Release 2.5.0 2025-12-08 22:41:42 +08:00
Kevin Yue 740c79af9b chore: update dependencies 2025-12-08 22:10:15 +08:00
Kevin Yue d0096c6cb2 feat: update application name and description to reflect GP Connect branding 2025-12-08 21:46:02 +08:00
Kevin Yue e4701c1bd8 feat: add support for client version emulation and integrate OpenConnect submodule 2025-12-08 21:46:02 +08:00
Kevin Yue a08ae655cf feat: support the --script-tun option 2025-12-02 19:54:09 +08:00
Olivier Louvignes a917e16e62 Add support for macOS builds (apple silicon) (#557) 2025-12-01 22:43:00 +08:00
Kevin Yue 8ed3304e61 Update flake.nix 2025-11-13 11:03:13 +08:00
Kevin Yue c40fd051e5 Release 2.4.7 2025-11-13 00:14:07 +08:00
Kevin Yue 09cd8ecb18 feat: upgrade Rust version to 1.85 2025-11-13 00:13:53 +08:00
Kevin Yue a4e1743691 feat: add NixOS support with flake configuration and package setup 2025-11-12 23:35:44 +08:00
Kevin Yue 801a339525 feat: update browser argument in Cli and ConnectArgs to include default value and argument count 2025-11-12 23:35:44 +08:00
Kevin Yue 49a7cbfe99 feat: add auth_executable parameter to SamlAuthLauncher and update launch logic 2025-11-12 23:35:44 +08:00
Kevin Yue 603975bfe0 feat: add hip parameter to ConnectArgs and VpnBuilder, update connection logic 2025-11-12 23:35:44 +08:00
Kevin Yue 49fe7447ff feat: add VpnEnv struct and update WsEvent to include VPN environment details 2025-11-12 23:35:43 +08:00
Kevin Yue 7048248268 feat: integrate common crate and add constants for user agent and lock files 2025-11-12 23:35:43 +08:00
Kevin Yue cad5ca3d68 fix: add vpnc script location 2025-11-12 23:35:43 +08:00
Kevin Yue 9e9ab6fb7d fix: update @mui/icons-material and @mui/material dependencies to version 7.3.4 2025-11-12 23:35:42 +08:00
Fred Eisele 8e55698271 Update the README.md to describe building with devcontainers (#521) 2025-11-04 22:27:25 +08:00
Kevin Yue 47338b21a8 fix: remove conditional check for PPA input in publish job 2025-10-15 23:41:42 +08:00
Kevin Yue 4c307e05f5 fix: update Docker volume paths in build steps 2025-10-15 23:38:08 +08:00
Kevin Yue b56659b0b4 Release 2.4.6 2025-10-15 22:49:55 +08:00
Kevin Yue e3c3b6e89e Update dependencies and improve crypto handling
- Updated macOS-specific dependencies in `Cargo.toml` to their latest versions for better compatibility and performance.
- Refactored nonce handling in `crypto.rs` to improve clarity and correctness in the decryption process.
- Modified `gh-release.sh` to streamline asset uploads for snapshot releases and ensure stability for tagged releases by limiting uploaded components.
2025-10-15 22:49:54 +08:00
Kevin Yue f1a8a3c19a feat: add support for ubuntu-rolling package in build-gp job 2025-10-15 19:46:11 +08:00
Kevin Yue 986b63391a fix: update visibility of auth window based on clean state 2025-10-12 22:04:16 +08:00
Kevin Yue 9b180ad90c feat: add Publish PPA workflow and support for disabling Rust toolchain 2025-10-12 22:04:16 +08:00
Kevin Yue 6079dc6aee fix: update Rust version and dependencies for packaging 2025-10-12 22:04:16 +08:00
Kevin Yue 2bd7371c7a feat: refactor password handling in ConnectHandler to reuse stdin input
--passwd-on-stdin reads again on gateway failure
Fixes #546
2025-10-12 22:04:15 +08:00
Dark12andKevin Yue e1eb191def Support for remote browser. Useful for headless servers (#544)
* Support for remote browser. Useful for headless servers

* feat: enhance browser authentication to support remote mode and local IP detection

---------

Co-authored-by: Kevin Yue <[email protected]>
2025-10-12 22:02:19 +08:00
Eric Work a9d2de06b5 Fix gpclient disconnect bailing with client is already running (#542)
The command `gpclient disconnect` should disconnect an already running gpclient connection, but instead bails with `client is already running`. The client is expected to be running since the desired behavior is to disconnect an existing connection. Fix the CLI run logic to not bail when the client is already running and a disconnect operation is in progress.

Fixes #533
2025-10-10 11:41:34 +08:00
Kevin Yue 2aa875a626 Release 2.4.5 2025-07-16 14:18:00 +08:00
Kevin Yue e4fa429dcc style: format code for consistency and readability 2025-07-16 10:01:28 +08:00
Kevin Yue 5ba7bf2e18 feat: add the --force-dpd option
gh-519
2025-07-15 22:03:35 +08:00
Kevin Yue 11925a372d fix: parse VPN URL to support custom port
Related: #404
2025-07-08 23:32:54 +08:00
Kevin Yue e1eb9e20f1 feat: update VPN connection to parse URL and ensure HTTPS prefix 2025-07-08 23:26:04 +08:00
Kevin Yue 1d3aa889d5 ci: use GitHub hosted arm action runner 2025-06-11 11:37:48 +08:00
Kevin Yue c1ab26aef3 feat: add the -i/--interface option (#512) 2025-06-10 22:12:14 +08:00
Kevin Yue ea9819d161 fix: correct the Gentoo package name, fix #71 2025-05-05 17:14:23 +08:00
Kevin Yue dc9480fd71 Release 2.4.4 2025-02-09 14:30:40 +00:00
Kevin Yue fa2849a080 chore: update dependencies 2025-02-09 14:25:35 +00:00
Kevin Yue c70c7ee5b9 fix: multiple tray icon related: #464 2025-02-09 08:23:40 +00:00
Kevin Yue fe3d3df662 ci: upload offline tarball 2025-01-23 21:59:59 +08:00
Kevin Yue 2f90b73683 fix: check the cli running state 2025-01-22 21:30:42 +08:00
Kevin Yue 5186e80c6f doc: update installation for Ubuntu 18.04 2025-01-21 23:00:32 +08:00
Kevin Yue 4ff1c1dc1f Release 2.4.3 2025-01-21 00:16:00 +08:00
Kevin Yue c1427040f6 fix: do not use default value for os_version 2025-01-21 00:14:13 +08:00
Kevin Yue a7ad02acb6 Release 2.4.2 2025-01-20 20:57:57 +08:00
Kevin Yue b188d61be1 fix: disconnect VPN when sleep 2025-01-20 19:29:22 +08:00
Kevin Yue ec85e857bc Release 2.4.1 2025-01-09 23:53:03 +08:00
Kevin Yue d37ccafdc2 feat: gpauth support macos 2025-01-09 21:22:41 +08:00
Kevin Yue 0c9b8e6c63 Update publish.yaml 2024-12-26 23:25:23 +08:00
124 changed files with 7578 additions and 4126 deletions

No files matched your search

+6
View File
@@ -0,0 +1,6 @@
BasedOnStyle: LLVM
IndentWidth: 8
TabWidth: 8
UseTab: Always
ColumnLimit: 80
BreakBeforeBraces: Linux
+27 -27
View File
@@ -7,19 +7,36 @@ ARG USER_GID=$USER_UID
ENV RUSTUP_HOME=/usr/local/rustup \ ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \ CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \ PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.80.0 RUST_VERSION=1.85.0 \
DEBIAN_FRONTEND=noninteractive
# Install common dependencies # Install all system dependencies in a single layer and clean up apt cache
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
# Common utilities
sudo \ sudo \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg \ gnupg \
git \ git \
less \ less \
software-properties-common wget \
file \
software-properties-common \
# libopenconnect-dev to install the related dependencies for building openconnect from source
# Otherwise, we have to install them manually one by one
libopenconnect-dev \
# Tauri dependencies
libwebkit2gtk-4.1-dev \
build-essential \
libxdo-dev \
libssl-dev \
libayatana-appindicator3-dev \
librsvg2-dev; \
# Clean up apt cache to reduce image size
apt-get clean; \
rm -rf /var/lib/apt/lists/*
# Create a non-root user # Create a non-root user
RUN set -eux; \ RUN set -eux; \
@@ -30,38 +47,21 @@ RUN set -eux; \
# Install Rust # Install Rust
RUN set -eux; \ RUN set -eux; \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_VERSION; \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_VERSION --profile minimal; \
chown -R $USERNAME:$USERNAME $RUSTUP_HOME $CARGO_HOME; \ chown -R $USERNAME:$USERNAME $RUSTUP_HOME $CARGO_HOME; \
rustup --version; \ rustup --version; \
cargo --version; \ cargo --version; \
rustc --version rustc --version
# Install Node.js # Install Node.js and global npm packages
RUN set -eux; \ RUN set -eux; \
curl -fsSL https://deb.nodesource.com/setup_20.x | bash -; \ curl -fsSL https://deb.nodesource.com/setup_20.x | bash -; \
apt-get install -y nodejs; \ apt-get install -y --no-install-recommends nodejs; \
corepack enable; \ corepack enable; \
# Install diff-so-fancy npm install -g diff-so-fancy; \
npm install -g diff-so-fancy # Clean up apt cache
apt-get clean; \
# Install openconnect rm -rf /var/lib/apt/lists/*
RUN set -eux; \
add-apt-repository ppa:yuezk/globalprotect-openconnect; \
apt-get update; \
apt-get install -y openconnect libopenconnect-dev
# Tauri dependencies
RUN set -eux; \
apt-get install -y \
libwebkit2gtk-4.1-dev \
build-essential \
curl \
wget \
file \
libxdo-dev \
libssl-dev \
libayatana-appindicator3-dev \
librsvg2-dev
USER $USERNAME USER $USERNAME
+4
View File
@@ -8,5 +8,9 @@ end_of_line = lf
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[{*.c,*.h}]
indent_style = tab
indent_size = 8
[{Makefile,Makefile.in}] [{Makefile,Makefile.in}]
indent_style = tab indent_style = tab
+88 -11
View File
@@ -1,5 +1,6 @@
name: Build name: Build
on: on:
workflow_dispatch:
push: push:
paths-ignore: paths-ignore:
- LICENSE - LICENSE
@@ -14,6 +15,11 @@ on:
- release/* - release/*
tags: tags:
- v*.*.* - v*.*.*
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
# Include arm64 if ref is a tag # Include arm64 if ref is a tag
setup-matrix: setup-matrix:
@@ -26,7 +32,7 @@ jobs:
run: | run: |
# Set the matrix to include arm64 if the ref is a tag or is the dev branch # Set the matrix to include arm64 if the ref is a tag or is the dev branch
if [[ "${{ github.ref }}" == "refs/tags/"* || "${{ github.ref }}" == "refs/heads/dev" ]]; then if [[ "${{ github.ref }}" == "refs/tags/"* || "${{ github.ref }}" == "refs/heads/dev" ]]; then
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}, {"runner": "arm64", "arch": "arm64"}]' >> $GITHUB_OUTPUT echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}, {"runner": "ubuntu-24.04-arm", "arch": "ubuntu-24.04-arm"}]' >> $GITHUB_OUTPUT
else else
echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}]' >> $GITHUB_OUTPUT echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}]' >> $GITHUB_OUTPUT
fi fi
@@ -39,7 +45,8 @@ jobs:
with: with:
version: 9 version: 9
- name: Prepare workspace - name: Prepare workspace
run: rm -rf source && mkdir source run: rm -rf source && mkdir -p source/artifacts
- name: Checkout GlobalProtect-openconnect - name: Checkout GlobalProtect-openconnect
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@@ -47,6 +54,8 @@ jobs:
repository: yuezk/GlobalProtect-openconnect repository: yuezk/GlobalProtect-openconnect
ref: ${{ github.ref }} ref: ${{ github.ref }}
path: source/gp path: source/gp
submodules: recursive
- name: Create tarball - name: Create tarball
run: | run: |
cd source/gp cd source/gp
@@ -55,13 +64,69 @@ jobs:
touch SNAPSHOT touch SNAPSHOT
fi fi
make tarball make tarball
mv -v .build/tarball/*.tar.gz ../artifacts/
- name: Generate RPM spec file
env:
RELEASE_TAG: ${{ github.ref == 'refs/heads/dev' && 'snapshot' || github.ref_name }}
run: |
cd source/gp
make init-rpm \
REVISION='1%{?dist}' \
RPM_SOURCE=https://github.com/yuezk/GlobalProtect-openconnect/releases/download/${RELEASE_TAG}/%{name}-%{version}.tar.gz
mv -v .build/rpm/*.spec ../artifacts/
- name: Upload tarball - name: Upload tarball
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: artifact-source name: artifact-source
if-no-files-found: error if-no-files-found: error
path: | path: |
source/gp/.build/tarball/*.tar.gz source/artifacts/*
tarball-offline:
if: ${{ github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/') }}
runs-on: ubuntu-latest
needs:
- tarball
steps:
- uses: pnpm/action-setup@v4
with:
version: 9
- name: Prepare workspace
run: rm -rf source-offline && mkdir source-offline
- name: Download tarball
uses: actions/download-artifact@v4
with:
name: artifact-source
path: source-offline
- name: Create offline tarball
run: |
cd source-offline
offline_tarball=$(basename *.tar.gz .tar.gz).offline.tar.gz
# Extract the tarball
tar -xzf *.tar.gz
cd */
make tarball OFFLINE=1
# Rename the tarball to .offline.tar.gz
mv -v .build/tarball/*.tar.gz ../$offline_tarball
- name: Upload offline tarball
uses: actions/upload-artifact@v4
with:
path: source-offline/*.offline.tar.gz
name: artifact-source-offline
if-no-files-found: error
build-gp: build-gp:
needs: needs:
@@ -69,9 +134,8 @@ jobs:
- tarball - tarball
strategy: strategy:
matrix: matrix:
# Only build gp on amd64, as the arm64 package will be built in release.yaml os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
os: [{runner: ubuntu-latest, arch: amd64}] package: [deb, rpm, pkg, binary, ubuntu-rolling]
package: [deb, rpm, pkg, binary]
runs-on: ${{ matrix.os.runner }} runs-on: ${{ matrix.os.runner }}
name: build-gp (${{ matrix.package }}, ${{ matrix.os.arch }}) name: build-gp (${{ matrix.package }}, ${{ matrix.os.arch }})
steps: steps:
@@ -87,18 +151,24 @@ jobs:
- name: Docker Login - name: Docker Login
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build ${{ matrix.package }} package in Docker - name: Build ${{ matrix.package }} package in Docker
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
run: | run: |
docker run --pull=always --rm \ docker run --pull=always --rm \
-v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \ -e COREPACK_INTEGRITY_KEYS=0 \
-e LIBXML2_STATIC=1 \
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 yuezk/gpdev:${{ matrix.package }}-builder-tauri2
- name: Install ${{ matrix.package }} package in Docker - name: Install ${{ matrix.package }} package in Docker
run: | run: |
docker run --pull=always --rm \ docker run --pull=always --rm \
-e COREPACK_INTEGRITY_KEYS=0 \
-e GPGUI_INSTALLED=0 \ -e GPGUI_INSTALLED=0 \
-v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \ -v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \ yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
bash install.sh bash install.sh
# Don't upload package for ubuntu-rolling because it's duplicate of deb package
- name: Upload ${{ matrix.package }} package - name: Upload ${{ matrix.package }} package
if: ${{ matrix.package != 'ubuntu-rolling' }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: artifact-gp-${{ matrix.package }}-${{ matrix.os.arch }} name: artifact-gp-${{ matrix.package }}-${{ matrix.os.arch }}
@@ -127,6 +197,7 @@ jobs:
repository: yuezk/GlobalProtect-openconnect repository: yuezk/GlobalProtect-openconnect
ref: ${{ github.ref }} ref: ${{ github.ref }}
path: gpgui-source/gp path: gpgui-source/gp
submodules: recursive
- name: Checkout gpgui@${{ github.ref_name }} - name: Checkout gpgui@${{ github.ref_name }}
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@@ -142,13 +213,17 @@ jobs:
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build gpgui in Docker - name: Build gpgui in Docker
run: | run: |
docker run --pull=always --rm -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder-tauri2 docker run --pull=always --rm \
-e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd)/gpgui-source:/workspace yuezk/gpdev:gpgui-builder-tauri2
- name: Install gpgui in Docker - name: Install gpgui in Docker
run: | run: |
cd gpgui-source cd gpgui-source
tar -xJf *.bin.tar.xz tar -xJf *.bin.tar.xz
docker run --pull=always --rm -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder-tauri2 \ docker run --pull=always --rm \
bash -c "cd /gpgui/gpgui_*/ && ./gpgui --version" -e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd):/workspace yuezk/gpdev:gpgui-builder-tauri2 \
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
- name: Upload gpgui - name: Upload gpgui
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
@@ -163,6 +238,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
- tarball - tarball
- tarball-offline
- build-gp - build-gp
- build-gpgui - build-gpgui
@@ -177,6 +253,7 @@ jobs:
repository: yuezk/GlobalProtect-openconnect repository: yuezk/GlobalProtect-openconnect
ref: ${{ github.ref }} ref: ${{ github.ref }}
path: gh-release/gp path: gh-release/gp
submodules: recursive
- name: Download all artifacts - name: Download all artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@@ -1,4 +1,4 @@
name: Publish Packages name: Publish PPA
on: on:
workflow_dispatch: workflow_dispatch:
@@ -8,24 +8,18 @@ on:
required: true required: true
revision: revision:
description: 'Package revision' description: 'Package revision'
required: true required: false
default: "1" default: "1"
ppa: series:
description: 'Publish to PPA' description: 'Ubuntu series to publish'
type: boolean type: "string"
required: false
default: ""
rust:
description: 'Rust version to use'
type: "string"
required: true required: true
default: true default: "1.85"
obs:
description: 'Publish to OBS'
type: boolean
required: true
default: true
aur:
description: 'Publish to AUR'
type: boolean
required: true
default: true
jobs: jobs:
check: check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -44,7 +38,6 @@ jobs:
publish-ppa: publish-ppa:
needs: check needs: check
if: ${{ inputs.ppa }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
@@ -52,22 +45,26 @@ jobs:
version: 9 version: 9
- name: Prepare workspace - name: Prepare workspace
run: rm -rf publish-ppa && mkdir publish-ppa run: rm -rf publish-ppa && mkdir publish-ppa
- name: Download ${{ inputs.tag }} source code - name: Download ${{ inputs.tag }} offline source code
uses: robinraju/[email protected] env:
with: GH_TOKEN: ${{ secrets.GH_PAT }}
token: ${{ secrets.GH_PAT }} run: |
tag: ${{ inputs.tag }} gh -R yuezk/GlobalProtect-openconnect \
fileName: globalprotect-openconnect-*.tar.gz release download ${{ inputs.tag }} \
tarBall: false --pattern '*.offline.tar.gz' \
zipBall: false --dir publish-ppa
out-file-path: publish-ppa - name: Patch the source code
- name: Make the offline tarball
run: | run: |
cd publish-ppa cd publish-ppa
tar -xf globalprotect-openconnect-*.tar.gz
cd globalprotect-openconnect-*/
make tarball OFFLINE=1 # Rename the source tarball without the offline suffix
mv -v *.tar.gz $(basename *.tar.gz .offline.tar.gz).tar.gz
# Extract the source tarball
tar -xzf *.tar.gz
# Prepare the debian directory with custom files
cd globalprotect-openconnect-*/
# Prepare the debian directory with custom files # Prepare the debian directory with custom files
mkdir -p .build/debian mkdir -p .build/debian
@@ -77,11 +74,13 @@ jobs:
cp -v packaging/deb/compat .build/debian/compat cp -v packaging/deb/compat .build/debian/compat
cp -v packaging/deb/postrm .build/debian/postrm cp -v packaging/deb/postrm .build/debian/postrm
sed -i "s/@RUST@/cargo-1.80/g" .build/debian/control
sed -i "s/@OFFLINE@/1/g" .build/debian/rules sed -i "s/@OFFLINE@/1/g" .build/debian/rules
sed -i "s/@BUILD_GUI@/1/g" .build/deb/debian/rules sed -i "s/@BUILD_GUI@/1/g" .build/debian/rules
sed -i "s/@RUST_VERSION@/1.80/g" .build/deb/debian/rules
# Update the control file with the correct Rust version
# sed -i "s/rust-[0-9.]\+-all/rust-${{ inputs.rust }}-all/g" .build/debian/control
# sed -i "s/rust-[0-9.]\+/rust-${{ inputs.rust }}/g" .build/debian/rules
sed -i "s/DISABLE_RUST_TOOLCHAIN = 0/DISABLE_RUST_TOOLCHAIN = 1/g" .build/debian/rules
- name: Publish to PPA - name: Publish to PPA
uses: yuezk/publish-ppa-package@gp uses: yuezk/publish-ppa-package@gp
@@ -89,11 +88,12 @@ jobs:
repository: "yuezk/globalprotect-openconnect" repository: "yuezk/globalprotect-openconnect"
gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }} gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }} gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
tarball: publish-ppa/globalprotect-openconnect-*/.build/tarball/*.tar.gz tarball: publish-ppa/globalprotect-openconnect-*.tar.gz
debian_dir: publish-ppa/globalprotect-openconnect-*/.build/debian debian_dir: publish-ppa/globalprotect-openconnect-*/.build/debian
deb_email: "[email protected]" deb_email: "[email protected]"
deb_fullname: "Kevin Yue" deb_fullname: "Kevin Yue"
extra_ppa: "yuezk/globalprotect-openconnect liushuyu-011/rust-updates-1.80" extra_ppa: "yuezk/globalprotect-openconnect"
# Ubuntu 18.04 and 20.04 are excluded because tauri2 no longer supports them # Ubuntu 18.04 and 20.04 are excluded because tauri2 no longer supports them
excluded_series: "bionic focal" excluded_series: "bionic focal"
series: ${{ inputs.series }}
revision: ${{ inputs.revision }} revision: ${{ inputs.revision }}
+15 -12
View File
@@ -73,9 +73,9 @@ jobs:
const inputs = ${{ toJson(inputs) }} const inputs = ${{ toJson(inputs) }}
const { arch } = inputs const { arch } = inputs
const osMap = { const osMap = {
"all": ["ubuntu-latest", "arm64"], "all": ["ubuntu-latest", "ubuntu-24.04-arm"],
"x86_64": ["ubuntu-latest"], "x86_64": ["ubuntu-latest"],
"arm64": ["arm64"] "arm64": ["ubuntu-24.04-arm"]
} }
const package = Object.entries(inputs) const package = Object.entries(inputs)
@@ -96,28 +96,31 @@ jobs:
steps: steps:
- name: Prepare workspace - name: Prepare workspace
run: rm -rf build-${{ matrix.package }} && mkdir -p build-${{ matrix.package }} run: rm -rf build-${{ matrix.package }} && mkdir -p build-${{ matrix.package }}
- name: Download ${{ inputs.tag }} source code - name: Download ${{ inputs.tag }} source code
uses: robinraju/[email protected] env:
with: GH_TOKEN: ${{ secrets.GH_PAT }}
token: ${{ secrets.GH_PAT }} run: |
tag: ${{ inputs.tag }} gh -R yuezk/GlobalProtect-openconnect \
fileName: globalprotect-openconnect-*.tar.gz release download ${{ inputs.tag }} \
tarBall: false --pattern '*[^offline].tar.gz' \
zipBall: false --dir build-${{ matrix.package }}
out-file-path: build-${{ matrix.package }}
- name: Docker Login - name: Docker Login
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
- name: Build ${{ matrix.package }} package in Docker - name: Build ${{ matrix.package }} package in Docker
run: | run: |
docker run --pull=always --rm \ docker run --pull=always --rm \
-v $(pwd)/build-${{ matrix.package }}:/${{ matrix.package }} \ -v $(pwd)/build-${{ matrix.package }}:/workspace \
-e COREPACK_INTEGRITY_KEYS=0 \
-e INCLUDE_GUI=1 \ -e INCLUDE_GUI=1 \
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 yuezk/gpdev:${{ matrix.package }}-builder-tauri2
- name: Install ${{ matrix.package }} package in Docker - name: Install ${{ matrix.package }} package in Docker
run: | run: |
docker run --pull=always --rm \ docker run --pull=always --rm \
-v $(pwd)/build-${{ matrix.package }}:/${{ matrix.package }} \ -e COREPACK_INTEGRITY_KEYS=0 \
-v $(pwd)/build-${{ matrix.package }}:/workspace \
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \ yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
bash install.sh bash install.sh
+3
View File
@@ -11,3 +11,6 @@ SNAPSHOT
# Tauri generated files # Tauri generated files
gen gen
# Nix files
result
+6
View File
@@ -0,0 +1,6 @@
[submodule "crates/openconnect/deps/openconnect"]
path = crates/openconnect/deps/openconnect
url = https://gitlab.com/openconnect/openconnect.git
[submodule "crates/openconnect/deps/libxml2"]
path = crates/openconnect/deps/libxml2
url = https://gitlab.gnome.org/GNOME/libxml2.git
+14
View File
@@ -0,0 +1,14 @@
{
"configurations": [
{
"name": "Mac",
"includePath": ["crates/openconnect/deps/openconnect"],
"macFrameworkPath": ["/System/Library/Frameworks", "/Library/Frameworks"],
"intelliSenseMode": "macos-clang-x64",
"compilerPath": "/usr/bin/clang",
"cStandard": "c17",
"cppStandard": "c++17"
}
],
"version": 4
}
+11
View File
@@ -23,8 +23,12 @@
"gpgui", "gpgui",
"gpservice", "gpservice",
"hidpi", "hidpi",
"Ivars",
"jnlp", "jnlp",
"LOGNAME", "LOGNAME",
"NSHTTPURL",
"NSURL",
"objc",
"oneshot", "oneshot",
"openconnect", "openconnect",
"pkcs", "pkcs",
@@ -55,9 +59,16 @@
"Vite", "Vite",
"vpnc", "vpnc",
"vpninfo", "vpninfo",
"webbrowser",
"wmctrl", "wmctrl",
"XAUTHORITY", "XAUTHORITY",
"yuezk" "yuezk"
], ],
"rust-analyzer.cargo.features": "all", "rust-analyzer.cargo.features": "all",
"files.associations": {
"unistd.h": "c",
"utsname.h": "c",
"vpn.h": "c",
"openconnect.h": "c"
},
} }
Generated
+1717 -1234
View File
File diff suppressed because it is too large. Load diff
+25 -12
View File
@@ -1,23 +1,32 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"] members = [
"crates/*",
"apps/gpclient",
"apps/gpservice",
"apps/gpauth",
"apps/gpgui-helper/src-tauri",
]
[workspace.package] [workspace.package]
rust-version = "1.80" rust-version = "1.85"
version = "2.4.0" version = "2.5.1"
authors = ["Kevin Yue <[email protected]>"] authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect" homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2021" edition = "2024"
license = "GPL-3.0" license = "GPL-3.0"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0" anyhow = "1.0"
askama = "0.14"
base64 = "0.22" base64 = "0.22"
chrono = "0.4"
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
clap-verbosity-flag = "3"
ctrlc = "3.4" ctrlc = "3.4"
directories = "5.0" directories = "6.0"
dns-lookup = "2.0.4" dns-lookup = "3"
env_logger = "0.11" env_logger = "0.11"
is_executable = "1.0" is_executable = "1.0"
log = "0.4" log = "0.4"
@@ -25,16 +34,17 @@ regex = "1"
reqwest = { version = "0.12", features = ["native-tls", "json"] } reqwest = { version = "0.12", features = ["native-tls", "json"] }
openssl = "0.10" openssl = "0.10"
pem = "3" pem = "3"
roxmltree = "0.20" xmltree = "0.12"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
sysinfo = "0.33" # Use 0.36 as newer versions requires Rust 1.88+
sysinfo = "0.36"
tempfile = "3.8" tempfile = "3.8"
tokio = { version = "1", features = ["full"] } tokio = { version = "1" }
tokio-util = "0.7" tokio-util = "0.7"
url = "2.4" url = "2.4"
urlencoding = "2.1.3" urlencoding = "2.1.3"
axum = "0.7" axum = "0.8"
futures = "0.3" futures = "0.3"
futures-util = "0.3" futures-util = "0.3"
uzers = "0.12" uzers = "0.12"
@@ -43,9 +53,12 @@ thiserror = "2"
redact-engine = "0.1" redact-engine = "0.1"
compile-time = "0.2" compile-time = "0.2"
serde_urlencoded = "0.7" serde_urlencoded = "0.7"
md5="0.7" md5 = "0.8"
sha256 = "1" sha256 = "1"
which="7" which = "8"
uuid = "1"
netdev = "0.40"
machine-uid = "0.5"
# Tauri dependencies # Tauri dependencies
tauri = { version = "2" } tauri = { version = "2" }
+27 -12
View File
@@ -4,10 +4,12 @@ OFFLINE ?= 0
BUILD_FE ?= 1 BUILD_FE ?= 1
INCLUDE_GUI ?= 0 INCLUDE_GUI ?= 0
CARGO ?= cargo CARGO ?= cargo
RUST_VERSION = 1.80 DISABLE_RUST_TOOLCHAIN ?= 0
VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version') VERSION = $(shell grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/')
REVISION ?= 1 REVISION ?= 1
RPM_SOURCE ?= %{name}.tar.gz
PPA_REVISION ?= 1 PPA_REVISION ?= 1
PKG_NAME = globalprotect-openconnect PKG_NAME = globalprotect-openconnect
PKG = $(PKG_NAME)-$(VERSION) PKG = $(PKG_NAME)-$(VERSION)
@@ -100,12 +102,16 @@ build-rs:
tar -xJf vendor.tar.xz; \ tar -xJf vendor.tar.xz; \
fi fi
# Remove the rust-toolchain.toml if DISABLE_RUST_TOOLCHAIN is set to 1
if [ $(DISABLE_RUST_TOOLCHAIN) -eq 1 ]; then \
rm -vf rust-toolchain.toml; \
fi
# Only build the GUI components if BUILD_GUI is set to 1 # Only build the GUI components if BUILD_GUI is set to 1
if [ $(BUILD_GUI) -eq 1 ]; then \ if [ $(BUILD_GUI) -eq 1 ]; then \
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth; \ $(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth -p gpgui-helper; \
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"; \
else \ else \
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth --no-default-features; \ $(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth; \
fi fi
clean: clean:
@@ -130,6 +136,13 @@ install:
install -Dm755 .build/gpgui/gpgui_*/gpgui $(DESTDIR)/usr/bin/gpgui; \ install -Dm755 .build/gpgui/gpgui_*/gpgui $(DESTDIR)/usr/bin/gpgui; \
fi fi
# Install the HIP report script
install -Dm755 packaging/files/usr/libexec/gpclient/hipreport.sh $(DESTDIR)/usr/libexec/gpclient/hipreport.sh
# Install the disconnect hooks
install -Dm755 packaging/files/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down
install -Dm755 packaging/files/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
install -Dm644 packaging/files/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop install -Dm644 packaging/files/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
install -Dm644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png install -Dm644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
@@ -146,6 +159,11 @@ uninstall:
rm -f $(DESTDIR)/usr/bin/gpgui-helper rm -f $(DESTDIR)/usr/bin/gpgui-helper
rm -f $(DESTDIR)/usr/bin/gpgui rm -f $(DESTDIR)/usr/bin/gpgui
rm -f $(DESTDIR)/usr/libexec/gpclient/hipreport.sh
rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down
rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook
rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
@@ -171,11 +189,9 @@ init-debian: clean-debian tarball
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules
sed -i "s/@BUILD_GUI@/$(BUILD_GUI)/g" .build/deb/$(PKG)/debian/rules sed -i "s/@BUILD_GUI@/$(BUILD_GUI)/g" .build/deb/$(PKG)/debian/rules
sed -i "s/@RUST_VERSION@/$(RUST_VERSION)/g" .build/deb/$(PKG)/debian/rules
# Remove the GUI dependencies if BUILD_GUI is set to 0 # Remove the GUI dependencies if BUILD_GUI is set to 0
if [ $(BUILD_GUI) -eq 0 ]; then \ if [ $(BUILD_GUI) -eq 0 ]; then \
sed -i "/libxml2/d" .build/deb/$(PKG)/debian/control; \
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 "/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; \
@@ -185,11 +201,11 @@ init-debian: clean-debian tarball
rm -f .build/deb/$(PKG)/debian/changelog rm -f .build/deb/$(PKG)/debian/changelog
deb: init-debian deb: init-debian
# Remove the rust build dependency from the control file
sed -i "s/@RUST@//g" .build/deb/$(PKG)/debian/control
cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements." cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
# Install build dependencies
cd .build/deb/$(PKG) && sudo mk-build-deps --install --remove debian/control
cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b
check-ppa: check-ppa:
@@ -199,8 +215,6 @@ check-ppa:
# Usage: make ppa SERIES=focal OFFLINE=1 PUBLISH=1 # Usage: make ppa SERIES=focal OFFLINE=1 PUBLISH=1
ppa: check-ppa init-debian ppa: check-ppa init-debian
sed -i "s/@RUST@/cargo-1.80/g" .build/deb/$(PKG)/debian/control
$(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1)) $(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1))
@echo "Building for $(SERIES) $(SERIES_VER)" @echo "Building for $(SERIES) $(SERIES_VER)"
@@ -227,6 +241,7 @@ init-rpm: clean-rpm
sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
sed -i "s|@SOURCE@|$(RPM_SOURCE)|g" .build/rpm/globalprotect-openconnect.spec
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/rpm/globalprotect-openconnect.spec sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/rpm/globalprotect-openconnect.spec
sed -i "s/@DATE@/$(shell LC_ALL=en.US date "+%a %b %d %Y")/g" .build/rpm/globalprotect-openconnect.spec sed -i "s/@DATE@/$(shell LC_ALL=en.US date "+%a %b %d %Y")/g" .build/rpm/globalprotect-openconnect.spec
+289 -97
View File
@@ -1,32 +1,52 @@
# GlobalProtect-openconnect # GlobalProtect-openconnect
A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method. Inspired by [gp-saml-gui](https://github.com/dlenski/gp-saml-gui). A modern GlobalProtect VPN client for Linux, built on OpenConnect with full support for SSO authentication. This project provides both command-line and graphical interfaces for seamless VPN connectivity.
<p align="center"> <p align="center">
<img width="300" src="https://github.com/yuezk/GlobalProtect-openconnect/assets/3297602/9242df9c-217d-42ab-8c21-8f9f69cd4eb5"> <img width="300" src="https://github.com/user-attachments/assets/2fb6116c-dc57-43f2-af75-9c3d97ab7122">
</p> </p>
> **Inspired by** [gp-saml-gui](https://github.com/dlenski/gp-saml-gui)
## Table of Contents
- [Features](#features)
- [Usage](#usage)
- [Command-Line Interface](#command-line-interface)
- [Graphical User Interface](#graphical-user-interface)
- [Installation](#installation)
- [Debian / Ubuntu](#debian--ubuntu)
- [Arch Linux / Manjaro](#arch-linux--manjaro)
- [Fedora 38+ / Rawhide](#fedora-38--rawhide)
- [openSUSE Leap 15.6+ / Tumbleweed](#opensuse-leap-156--tumbleweed)
- [Other RPM-based Distributions](#other-rpm-based-distributions)
- [Gentoo](#gentoo)
- [NixOS](#nixos)
- [Other Distributions](#other-distributions)
- [Building from Source](#building-from-source)
- [Frequently Asked Questions](#frequently-asked-questions)
- [License](#license)
## Features ## Features
- [x] Better Linux support - **Cross-Platform Linux Support** – Optimized for various Linux distributions
- [x] Support both CLI and GUI - **Dual Interface** – Available as both CLI and GUI applications
- [x] Support both SSO and non-SSO authentication - **Flexible Authentication** – Supports SSO, non-SSO, FIDO2 (e.g., YubiKey), and client certificate authentication
- [x] Support the FIDO2 authentication (e.g., YubiKey) - **Browser Integration** – Authenticate using your default browser or any specified browser
- [x] Support authentication using default browser - **Multi-Portal Support** – Connect to multiple portals and gateways
- [x] Support client certificate authentication - **Direct Gateway Connection** – Bypass portal selection when needed
- [x] Support multiple portals - **Auto-Connect** – Automatically connect on system startup
- [x] Support gateway selection - **System Tray Integration** – Convenient system tray icon (requires [gnome-shell-extension-appindicator](https://extensions.gnome.org/extension/615/appindicator-support/) on GNOME)
- [x] Support connect gateway directly
- [x] Support auto-connect on startup
- [x] Support system tray icon
## Usage ## Usage
### CLI ### Command-Line Interface
The CLI version is always free and open source in this repo. It has almost the same features as the GUI version. The CLI version is fully open source and feature-rich, providing nearly identical functionality to the GUI version.
``` #### Basic Commands
```bash
Usage: gpclient [OPTIONS] <COMMAND> Usage: gpclient [OPTIONS] <COMMAND>
Commands: Commands:
@@ -36,58 +56,66 @@ Commands:
help Print this message or the help of the given subcommand(s) help Print this message or the help of the given subcommand(s)
Options: Options:
--fix-openssl Get around the OpenSSL `unsafe legacy renegotiation` error --fix-openssl Get around the OpenSSL 'unsafe legacy renegotiation' error
--ignore-tls-errors Ignore the TLS errors --ignore-tls-errors Ignore TLS errors
-h, --help Print help -h, --help Print help
-V, --version Print version -V, --version Print version
See 'gpclient help <command>' for more information on a specific command.
``` ```
To use the external browser for authentication with the CLI version, you need to use the following command: > **Tip:** Use `gpclient help <command>` for detailed information on a specific command.
#### External Browser Authentication
For browser-based authentication with the CLI:
**Method 1:** Using sudo with environment preservation:
```bash
sudo -E gpclient connect --browser <portal>
```
**Method 2:** Using authentication piping:
```bash
gpauth <portal> --browser 2>/dev/null | sudo gpclient connect <portal> --cookie-on-stdin
```
**Browser Options:**
- 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
The GUI application provides an intuitive interface for managing VPN connections. Launch it from your application menu or via the terminal:
```bash ```bash
sudo -E gpclient connect --browser default <portal> gpclient launch-gui
``` ```
Or you can try the following command if the above command does not work:
```bash
gpauth <portal> --browser default 2>/dev/null | sudo gpclient connect <portal> --cookie-on-stdin
```
You can specify the browser with the `--browser <browser>` option, e.g., `--browser firefox`, `--browser chrome`, etc.
### GUI
The GUI version is also available after you installed it. You can launch it from the application menu or run `gpclient launch-gui` in the terminal.
> [!Note] > [!Note]
> >
> The GUI version is partially open source. Its background service is open sourced in this repo as [gpservice](./apps/gpservice/). The GUI part is a wrapper of the background service, which is not open sourced. > The GUI version is partially open source. The background service ([gpservice](./apps/gpservice/)) is open source, while the GUI wrapper is proprietary.
## Installation ## Installation
### Debian/Ubuntu based distributions ### Debian / Ubuntu
#### Install from PPA (Ubuntu > 18.04) #### Option 1: Install from PPA (Recommended)
``` ```bash
sudo add-apt-repository ppa:yuezk/globalprotect-openconnect sudo add-apt-repository ppa:yuezk/globalprotect-openconnect
sudo apt-get update
sudo apt-get install globalprotect-openconnect sudo apt-get install globalprotect-openconnect
``` ```
> [!Note] > [!Note]
> >
> For Linux Mint, you might need to import the GPG key with: `sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7937C393082992E5D6E4A60453FC26B43838D761` if you encountered an error `gpg: keyserver receive failed: General error`. > **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
> ```
#### **Ubuntu 18.04** #### Option 2: Install from DEB Package
The latest package is not available in the PPA, but you still needs to add the `ppa:yuezk/globalprotect-openconnect` repo beforehand to use the required `openconnect` package. Then you can follow the [Install from deb package](#install-from-deb-package) section to install the latest package. Download the latest `.deb` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install:
#### Install from deb package
Download the latest deb package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Then install it with `apt`:
```bash ```bash
sudo apt install --fix-broken globalprotect-openconnect_*.deb sudo apt install --fix-broken globalprotect-openconnect_*.deb
@@ -95,44 +123,60 @@ sudo apt install --fix-broken globalprotect-openconnect_*.deb
### Arch Linux / Manjaro ### Arch Linux / Manjaro
#### Install from AUR #### Option 1: Install from AUR
Install from AUR: [globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/) 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
yay -S globalprotect-openconnect-git yay -S globalprotect-openconnect-git
``` ```
#### Install from package #### Option 2: Install from the Official Extra Repository
Download the latest package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Then install it with `pacman`: The package is also available in the official Arch Linux Extra 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 ```bash
sudo pacman -U globalprotect-openconnect-*.pkg.tar.zst sudo pacman -U globalprotect-openconnect-*.pkg.tar.zst
``` ```
### Fedora 38 and later / Fedora Rawhide ### Fedora 38+ / Rawhide
#### Install from COPR #### Install from COPR
The package is available on [COPR](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/) for various RPM-based distributions. You can install it with the following commands: 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 / openSUSE Tumbleweed ### openSUSE Leap 15.6+ / Tumbleweed
#### Install from OBS (openSUSE Build Service) #### Install from OBS (openSUSE Build Service)
The package is also available on [OBS](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect) for various RPM-based distributions. You can follow the instructions [on this page](https://software.opensuse.org//download.html?project=home%3Ayuezk&package=globalprotect-openconnect) to install it. 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 ### Other RPM-based Distributions
#### Install from RPM package #### Install from RPM Package
Download the latest RPM package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Download the latest RPM package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page:
```bash ```bash
sudo rpm -i globalprotect-openconnect-*.rpm sudo rpm -i globalprotect-openconnect-*.rpm
@@ -140,67 +184,215 @@ sudo rpm -i globalprotect-openconnect-*.rpm
### Gentoo ### Gentoo
It is available via `guru` and `lamdness` overlays. Available via the `guru` and `lamdness` overlays:
```bash ```bash
sudo eselect repository enable guru sudo eselect repository enable guru
sudo emerge -r guru sync sudo emerge --sync guru
sudo emerge -av net-vpn/globalprotect-openconnect sudo emerge --ask --verbose net-vpn/GlobalProtect-openconnect
``` ```
### Other distributions ### NixOS
- Install `openconnect >= 8.20`, `webkit2gtk`, `libsecret`, `libayatana-appindicator` or `libappindicator-gtk3`. This repository includes a flake for NixOS integration.
- Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
- Extract the tarball with `tar -xJf globalprotect-openconnect_${version}_${arch}.bin.tar.xz`.
- Run `sudo make install` to install the client.
## Build from source #### Installation Steps
You can also build the client from source, steps are as follows: 1. Add the flake to your `flake.nix`:
### Prerequisites ```nix
{
inputs = {
# ... other inputs
globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect";
};
- [Install Rust 1.80 or later](https://www.rust-lang.org/tools/install) outputs = { nixpkgs, ... }@inputs: {
- Install Tauri dependencies: https://tauri.app/start/prerequisites/ nixosConfigurations.<your-host> = nixpkgs.lib.nixosSystem {
- Install `perl` and `jq` specialArgs = { inherit inputs; };
- Install `openconnect >= 8.20` and `libopenconnect-dev` (or `openconnect-devel` on RPM-based distributions) modules = [
- Install `pkexec`, `gnome-keyring` (or `pam_kwallet` on KDE) ./configuration.nix
- Install `nodejs` and `pnpm` (optional only if you downloaded the source tarball from the release page and run with the `BUILD_FE=0` flag, see below) ];
};
};
}
```
### Build 2. Add the package to your `configuration.nix`:
1. Download the source code tarball from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Choose `globalprotect-openconnect-${version}.tar.gz`. ```nix
2. Extract the tarball with `tar -xzf globalprotect-openconnect-${version}.tar.gz`. { config, pkgs, inputs, ... }:
3. Enter the source directory and run `make build BUILD_FE=0` to build the client.
3. Run `sudo make install` to install the client. (Note, `DESTDIR` is not supported)
## FAQ {
# ... other configurations
environment.systemPackages = with pkgs; [
# ... other packages
] ++ [
inputs.globalprotect-openconnect.packages.${pkgs.system}.default
];
}
```
1. How to deal with error `Secure Storage not ready` 3. Apply the changes:
Try upgrade the client to `2.2.0` or later, which will use a file-based storage as a fallback. ```bash
sudo nixos-rebuild switch
```
You need to install the `gnome-keyring` package, and restart the system (See [#321](https://github.com/yuezk/GlobalProtect-openconnect/issues/321), [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)). ### Other Distributions
2. How to deal with error `(gpauth:18869): Gtk-WARNING **: 10:33:37.566: cannot open display:` #### Manual Installation
If you encounter this error when using the CLI version, try to run the command with `sudo -E` (See [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)). 1. **Install dependencies:**
- `webkit2gtk`
- `libsecret`
- `libayatana-appindicator` or `libappindicator-gtk3`
## About Trial 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
```
The CLI version is always free, while the GUI version is paid. There are two trial modes for the GUI version: 3. **Install:**
```bash
sudo make install
```
1. 10-day trial: You can use the GUI stable release for 10 days after the installation. ## Building from Source
2. 14-day trial: Each beta release has a fresh trial period (at most 14 days) after released.
## License You can build the application from source using either a DevContainer (recommended) or a local development environment.
- crate [gpapi](./crates/gpapi): [MIT](./crates/gpapi/LICENSE) ### Method 1: Using DevContainer (Recommended)
- crate [openconnect](./crates/openconnect): [GPL-3.0](./crates/openconnect/LICENSE)
- crate [common](./crates/common): [GPL-3.0](./crates/common/LICENSE) This project includes a DevContainer configuration that provides a consistent, reproducible build environment with all dependencies pre-installed.
- crate [auth](./crates/auth): [GPL-3.0](./crates/auth/LICENSE)
- app [gpservice](./apps/gpservice): [GPL-3.0](./apps/gpservice/LICENSE) #### Prerequisites
- app [gpclient](./apps/gpclient): [GPL-3.0](./apps/gpclient/LICENSE)
- app [gpauth](./apps/gpauth): [GPL-3.0](./apps/gpauth/LICENSE) - [Docker](https://docs.docker.com/get-docker/)
- app [gpgui-helper](./apps/gpgui-helper): [GPL-3.0](./apps/gpgui-helper/LICENSE) - [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:**
```bash
docker run --privileged --cap-add=NET_ADMIN --device=/dev/net/tun \
-v "$(pwd)":/workspace -w /workspace gpoc-devcontainer \
bash -c "export PATH=/usr/local/cargo/bin:\$PATH && make build"
```
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
#### 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.85 or later](https://www.rust-lang.org/tools/install)
- [Tauri dependencies](https://tauri.app/start/prerequisites/)
- `libopenconnect-dev` (or `openconnect-devel` on RPM-based systems)
- `pkexec` and `gnome-keyring` (or `pam_kwallet` on KDE)
- `nodejs` and `pnpm` (optional if using pre-built release tarballs with `BUILD_FE=0`)
#### 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 BUILD_FE=0
```
3. **Install:**
```bash
sudo make install
```
> **Note:** `DESTDIR` is not currently supported.
### Testing Your Build
Verify the CLI client is working correctly:
```bash
./target/release/gpclient --help
```
### Build Options
- `BUILD_GUI=0` – Build CLI components only (excludes GUI)
- `BUILD_FE=0` – Skip frontend build (uses pre-built assets)
- `OFFLINE=1` – Build in offline mode using vendored dependencies
## Frequently Asked Questions
### Q: How do I resolve the "Secure Storage not ready" error?
**Solution 1:** Update to version 2.2.0 or later, which includes a file-based storage fallback.
**Solution 2:** Install the `gnome-keyring` package and restart your system.
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?
If you encounter `(gpauth:18869): Gtk-WARNING **: 10:33:37.566: cannot open display:`, try running the command with `sudo -E`:
```bash
sudo -E gpclient connect <portal>
```
See related issue: [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316)
## Licensing
### Trial and Pricing
The **CLI version** is completely free and open source.
The **GUI version** is a paid application with a **10-day trial period** after installation.
### Open Source Licenses
This project consists of multiple components, each with its own license:
| Component | Type | License |
|-----------|------|---------|
| [gpapi](./crates/gpapi) | Crate | [MIT](./crates/gpapi/LICENSE) |
| [openconnect](./crates/openconnect) | Crate | [GPL-3.0](./crates/openconnect/LICENSE) |
| [common](./crates/common) | Crate | [GPL-3.0](./crates/common/LICENSE) |
| [auth](./crates/auth) | Crate | [GPL-3.0](./crates/auth/LICENSE) |
| [gpservice](./apps/gpservice) | Application | [GPL-3.0](./apps/gpservice/LICENSE) |
| [gpclient](./apps/gpclient) | Application | [GPL-3.0](./apps/gpclient/LICENSE) |
| [gpauth](./apps/gpauth) | Application | [GPL-3.0](./apps/gpauth/LICENSE) |
| [gpgui-helper](./apps/gpgui-helper) | Application | [GPL-3.0](./apps/gpgui-helper/LICENSE) |
+4
View File
@@ -10,6 +10,7 @@ license.workspace = true
tauri-build = { version = "2", features = [], optional = true } tauri-build = { version = "2", features = [], optional = true }
[dependencies] [dependencies]
common = { path = "../../crates/common" }
gpapi = { path = "../../crates/gpapi", features = ["clap"] } gpapi = { path = "../../crates/gpapi", features = ["clap"] }
auth = { path = "../../crates/auth", features = ["browser-auth"] } auth = { path = "../../crates/auth", features = ["browser-auth"] }
@@ -24,6 +25,9 @@ tokio.workspace = true
tempfile.workspace = true tempfile.workspace = true
compile-time.workspace = true compile-time.workspace = true
# Pin to specific version due to MSRV
home = "=0.5.11"
# webview auth dependencies # webview auth dependencies
tauri = { workspace = true, optional = true } tauri = { workspace = true, optional = true }
+26 -23
View File
@@ -1,21 +1,19 @@
use std::borrow::Cow; use auth::{auth_prelogin, BrowserAuthenticator};
use auth::{auth_prelogin, Authenticator, BrowserAuthenticator};
use clap::Parser; use clap::Parser;
use common::constants::GP_USER_AGENT;
use gpapi::{ use gpapi::{
auth::{SamlAuthData, SamlAuthResult}, auth::{SamlAuthData, SamlAuthResult},
clap::{args::Os, handle_error, Args}, clap::{args::Os, handle_error, Args, InfoLevelVerbosity},
gp_params::{ClientOs, GpParams}, gp_params::{ClientOs, GpParams},
utils::{normalize_server, openssl}, utils::{normalize_server, openssl},
GP_USER_AGENT,
}; };
use log::{info, LevelFilter}; use log::info;
use serde_json::json; use serde_json::json;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")"); const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")");
#[derive(Parser, Clone)] #[derive(Parser)]
#[command( #[command(
version = VERSION, version = VERSION,
author, author,
@@ -33,7 +31,7 @@ const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::dat
See 'gpauth -h' for more information. See 'gpauth -h' for more information.
" "
)] )]
pub(crate) struct Cli { struct Cli {
#[arg(help = "The portal server to authenticate")] #[arg(help = "The portal server to authenticate")]
server: String, server: String,
@@ -64,7 +62,9 @@ pub(crate) struct Cli {
#[arg( #[arg(
long, long,
help = "The browser to use for authentication, e.g., `default`, `firefox`, `chrome`, `chromium`, or the path to the browser executable" help = "The browser to use for authentication, e.g., `default`, `firefox`, `chrome`, `chromium`, or the path to the browser executable",
default_missing_value = "default",
num_args=0..=1
)] )]
browser: Option<String>, browser: Option<String>,
@@ -75,6 +75,9 @@ pub(crate) struct Cli {
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
#[arg(long, help = "Clean the cache of the embedded browser")] #[arg(long, help = "Clean the cache of the embedded browser")]
pub clean: bool, pub clean: bool,
#[command(flatten)]
verbose: InfoLevelVerbosity,
} }
impl Args for Cli { impl Args for Cli {
@@ -110,28 +113,26 @@ impl Cli {
let openssl_conf = self.prepare_env()?; let openssl_conf = self.prepare_env()?;
let server = normalize_server(&self.server)?; let server = normalize_server(&self.server)?;
let server: &'static str = Box::leak(server.into_boxed_str()); let gp_params = self.build_gp_params();
let gp_params: &'static GpParams = Box::leak(Box::new(self.build_gp_params()));
let auth_request = match self.saml_request.as_deref() { let auth_request = match self.saml_request.as_deref() {
Some(auth_request) => Cow::Borrowed(auth_request), Some(auth_request) => auth_request.to_string(),
None => Cow::Owned(auth_prelogin(server, gp_params).await?), None => auth_prelogin(&server, &gp_params).await?,
}; };
let auth_request: &'static str = Box::leak(auth_request.into_owned().into_boxed_str());
let authenticator = Authenticator::new(&server, gp_params).with_auth_request(&auth_request);
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
let browser = self let browser = self
.browser .browser
.as_deref() .as_deref()
.or_else(|| self.default_browser.then_some("default")); .or_else(|| self.default_browser.then(|| "default"));
#[cfg(not(feature = "webview-auth"))] #[cfg(not(feature = "webview-auth"))]
let browser = self.browser.as_deref().or(Some("default")); let browser = self.browser.as_deref().or(Some("default"));
if browser.is_some() { if let Some(browser) = browser {
let auth_result = authenticator.browser_authenticate(browser).await; let authenticator = BrowserAuthenticator::new(&auth_request, browser);
let auth_result = authenticator.authenticate().await;
print_auth_result(auth_result); print_auth_result(auth_result);
// explicitly drop openssl_conf to avoid the unused variable warning // explicitly drop openssl_conf to avoid the unused variable warning
@@ -140,7 +141,7 @@ impl Cli {
} }
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
crate::webview_auth::authenticate(&self, authenticator, openssl_conf)?; crate::webview_auth::authenticate(server, gp_params, auth_request, self.clean, openssl_conf).await?;
Ok(()) Ok(())
} }
@@ -158,14 +159,16 @@ impl Cli {
} }
} }
fn init_logger() { fn init_logger(cli: &Cli) {
env_logger::builder().filter_level(LevelFilter::Info).init(); env_logger::builder()
.filter_level(cli.verbose.log_level_filter())
.init();
} }
pub async fn run() { pub async fn run() {
let cli = Cli::parse(); let cli = Cli::parse();
init_logger(); init_logger(&cli);
info!("gpauth started: {}", VERSION); info!("gpauth started: {}", VERSION);
if let Err(err) = cli.run().await { if let Err(err) = cli.run().await {
+1
View File
@@ -1,6 +1,7 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
mod cli; mod cli;
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
mod webview_auth; mod webview_auth;
+13 -8
View File
@@ -1,23 +1,28 @@
use auth::{Authenticator, WebviewAuthenticator}; use auth::WebviewAuthenticator;
use gpapi::gp_params::GpParams;
use log::info; use log::info;
use tauri::RunEvent; use tauri::RunEvent;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use crate::cli::{print_auth_result, Cli}; use crate::cli::print_auth_result;
pub fn authenticate( pub async fn authenticate(
cli: &Cli, server: String,
authenticator: Authenticator<'static>, gp_params: GpParams,
auth_request: String,
clean: bool,
mut openssl_conf: Option<NamedTempFile>, mut openssl_conf: Option<NamedTempFile>,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let authenticator = authenticator.with_clean(cli.clean);
tauri::Builder::default() tauri::Builder::default()
.setup(move |app| { .setup(move |app| {
let app_handle = app.handle().clone(); let app_handle = app.handle().clone();
tauri::async_runtime::spawn(async move { tauri::async_runtime::spawn(async move {
let auth_result = authenticator.webview_authenticate(&app_handle).await; let authenticator = WebviewAuthenticator::new(&server, &gp_params)
.with_auth_request(&auth_request)
.with_clean(clean);
let auth_result = authenticator.authenticate(&app_handle).await;
print_auth_result(auth_result); print_auth_result(auth_result);
// Ensure the app exits after the authentication process // Ensure the app exits after the authentication process
+8 -3
View File
@@ -12,18 +12,23 @@ gpapi = { path = "../../crates/gpapi", features = ["clap"] }
openconnect = { path = "../../crates/openconnect" } openconnect = { path = "../../crates/openconnect" }
anyhow.workspace = true anyhow.workspace = true
askama.workspace = true
chrono.workspace = true
clap.workspace = true clap.workspace = true
env_logger.workspace = true env_logger.workspace = true
inquire = "0.7" inquire = "0.9"
log.workspace = true log.workspace = true
tokio.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] }
sysinfo.workspace = true sysinfo.workspace = true
serde_json.workspace = true serde_json.workspace = true
serde_urlencoded.workspace = true
whoami.workspace = true whoami.workspace = true
tempfile.workspace = true tempfile.workspace = true
reqwest.workspace = true reqwest.workspace = true
directories = "5.0" directories.workspace = true
compile-time.workspace = true compile-time.workspace = true
netdev.workspace = true
xmltree.workspace = true
[features] [features]
default = ["webview-auth"] default = ["webview-auth"]
+48 -11
View File
@@ -1,24 +1,30 @@
use std::{env::temp_dir, fs::File}; use std::{env::temp_dir, fs::File, str::FromStr};
use anyhow::bail;
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use gpapi::{ use gpapi::{
clap::{handle_error, Args}, clap::{Args, InfoLevelVerbosity, handle_error},
utils::openssl, utils::openssl,
}; };
use log::{info, LevelFilter}; use log::info;
use sysinfo::{Pid, System};
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use tokio::fs;
use crate::{ use crate::{
GP_CLIENT_LOCK_FILE,
connect::{ConnectArgs, ConnectHandler}, connect::{ConnectArgs, ConnectHandler},
disconnect::DisconnectHandler, disconnect::{DisconnectArgs, DisconnectHandler},
hip::{HipArgs, HipHandler},
launch_gui::{LaunchGuiArgs, LaunchGuiHandler}, launch_gui::{LaunchGuiArgs, LaunchGuiHandler},
}; };
const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")"); const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")");
pub(crate) struct SharedArgs { pub(crate) struct SharedArgs<'a> {
pub(crate) fix_openssl: bool, pub(crate) fix_openssl: bool,
pub(crate) ignore_tls_errors: bool, pub(crate) ignore_tls_errors: bool,
pub(crate) verbose: &'a InfoLevelVerbosity,
} }
#[derive(Subcommand)] #[derive(Subcommand)]
@@ -26,9 +32,11 @@ enum CliCommand {
#[command(about = "Connect to a portal server")] #[command(about = "Connect to a portal server")]
Connect(Box<ConnectArgs>), Connect(Box<ConnectArgs>),
#[command(about = "Disconnect from the server")] #[command(about = "Disconnect from the server")]
Disconnect, Disconnect(DisconnectArgs),
#[command(about = "Launch the GUI")] #[command(about = "Launch the GUI")]
LaunchGui(LaunchGuiArgs), LaunchGui(LaunchGuiArgs),
#[command(about = "Generate HIP report")]
Hip(HipArgs),
} }
#[derive(Parser)] #[derive(Parser)]
@@ -60,6 +68,9 @@ struct Cli {
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,
#[command(flatten)]
verbose: InfoLevelVerbosity,
} }
impl Args for Cli { impl Args for Cli {
@@ -73,6 +84,25 @@ impl Args for Cli {
} }
impl Cli { impl Cli {
async fn is_running(&self) -> bool {
let Ok(c) = fs::read_to_string(GP_CLIENT_LOCK_FILE).await else {
return false;
};
let Ok(pid) = Pid::from_str(c.trim()) else {
return false;
};
let s = System::new_all();
let Some(p) = s.process(pid) else {
return false;
};
p.exe()
.map(|exe| exe.to_string_lossy().contains("gpclient"))
.unwrap_or(false)
}
fn fix_openssl(&self) -> anyhow::Result<Option<NamedTempFile>> { fn fix_openssl(&self) -> anyhow::Result<Option<NamedTempFile>> {
if self.fix_openssl { if self.fix_openssl {
let file = openssl::fix_openssl_env()?; let file = openssl::fix_openssl_env()?;
@@ -83,12 +113,18 @@ impl Cli {
} }
async fn run(&self) -> anyhow::Result<()> { async fn run(&self) -> anyhow::Result<()> {
// check if an instance is running
if !matches!(self.command, CliCommand::Disconnect(_)) && self.is_running().await {
bail!("Another instance of the client is already running");
}
// The temp file will be dropped automatically when the file handle is dropped // The temp file will be dropped automatically when the file handle is dropped
// So, declare it here to ensure it's not dropped // So, declare it here to ensure it's not dropped
let _file = self.fix_openssl()?; let _file = self.fix_openssl()?;
let shared_args = SharedArgs { let shared_args = SharedArgs {
fix_openssl: self.fix_openssl, fix_openssl: self.fix_openssl,
ignore_tls_errors: self.ignore_tls_errors, ignore_tls_errors: self.ignore_tls_errors,
verbose: &self.verbose,
}; };
if self.ignore_tls_errors { if self.ignore_tls_errors {
@@ -97,18 +133,19 @@ impl Cli {
match &self.command { match &self.command {
CliCommand::Connect(args) => ConnectHandler::new(args, &shared_args).handle().await, CliCommand::Connect(args) => ConnectHandler::new(args, &shared_args).handle().await,
CliCommand::Disconnect => DisconnectHandler::new().handle(), CliCommand::Disconnect(args) => DisconnectHandler::new(args).handle().await,
CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await, CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await,
CliCommand::Hip(args) => HipHandler::new(args).handle().await,
} }
} }
} }
fn init_logger(command: &CliCommand) { fn init_logger(cli: &Cli) {
let mut builder = env_logger::builder(); let mut builder = env_logger::builder();
builder.filter_level(LevelFilter::Info); builder.filter_level(cli.verbose.log_level_filter());
// Output the log messages to a file if the command is the auth callback // Output the log messages to a file if the command is the auth callback
if let CliCommand::LaunchGui(args) = command { if let CliCommand::LaunchGui(args) = &cli.command {
let auth_data = args.auth_data.as_deref().unwrap_or_default(); let auth_data = args.auth_data.as_deref().unwrap_or_default();
if !auth_data.is_empty() { if !auth_data.is_empty() {
if let Ok(log_file) = File::create(temp_dir().join("gpcallback.log")) { if let Ok(log_file) = File::create(temp_dir().join("gpcallback.log")) {
@@ -124,7 +161,7 @@ fn init_logger(command: &CliCommand) {
pub(crate) async fn run() { pub(crate) async fn run() {
let cli = Cli::parse(); let cli = Cli::parse();
init_logger(&cli.command); init_logger(&cli);
info!("gpclient started: {}", VERSION); info!("gpclient started: {}", VERSION);
+128 -44
View File
@@ -1,28 +1,27 @@
use std::{cell::RefCell, fs, sync::Arc}; use std::{borrow::Cow, cell::RefCell, fs, sync::Arc};
use anyhow::bail; use anyhow::bail;
use clap::Args; use clap::Args;
use common::vpn_utils::find_csd_wrapper; use common::constants::{GP_CLIENT_VERSION, GP_USER_AGENT};
use gpapi::{ use gpapi::{
auth::SamlAuthResult, auth::SamlAuthResult,
clap::args::Os, clap::{ToVerboseArg, args::Os},
credential::{Credential, PasswordCredential}, credential::{Credential, PasswordCredential},
error::PortalError, error::PortalError,
gateway::{gateway_login, GatewayLogin}, gateway::{GatewayLogin, gateway_login},
gp_params::{ClientOs, GpParams}, gp_params::{ClientOs, GpParams},
portal::{prelogin, retrieve_config, Prelogin}, portal::{Prelogin, StandardPrelogin, prelogin, retrieve_config},
process::{ process::{
auth_launcher::SamlAuthLauncher, auth_launcher::SamlAuthLauncher,
users::{get_non_root_user, get_user_by_name}, users::{get_non_root_user, get_user_by_name},
}, },
utils::{request::RequestIdentityError, shutdown_signal}, utils::{host_utils, request::RequestIdentityError, shutdown_signal},
GP_USER_AGENT,
}; };
use inquire::{Password, PasswordDisplayMode, Select, Text}; use inquire::{Password, PasswordDisplayMode, Select, Text};
use log::info; use log::{info, warn};
use openconnect::Vpn; use openconnect::Vpn;
use crate::{cli::SharedArgs, GP_CLIENT_LOCK_FILE}; use crate::{GP_CLIENT_LOCK_FILE, cli::SharedArgs};
#[derive(Args)] #[derive(Args)]
pub(crate) struct ConnectArgs { pub(crate) struct ConnectArgs {
@@ -41,9 +40,15 @@ pub(crate) struct ConnectArgs {
#[arg(long, help = "Read the cookie from standard input")] #[arg(long, help = "Read the cookie from standard input")]
cookie_on_stdin: bool, cookie_on_stdin: bool,
#[arg(long, short, help = "The VPNC script to use")] #[arg(long, short, help = "The VPNC script to use", required_if_eq("script_tun", "true"))]
script: Option<String>, script: Option<String>,
#[arg(long, short, help = "The IFNAME for tunnel interface")]
interface: Option<String>,
#[arg(long, short = 'S', help = "Pass traffic to '--script' program, not tun")]
script_tun: bool,
#[arg(long, help = "Connect the server as a gateway, instead of a portal")] #[arg(long, help = "Connect the server as a gateway, instead of a portal")]
as_gateway: bool, as_gateway: bool,
@@ -81,18 +86,30 @@ pub(crate) struct ConnectArgs {
#[arg(long, help = "Do not ask for IPv6 connectivity")] #[arg(long, help = "Do not ask for IPv6 connectivity")]
disable_ipv6: bool, disable_ipv6: bool,
#[arg(long, default_value = GP_USER_AGENT, help = "The user agent to use")] #[arg(
user_agent: String, long,
help = "The user agent to use, if not specified, it will be generated based on the OS and client version"
)]
user_agent: Option<String>,
#[arg(long, default_value = "Linux")] #[arg(long, value_enum, default_value_t = ConnectArgs::default_os())]
os: Os, os: Os,
#[arg(long)] #[arg(long, help = "If not specified, it will be computed based on the --os option")]
os_version: Option<String>, os_version: Option<String>,
#[arg(long, help = "The GP client version to emulate, e.g., '6.2.4-49'")]
client_version: Option<String>,
#[arg(long, help = "Disable DTLS and ESP")] #[arg(long, help = "Disable DTLS and ESP")]
no_dtls: bool, no_dtls: bool,
#[arg(
long = "force-dpd",
help = "Same as the '--force-dpd' option in the openconnect command"
)]
dpd_interval: Option<u32>,
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
#[arg(long, help = "The HiDPI mode, useful for high-resolution screens")] #[arg(long, help = "The HiDPI mode, useful for high-resolution screens")]
hidpi: bool, hidpi: bool,
@@ -107,29 +124,41 @@ pub(crate) struct ConnectArgs {
#[arg( #[arg(
long, long,
help = "Use the specified browser to authenticate, e.g., `default`, `firefox`, `chrome`, `chromium`, or the path to the browser executable" help = "Use the specified browser to authenticate, e.g., `default`, `firefox`, `chrome`, `chromium`, `remote`.\nOr the path to the browser executable.\nUse 'remote' for headless servers.",
default_missing_value = "default",
num_args=0..=1
)] )]
browser: Option<String>, browser: Option<String>,
} }
impl ConnectArgs { impl ConnectArgs {
fn os_version(&self) -> String { fn default_os() -> Os {
if let Some(os_version) = &self.os_version { #[cfg(target_os = "macos")]
return os_version.to_owned(); return Os::Mac;
#[cfg(target_os = "windows")]
return Os::Windows;
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
return Os::Linux;
}
fn os_version(&self) -> &str {
if let Some(os_version) = self.os_version.as_deref() {
return os_version;
} }
match self.os { match self.os {
Os::Linux => format!("Linux {}", whoami::distro()), Os::Linux => host_utils::get_linux_os_string(),
Os::Windows => String::from("Microsoft Windows 11 Pro , 64-bit"), Os::Windows => host_utils::get_windows_os_string(),
Os::Mac => String::from("Apple Mac OS X 13.4.0"), Os::Mac => host_utils::get_macos_os_string(),
} }
} }
} }
pub(crate) struct ConnectHandler<'a> { pub(crate) struct ConnectHandler<'a> {
args: &'a ConnectArgs, args: &'a ConnectArgs,
shared_args: &'a SharedArgs, shared_args: &'a SharedArgs<'a>,
latest_key_password: RefCell<Option<String>>, latest_key_password: RefCell<Option<String>>,
password_from_stdin: RefCell<Option<String>>,
} }
impl<'a> ConnectHandler<'a> { impl<'a> ConnectHandler<'a> {
@@ -138,14 +167,29 @@ impl<'a> ConnectHandler<'a> {
args, args,
shared_args, shared_args,
latest_key_password: Default::default(), latest_key_password: Default::default(),
password_from_stdin: Default::default(),
}
}
fn user_agent(&self) -> Cow<'_, str> {
if let Some(user_agent) = self.args.user_agent.as_deref() {
Cow::Borrowed(user_agent)
} else {
let client_version = self.args.client_version.as_deref().unwrap_or(GP_CLIENT_VERSION);
Cow::Owned(format!(
"{}/{} ({})",
GP_USER_AGENT,
client_version,
self.args.os_version()
))
} }
} }
fn build_gp_params(&self) -> GpParams { fn build_gp_params(&self) -> GpParams {
GpParams::builder() GpParams::builder()
.user_agent(&self.args.user_agent) .user_agent(&self.user_agent())
.client_os(ClientOs::from(&self.args.os)) .client_os(ClientOs::from(&self.args.os))
.os_version(self.args.os_version()) .os_version(self.args.os_version().to_owned())
.ignore_tls_errors(self.shared_args.ignore_tls_errors) .ignore_tls_errors(self.shared_args.ignore_tls_errors)
.certificate(self.args.certificate.clone()) .certificate(self.args.certificate.clone())
.sslkey(self.args.sslkey.clone()) .sslkey(self.args.sslkey.clone())
@@ -203,7 +247,7 @@ impl<'a> ConnectHandler<'a> {
return Ok(()); return Ok(());
}; };
info!("Failed to connect portal with prelogin: {}", err); warn!("Failed to connect portal with prelogin: {}", err);
if err.root_cause().downcast_ref::<PortalError>().is_some() { if err.root_cause().downcast_ref::<PortalError>().is_some() {
info!("Trying the gateway authentication workflow..."); info!("Trying the gateway authentication workflow...");
self.connect_gateway_with_prelogin(server).await?; self.connect_gateway_with_prelogin(server).await?;
@@ -257,7 +301,11 @@ impl<'a> ConnectHandler<'a> {
} }
}; };
self.connect_gateway(gateway, &cookie).await // Use the client version from the command line argument if specified, otherwise
// use the version from the portal config if available
let client_version = self.args.client_version.as_deref().or_else(|| portal_config.version());
self.connect_gateway(gateway, &cookie, client_version).await
} }
async fn connect_gateway_with_prelogin(&self, gateway: &str) -> anyhow::Result<()> { async fn connect_gateway_with_prelogin(&self, gateway: &str) -> anyhow::Result<()> {
@@ -271,7 +319,10 @@ impl<'a> ConnectHandler<'a> {
let cookie = self.login_gateway(gateway, &cred, &gp_params).await?; let cookie = self.login_gateway(gateway, &cred, &gp_params).await?;
self.connect_gateway(gateway, &cookie).await // When logging in to a gateway directly, there is no portal config to get the client version from
let client_version = self.args.client_version.as_deref();
self.connect_gateway(gateway, &cookie, client_version).await
} }
async fn login_gateway(&self, gateway: &str, cred: &Credential, gp_params: &GpParams) -> anyhow::Result<String> { async fn login_gateway(&self, gateway: &str, cred: &Credential, gp_params: &GpParams) -> anyhow::Result<String> {
@@ -291,31 +342,39 @@ impl<'a> ConnectHandler<'a> {
} }
} }
async fn connect_gateway(&self, gateway: &str, cookie: &str) -> anyhow::Result<()> { async fn connect_gateway(&self, gateway: &str, cookie: &str, client_version: Option<&str>) -> anyhow::Result<()> {
let mtu = self.args.mtu.unwrap_or(0); let mtu = self.args.mtu.unwrap_or(0);
let csd_uid = get_csd_uid(&self.args.csd_user)?; let csd_uid = get_csd_uid(&self.args.csd_user)?;
let csd_wrapper = if self.args.csd_wrapper.is_some() { let (hip, csd_wrapper) = if let Some(csd_wrapper) = &self.args.csd_wrapper {
self.args.csd_wrapper.clone() (true, Some(csd_wrapper.clone()))
} else if self.args.hip { } else if self.args.hip {
find_csd_wrapper() (true, None)
} else { } else {
None (false, None)
}; };
let os = ClientOs::from(&self.args.os).to_openconnect_os().to_string(); let os = ClientOs::from(&self.args.os).to_openconnect_os().to_owned();
let os_version = self.args.os_version().to_owned();
let client_version = client_version.map(|s| s.to_owned());
let vpn = Vpn::builder(gateway, cookie) let vpn = Vpn::builder(gateway, cookie)
.script(self.args.script.clone()) .script(self.args.script.clone())
.user_agent(self.args.user_agent.clone()) .interface(self.args.interface.clone())
.script_tun(self.args.script_tun)
.user_agent(self.user_agent().into_owned())
.os(Some(os)) .os(Some(os))
.os_version(Some(os_version))
.client_version(client_version)
.certificate(self.args.certificate.clone()) .certificate(self.args.certificate.clone())
.sslkey(self.args.sslkey.clone()) .sslkey(self.args.sslkey.clone())
.key_password(self.latest_key_password.borrow().clone()) .key_password(self.latest_key_password.borrow().clone())
.hip(hip)
.csd_uid(csd_uid) .csd_uid(csd_uid)
.csd_wrapper(csd_wrapper) .csd_wrapper(csd_wrapper)
.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)
.no_dtls(self.args.no_dtls) .no_dtls(self.args.no_dtls)
.dpd_interval(self.args.dpd_interval.unwrap_or(0))
.build()?; .build()?;
let vpn = Arc::new(vpn); let vpn = Arc::new(vpn);
@@ -350,21 +409,26 @@ impl<'a> ConnectHandler<'a> {
let browser = if prelogin.support_default_browser() { let browser = if prelogin.support_default_browser() {
self.args.browser.as_deref() self.args.browser.as_deref()
} else if !cfg!(feature = "webview-auth") { } else if !cfg!(feature = "webview-auth") {
bail!("The server does not support authentication via the default browser and the gpclient is not built with the `webview-auth` feature"); bail!(
"The server does not support authentication via the default browser and the gpclient is not built with the `webview-auth` feature"
);
} else { } else {
None None
}; };
let os_version = self.args.os_version(); let os_version = self.args.os_version();
let verbose = self.shared_args.verbose.to_verbose_arg();
let user_agent = self.user_agent();
let auth_launcher = SamlAuthLauncher::new(&self.args.server) let auth_launcher = SamlAuthLauncher::new(&self.args.server)
.gateway(is_gateway) .gateway(is_gateway)
.saml_request(prelogin.saml_request()) .saml_request(prelogin.saml_request())
.user_agent(&self.args.user_agent) .user_agent(&user_agent)
.os(self.args.os.as_str()) .os(self.args.os.as_str())
.os_version(Some(&os_version)) .os_version(Some(&os_version))
.fix_openssl(self.shared_args.fix_openssl) .fix_openssl(self.shared_args.fix_openssl)
.ignore_tls_errors(self.shared_args.ignore_tls_errors) .ignore_tls_errors(self.shared_args.ignore_tls_errors)
.browser(browser); .browser(browser)
.verbose(verbose);
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
let use_default_browser = prelogin.support_default_browser() && self.args.default_browser; let use_default_browser = prelogin.support_default_browser() && self.args.default_browser;
@@ -387,11 +451,32 @@ impl<'a> ConnectHandler<'a> {
|user| Ok(user.to_owned()), |user| Ok(user.to_owned()),
)?; )?;
let password = self.obtain_password(prelogin)?;
let password_cred = PasswordCredential::new(&user, &password);
Ok(password_cred.into())
}
}
}
fn obtain_password(&self, prelogin: &StandardPrelogin) -> anyhow::Result<String> {
let password = if self.args.passwd_on_stdin { let password = if self.args.passwd_on_stdin {
// If the password has been read from stdin, use it directly
if let Some(password) = self.password_from_stdin.borrow().as_ref() {
info!("Reusing the password read from standard input");
return Ok(password.clone());
}
info!("Reading password from standard input"); info!("Reading password from standard input");
let mut input = String::new(); let mut input = String::new();
std::io::stdin().read_line(&mut input)?; std::io::stdin().read_line(&mut input)?;
input.trim_end().to_owned() let password = input.trim_end().to_owned();
// Considering that the gateway connection may fail even though the password read
// from stdin is correct. It may retry the gateway connection, so we need to
// save the password read from stdin to avoid reading stdin again.
self.password_from_stdin.replace(Some(password.clone()));
password
} else { } else {
Password::new(&format!("{}:", prelogin.label_password())) Password::new(&format!("{}:", prelogin.label_password()))
.without_confirmation() .without_confirmation()
@@ -399,11 +484,7 @@ impl<'a> ConnectHandler<'a> {
.prompt()? .prompt()?
}; };
let password_cred = PasswordCredential::new(&user, &password); Ok(password)
Ok(password_cred.into())
}
}
} }
} }
@@ -423,9 +504,12 @@ fn read_cookie_from_stdin() -> anyhow::Result<Credential> {
fn write_pid_file() { fn write_pid_file() {
let pid = std::process::id(); let pid = std::process::id();
fs::write(GP_CLIENT_LOCK_FILE, pid.to_string()).unwrap(); if let Err(err) = fs::write(GP_CLIENT_LOCK_FILE, pid.to_string()) {
warn!("Failed to write PID file: {}", err);
} else {
info!("Wrote PID {} to {}", pid, GP_CLIENT_LOCK_FILE); info!("Wrote PID {} to {}", pid, GP_CLIENT_LOCK_FILE);
} }
}
fn get_csd_uid(csd_user: &Option<String>) -> anyhow::Result<u32> { fn get_csd_uid(csd_user: &Option<String>) -> anyhow::Result<u32> {
if let Some(csd_user) = csd_user { if let Some(csd_user) = csd_user {
+48 -16
View File
@@ -1,31 +1,63 @@
use crate::GP_CLIENT_LOCK_FILE; use crate::GP_CLIENT_LOCK_FILE;
use clap::Args;
use gpapi::utils::lock_file::gpservice_lock_info;
use log::{info, warn}; use log::{info, warn};
use std::fs; use std::{fs, str::FromStr, thread, time::Duration};
use sysinfo::{Pid, Signal, System}; use sysinfo::{Pid, Signal, System};
pub(crate) struct DisconnectHandler; #[derive(Args)]
pub struct DisconnectArgs {
impl DisconnectHandler { #[arg(
pub(crate) fn new() -> Self { long,
Self required = false,
help = "The time in seconds to wait for the VPN connection to disconnect"
)]
wait: Option<u64>,
} }
pub(crate) fn handle(&self) -> anyhow::Result<()> { pub struct DisconnectHandler<'a> {
if fs::metadata(GP_CLIENT_LOCK_FILE).is_err() { args: &'a DisconnectArgs,
warn!("PID file not found, maybe the client is not running");
return Ok(());
} }
let pid = fs::read_to_string(GP_CLIENT_LOCK_FILE)?; impl<'a> DisconnectHandler<'a> {
let pid = pid.trim().parse::<usize>()?; pub fn new(args: &'a DisconnectArgs) -> Self {
Self { args }
}
pub async fn handle(&self) -> anyhow::Result<()> {
// Try to disconnect the CLI client
if let Ok(c) = fs::read_to_string(GP_CLIENT_LOCK_FILE) {
send_signal(c.trim(), Signal::Interrupt).unwrap_or_else(|err| {
warn!("Failed to send signal to client: {}", err);
});
};
// Try to disconnect the GUI service
if let Ok(c) = gpservice_lock_info().await {
send_signal(&c.pid.to_string(), Signal::User1).unwrap_or_else(|err| {
warn!("Failed to send signal to service: {}", err);
});
};
// sleep, to give the client and service time to disconnect
if let Some(wait) = self.args.wait {
thread::sleep(Duration::from_secs(wait));
}
Ok(())
}
}
fn send_signal(pid: &str, signal: Signal) -> anyhow::Result<()> {
let s = System::new_all(); let s = System::new_all();
let pid = Pid::from_str(pid)?;
if let Some(process) = s.process(Pid::from(pid)) { if let Some(process) = s.process(pid) {
info!("Found process {}, killing...", pid); info!("Found process {}, sending signal...", pid);
if process.kill_with(Signal::Interrupt).is_none() {
if process.kill_with(signal).is_none() {
warn!("Failed to kill process {}", pid); warn!("Failed to kill process {}", pid);
} }
} }
Ok(()) Ok(())
} }
}
+374
View File
@@ -0,0 +1,374 @@
use askama::Template;
use clap::Args;
use gpapi::{clap::args::Os, utils::host_utils};
use log::debug;
use std::collections::HashMap;
use xmltree::Element;
#[derive(Template)]
#[template(path = "hip_report.xml")]
struct HipReportTemplate<'a> {
client_version: &'a str,
generate_time: String,
day: String,
month: String,
year: String,
user_name: &'a str,
host_info: HostInfo<'a>,
md5: &'a str,
}
/// Host information for HIP reporting
struct HostInfo<'a> {
/// Common for all OSes, e.g., "Apple", "Microsoft", "Linux"
os_vendor: &'a str,
/// Common for all OSes, e.g., "Linux Ubuntu 20.04", "Apple Mac OS X 10.15.7", etc.
os_version: &'a str,
/// Only for macOS and Windows
host_id: String,
/// Common for all OSes
host_name: String,
/// Only for macOS and Windows, e.g., "10.15.7", "10.0.19044.2130"
software_version: &'a str,
domain: String,
network_interfaces: Vec<NetworkInterface>,
}
impl<'a> HostInfo<'a> {
/// Get the first available IPv4 address from network interfaces
pub fn default_ipv4(&self) -> &str {
self
.network_interfaces
.first()
.and_then(|iface| iface.ipv4.as_deref())
.unwrap_or_default()
}
/// Get the first available IPv6 address from network interfaces
pub fn default_ipv6(&self) -> &str {
self
.network_interfaces
.first()
.and_then(|iface| iface.ipv6.as_deref())
.unwrap_or_default()
}
}
/// Network interface information
#[derive(Clone)]
struct NetworkInterface {
name: String,
description: String,
mac_address: Option<String>,
ipv4: Option<String>,
ipv6: Option<String>,
}
impl NetworkInterface {
/// Create a new network interface with basic information
fn new(name: String, description: String) -> Self {
Self {
name,
description,
mac_address: None,
ipv4: None,
ipv6: None,
}
}
/// Set MAC address
fn with_mac(mut self, mac: Option<String>) -> Self {
self.mac_address = mac;
self
}
/// Set IPv4 address
fn with_ipv4(mut self, ipv4: Option<String>) -> Self {
self.ipv4 = ipv4;
self
}
/// Set IPv6 address
fn with_ipv6(mut self, ipv6: Option<String>) -> Self {
self.ipv6 = ipv6;
self
}
}
#[derive(Args)]
pub(crate) struct HipArgs {
#[arg(long, help = "The GP client version, e.g., 6.2.4-49")]
client_version: String,
#[arg(long, value_enum, help = "The client OS")]
client_os: Os,
#[arg(long, help = "The OS version string, e.g., Apple Mac OS X 10.15.7")]
os_version: String,
#[arg(long, help = "The authentication cookie")]
cookie: String,
#[arg(long, help = "The client IPv4 address")]
client_ip: Option<String>,
#[arg(long, help = "The client IPv6 address")]
client_ipv6: Option<String>,
#[arg(long, help = "The MD5 digest to encode into the HIP report")]
md5: String,
}
pub(crate) struct HipHandler<'a> {
args: &'a HipArgs,
}
impl<'a> HipHandler<'a> {
pub(crate) fn new(args: &'a HipArgs) -> Self {
Self { args }
}
pub(crate) async fn handle(&self) -> anyhow::Result<()> {
let cookie_params = self.parse_cookie();
let report = self.generate_hip_report(&cookie_params)?;
debug!("Generated HIP report:\n{}", report);
println!("{}", report);
Ok(())
}
fn parse_cookie(&self) -> HashMap<String, String> {
// Parse URL-encoded cookie string using serde_urlencoded
serde_urlencoded::from_str(&self.args.cookie).unwrap_or_default()
}
/// Generate the complete HIP report XML
fn generate_hip_report(&self, cookie_params: &HashMap<String, String>) -> anyhow::Result<String> {
let (generate_time, day, month, year) = get_current_time_components();
let user_name = cookie_params.get("user").map(|s| s.as_str()).unwrap_or("");
let host_info = self.collect_host_info(cookie_params);
let template = HipReportTemplate {
client_version: &self.args.client_version,
generate_time,
day,
month,
year,
user_name,
host_info,
md5: &self.args.md5,
};
let report = template.render()?;
format_xml(&report)
}
/// Collect host information based on the client OS
fn collect_host_info(&self, cookie_params: &'a HashMap<String, String>) -> HostInfo<'a> {
let collector = HostInfoCollector::new(self.args, cookie_params);
match self.args.client_os {
Os::Linux => collector.collect_linux(),
Os::Mac => collector.collect_macos(),
Os::Windows => collector.collect_windows(),
}
}
}
// ============================================================================
// Host Information Collector
// ============================================================================
/// Helper struct for collecting host information
struct HostInfoCollector<'a> {
args: &'a HipArgs,
cookie_params: &'a HashMap<String, String>,
}
impl<'a> HostInfoCollector<'a> {
fn new(args: &'a HipArgs, cookie_params: &'a HashMap<String, String>) -> Self {
Self { args, cookie_params }
}
/// Get domain from cookie parameters
fn get_domain(&self) -> String {
self
.cookie_params
.get("domain")
.map(|s| s.to_string())
.unwrap_or_default()
}
/// Collect network interface information with fallback
fn collect_network_interface(&self) -> NetworkInterface {
match netdev::get_default_interface() {
Ok(iface) => NetworkInterface::new(
iface.name.clone(),
iface.description.unwrap_or_else(|| iface.name.clone()),
)
.with_mac(iface.mac_addr.map(|mac| mac.address()))
.with_ipv4(iface.ipv4.first().map(|ip| ip.addr().to_string()))
.with_ipv6(iface.ipv6.first().map(|ip| ip.addr().to_string())),
Err(_) => NetworkInterface::new("unknown".to_string(), "unknown".to_string())
.with_ipv4(self.args.client_ip.clone())
.with_ipv6(self.args.client_ipv6.clone()),
}
}
/// Collect Linux-specific host information
fn collect_linux(&self) -> HostInfo<'a> {
let iface = self.collect_network_interface();
// Use the fixed interface name enp1s0f0 for Linux if it is not on Linux
let iface = NetworkInterface {
#[cfg(target_os = "linux")]
name: iface.name,
#[cfg(target_os = "linux")]
description: iface.description,
#[cfg(not(target_os = "linux"))]
name: "enp1s0f0".to_string(),
#[cfg(not(target_os = "linux"))]
description: "enp1s0f0".to_string(),
mac_address: iface.mac_address,
ipv4: iface.ipv4,
ipv6: iface.ipv6,
};
HostInfo {
os_vendor: "Linux",
os_version: &self.args.os_version,
host_id: host_utils::derive_uuid(&[]),
host_name: whoami::devicename(),
software_version: "",
domain: String::new(),
network_interfaces: vec![iface],
}
}
/// Collect macOS-specific host information
fn collect_macos(&self) -> HostInfo<'a> {
let iface = self.collect_network_interface();
// macOS use the mac address as host ID
let host_id = iface
.mac_address
.as_ref()
.map(|s| s.to_string())
.unwrap_or_else(|| "00:00:00:00:00:00".to_string());
// Use the fixed interface name en0 for macOS if it is not on macOS
let iface = NetworkInterface {
#[cfg(target_os = "macos")]
name: iface.name,
#[cfg(target_os = "macos")]
description: iface.description,
#[cfg(not(target_os = "macos"))]
name: "en0".to_string(),
#[cfg(not(target_os = "macos"))]
description: "en0".to_string(),
mac_address: iface.mac_address,
ipv4: iface.ipv4,
ipv6: iface.ipv6,
};
HostInfo {
os_vendor: "Apple",
os_version: &self.args.os_version,
host_id,
host_name: whoami::devicename(),
software_version: host_utils::get_macos_version(),
domain: self.get_domain(),
network_interfaces: vec![iface],
}
}
/// Collect Windows-specific host information
fn collect_windows(&self) -> HostInfo<'a> {
// Use the actual machine ID on Windows
#[cfg(target_os = "windows")]
let host_id = host_utils::get_machine_id().to_string();
#[cfg(not(target_os = "windows"))]
let host_id = host_utils::derive_uuid(&[]);
let iface = self.collect_network_interface();
// Use the fixed interface name if it is not on Windows
let iface = NetworkInterface {
#[cfg(target_os = "windows")]
name: iface.name,
#[cfg(target_os = "windows")]
description: iface.description,
#[cfg(not(target_os = "windows"))]
name: derive_windows_network_name(&iface),
#[cfg(not(target_os = "windows"))]
description: "PANGP Virtual Ethernet Adapter Secure".to_string(),
// mac address on windows should replace ':' with '-'
mac_address: iface.mac_address.map(|mac| mac.replace(':', "-")),
ipv4: iface.ipv4,
ipv6: iface.ipv6,
};
// Add the local loopback interface
let loopback_iface = NetworkInterface {
name: derive_windows_network_name(&iface),
description: "Software Loopback Interface 1".to_string(),
mac_address: Some(String::new()),
ipv4: Some("127.0.0.1".to_string()),
ipv6: Some("::1".to_string()),
};
let ifaces = vec![iface, loopback_iface];
HostInfo {
os_vendor: "Microsoft",
os_version: &self.args.os_version,
host_id,
host_name: whoami::devicename(),
software_version: host_utils::get_windows_version(),
domain: self.get_domain(),
network_interfaces: ifaces,
}
}
}
// ============================================================================
// Utility Functions
// ============================================================================
/// Get current time components for HIP report
fn get_current_time_components() -> (String, String, String, String) {
let now = chrono::Local::now();
(
now.format("%m/%d/%Y %H:%M:%S").to_string(),
now.format("%d").to_string(),
now.format("%m").to_string(),
now.format("%Y").to_string(),
)
}
/// Format XML string with proper indentation
fn format_xml(xml_str: &str) -> anyhow::Result<String> {
let xml = Element::parse(xml_str.as_bytes())?;
let config = xmltree::EmitterConfig::new().perform_indent(true);
let mut xml_buf = Vec::new();
xml.write_with_config(&mut xml_buf, config)?;
Ok(String::from_utf8(xml_buf)?)
}
fn derive_windows_network_name(iface: &NetworkInterface) -> String {
let seeds = [
iface.mac_address.as_deref().unwrap_or("00:00:00:00:00:00"),
iface.name.as_str(),
];
format!("{{{}}}", host_utils::derive_uuid(&seeds).to_uppercase())
}
+1 -1
View File
@@ -1,11 +1,11 @@
use std::{collections::HashMap, env::temp_dir, fs, path::PathBuf}; use std::{collections::HashMap, env::temp_dir, fs, path::PathBuf};
use clap::Args; use clap::Args;
use common::constants::GP_CALLBACK_PORT_FILENAME;
use directories::ProjectDirs; use directories::ProjectDirs;
use gpapi::{ use gpapi::{
process::service_launcher::ServiceLauncher, process::service_launcher::ServiceLauncher,
utils::{endpoint::http_endpoint, env_utils, shutdown_signal}, utils::{endpoint::http_endpoint, env_utils, shutdown_signal},
GP_CALLBACK_PORT_FILENAME,
}; };
use log::info; use log::info;
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
+1
View File
@@ -1,6 +1,7 @@
mod cli; mod cli;
mod connect; mod connect;
mod disconnect; mod disconnect;
mod hip;
mod launch_gui; mod launch_gui;
pub(crate) const GP_CLIENT_LOCK_FILE: &str = "/var/run/gpclient.lock"; pub(crate) const GP_CLIENT_LOCK_FILE: &str = "/var/run/gpclient.lock";
+277
View File
@@ -0,0 +1,277 @@
<?xml version="1.0" encoding="UTF-8"?>
<hip-report name="hip-report">
<md5-sum>{{ md5 }}</md5-sum>
<user-name>{{ user_name }}</user-name>
<domain>{{ host_info.domain }}.internal</domain>
<host-name>{{ host_info.host_name }}</host-name>
<host-id>{{ host_info.host_id }}</host-id>
<ip-address>{{ host_info.default_ipv4() }}</ip-address>
<ipv6-address>{{ host_info.default_ipv6() }}</ipv6-address>
<generate-time>{{ generate_time }}</generate-time>
<hip-report-version>4</hip-report-version>
<categories>
<entry name="host-info">
<client-version>{{ client_version }}</client-version>
<os>{{ host_info.os_version }}</os>
<os-vendor>{{ host_info.os_vendor }}</os-vendor>
<domain>{{ host_info.domain }}.internal</domain>
<host-name>{{ host_info.host_name }}</host-name>
<host-id>{{ host_info.host_id }}</host-id>
<network-interface>
{% for iface in host_info.network_interfaces.iter() -%}
<entry name="{{ iface.name }}">
<description>{{ iface.description }}</description>
{% if let Some(mac) = iface.mac_address -%}
<mac-address>{{ mac }}</mac-address>
{% endif -%}
{% if let Some(ipv4) = iface.ipv4 -%}
<ip-address>
<entry name="{{ ipv4 }}"/>
</ip-address>
{% endif -%}
{% if let Some(ipv6) = iface.ipv6 -%}
<ipv6-address>
<entry name="{{ ipv6 }}"/>
</ipv6-address>
{% endif -%}
</entry>
{% endfor -%}
</network-interface>
</entry>
{% if host_info.os_vendor == "Microsoft" -%}
<entry name="antivirus">
<list>
<entry>
<ProductInfo>
<Prod name="McAfee VirusScan Enterprise" version="8.8.0.1804" defver="8682.0" prodType="1" engver="5900.7806" osType="1" vendor="McAfee, Inc." dateday="{{ day }}" dateyear="{{ year }}" datemon="{{ month }}">
</Prod>
<real-time-protection>yes</real-time-protection>
<last-full-scan-time>{{ generate_time }}</last-full-scan-time>
</ProductInfo>
</entry>
<entry>
<ProductInfo>
<Prod name="Windows Defender" version="4.11.15063.332" defver="1.245.683.0" prodType="1" engver="1.1.13804.0" osType="1" vendor="Microsoft Corp." dateday="{{ day }}" dateyear="{{ year }}" datemon="{{ month }}">
</Prod>
<real-time-protection>no</real-time-protection>
<last-full-scan-time>n/a</last-full-scan-time>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="anti-spyware">
<list>
<entry>
<ProductInfo>
<Prod name="McAfee VirusScan Enterprise" version="8.8.0.1804" defver="8682.0" prodType="2" engver="5900.7806" osType="1" vendor="McAfee, Inc." dateday="{{ day }}" dateyear="{{ year }}" datemon="{{ month }}">
</Prod>
<real-time-protection>yes</real-time-protection>
<last-full-scan-time>{{ generate_time }}</last-full-scan-time>
</ProductInfo>
</entry>
<entry>
<ProductInfo>
<Prod name="Windows Defender" version="4.11.15063.332" defver="1.245.683.0" prodType="2" engver="1.1.13804.0" osType="1" vendor="Microsoft Corp." dateday="{{ day }}" dateyear="{{ year }}" datemon="{{ month }}">
</Prod>
<real-time-protection>no</real-time-protection>
<last-full-scan-time>n/a</last-full-scan-time>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="disk-backup">
<list>
<entry>
<ProductInfo>
<Prod name="Windows Backup and Restore" version="{{ host_info.software_version }}" vendor="Microsoft Corp.">
</Prod>
<last-backup-time>n/a</last-backup-time>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="disk-encryption">
<list>
<entry>
<ProductInfo>
<Prod name="Windows Drive Encryption" version="{{ host_info.software_version }}" vendor="Microsoft Corp.">
</Prod>
<drives>
<entry>
<drive-name>C:\\</drive-name>
<enc-state>full</enc-state>
</entry>
</drives>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="firewall">
<list>
<entry>
<ProductInfo>
<Prod name="Microsoft Windows Firewall" version="10.0.22621.4830" vendor="Microsoft Corp.">
</Prod>
<is-enabled>yes</is-enabled>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="patch-management">
<list>
<entry>
<ProductInfo>
<Prod name="McAfee ePolicy Orchestrator Agent" version="5.0.5.658" vendor="McAfee, Inc.">
</Prod>
<is-enabled>yes</is-enabled>
</ProductInfo>
</entry>
<entry>
<ProductInfo>
<Prod name="Microsoft Windows Update Agent" version="{{ host_info.software_version }}" vendor="Microsoft Corp.">
</Prod>
<is-enabled>yes</is-enabled>
</ProductInfo>
</entry>
</list>
<missing-patches/>
</entry>
{% elif host_info.os_vendor == "Apple" -%}
<entry name="anti-malware">
<list>
<entry>
<ProductInfo>
<Prod vendor="Apple Inc." name="Xprotect" version="2167" defver="235000000000000" engver="" datemon="{{ month }}" dateday="{{ day }}" dateyear="{{ year }}" prodType="3" osType="4"/>
<real-time-protection>yes</real-time-protection>
<last-full-scan-time>n/a</last-full-scan-time>
</ProductInfo>
</entry>
<entry>
<ProductInfo>
<Prod vendor="Apple Inc." name="Gatekeeper" version="{{ host_info.software_version }}" defver="" engver="" datemon="{{ month }}" dateday="{{ day }}" dateyear="{{ year }}" prodType="3" osType="4"/>
<real-time-protection>yes</real-time-protection>
<last-full-scan-time>n/a</last-full-scan-time>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="disk-backup">
<list>
<entry>
<ProductInfo>
<Prod vendor="Apple Inc." name="Time Machine" version="1.3"/>
<last-backup-time>n/a</last-backup-time>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="disk-encryption">
<list>
<entry>
<ProductInfo>
<Prod vendor="Apple Inc." name="FileVault" version="{{ host_info.software_version }}"/>
<drives>
<entry>
<drive-name>Macintosh HD</drive-name>
<enc-state>encrypted</enc-state>
</entry>
<entry>
<drive-name>Data</drive-name>
<enc-state>encrypted</enc-state>
</entry>
<entry>
<drive-name>All</drive-name>
<enc-state>encrypted</enc-state>
</entry>
</drives>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="firewall">
<list>
<entry>
<ProductInfo>
<Prod vendor="Apple Inc." name="Mac OS X Builtin Firewall" version="{{ host_info.software_version }}"/>
<is-enabled>yes</is-enabled>
</ProductInfo>
</entry>
<entry>
<ProductInfo>
<Prod vendor="OpenBSD" name="Packet Filter" version="{{ host_info.software_version }}"/>
<is-enabled>no</is-enabled>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="patch-management">
<list>
<entry>
<ProductInfo>
<Prod vendor="Apple Inc." name="Software Update" version="3.0"/>
<is-enabled>yes</is-enabled>
</ProductInfo>
</entry>
</list>
<missing-patches>
</missing-patches>
</entry>
{% elif host_info.os_vendor == "Linux" -%}
<entry name="anti-malware">
<list/>
</entry>
<entry name="disk-backup">
<list/>
</entry>
<entry name="disk-encryption">
<list>
<entry>
<ProductInfo>
<Prod name="cryptsetup" version="2.3.3" vendor="GitLab Inc.">
</Prod>
<drives>
<entry>
<drive-name>/</drive-name>
<enc-state>encrypted</enc-state>
</entry>
</drives>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="firewall">
<list>
<entry>
<ProductInfo>
<Prod name="IPTables" version="1.8.4" vendor="IPTables">
</Prod>
<is-enabled>no</is-enabled>
</ProductInfo>
</entry>
<entry>
<ProductInfo>
<Prod name="nftables" version="0.9.3" vendor="The Netfilter Project">
</Prod>
<is-enabled>n/a</is-enabled>
</ProductInfo>
</entry>
</list>
</entry>
<entry name="patch-management">
<list>
<entry>
<ProductInfo>
<Prod name="Dandified Yum" version="4.2.23" vendor="Red Hat, Inc.">
</Prod>
<is-enabled>yes</is-enabled>
</ProductInfo>
</entry>
</list>
<missing-patches/>
</entry>
{% endif -%}
<entry name="data-loss-prevention">
<list/>
</entry>
</categories>
</hip-report>
+167
View File
@@ -0,0 +1,167 @@
function Av(l,i){for(var c=0;c<i.length;c++){const o=i[c];if(typeof o!="string"&&!Array.isArray(o)){for(const s in o)if(s!=="default"&&!(s in l)){const d=Object.getOwnPropertyDescriptor(o,s);d&&Object.defineProperty(l,s,d.get?d:{enumerable:!0,get:()=>o[s]})}}}return Object.freeze(Object.defineProperty(l,Symbol.toStringTag,{value:"Module"}))}(function(){const i=document.createElement("link").relList;if(i&&i.supports&&i.supports("modulepreload"))return;for(const s of document.querySelectorAll('link[rel="modulepreload"]'))o(s);new MutationObserver(s=>{for(const d of s)if(d.type==="childList")for(const m of d.addedNodes)m.tagName==="LINK"&&m.rel==="modulepreload"&&o(m)}).observe(document,{childList:!0,subtree:!0});function c(s){const d={};return s.integrity&&(d.integrity=s.integrity),s.referrerPolicy&&(d.referrerPolicy=s.referrerPolicy),s.crossOrigin==="use-credentials"?d.credentials="include":s.crossOrigin==="anonymous"?d.credentials="omit":d.credentials="same-origin",d}function o(s){if(s.ep)return;s.ep=!0;const d=c(s);fetch(s.href,d)}})();function xv(l){return l&&l.__esModule&&Object.prototype.hasOwnProperty.call(l,"default")?l.default:l}var hs={exports:{}},Gi={};var m0;function zv(){if(m0)return Gi;m0=1;var l=Symbol.for("react.transitional.element"),i=Symbol.for("react.fragment");function c(o,s,d){var m=null;if(d!==void 0&&(m=""+d),s.key!==void 0&&(m=""+s.key),"key"in s){d={};for(var g in s)g!=="key"&&(d[g]=s[g])}else d=s;return s=d.ref,{$$typeof:l,type:o,key:m,ref:s!==void 0?s:null,props:d}}return Gi.Fragment=i,Gi.jsx=c,Gi.jsxs=c,Gi}var y0;function Ov(){return y0||(y0=1,hs.exports=zv()),hs.exports}var lt=Ov(),ms={exports:{}},Yi={},ys={exports:{}},ps={};var p0;function Mv(){return p0||(p0=1,(function(l){function i(O,$){var et=O.length;O.push($);t:for(;0<et;){var rt=et-1>>>1,wt=O[rt];if(0<s(wt,$))O[rt]=$,O[et]=wt,et=rt;else break t}}function c(O){return O.length===0?null:O[0]}function o(O){if(O.length===0)return null;var $=O[0],et=O.pop();if(et!==$){O[0]=et;t:for(var rt=0,wt=O.length,S=wt>>>1;rt<S;){var j=2*(rt+1)-1,W=O[j],tt=j+1,ot=O[tt];if(0>s(W,et))tt<wt&&0>s(ot,W)?(O[rt]=ot,O[tt]=et,rt=tt):(O[rt]=W,O[j]=et,rt=j);else if(tt<wt&&0>s(ot,et))O[rt]=ot,O[tt]=et,rt=tt;else break t}}return $}function s(O,$){var et=O.sortIndex-$.sortIndex;return et!==0?et:O.id-$.id}if(l.unstable_now=void 0,typeof performance=="object"&&typeof performance.now=="function"){var d=performance;l.unstable_now=function(){return d.now()}}else{var m=Date,g=m.now();l.unstable_now=function(){return m.now()-g}}var v=[],p=[],A=1,E=null,D=3,q=!1,R=!1,_=!1,Y=!1,J=typeof setTimeout=="function"?setTimeout:null,F=typeof clearTimeout=="function"?clearTimeout:null,P=typeof setImmediate<"u"?setImmediate:null;function X(O){for(var $=c(p);$!==null;){if($.callback===null)o(p);else if($.startTime<=O)o(p),$.sortIndex=$.expirationTime,i(v,$);else break;$=c(p)}}function U(O){if(_=!1,X(O),!R)if(c(v)!==null)R=!0,G||(G=!0,y());else{var $=c(p);$!==null&&at(U,$.startTime-O)}}var G=!1,V=-1,dt=5,ht=-1;function gt(){return Y?!0:!(l.unstable_now()-ht<dt)}function ct(){if(Y=!1,G){var O=l.unstable_now();ht=O;var $=!0;try{t:{R=!1,_&&(_=!1,F(V),V=-1),q=!0;var et=D;try{e:{for(X(O),E=c(v);E!==null&&!(E.expirationTime>O&&gt());){var rt=E.callback;if(typeof rt=="function"){E.callback=null,D=E.priorityLevel;var wt=rt(E.expirationTime<=O);if(O=l.unstable_now(),typeof wt=="function"){E.callback=wt,X(O),$=!0;break e}E===c(v)&&o(v),X(O)}else o(v);E=c(v)}if(E!==null)$=!0;else{var S=c(p);S!==null&&at(U,S.startTime-O),$=!1}}break t}finally{E=null,D=et,q=!1}$=void 0}}finally{$?y():G=!1}}}var y;if(typeof P=="function")y=function(){P(ct)};else if(typeof MessageChannel<"u"){var k=new MessageChannel,Q=k.port2;k.port1.onmessage=ct,y=function(){Q.postMessage(null)}}else y=function(){J(ct,0)};function at(O,$){V=J(function(){O(l.unstable_now())},$)}l.unstable_IdlePriority=5,l.unstable_ImmediatePriority=1,l.unstable_LowPriority=4,l.unstable_NormalPriority=3,l.unstable_Profiling=null,l.unstable_UserBlockingPriority=2,l.unstable_cancelCallback=function(O){O.callback=null},l.unstable_forceFrameRate=function(O){0>O||125<O?console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported"):dt=0<O?Math.floor(1e3/O):5},l.unstable_getCurrentPriorityLevel=function(){return D},l.unstable_next=function(O){switch(D){case 1:case 2:case 3:var $=3;break;default:$=D}var et=D;D=$;try{return O()}finally{D=et}},l.unstable_requestPaint=function(){Y=!0},l.unstable_runWithPriority=function(O,$){switch(O){case 1:case 2:case 3:case 4:case 5:break;default:O=3}var et=D;D=O;try{return $()}finally{D=et}},l.unstable_scheduleCallback=function(O,$,et){var rt=l.unstable_now();switch(typeof et=="object"&&et!==null?(et=et.delay,et=typeof et=="number"&&0<et?rt+et:rt):et=rt,O){case 1:var wt=-1;break;case 2:wt=250;break;case 5:wt=1073741823;break;case 4:wt=1e4;break;default:wt=5e3}return wt=et+wt,O={id:A++,callback:$,priorityLevel:O,startTime:et,expirationTime:wt,sortLine truncated
at`)?" (<anonymous>)":-1<n.stack.indexOf("@")?"@unknown:0:0":""}return`
`+Xl+t+iu}var $l=!1;function Ql(t,e){if(!t||$l)return"";$l=!0;var n=Error.prepareStackTrace;Error.prepareStackTrace=void 0;try{var a={DetermineComponentFrameRoot:function(){try{if(e){var L=function(){throw Error()};if(Object.defineProperty(L.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(L,[])}catch(w){var M=w}Reflect.construct(t,[],L)}else{try{L.call()}catch(w){M=w}t.call(L.prototype)}}else{try{throw Error()}catch(w){M=w}(L=t())&&typeof L.catch=="function"&&L.catch(function(){})}}catch(w){if(w&&M&&typeof w.stack=="string")return[w.stack,M.stack]}return[null,null]}};a.DetermineComponentFrameRoot.displayName="DetermineComponentFrameRoot";var u=Object.getOwnPropertyDescriptor(a.DetermineComponentFrameRoot,"name");u&&u.configurable&&Object.defineProperty(a.DetermineComponentFrameRoot,"name",{value:"DetermineComponentFrameRoot"});var r=a.DetermineComponentFrameRoot(),f=r[0],h=r[1];if(f&&h){var b=f.split(`
`),z=h.split(`
`);for(u=a=0;a<b.length&&!b[a].includes("DetermineComponentFrameRoot");)a++;for(;u<z.length&&!z[u].includes("DetermineComponentFrameRoot");)u++;if(a===b.length||u===z.length)for(a=b.length-1,u=z.length-1;1<=a&&0<=u&&b[a]!==z[u];)u--;for(;1<=a&&0<=u;a--,u--)if(b[a]!==z[u]){if(a!==1||u!==1)do if(a--,u--,0>u||b[a]!==z[u]){var B=`
`+b[a].replace(" at new "," at ");return t.displayName&&B.includes("<anonymous>")&&(B=B.replace("<anonymous>",t.displayName)),B}while(1<=a&&0<=u);break}}}finally{$l=!1,Error.prepareStackTrace=n}return(n=t?t.displayName||t.name:"")?en(n):""}function $a(t,e){switch(t.tag){case 26:case 27:case 5:return en(t.type);case 16:return en("Lazy");case 13:return t.child!==e&&e!==null?en("Suspense Fallback"):en("Suspense");case 19:return en("SuspenseList");case 0:case 15:return Ql(t.type,!1);case 11:return Ql(t.type.render,!1);case 1:return Ql(t.type,!0);case 31:return en("Activity");default:return""}}function qn(t){try{var e="",n=null;do e+=$a(t,n),n=t,t=t.return;while(t);return e}catch(a){return`
Error generating stack: `+a.message+`
`+a.stack}}var Zl=Object.prototype.hasOwnProperty,Qa=l.unstable_scheduleCallback,kl=l.unstable_cancelCallback,ft=l.unstable_shouldYield,lp=l.unstable_requestPaint,ze=l.unstable_now,ip=l.unstable_getCurrentPriorityLevel,yf=l.unstable_ImmediatePriority,pf=l.unstable_UserBlockingPriority,uu=l.unstable_NormalPriority,up=l.unstable_LowPriority,gf=l.unstable_IdlePriority,rp=l.log,cp=l.unstable_setDisableYieldValue,Kl=null,Oe=null;function Gn(t){if(typeof rp=="function"&&cp(t),Oe&&typeof Oe.setStrictMode=="function")try{Oe.setStrictMode(Kl,t)}catch{}}var Me=Math.clz32?Math.clz32:fp,op=Math.log,sp=Math.LN2;function fp(t){return t>>>=0,t===0?32:31-(op(t)/sp|0)|0}var ru=256,cu=262144,ou=4194304;function ga(t){var e=t&42;if(e!==0)return e;switch(t&-t){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 t&261888;case 262144:case 524288:case 1048576:case 2097152:return t&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return t&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return t}}function su(t,e,n){var a=t.pendingLanes;if(a===0)return 0;var u=0,r=t.suspendedLanes,f=t.pingedLanes;t=t.warmLanes;var h=a&134217727;return h!==0?(a=h&~r,a!==0?u=ga(a):(f&=h,f!==0?u=ga(f):n||(n=h&~t,n!==0&&(u=ga(n))))):(h=a&~r,h!==0?u=ga(h):f!==0?u=ga(f):n||(n=a&~t,n!==0&&(u=ga(n)))),u===0?0:e!==0&&e!==u&&(e&r)===0&&(r=u&-u,n=e&-e,r>=n||r===32&&(n&4194048)!==0)?e:u}function Jl(t,e){return(t.pendingLanes&~(t.suspendedLanes&~t.pingedLanes)&e)===0}function dp(t,e){switch(t){case 1:case 2:case 4:case 8:case 64:return e+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 e+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 vf(){var t=ou;return ou<<=1,(ou&62914560)===0&&(ou=4194304),t}function tc(t){for(var e=[],n=0;31>n;n++)e.push(t);return e}function Wl(t,e){t.pendingLanes|=e,e!==268435456&&(t.suspendedLanes=0,t.pingedLanes=0,t.warmLanes=0)}function hp(t,e,n,a,u,r){var f=t.pendingLanes;t.pendingLanes=n,t.suspendedLanes=0,t.pingedLanes=0,t.warmLanes=0,t.expiredLanes&=n,t.entangledLanes&=n,t.errorRecoveryDisabledLanes&=n,t.shellSuspendCounter=0;var h=t.entanglements,b=t.expirationTimes,z=t.hiddenUpdates;for(n=f&~n;0<n;){var B=31-Me(n),L=1<<B;h[B]=0,b[B]=-1;var M=z[B];if(M!==null)for(z[B]=null,B=0;B<M.length;B++){var w=M[B];w!==null&&(w.lane&=-536870913)}n&=~L}a!==0&&bf(t,a,0),r!==0&&u===0&&t.tag!==0&&(t.suspendedLanes|=r&~(f&~e))}function bf(t,e,n){t.pendingLanes|=e,t.suspendedLanes&=~e;var a=31-Me(e);t.entangledLanes|=e,t.entanglements[a]=t.entanglements[a]|1073741824|n&261930}function Sf(t,e){var n=t.entangledLanes|=e;for(t=t.entanglements;n;){var a=31-Me(n),u=1<<a;u&e|t[a]&e&&(t[a]|=e),n&=~u}}function Tf(t,e){var n=e&-e;return n=(n&42)!==0?1:ec(n),(n&(t.suspendedLanes|e))!==0?0:n}function ec(t){switch(t){case 2:t=1;break;case 8:t=4;break;case 32:t=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:t=128;break;case 268435456:t=134217728;break;default:t=0}return t}function nc(t){return t&=-t,2<t?8<t?(t&134217727)!==0?32:268435456:8:2}function Cf(){var t=$.p;return t!==0?t:(t=window.event,t===void 0?32:r0(t.type))}function Ef(t,e){var n=$.p;try{return $.p=t,e()}finally{$.p=n}}var Yn=Math.random().toString(36).slice(2),ce="__reactFiber$"+Yn,be="__reactProps$"+Yn,Za="__reactContainer$"+Yn,ac="__reactEvents$"+Yn,mp="__reactListeners$"+Yn,yp="__reactHandles$"+Yn,_f="__reactResources$"+Yn,Fl="__reactMarker$"+Yn;function lc(t){delete t[ce],delete t[be],delete t[ac],delete t[mp],delete t[yp]}function ka(t){var e=t[ce];if(e)return e;for(var n=t.parentNode;n;){if(e=n[Za]||n[ce]){if(n=e.alternate,e.child!==null||n!==null&&n.child!==null)for(t=Qm(t);t!==null;){if(n=t[ce])return n;t=Qm(t)}return e}t=n,n=t.parentNode}return null}function Ka(t){if(t=t[ce]||t[Za]){var e=t.tag;if(e===5||e===6||e===13||e===31||e===26||e===27||e===3)return t}return null}function Pl(t){var e=t.tag;if(e===5||e===26||e===27||e===6)return t.stateNode;throw Error(o(33))}function Ja(t){var e=t[_f];return e||(e=t[_f]={hoistableStyles:new Map,hoistableScripts:new Map}),e}function ie(t){t[Fl]=!0}var Af=new Set,xf={};function va(t,e){Wa(t,e),Wa(t+"Capture",e)}function Wa(t,e){for(xf[t]=e,t=0;t<e.length;t++)Af.add(e[t])}var pp=RegExp("^[:A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u21 Line truncated
`).replace(kg,"")}function Um(t,e){return e=Nm(e),Nm(t)===e}function jt(t,e,n,a,u,r){switch(n){case"children":typeof a=="string"?e==="body"||e==="textarea"&&a===""||Pa(t,a):(typeof a=="number"||typeof a=="bigint")&&e!=="body"&&Pa(t,""+a);break;case"className":du(t,"class",a);break;case"tabIndex":du(t,"tabindex",a);break;case"dir":case"role":case"viewBox":case"width":case"height":du(t,n,a);break;case"style":Uf(t,a,r);break;case"data":if(e!=="object"){du(t,"data",a);break}case"src":case"href":if(a===""&&(e!=="a"||n!=="href")){t.removeAttribute(n);break}if(a==null||typeof a=="function"||typeof a=="symbol"||typeof a=="boolean"){t.removeAttribute(n);break}a=mu(""+a),t.setAttribute(n,a);break;case"action":case"formAction":if(typeof a=="function"){t.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}else typeof r=="function"&&(n==="formAction"?(e!=="input"&&jt(t,e,"name",u.name,u,null),jt(t,e,"formEncType",u.formEncType,u,null),jt(t,e,"formMethod",u.formMethod,u,null),jt(t,e,"formTarget",u.formTarget,u,null)):(jt(t,e,"encType",u.encType,u,null),jt(t,e,"method",u.method,u,null),jt(t,e,"target",u.target,u,null)));if(a==null||typeof a=="symbol"||typeof a=="boolean"){t.removeAttribute(n);break}a=mu(""+a),t.setAttribute(n,a);break;case"onClick":a!=null&&(t.onclick=gn);break;case"onScroll":a!=null&&bt("scroll",t);break;case"onScrollEnd":a!=null&&bt("scrollend",t);break;case"dangerouslySetInnerHTML":if(a!=null){if(typeof a!="object"||!("__html"in a))throw Error(o(61));if(n=a.__html,n!=null){if(u.children!=null)throw Error(o(60));t.innerHTML=n}}break;case"multiple":t.multiple=a&&typeof a!="function"&&typeof a!="symbol";break;case"muted":t.muted=a&&typeof a!="function"&&typeof a!="symbol";break;case"suppressContentEditableWarning":case"suppressHydrationWarning":case"defaultValue":case"defaultChecked":case"innerHTML":case"ref":break;case"autoFocus":break;case"xlinkHref":if(a==null||typeof a=="function"||typeof a=="boolean"||typeof a=="symbol"){t.removeAttribute("xlink:href");break}n=mu(""+a),t.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":a!=null&&typeof a!="function"&&typeof a!="symbol"?t.setAttribute(n,""+a):t.removeAttribute(n);break;case"inert":case"allowFullScreen":case"async":case"autoPlay":case"controls":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":a&&typeof a!="function"&&typeof a!="symbol"?t.setAttribute(n,""):t.removeAttribute(n);break;case"capture":case"download":a===!0?t.setAttribute(n,""):a!==!1&&a!=null&&typeof a!="function"&&typeof a!="symbol"?t.setAttribute(n,a):t.removeAttribute(n);break;case"cols":case"rows":case"size":case"span":a!=null&&typeof a!="function"&&typeof a!="symbol"&&!isNaN(a)&&1<=a?t.setAttribute(n,a):t.removeAttribute(n);break;case"rowSpan":case"start":a==null||typeof a=="function"||typeof a=="symbol"||isNaN(a)?t.removeAttribute(n):t.setAttribute(n,a);break;case"popover":bt("beforetoggle",t),bt("toggle",t),fu(t,"popover",a);break;case"xlinkActuate":pn(t,"http://www.w3.org/1999/xlink","xlink:actuate",a);break;case"xlinkArcrole":pn(t,"http://www.w3.org/1999/xlink","xlink:arcrole",a);break;case"xlinkRole":pn(t,"http://www.w3.org/1999/xlink","xlink:role",a);break;case"xlinkShow":pn(t,"http://www.w3.org/1999/xlink","xlink:show",a);break;case"xlinkTitle":pn(t,"http://www.w3.org/1999/xlink","xlink:title",a);break;case"xlinkType":pn(t,"http://www.w3.org/1999/xlink","xlink:type",a);break;case"xmlBase":pn(t,"http://www.w3.org/XML/1998/namespace","xml:base",a);break;case"xmlLang":pn(t,"http://www.w3.org/XML/1998/namespace","xml:lang",a);break;case"xmlSpace":pn(t,"http://www.w3.org/XML/1998/namespace","xml:space",a);break;case"is":fu(t,"is",a);break;case"innerText":case"textContent":break;default:(!(2<n.length)||n[0]!=="o"&&n[0]!=="O"||n[1]!=="n"&&n[1]!=="N")&&(n=Tp.get(n)||n,fu(t,n,a))}}function Jo(t,e,n,a,u,r){switch(n){case"style":Uf(t,a,r);break;case"dangerouslySetInnerHTML":if(a!=null){if(typeof a!="object"||!("__html"in a))throw Error(o(61));if(n=a.__html,n!=null){if(u.children!=null)throw Error(o(60));t.innerHTML=n}}break;case"children":typeof a=="string"?Pa(t,a):(typeof a=="number"||typeof a=="bigint")&&Pa(t,""+a);break;case"onScroll":a!=null&&bt("scroll",t);break;case"onScrollEnd":a!=null&&bt("scrollend",t);break;case"onClick":a!=null&&(t.onclick=gn);break;case"suppressContentEditableWarning":case"suppressHydrationWarning":case"inne Line truncated
const theme = ${JSON.stringify(i,null,2)};
theme.breakpoints = createBreakpoints(theme.breakpoints || {});
theme.transitions = createTransitions(theme.transitions || {});
export default theme;`}function ty(l){return typeof l=="number"?`${(l*100).toFixed(0)}%`:`calc((${l}) * 100%)`}const jS=l=>{if(!Number.isNaN(+l))return+l;const i=l.match(/\d*\.?\d+/g);if(!i)return 0;let c=0;for(let o=0;o<i.length;o+=1)c+=+i[o];return c};function LS(l){Object.assign(l,{alpha(i,c){const o=this||l;return o.colorSpace?`oklch(from ${i} l c h / ${typeof c=="string"?`calc(${c})`:c})`:o.vars?`rgba(${i.replace(/var\(--([^,\s)]+)(?:,[^)]+)?\)+/g,"var(--$1Channel)")} / ${typeof c=="string"?`calc(${c})`:c})`:Ly(i,jS(c))},lighten(i,c){const o=this||l;return o.colorSpace?`color-mix(in ${o.colorSpace}, ${i}, #fff ${ty(c)})`:Ir(i,c)},darken(i,c){const o=this||l;return o.colorSpace?`color-mix(in ${o.colorSpace}, ${i}, #000 ${ty(c)})`:Pr(i,c)}})}function Hs(l={},...i){const{breakpoints:c,mixins:o={},spacing:s,palette:d={},transitions:m={},typography:g={},shape:v,colorSpace:p,...A}=l;if(l.vars&&l.generateThemeVars===void 0)throw new Error(qa(20));const E=of({...d,colorSpace:p}),D=rf(l);let q=Ge(D,{mixins:_S(D.breakpoints,o),palette:E,shadows:RS.slice(),typography:xS(E,g),transitions:NS(m),zIndex:{...US}});return q=Ge(q,A),q=i.reduce((R,_)=>Ge(R,_),q),q.unstable_sxConfig={...au,...A?.unstable_sxConfig},q.unstable_sx=function(_){return Ga({sx:_,theme:this})},q.toRuntimeSource=Vy,LS(q),q}function qS(l){let i;return l<1?i=5.11916*l**2:i=4.5*Math.log(l+1)+2,Math.round(i*10)/1e3}const GS=[...Array(25)].map((l,i)=>{if(i===0)return"none";const c=qS(i);return`linear-gradient(rgba(255 255 255 / ${c}), rgba(255 255 255 / ${c}))`});function Xy(l){return{inputPlaceholder:l==="dark"?.5:.42,inputUnderline:l==="dark"?.7:.42,switchTrackDisabled:l==="dark"?.2:.12,switchTrack:l==="dark"?.3:.38}}function $y(l){return l==="dark"?GS:[]}function YS(l){const{palette:i={mode:"light"},opacity:c,overlays:o,colorSpace:s,...d}=l,m=of({...i,colorSpace:s});return{palette:m,opacity:{...Xy(m.mode),...c},overlays:o||$y(m.mode),...d}}function VS(l){return!!l[0].match(/(cssVarPrefix|colorSchemeSelector|modularCssLayers|rootSelector|typography|mixins|breakpoints|direction|transitions)/)||!!l[0].match(/sxConfig$/)||l[0]==="palette"&&!!l[1]?.match(/(mode|contrastThreshold|tonalOffset)/)}const XS=l=>[...[...Array(25)].map((i,c)=>`--${l?`${l}-`:""}overlays-${c}`),`--${l?`${l}-`:""}palette-AppBar-darkBg`,`--${l?`${l}-`:""}palette-AppBar-darkColor`],$S=l=>(i,c)=>{const o=l.rootSelector||":root",s=l.colorSchemeSelector;let d=s;if(s==="class"&&(d=".%s"),s==="data"&&(d="[data-%s]"),s?.startsWith("data-")&&!s.includes("%s")&&(d=`[${s}="%s"]`),l.defaultColorScheme===i){if(i==="dark"){const m={};return XS(l.cssVarPrefix).forEach(g=>{m[g]=c[g],delete c[g]}),d==="media"?{[o]:c,"@media (prefers-color-scheme: dark)":{[o]:m}}:d?{[d.replace("%s",i)]:m,[`${o}, ${d.replace("%s",i)}`]:c}:{[o]:{...c,...m}}}if(d&&d!=="media")return`${o}, ${d.replace("%s",String(i))}`}else if(i){if(d==="media")return{[`@media (prefers-color-scheme: ${String(i)})`]:{[o]:c}};if(d)return d.replace("%s",String(i))}return o};function QS(l,i){i.forEach(c=>{l[c]||(l[c]={})})}function N(l,i,c){!l[i]&&c&&(l[i]=c)}function Qi(l){return typeof l!="string"||!l.startsWith("hsl")?l:jy(l)}function Nn(l,i){`${i}Channel`in l||(l[`${i}Channel`]=$i(Qi(l[i])))}function ZS(l){return typeof l=="number"?`${l}px`:typeof l=="string"||typeof l=="function"||Array.isArray(l)?l:"8px"}const fn=l=>{try{return l()}catch{}},kS=(l="mui")=>fS(l);function xs(l,i,c,o,s){if(!c)return;c=c===!0?{}:c;const d=s==="dark"?"dark":"light";if(!o){i[s]=YS({...c,palette:{mode:d,...c?.palette},colorSpace:l});return}const{palette:m,...g}=Hs({...o,palette:{mode:d,...c?.palette},colorSpace:l});return i[s]={...c,palette:m,opacity:{...Xy(d),...c?.opacity},overlays:c?.overlays||$y(d)},g}function KS(l={},...i){const{colorSchemes:c={light:!0},defaultColorScheme:o,disableCssColorScheme:s=!1,cssVarPrefix:d="mui",nativeColor:m=!1,shouldSkipGeneratingVar:g=VS,colorSchemeSelector:v=c.light&&c.dark?"media":void 0,rootSelector:p=":root",...A}=l,E=Object.keys(c)[0],D=o||(c.light&&E!=="light"?"light":E),q=kS(d),{[D]:R,light:_,dark:Y,...J}=c,F={...J};let P=R;if((D==="dark"&&!("dark"in c)||D==="light"&&!("light"in c))&&(P=!0),!P)throw new Error(qa(21,D));let X;m&&(X="oklch");const U=xs(X,F,P,A,D);_&&!F.light&&xs(X,F,_,void 0,"light"),Y&&!F.dark&&xs(X,F,Y,void 0,"dark");let G={defaultColorScheme:D,...U,cssVarPrefix:d,colorSchemeSelector:v,rootSelector:p,getCssVar:q,colorSchemes:F,font:{...ES(U.typography),...U.font},spacing:ZS(A.spacing)};Object.keys(G.colorSchemes).forEach(ct=>{const y=G.colorSchemes[ct].palette,k=at=>{const O=at.split("-"),$=O[1],et=O[2];return q(at,y[$][et])};y.mode==="light"&&(N(y.common,"background","#fff"),N(y.common,"onBackground","#000")),y.mode==="dark"&&(N(y.common,"background","#000"),N(y.common,"onBackground","#fff"));function Q(at,O,$){if(X){let et;return at===Ua&&(et=`transparent ${((1-$)*100).toFixed(0)}%`),at===Nt&&(et=`#000 ${($*100).toFixed(0)}%`),at===Ut&&(et=`#fff ${($*100).toFixed(0)}%`),`color-mix(in ${X}, ${O}, ${Line truncated
0% {
transform: scale(0);
opacity: 0.1;
}
100% {
transform: scale(1);
opacity: 0.3;
}
`,m2=ya`
0% {
opacity: 1;
}
100% {
opacity: 0;
}
`,y2=ya`
0% {
transform: scale(1);
}
50% {
transform: scale(0.92);
}
100% {
transform: scale(1);
}
`,p2=ye("span",{name:"MuiTouchRipple",slot:"Root"})({overflow:"hidden",pointerEvents:"none",position:"absolute",zIndex:0,top:0,right:0,bottom:0,left:0,borderRadius:"inherit"}),g2=ye(f2,{name:"MuiTouchRipple",slot:"Ripple"})`
opacity: 0;
position: absolute;
&.${Fe.rippleVisible} {
opacity: 0.3;
transform: scale(1);
animation-name: ${h2};
animation-duration: ${Ls}ms;
animation-timing-function: ${({theme:l})=>l.transitions.easing.easeInOut};
}
&.${Fe.ripplePulsate} {
animation-duration: ${({theme:l})=>l.transitions.duration.shorter}ms;
}
& .${Fe.child} {
opacity: 1;
display: block;
width: 100%;
height: 100%;
border-radius: 50%;
background-color: currentColor;
}
& .${Fe.childLeaving} {
opacity: 0;
animation-name: ${m2};
animation-duration: ${Ls}ms;
animation-timing-function: ${({theme:l})=>l.transitions.easing.easeInOut};
}
& .${Fe.childPulsate} {
position: absolute;
/* @noflip */
left: 0px;
top: 0;
animation-name: ${y2};
animation-duration: 2500ms;
animation-timing-function: ${({theme:l})=>l.transitions.easing.easeInOut};
animation-iteration-count: infinite;
animation-delay: 200ms;
}
`,v2=Z.forwardRef(function(i,c){const o=Va({props:i,name:"MuiTouchRipple"}),{center:s=!1,classes:d={},className:m,...g}=o,[v,p]=Z.useState([]),A=Z.useRef(0),E=Z.useRef(null);Z.useEffect(()=>{E.current&&(E.current(),E.current=null)},[v]);const D=Z.useRef(!1),q=c2(),R=Z.useRef(null),_=Z.useRef(null),Y=Z.useCallback(X=>{const{pulsate:U,rippleX:G,rippleY:V,rippleSize:dt,cb:ht}=X;p(gt=>[...gt,lt.jsx(g2,{classes:{ripple:me(d.ripple,Fe.ripple),rippleVisible:me(d.rippleVisible,Fe.rippleVisible),ripplePulsate:me(d.ripplePulsate,Fe.ripplePulsate),child:me(d.child,Fe.child),childLeaving:me(d.childLeaving,Fe.childLeaving),childPulsate:me(d.childPulsate,Fe.childPulsate)},timeout:Ls,pulsate:U,rippleX:G,rippleY:V,rippleSize:dt},A.current)]),A.current+=1,E.current=ht},[d]),J=Z.useCallback((X={},U={},G=()=>{})=>{const{pulsate:V=!1,center:dt=s||U.pulsate,fakeElement:ht=!1}=U;if(X?.type==="mousedown"&&D.current){D.current=!1;return}X?.type==="touchstart"&&(D.current=!0);const gt=ht?null:_.current,ct=gt?gt.getBoundingClientRect():{width:0,height:0,left:0,top:0};let y,k,Q;if(dt||X===void 0||X.clientX===0&&X.clientY===0||!X.clientX&&!X.touches)y=Math.round(ct.width/2),k=Math.round(ct.height/2);else{const{clientX:at,clientY:O}=X.touches&&X.touches.length>0?X.touches[0]:X;y=Math.round(at-ct.left),k=Math.round(O-ct.top)}if(dt)Q=Math.sqrt((2*ct.width**2+ct.height**2)/3),Q%2===0&&(Q+=1);else{const at=Math.max(Math.abs((gt?gt.clientWidth:0)-y),y)*2+2,O=Math.max(Math.abs((gt?gt.clientHeight:0)-k),k)*2+2;Q=Math.sqrt(at**2+O**2)}X?.touches?R.current===null&&(R.current=()=>{Y({pulsate:V,rippleX:y,rippleY:k,rippleSize:Q,cb:G})},q.start(d2,()=>{R.current&&(R.current(),R.current=null)})):Y({pulsate:V,rippleX:y,rippleY:k,rippleSize:Q,cb:G})},[s,Y,q]),F=Z.useCallback(()=>{J({},{pulsate:!0})},[J]),P=Z.useCallback((X,U)=>{if(q.clear(),X?.type==="touchend"&&R.current){R.current(),R.current=null,q.start(0,()=>{P(X,U)});return}R.current=null,p(G=>G.length>0?G.slice(1):G),E.current=U},[q]);return Z.useImperativeHandle(c,()=>({pulsate:F,start:J,stop:P}),[F,J,P]),lt.jsx(p2,{className:me(Fe.root,d.root,m),ref:_,...g,children:lt.jsx(ff,{component:null,exit:!0,children:v})})});function b2(l){return Vl("MuiButtonBase",l)}const S2=Ya("MuiButtonBase",["root","disabled","focusVisible"]),T2=l=>{const{disabled:i,focusVisible:c,focusVisibleClassName:o,classes:s}=l,m=lu({root:["root",i&&"disabled",c&&"focusVisible"]},b2,s);return c&&o&&(m.root+=` ${o}`),m},C2=ye("button",{name:"MuiButtonBase",slot:"Root"})({display:"inline-flex",alignItems:"center",justifyContent:"center",position:"relative",boxSizing:"border-box",WebkitTapHighlightColor:"transparent",backgroundColor:"transparent",outline:0,border:0,margin:0,borderRadius:0,padding:0,cursor:"pointer",userSelect:"none",verticalAlign:"middle",MozAppearance:"none",WebkitAppearance:"none",textDecoration:"none",color:"inherit","&::-moz-focus-inner":{borderStyle:"none"},[`&.${S2.disabled}`]:{pointerEvents:"none",cursor:"default"},"@media print":{colorAdjust:"exact"}}),E2=Z.forwardRef(function(i,c){const o=Va({props:i,name:"MuiButtonBase"}),{action:s,centerRipple:d=!1,children:m,className:g,component:v="button",disabled:p=!1,disableRipple:A=!1,disableTouchRipple:E=!1,focusRipple:D=!1,focusVisibleClassName:q,LinkComponent:R="a",onBlur:_,onClick:Y,onContextMenu:J,onDragLeave:F,onFocus:P,onFocusVisible:X,onKeyDown:U,onKeyUp:G,onMouseDown:V,onMouseLeave:dt,onMouseUp:ht,onTouchEnd:gt,onTouchMove:ct,onTouchStart:y,tabIndex:k=0,TouchRippleProps:Q,touchRippleRef:at,type:O,...$}=o,et=Z.useRef(null),rt=o2(),wt=ny(rt.ref,at),[S,j]=Z.useState(!1);p&&S&&j(!1),Z.useImperativeHandle(s,()=>({focusVisible:()=>{j(!0),et.current.focus()}}),[]);const W=rt.shouldMount&&!A&&!p;Z.useEffect(()=>{S&&D&&!A&&rt.pulsate()},[A,D,S,rt]);const tt=Un(rt,"start",V,E),ot=Un(rt,"stop",J,E),pt=Un(rt,"stop",F,E),Et=Un(rt,"stop",ht,E),re=Un(rt,"stop",ft=>{S&&ft.preventDefault(),dt&&dt(ft)},E),Qt=Un(rt,"start",y,E),pa=Un(rt,"stop",gt,E),Xa=Un(rt,"stop",ct,E),Xl=Un(rt,"stop",ft=>{iy(ft.target)||j(!1),_&&_(ft)},!1),iu=Rr(ft=>{et.current||(et.current=ft.currentTarget),iy(ft.target)&&(j(!0),X&&X(ft)),P&&P(ft)}),en=()=>{const ft=et.current;return v&&v!=="button"&&!(ft.tagName==="A"&&ft.href)},$l=Rr(ft=>{D&&!ft.repeat&&S&&ft.key===" "&&rt.stop(ft,()=>{rt.start(ft)}),ft.target===ft.currentTarget&&en()&&ft.key===" "&&ft.preventDefault(),U&&U(ft),ft.target===ft.currentTarget&&en()&&ft.key==="Enter"&&!p&&(ft.preventDefault(),Y&&Y(ft))}),Ql=Rr(ft=>{D&&ft.key===" "&&S&&!ft.defaultPrevented&&rt.stop(ft,()=>{rt.pulsate(ft)}),G&&G(ft),Y&&ft.target===ft.currentTarget&&en()&&ft.key===" "&&!ft.defaultPrevented&&Y(ft)});let $a=v;$a==="button"&&($.href||$.to)&&($a=R);const qn={};if($a==="button"){const ft=!!$.formAction;qn.type=O===void 0&&!ft?"button":O,qn.disabled=p}else!$.href&&!$.to&&(qn.role="button"),p&&(qn["aria-disabled"]=p);const Zl=ny(c,et),Qa={...o,centerRipple:d,component:v,disabled:p,disableRipple:A,disableTouchRipple:E,focusRipple:D,tabIndex:k,focusVisible:S},kl= Line truncated
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
`,Gs=ya`
0% {
stroke-dasharray: 1px, 200px;
stroke-dashoffset: 0;
}
50% {
stroke-dasharray: 100px, 200px;
stroke-dashoffset: -15px;
}
100% {
stroke-dasharray: 1px, 200px;
stroke-dashoffset: -126px;
}
`,z2=typeof qs!="string"?Yl`
animation: ${qs} 1.4s linear infinite;
`:null,O2=typeof Gs!="string"?Yl`
animation: ${Gs} 1.4s ease-in-out infinite;
`:null,M2=l=>{const{classes:i,variant:c,color:o,disableShrink:s}=l,d={root:["root",c,`color${Rt(o)}`],svg:["svg"],track:["track"],circle:["circle",`circle${Rt(c)}`,s&&"circleDisableShrink"]};return lu(d,x2,i)},R2=ye("span",{name:"MuiCircularProgress",slot:"Root",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.root,i[c.variant],i[`color${Rt(c.color)}`]]}})(Ln(({theme:l})=>({display:"inline-block",variants:[{props:{variant:"determinate"},style:{transition:l.transitions.create("transform")}},{props:{variant:"indeterminate"},style:z2||{animation:`${qs} 1.4s linear infinite`}},...Object.entries(l.palette).filter(ma()).map(([i])=>({props:{color:i},style:{color:(l.vars||l).palette[i].main}}))]}))),w2=ye("svg",{name:"MuiCircularProgress",slot:"Svg"})({display:"block"}),D2=ye("circle",{name:"MuiCircularProgress",slot:"Circle",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.circle,i[`circle${Rt(c.variant)}`],c.disableShrink&&i.circleDisableShrink]}})(Ln(({theme:l})=>({stroke:"currentColor",variants:[{props:{variant:"determinate"},style:{transition:l.transitions.create("stroke-dashoffset")}},{props:{variant:"indeterminate"},style:{strokeDasharray:"80px, 200px",strokeDashoffset:0}},{props:({ownerState:i})=>i.variant==="indeterminate"&&!i.disableShrink,style:O2||{animation:`${Gs} 1.4s ease-in-out infinite`}}]}))),B2=ye("circle",{name:"MuiCircularProgress",slot:"Track"})(Ln(({theme:l})=>({stroke:"currentColor",opacity:(l.vars||l).palette.action.activatedOpacity}))),N2=Z.forwardRef(function(i,c){const o=Va({props:i,name:"MuiCircularProgress"}),{className:s,color:d="primary",disableShrink:m=!1,enableTrackSlot:g=!1,size:v=40,style:p,thickness:A=3.6,value:E=0,variant:D="indeterminate",...q}=o,R={...o,color:d,disableShrink:m,size:v,thickness:A,value:E,variant:D,enableTrackSlot:g},_=M2(R),Y={},J={},F={};if(D==="determinate"){const P=2*Math.PI*((un-A)/2);Y.strokeDasharray=P.toFixed(3),F["aria-valuenow"]=Math.round(E),Y.strokeDashoffset=`${((100-E)/100*P).toFixed(3)}px`,J.transform="rotate(-90deg)"}return lt.jsx(R2,{className:me(_.root,s),style:{width:v,height:v,...J,...p},ownerState:R,ref:c,role:"progressbar",...F,...q,children:lt.jsxs(w2,{className:_.svg,ownerState:R,viewBox:`${un/2} ${un/2} ${un} ${un}`,children:[g?lt.jsx(B2,{className:_.track,ownerState:R,cx:un,cy:un,r:(un-A)/2,fill:"none",strokeWidth:A,"aria-hidden":"true"}):null,lt.jsx(D2,{className:_.circle,style:Y,ownerState:R,cx:un,cy:un,r:(un-A)/2,fill:"none",strokeWidth:A})]})})});function U2(l){return Vl("MuiTypography",l)}Ya("MuiTypography",["root","h1","h2","h3","h4","h5","h6","subtitle1","subtitle2","body1","body2","inherit","button","caption","overline","alignLeft","alignRight","alignCenter","alignJustify","noWrap","gutterBottom","paragraph"]);const H2={primary:!0,secondary:!0,error:!0,info:!0,success:!0,warning:!0,textPrimary:!0,textSecondary:!0,textDisabled:!0},j2=FS(),L2=l=>{const{align:i,gutterBottom:c,noWrap:o,paragraph:s,variant:d,classes:m}=l,g={root:["root",d,l.align!=="inherit"&&`align${Rt(i)}`,c&&"gutterBottom",o&&"noWrap",s&&"paragraph"]};return lu(g,U2,m)},q2=ye("span",{name:"MuiTypography",slot:"Root",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.root,c.variant&&i[c.variant],c.align!=="inherit"&&i[`align${Rt(c.align)}`],c.noWrap&&i.noWrap,c.gutterBottom&&i.gutterBottom,c.paragraph&&i.paragraph]}})(Ln(({theme:l})=>({margin:0,variants:[{props:{variant:"inherit"},style:{font:"inherit",lineHeight:"inherit",letterSpacing:"inherit"}},...Object.entries(l.typography).filter(([i,c])=>i!=="inherit"&&c&&typeof c=="object").map(([i,c])=>({props:{variant:i},style:c})),...Object.entries(l.palette).filter(ma()).map(([i])=>({props:{color:i},style:{color:(l.vars||l).palette[i].main}})),...Object.entries(l.palette?.text||{}).filter(([,i])=>typeof i=="string").map(([i])=>({props:{color:`text${Rt(i)}`},style:{color:(l.vars||l).palette.text[i]}})),{props:({ownerState:i})=>i.align!=="inherit",style:{textAlign:"var(--Typography-textAlign)"}},{props:({ownerState:i})=>i.noWrap,style:{overflow:"hidden",textOverflow:"ellipsis",whiteSpace:"nowrap"}},{props:({ownerState:i})=>i.gutterBottom,style:{marginBottom:"0.35em"}},{props:({ownerState:i})=>i.paragraph,style:{marginBottom:16}}]}))),uy={h1:"h1",h2:"h2",h3:"h3",h4:"h4",h5:"h5",h6:"h6",subtitle1:"h6",subtitle2:"h6",body1:"p",body2:"p",inherit:"p"},hf=Z.forwardRef(function(i,c){const{color:o,...s}=Va({props:i,name:"MuiTypography"}),d=!H2[o],m=j2({...s,...d&&{color:o}}),{align:g="inherit",className:v,component:p,gutterBottom:A=!1,noWrap:E=!1,paragraph:D=!1,variant:q="body1",variantMapping:R=uy,..._}=m,Y={...m,align:g,color:o,className:v,component:p,gutterBottom:A,noWrap:E,paragraph:D,variant:q,variantMapping:R},J=p||(D?"p":R[q]||uy[q])||"span",F=L2(Y);return lt.jsx(q2,{as:J,ref:c,className:me(F.root,v),..._,ownerState:Y,style:{...g!=="inherit"&&{"--Typography-textAlign":g},..._.style}})}),G2=Ya("MuiBox",["root"]),Y2=Qy(),Hn=G1({themeId:Ks,defaultTheme:Y2,defaultClassName:G2.root,generateClassNa Line truncated
0% {
left: -35%;
right: 100%;
}
60% {
left: 100%;
right: -90%;
}
100% {
left: 100%;
right: -90%;
}
`,a3=typeof Xs!="string"?Yl`
animation: ${Xs} 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite;
`:null,$s=ya`
0% {
left: -200%;
right: 100%;
}
60% {
left: 107%;
right: -8%;
}
100% {
left: 107%;
right: -8%;
}
`,l3=typeof $s!="string"?Yl`
animation: ${$s} 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite;
`:null,Qs=ya`
0% {
opacity: 1;
background-position: 0 -23px;
}
60% {
opacity: 0;
background-position: 0 -23px;
}
100% {
opacity: 1;
background-position: -200px -23px;
}
`,i3=typeof Qs!="string"?Yl`
animation: ${Qs} 3s infinite linear;
`:null,u3=l=>{const{classes:i,variant:c,color:o}=l,s={root:["root",`color${Rt(o)}`,c],dashed:["dashed",`dashedColor${Rt(o)}`],bar1:["bar","bar1",`barColor${Rt(o)}`,(c==="indeterminate"||c==="query")&&"bar1Indeterminate",c==="determinate"&&"bar1Determinate",c==="buffer"&&"bar1Buffer"],bar2:["bar","bar2",c!=="buffer"&&`barColor${Rt(o)}`,c==="buffer"&&`color${Rt(o)}`,(c==="indeterminate"||c==="query")&&"bar2Indeterminate",c==="buffer"&&"bar2Buffer"]};return lu(s,n3,i)},mf=(l,i)=>l.vars?l.vars.palette.LinearProgress[`${i}Bg`]:l.palette.mode==="light"?l.lighten(l.palette[i].main,.62):l.darken(l.palette[i].main,.5),r3=ye("span",{name:"MuiLinearProgress",slot:"Root",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.root,i[`color${Rt(c.color)}`],i[c.variant]]}})(Ln(({theme:l})=>({position:"relative",overflow:"hidden",display:"block",height:4,zIndex:0,"@media print":{colorAdjust:"exact"},variants:[...Object.entries(l.palette).filter(ma()).map(([i])=>({props:{color:i},style:{backgroundColor:mf(l,i)}})),{props:({ownerState:i})=>i.color==="inherit"&&i.variant!=="buffer",style:{"&::before":{content:'""',position:"absolute",left:0,top:0,right:0,bottom:0,backgroundColor:"currentColor",opacity:.3}}},{props:{variant:"buffer"},style:{backgroundColor:"transparent"}},{props:{variant:"query"},style:{transform:"rotate(180deg)"}}]}))),c3=ye("span",{name:"MuiLinearProgress",slot:"Dashed",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.dashed,i[`dashedColor${Rt(c.color)}`]]}})(Ln(({theme:l})=>({position:"absolute",marginTop:0,height:"100%",width:"100%",backgroundSize:"10px 10px",backgroundPosition:"0 -23px",variants:[{props:{color:"inherit"},style:{opacity:.3,backgroundImage:"radial-gradient(currentColor 0%, currentColor 16%, transparent 42%)"}},...Object.entries(l.palette).filter(ma()).map(([i])=>{const c=mf(l,i);return{props:{color:i},style:{backgroundImage:`radial-gradient(${c} 0%, ${c} 16%, transparent 42%)`}}})]})),i3||{animation:`${Qs} 3s infinite linear`}),o3=ye("span",{name:"MuiLinearProgress",slot:"Bar1",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.bar,i.bar1,i[`barColor${Rt(c.color)}`],(c.variant==="indeterminate"||c.variant==="query")&&i.bar1Indeterminate,c.variant==="determinate"&&i.bar1Determinate,c.variant==="buffer"&&i.bar1Buffer]}})(Ln(({theme:l})=>({width:"100%",position:"absolute",left:0,bottom:0,top:0,transition:"transform 0.2s linear",transformOrigin:"left",variants:[{props:{color:"inherit"},style:{backgroundColor:"currentColor"}},...Object.entries(l.palette).filter(ma()).map(([i])=>({props:{color:i},style:{backgroundColor:(l.vars||l).palette[i].main}})),{props:{variant:"determinate"},style:{transition:`transform .${Vs}s linear`}},{props:{variant:"buffer"},style:{zIndex:1,transition:`transform .${Vs}s linear`}},{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:{width:"auto"}},{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:a3||{animation:`${Xs} 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite`}}]}))),s3=ye("span",{name:"MuiLinearProgress",slot:"Bar2",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.bar,i.bar2,i[`barColor${Rt(c.color)}`],(c.variant==="indeterminate"||c.variant==="query")&&i.bar2Indeterminate,c.variant==="buffer"&&i.bar2Buffer]}})(Ln(({theme:l})=>({width:"100%",position:"absolute",left:0,bottom:0,top:0,transition:"transform 0.2s linear",transformOrigin:"left",variants:[...Object.entries(l.palette).filter(ma()).map(([i])=>({props:{color:i},style:{"--LinearProgressBar2-barColor":(l.vars||l).palette[i].main}})),{props:({ownerState:i})=>i.variant!=="buffer"&&i.color!=="inherit",style:{backgroundColor:"var(--LinearProgressBar2-barColor, currentColor)"}},{props:({ownerState:i})=>i.variant!=="buffer"&&i.color==="inherit",style:{backgroundColor:"currentColor"}},{props:{color:"inherit"},style:{opacity:.3}},...Object.entries(l.palette).filter(ma()).map(([i])=>({props:{color:i,variant:"buffer"},style:{backgroundColor:mf(l,i),transition:`transform .${Vs}s linear`}})),{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:{width:"auto"}},{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:l3||{animation:`${$s} 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite`}}]}))),f3=Z.forwardRef(function(i,c){const o=Va({props:i,name:"MuiLinearProgress"}),{className:s,color:d="primary",value:m,valueBuffer:g,variant:v="indeterminate",...p}=o,A={...o,color:d,variant:v},E=u3(A),D=aS(),q={},R={bar1:{},bar2:{}};if((v==="determinate"||v==="buffer")&&m!==void 0){q["aria-valuenow"]=Math.round(m),q["aria-valuemin"]=0,q["aria-valuemax"]=100;let _=m-100;D&&(_=-_),R.bar1.transform=`translateX(${_}%)`}if(v==="buffer"&&g!==void 0){let _=(g||0)-100;D&&(_=-_),R.bar2.transform=`translateX(${_}%)`}return lt.jsxs(r3,{className:me(E.root,s),ownerState:A,role:"progressbar",...q,ref:c,...p,children:[v==="buffer"?lt.jsx(c3,{className:E.dashed,ownerState:A}):null,lt.jsx(o3,{classNa Line truncated
-193
View File
@@ -1,193 +0,0 @@
var zg=Object.defineProperty;var wg=(l,i,c)=>i in l?zg(l,i,{enumerable:!0,configurable:!0,writable:!0,value:c}):l[i]=c;var Ni=(l,i,c)=>wg(l,typeof i!="symbol"?i+"":i,c);function Rg(l,i){for(var c=0;c<i.length;c++){const o=i[c];if(typeof o!="string"&&!Array.isArray(o)){for(const s in o)if(s!=="default"&&!(s in l)){const d=Object.getOwnPropertyDescriptor(o,s);d&&Object.defineProperty(l,s,d.get?d:{enumerable:!0,get:()=>o[s]})}}}return Object.freeze(Object.defineProperty(l,Symbol.toStringTag,{value:"Module"}))}(function(){const i=document.createElement("link").relList;if(i&&i.supports&&i.supports("modulepreload"))return;for(const s of document.querySelectorAll('link[rel="modulepreload"]'))o(s);new MutationObserver(s=>{for(const d of s)if(d.type==="childList")for(const m of d.addedNodes)m.tagName==="LINK"&&m.rel==="modulepreload"&&o(m)}).observe(document,{childList:!0,subtree:!0});function c(s){const d={};return s.integrity&&(d.integrity=s.integrity),s.referrerPolicy&&(d.referrerPolicy=s.referrerPolicy),s.crossOrigin==="use-credentials"?d.credentials="include":s.crossOrigin==="anonymous"?d.credentials="omit":d.credentials="same-origin",d}function o(s){if(s.ep)return;s.ep=!0;const d=c(s);fetch(s.href,d)}})();function Mg(l){return l&&l.__esModule&&Object.prototype.hasOwnProperty.call(l,"default")?l.default:l}var Jo={exports:{}},Ui={};/**
* @license React
* react-jsx-runtime.production.js
*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/var wh;function Dg(){if(wh)return Ui;wh=1;var l=Symbol.for("react.transitional.element"),i=Symbol.for("react.fragment");function c(o,s,d){var m=null;if(d!==void 0&&(m=""+d),s.key!==void 0&&(m=""+s.key),"key"in s){d={};for(var b in s)b!=="key"&&(d[b]=s[b])}else d=s;return s=d.ref,{$$typeof:l,type:o,key:m,ref:s!==void 0?s:null,props:d}}return Ui.Fragment=i,Ui.jsx=c,Ui.jsxs=c,Ui}var Rh;function Bg(){return Rh||(Rh=1,Jo.exports=Dg()),Jo.exports}var rt=Bg(),Fo={exports:{}},Hi={},Po={exports:{}},Io={};/**
* @license React
* scheduler.production.js
*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/var Mh;function Ng(){return Mh||(Mh=1,function(l){function i(G,it){var tt=G.length;G.push(it);t:for(;0<tt;){var ot=tt-1>>>1,S=G[ot];if(0<s(S,it))G[ot]=it,G[tt]=S,tt=ot;else break t}}function c(G){return G.length===0?null:G[0]}function o(G){if(G.length===0)return null;var it=G[0],tt=G.pop();if(tt!==it){G[0]=tt;t:for(var ot=0,S=G.length,q=S>>>1;ot<q;){var at=2*(ot+1)-1,lt=G[at],J=at+1,bt=G[J];if(0>s(lt,tt))J<S&&0>s(bt,lt)?(G[ot]=bt,G[J]=tt,ot=J):(G[ot]=lt,G[at]=tt,ot=at);else if(J<S&&0>s(bt,tt))G[ot]=bt,G[J]=tt,ot=J;else break t}}return it}function s(G,it){var tt=G.sortIndex-it.sortIndex;return tt!==0?tt:G.id-it.id}if(l.unstable_now=void 0,typeof performance=="object"&&typeof performance.now=="function"){var d=performance;l.unstable_now=function(){return d.now()}}else{var m=Date,b=m.now();l.unstable_now=function(){return m.now()-b}}var v=[],p=[],C=1,_=null,w=3,j=!1,B=!1,U=!1,X=typeof setTimeout=="function"?setTimeout:null,Q=typeof clearTimeout=="function"?clearTimeout:null,F=typeof setImmediate<"u"?setImmediate:null;function V(G){for(var it=c(p);it!==null;){if(it.callback===null)o(p);else if(it.startTime<=G)o(p),it.sortIndex=it.expirationTime,i(v,it);else break;it=c(p)}}function L(G){if(U=!1,V(G),!B)if(c(v)!==null)B=!0,St();else{var it=c(p);it!==null&&_t(L,it.startTime-G)}}var O=!1,$=-1,W=5,gt=-1;function K(){return!(l.unstable_now()-gt<W)}function y(){if(O){var G=l.unstable_now();gt=G;var it=!0;try{t:{B=!1,U&&(U=!1,Q($),$=-1),j=!0;var tt=w;try{e:{for(V(G),_=c(v);_!==null&&!(_.expirationTime>G&&K());){var ot=_.callback;if(typeof ot=="function"){_.callback=null,w=_.priorityLevel;var S=ot(_.expirationTime<=G);if(G=l.unstable_now(),typeof S=="function"){_.callback=S,V(G),it=!0;break e}_===c(v)&&o(v),V(G)}else o(v);_=c(v)}if(_!==null)it=!0;else{var q=c(p);q!==null&&_t(L,q.startTime-G),it=!1}}break t}finally{_=null,w=tt,j=!1}it=void 0}}finally{it?Y():O=!1}}}var Y;if(typeof F=="function")Y=function(){F(y)};else if(typeof MessageChannel<"u"){var et=new MessageChannel,ct=et.port2;et.port1.onmessage=y,Y=function(){ct.postMessage(null)}}else Y=function(){X(y,0)};function St(){O||(O=!0,Y())}function _t(G,it){$=X(function(){G(l.unstable_now())},it)}l.unstable_IdlePriority=5,l.unstable_ImmediatePriority=1,l.unstable_LowPriority=4,l.unstable_NormalPriority=3,l.unstable_Profiling=null,l.unstable_UserBlockingPriority=2,l.unstable_cancelCallback=function(G){G.callback=null},l.unstable_continueExecution=function(){B||j||(B=!0,St())},l.unstable_forceFrameRate=function(G){0>G||125<G?console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported"):W=0<G?Math.floor(1e3/G):5},l.unstable_getCurrentPriorityLevel=function(){return w},l.unstable_getFirstCallbackNode=function(){return c(v)},l.unstable_next=function(G){switch(w){case 1:case 2:case 3:var it=3;break;default:it=w}var tt=w;w=it;try{return G()}finally{w=tt}},l.unstable_pauseExecution=function(){},l.unstable_requestPaint=function(){},l.unstable_runWithPriority=function(G,it){switch(G){case 1:case 2:case 3:case 4:case 5:break;default:G=3}var tt=w;w=G;try{return it()}finally{w=tt}},l.unstable_scheduleCallback=function(G,it,tt){var ot=l.unstable_now();switch(typeof tt=="object"&&tt!==null?(tt=tt.delay,tt=typeof tt=="number"&&0<tt?ot+tt:ot):tt=ot,G){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=tt+S,G={id:C++,callback:it,priorityLevel:G,startTime:tt,expirationTime:S,sortIndex:-1},tt>ot?(G.sortIndex=tt,i(p,G),c(v)===null&&G===c(p)&&(U?(Q($),$=-1):U=!0,_t(L,tt-ot))):(G.sortIndex=S,i(v,G),B||j||(B=!0,St())),G},l.unstable_shouldYield=K,l.unstable_wrapCallback=function(G){var it=w;return function(){var tt=w;w=it;try{return G.apply(this,arguments)}finally{w=tt}}}}(Io)),Io}var Dh;function Ug(){return Dh||(Dh=1,Po.exports=Ng()),Po.exports}var ts={exports:{}},ht={};/**
* @license React
* react.production.js
*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/var Bh;function Hg(){if(Bh)return ht;Bh=1;var l=Symbol.for("react.transitional.element"),i=Symbol.for("react.portal"),c=Symbol.for("react.fragment"),o=Symbol.for("react.strict_mode"),s=Symbol.for("react.profiler"),d=Symbol.for("react.consumer"),m=Symbol.for("react.context"),b=Symbol.for("react.forward_ref"),v=Symbol.for("react.suspense"),p=Symbol.for("react.memo"),C=Symbol.for("react.lazy"),_=Symbol.iterator;function w(S){return S===null||typeof S!="object"?null:(S=_&&S[_]||S["@@iterator"],typeof S=="function"?S:null)}var j={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},B=Object.assign,U={};function X(S,q,at){this.props=S,this.context=q,this.refs=U,this.updater=at||j}X.prototype.isReactComponent={},X.prototype.setState=function(S,q){if(typeof S!="object"&&typeof S!="function"&&S!=null)throw Error("takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,S,q,"setState")},X.prototype.forceUpdate=function(S){this.updater.enqueueForceUpdate(this,S,"forceUpdate")};function Q(){}Q.prototype=X.prototype;function F(S,q,at){this.props=S,this.context=q,this.refs=U,this.updater=at||j}var V=F.prototype=new Q;V.constructor=F,B(V,X.prototype),V.isPureReactComponent=!0;var L=Array.isArray,O={H:null,A:null,T:null,S:null},$=Object.prototype.hasOwnProperty;function W(S,q,at,lt,J,bt){return at=bt.ref,{$$typeof:l,type:S,key:q,ref:at!==void 0?at:null,props:bt}}function gt(S,q){return W(S.type,q,void 0,void 0,void 0,S.props)}function K(S){return typeof S=="object"&&S!==null&&S.$$typeof===l}function y(S){var q={"=":"=0",":":"=2"};return"$"+S.replace(/[=:]/g,function(at){return q[at]})}var Y=/\/+/g;function et(S,q){return typeof S=="object"&&S!==null&&S.key!=null?y(""+S.key):q.toString(36)}function ct(){}function St(S){switch(S.status){case"fulfilled":return S.value;case"rejected":throw S.reason;default:switch(typeof S.status=="string"?S.then(ct,ct):(S.status="pending",S.then(function(q){S.status==="pending"&&(S.status="fulfilled",S.value=q)},function(q){S.status==="pending"&&(S.status="rejected",S.reason=q)})),S.status){case"fulfilled":return S.value;case"rejected":throw S.reason}}throw S}function _t(S,q,at,lt,J){var bt=typeof S;(bt==="undefined"||bt==="boolean")&&(S=null);var ft=!1;if(S===null)ft=!0;else switch(bt){case"bigint":case"string":case"number":ft=!0;break;case"object":switch(S.$$typeof){case l:case i:ft=!0;break;case C:return ft=S._init,_t(ft(S._payload),q,at,lt,J)}}if(ft)return J=J(S),ft=lt===""?"."+et(S,0):lt,L(J)?(at="",ft!=null&&(at=ft.replace(Y,"$&/")+"/"),_t(J,q,at,"",function(Yt){return Yt})):J!=null&&(K(J)&&(J=gt(J,at+(J.key==null||S&&S.key===J.key?"":(""+J.key).replace(Y,"$&/")+"/")+ft)),q.push(J)),1;ft=0;var ie=lt===""?".":lt+":";if(L(S))for(var At=0;At<S.length;At++)lt=S[At],bt=ie+et(lt,At),ft+=_t(lt,q,at,bt,J);else if(At=w(S),typeof At=="function")for(S=At.call(S),At=0;!(lt=S.next()).done;)lt=lt.value,bt=ie+et(lt,At++),ft+=_t(lt,q,at,bt,J);else if(bt==="object"){if(typeof S.then=="function")return _t(St(S),q,at,lt,J);throw q=String(S),Error("Objects are not valid as a React child (found: "+(q==="[object Object]"?"object with keys {"+Object.keys(S).join(", ")+"}":q)+"). If you meant to render a collection of children, use an array instead.")}return ft}function G(S,q,at){if(S==null)return S;var lt=[],J=0;return _t(S,lt,"","",function(bt){return q.call(at,bt,J++)}),lt}function it(S){if(S._status===-1){var q=S._result;q=q(),q.then(function(at){(S._status===0||S._status===-1)&&(S._status=1,S._result=at)},function(at){(S._status===0||S._status===-1)&&(S._status=2,S._result=at)}),S._status===-1&&(S._status=0,S._result=q)}if(S._status===1)return S._result.default;throw S._result}var tt=typeof reportError=="function"?reportError:function(S){if(typeof window=="object"&&typeof window.ErrorEvent=="function"){var q=new window.ErrorEvent("error",{bubbles:!0,cancelable:!0,message:typeof S=="object"&&S!==null&&typeof S.message=="string"?String(S.message):String(S),error:S});if(!window.dispatchEvent(q))return}else if(typeof process=="object"&&typeof process.emit=="function"){process.emit("uncaughtException",S);return}console.error(S)};function ot(){}return ht.Children={map:G,forEach:function(S,q,at){G(S,function(){q.apply(this,arguments)},at)},count:function(S){var q=0;return G(S,function(){q++}),q},toArray:function(S){return G(S,function(q){return q})||[]},only:function(S){if(!K(S))throw Error("React.Children.only expected to receive a single React element child.");return S}},ht.Component=X,ht.Fragment=c,ht.Profiler=s,ht.PureComponent=F,ht.StrictMode=o,ht.Suspense=v,ht.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE=O,ht.act=function(){throw Error("act(...) is not supported in production builds of React.")},ht.cache=function(S){return function(){return S.apply(null,arguments)}},ht.cloneElement=function(S,q,at){if(S==null)throw Error("The argumeLine truncated
* @license React
* react-dom.production.js
*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/var Uh;function jg(){if(Uh)return de;Uh=1;var l=_s();function i(v){var p="https://react.dev/errors/"+v;if(1<arguments.length){p+="?args[]="+encodeURIComponent(arguments[1]);for(var C=2;C<arguments.length;C++)p+="&args[]="+encodeURIComponent(arguments[C])}return"Minified React error #"+v+"; visit "+p+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}function c(){}var o={d:{f:c,r:function(){throw Error(i(522))},D:c,C:c,L:c,m:c,X:c,S:c,M:c},p:0,findDOMNode:null},s=Symbol.for("react.portal");function d(v,p,C){var _=3<arguments.length&&arguments[3]!==void 0?arguments[3]:null;return{$$typeof:s,key:_==null?null:""+_,children:v,containerInfo:p,implementation:C}}var m=l.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;function b(v,p){if(v==="font")return"";if(typeof p=="string")return p==="use-credentials"?p:""}return de.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE=o,de.createPortal=function(v,p){var C=2<arguments.length&&arguments[2]!==void 0?arguments[2]:null;if(!p||p.nodeType!==1&&p.nodeType!==9&&p.nodeType!==11)throw Error(i(299));return d(v,p,null,C)},de.flushSync=function(v){var p=m.T,C=o.p;try{if(m.T=null,o.p=2,v)return v()}finally{m.T=p,o.p=C,o.d.f()}},de.preconnect=function(v,p){typeof v=="string"&&(p?(p=p.crossOrigin,p=typeof p=="string"?p==="use-credentials"?p:"":void 0):p=null,o.d.C(v,p))},de.prefetchDNS=function(v){typeof v=="string"&&o.d.D(v)},de.preinit=function(v,p){if(typeof v=="string"&&p&&typeof p.as=="string"){var C=p.as,_=b(C,p.crossOrigin),w=typeof p.integrity=="string"?p.integrity:void 0,j=typeof p.fetchPriority=="string"?p.fetchPriority:void 0;C==="style"?o.d.S(v,typeof p.precedence=="string"?p.precedence:void 0,{crossOrigin:_,integrity:w,fetchPriority:j}):C==="script"&&o.d.X(v,{crossOrigin:_,integrity:w,fetchPriority:j,nonce:typeof p.nonce=="string"?p.nonce:void 0})}},de.preinitModule=function(v,p){if(typeof v=="string")if(typeof p=="object"&&p!==null){if(p.as==null||p.as==="script"){var C=b(p.as,p.crossOrigin);o.d.M(v,{crossOrigin:C,integrity:typeof p.integrity=="string"?p.integrity:void 0,nonce:typeof p.nonce=="string"?p.nonce:void 0})}}else p==null&&o.d.M(v)},de.preload=function(v,p){if(typeof v=="string"&&typeof p=="object"&&p!==null&&typeof p.as=="string"){var C=p.as,_=b(C,p.crossOrigin);o.d.L(v,C,{crossOrigin:_,integrity:typeof p.integrity=="string"?p.integrity:void 0,nonce:typeof p.nonce=="string"?p.nonce:void 0,type:typeof p.type=="string"?p.type:void 0,fetchPriority:typeof p.fetchPriority=="string"?p.fetchPriority:void 0,referrerPolicy:typeof p.referrerPolicy=="string"?p.referrerPolicy:void 0,imageSrcSet:typeof p.imageSrcSet=="string"?p.imageSrcSet:void 0,imageSizes:typeof p.imageSizes=="string"?p.imageSizes:void 0,media:typeof p.media=="string"?p.media:void 0})}},de.preloadModule=function(v,p){if(typeof v=="string")if(p){var C=b(p.as,p.crossOrigin);o.d.m(v,{as:typeof p.as=="string"&&p.as!=="script"?p.as:void 0,crossOrigin:C,integrity:typeof p.integrity=="string"?p.integrity:void 0})}else o.d.m(v)},de.requestFormReset=function(v){o.d.r(v)},de.unstable_batchedUpdates=function(v,p){return v(p)},de.useFormState=function(v,p,C){return m.H.useFormState(v,p,C)},de.useFormStatus=function(){return m.H.useHostTransitionStatus()},de.version="19.0.0",de}var Hh;function qg(){if(Hh)return es.exports;Hh=1;function l(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>"u"||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!="function"))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(l)}catch(i){console.error(i)}}return l(),es.exports=jg(),es.exports}/**
* @license React
* react-dom-client.production.js
*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/var jh;function Lg(){if(jh)return Hi;jh=1;var l=Ug(),i=_s(),c=qg();function o(t){var e="https://react.dev/errors/"+t;if(1<arguments.length){e+="?args[]="+encodeURIComponent(arguments[1]);for(var n=2;n<arguments.length;n++)e+="&args[]="+encodeURIComponent(arguments[n])}return"Minified React error #"+t+"; visit "+e+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}function s(t){return!(!t||t.nodeType!==1&&t.nodeType!==9&&t.nodeType!==11)}var d=Symbol.for("react.element"),m=Symbol.for("react.transitional.element"),b=Symbol.for("react.portal"),v=Symbol.for("react.fragment"),p=Symbol.for("react.strict_mode"),C=Symbol.for("react.profiler"),_=Symbol.for("react.provider"),w=Symbol.for("react.consumer"),j=Symbol.for("react.context"),B=Symbol.for("react.forward_ref"),U=Symbol.for("react.suspense"),X=Symbol.for("react.suspense_list"),Q=Symbol.for("react.memo"),F=Symbol.for("react.lazy"),V=Symbol.for("react.offscreen"),L=Symbol.for("react.memo_cache_sentinel"),O=Symbol.iterator;function $(t){return t===null||typeof t!="object"?null:(t=O&&t[O]||t["@@iterator"],typeof t=="function"?t:null)}var W=Symbol.for("react.client.reference");function gt(t){if(t==null)return null;if(typeof t=="function")return t.$$typeof===W?null:t.displayName||t.name||null;if(typeof t=="string")return t;switch(t){case v:return"Fragment";case b:return"Portal";case C:return"Profiler";case p:return"StrictMode";case U:return"Suspense";case X:return"SuspenseList"}if(typeof t=="object")switch(t.$$typeof){case j:return(t.displayName||"Context")+".Provider";case w:return(t._context.displayName||"Context")+".Consumer";case B:var e=t.render;return t=t.displayName,t||(t=e.displayName||e.name||"",t=t!==""?"ForwardRef("+t+")":"ForwardRef"),t;case Q:return e=t.displayName||null,e!==null?e:gt(t.type)||"Memo";case F:e=t._payload,t=t._init;try{return gt(t(e))}catch{}}return null}var K=i.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,y=Object.assign,Y,et;function ct(t){if(Y===void 0)try{throw Error()}catch(n){var e=n.stack.trim().match(/\n( *(at )?)/);Y=e&&e[1]||"",et=-1<n.stack.indexOf(`
at`)?" (<anonymous>)":-1<n.stack.indexOf("@")?"@unknown:0:0":""}return`
`+Y+t+et}var St=!1;function _t(t,e){if(!t||St)return"";St=!0;var n=Error.prepareStackTrace;Error.prepareStackTrace=void 0;try{var a={DetermineComponentFrameRoot:function(){try{if(e){var H=function(){throw Error()};if(Object.defineProperty(H.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(H,[])}catch(M){var z=M}Reflect.construct(t,[],H)}else{try{H.call()}catch(M){z=M}t.call(H.prototype)}}else{try{throw Error()}catch(M){z=M}(H=t())&&typeof H.catch=="function"&&H.catch(function(){})}}catch(M){if(M&&z&&typeof M.stack=="string")return[M.stack,z.stack]}return[null,null]}};a.DetermineComponentFrameRoot.displayName="DetermineComponentFrameRoot";var u=Object.getOwnPropertyDescriptor(a.DetermineComponentFrameRoot,"name");u&&u.configurable&&Object.defineProperty(a.DetermineComponentFrameRoot,"name",{value:"DetermineComponentFrameRoot"});var r=a.DetermineComponentFrameRoot(),f=r[0],h=r[1];if(f&&h){var g=f.split(`
`),A=h.split(`
`);for(u=a=0;a<g.length&&!g[a].includes("DetermineComponentFrameRoot");)a++;for(;u<A.length&&!A[u].includes("DetermineComponentFrameRoot");)u++;if(a===g.length||u===A.length)for(a=g.length-1,u=A.length-1;1<=a&&0<=u&&g[a]!==A[u];)u--;for(;1<=a&&0<=u;a--,u--)if(g[a]!==A[u]){if(a!==1||u!==1)do if(a--,u--,0>u||g[a]!==A[u]){var D=`
`+g[a].replace(" at new "," at ");return t.displayName&&D.includes("<anonymous>")&&(D=D.replace("<anonymous>",t.displayName)),D}while(1<=a&&0<=u);break}}}finally{St=!1,Error.prepareStackTrace=n}return(n=t?t.displayName||t.name:"")?ct(n):""}function G(t){switch(t.tag){case 26:case 27:case 5:return ct(t.type);case 16:return ct("Lazy");case 13:return ct("Suspense");case 19:return ct("SuspenseList");case 0:case 15:return t=_t(t.type,!1),t;case 11:return t=_t(t.type.render,!1),t;case 1:return t=_t(t.type,!0),t;default:return""}}function it(t){try{var e="";do e+=G(t),t=t.return;while(t);return e}catch(n){return`
Error generating stack: `+n.message+`
`+n.stack}}function tt(t){var e=t,n=t;if(t.alternate)for(;e.return;)e=e.return;else{t=e;do e=t,e.flags&4098&&(n=e.return),t=e.return;while(t)}return e.tag===3?n:null}function ot(t){if(t.tag===13){var e=t.memoizedState;if(e===null&&(t=t.alternate,t!==null&&(e=t.memoizedState)),e!==null)return e.dehydrated}return null}function S(t){if(tt(t)!==t)throw Error(o(188))}function q(t){var e=t.alternate;if(!e){if(e=tt(t),e===null)throw Error(o(188));return e!==t?null:t}for(var n=t,a=e;;){var u=n.return;if(u===null)break;var r=u.alternate;if(r===null){if(a=u.return,a!==null){n=a;continue}break}if(u.child===r.child){for(r=u.child;r;){if(r===n)return S(u),t;if(r===a)return S(u),e;r=r.sibling}throw Error(o(188))}if(n.return!==a.return)n=u,a=r;else{for(var f=!1,h=u.child;h;){if(h===n){f=!0,n=u,a=r;break}if(h===a){f=!0,a=u,n=r;break}h=h.sibling}if(!f){for(h=r.child;h;){if(h===n){f=!0,n=r,a=u;break}if(h===a){f=!0,a=r,n=u;break}h=h.sibling}if(!f)throw Error(o(189))}}if(n.alternate!==a)throw Error(o(190))}if(n.tag!==3)throw Error(o(188));return n.stateNode.current===n?t:e}function at(t){var e=t.tag;if(e===5||e===26||e===27||e===6)return t;for(t=t.child;t!==null;){if(e=at(t),e!==null)return e;t=t.sibling}return null}var lt=Array.isArray,J=c.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,bt={pending:!1,data:null,method:null,action:null},ft=[],ie=-1;function At(t){return{current:t}}function Yt(t){0>ie||(t.current=ft[ie],ft[ie]=null,ie--)}function Nt(t,e){ie++,ft[ie]=t.current,t.current=e}var De=At(null),oa=At(null),tn=At(null),Un=At(null);function Ha(t,e){switch(Nt(tn,e),Nt(oa,t),Nt(De,null),t=e.nodeType,t){case 9:case 11:e=(e=e.documentElement)&&(e=e.namespaceURI)?lh(e):0;break;default:if(t=t===8?e.parentNode:e,e=t.tagName,t=t.namespaceURI)t=lh(t),e=ih(t,e);else switch(e){case"svg":e=1;break;case"math":e=2;break;default:e=0}}Yt(De),Nt(De,e)}function Hn(){Yt(De),Yt(oa),Yt(tn)}function jn(t){t.memoizedState!==null&&Nt(Un,t);var e=De.current,n=ih(e,t.type);e!==n&&(Nt(oa,t),Nt(De,n))}function en(t){oa.current===t&&(Yt(De),Yt(oa)),Un.current===t&&(Yt(Un),wi._currentValue=bt)}var Hl=Object.prototype.hasOwnProperty,ja=l.unstable_scheduleCallback,jl=l.unstable_cancelCallback,dt=l.unstable_shouldYield,ry=l.unstable_requestPaint,nn=l.unstable_now,cy=l.unstable_getCurrentPriorityLevel,Qs=l.unstable_ImmediatePriority,Zs=l.unstable_UserBlockingPriority,tu=l.unstable_NormalPriority,oy=l.unstable_LowPriority,Ks=l.unstable_IdlePriority,sy=l.log,fy=l.unstable_setDisableYieldValue,ql=null,Te=null;function dy(t){if(Te&&typeof Te.onCommitFiberRoot=="function")try{Te.onCommitFiberRoot(ql,t,void 0,(t.current.flags&128)===128)}catch{}}function qn(t){if(typeof sy=="function"&&fy(t),Te&&typeof Te.setStrictMode=="function")try{Te.setStrictMode(ql,t)}catch{}}var Ae=Math.clz32?Math.clz32:yy,hy=Math.log,my=Math.LN2;function yy(t){return t>>>=0,t===0?32:31-(hy(t)/my|0)|0}var eu=128,nu=4194304;function sa(t){var e=t&42;if(e!==0)return e;switch(t&-t){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: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&4194176;case 4194304:case 8388608:case 16777216:case 33554432:return t&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return t}}function au(t,e){var n=t.pendingLanes;if(n===0)return 0;var a=0,u=t.suspendedLanes,r=t.pingedLanes,f=t.warmLanes;t=t.finishedLanes!==0;var h=n&134217727;return h!==0?(n=h&~u,n!==0?a=sa(n):(r&=h,r!==0?a=sa(r):t||(f=h&~f,f!==0&&(a=sa(f))))):(h=n&~u,h!==0?a=sa(h):r!==0?a=sa(r):t||(f=n&~f,f!==0&&(a=sa(f)))),a===0?0:e!==0&&e!==a&&!(e&u)&&(u=a&-a,f=e&-e,u>=f||u===32&&(f&4194176)!==0)?e:a}function Ll(t,e){return(t.pendingLanes&~(t.suspendedLanes&~t.pingedLanes)&e)===0}function py(t,e){switch(t){case 1:case 2:case 4:case 8:return e+250;case 16:case 32:case 64: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 e+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 Ws(){var t=eu;return eu<<=1,!(eu&4194176)&&(eu=128),t}function Js(){var t=nu;return nu<<=1,!(nu&62914560)&&(nu=4194304),t}function $r(t){for(var e=[],n=0;31>n;n++)e.push(t);return e}function Gl(t,e){t.pendingLanes|=e,e!==268435456&&(t.suspendedLanes=0,t.pingedLanes=0,t.warmLanes=0)}function gy(t,e,n,a,u,r){var f=t.pendingLanes;t.pendingLanes=n,t.suspendedLanes=0,t.pingedLanes=0,t.warmLanes=0,t.expiredLanes&=n,t.entangledLanes&=n,t.errorRecoveryDisabledLanes&=n,t.shellSuspendCounter=0;var h=t.entanglements,g=t.expirationTimes,A=t.hiddenUpdates;for(n=f&~n;0<n;){var D=31-Ae(n),H=1<<D; Line truncated
`).replace(Fp,"")}function ah(t,e){return e=nh(e),nh(t)===e}function Fu(){}function Rt(t,e,n,a,u,r){switch(n){case"children":typeof a=="string"?e==="body"||e==="textarea"&&a===""||Xa(t,a):(typeof a=="number"||typeof a=="bigint")&&e!=="body"&&Xa(t,""+a);break;case"className":iu(t,"class",a);break;case"tabIndex":iu(t,"tabindex",a);break;case"dir":case"role":case"viewBox":case"width":case"height":iu(t,n,a);break;case"style":hf(t,a,r);break;case"data":if(e!=="object"){iu(t,"data",a);break}case"src":case"href":if(a===""&&(e!=="a"||n!=="href")){t.removeAttribute(n);break}if(a==null||typeof a=="function"||typeof a=="symbol"||typeof a=="boolean"){t.removeAttribute(n);break}a=cu(""+a),t.setAttribute(n,a);break;case"action":case"formAction":if(typeof a=="function"){t.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}else typeof r=="function"&&(n==="formAction"?(e!=="input"&&Rt(t,e,"name",u.name,u,null),Rt(t,e,"formEncType",u.formEncType,u,null),Rt(t,e,"formMethod",u.formMethod,u,null),Rt(t,e,"formTarget",u.formTarget,u,null)):(Rt(t,e,"encType",u.encType,u,null),Rt(t,e,"method",u.method,u,null),Rt(t,e,"target",u.target,u,null)));if(a==null||typeof a=="symbol"||typeof a=="boolean"){t.removeAttribute(n);break}a=cu(""+a),t.setAttribute(n,a);break;case"onClick":a!=null&&(t.onclick=Fu);break;case"onScroll":a!=null&&vt("scroll",t);break;case"onScrollEnd":a!=null&&vt("scrollend",t);break;case"dangerouslySetInnerHTML":if(a!=null){if(typeof a!="object"||!("__html"in a))throw Error(o(61));if(n=a.__html,n!=null){if(u.children!=null)throw Error(o(60));t.innerHTML=n}}break;case"multiple":t.multiple=a&&typeof a!="function"&&typeof a!="symbol";break;case"muted":t.muted=a&&typeof a!="function"&&typeof a!="symbol";break;case"suppressContentEditableWarning":case"suppressHydrationWarning":case"defaultValue":case"defaultChecked":case"innerHTML":case"ref":break;case"autoFocus":break;case"xlinkHref":if(a==null||typeof a=="function"||typeof a=="boolean"||typeof a=="symbol"){t.removeAttribute("xlink:href");break}n=cu(""+a),t.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":a!=null&&typeof a!="function"&&typeof a!="symbol"?t.setAttribute(n,""+a):t.removeAttribute(n);break;case"inert":case"allowFullScreen":case"async":case"autoPlay":case"controls":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":a&&typeof a!="function"&&typeof a!="symbol"?t.setAttribute(n,""):t.removeAttribute(n);break;case"capture":case"download":a===!0?t.setAttribute(n,""):a!==!1&&a!=null&&typeof a!="function"&&typeof a!="symbol"?t.setAttribute(n,a):t.removeAttribute(n);break;case"cols":case"rows":case"size":case"span":a!=null&&typeof a!="function"&&typeof a!="symbol"&&!isNaN(a)&&1<=a?t.setAttribute(n,a):t.removeAttribute(n);break;case"rowSpan":case"start":a==null||typeof a=="function"||typeof a=="symbol"||isNaN(a)?t.removeAttribute(n):t.setAttribute(n,a);break;case"popover":vt("beforetoggle",t),vt("toggle",t),lu(t,"popover",a);break;case"xlinkActuate":yn(t,"http://www.w3.org/1999/xlink","xlink:actuate",a);break;case"xlinkArcrole":yn(t,"http://www.w3.org/1999/xlink","xlink:arcrole",a);break;case"xlinkRole":yn(t,"http://www.w3.org/1999/xlink","xlink:role",a);break;case"xlinkShow":yn(t,"http://www.w3.org/1999/xlink","xlink:show",a);break;case"xlinkTitle":yn(t,"http://www.w3.org/1999/xlink","xlink:title",a);break;case"xlinkType":yn(t,"http://www.w3.org/1999/xlink","xlink:type",a);break;case"xmlBase":yn(t,"http://www.w3.org/XML/1998/namespace","xml:base",a);break;case"xmlLang":yn(t,"http://www.w3.org/XML/1998/namespace","xml:lang",a);break;case"xmlSpace":yn(t,"http://www.w3.org/XML/1998/namespace","xml:space",a);break;case"is":lu(t,"is",a);break;case"innerText":case"textContent":break;default:(!(2<n.length)||n[0]!=="o"&&n[0]!=="O"||n[1]!=="n"&&n[1]!=="N")&&(n=Oy.get(n)||n,lu(t,n,a))}}function No(t,e,n,a,u,r){switch(n){case"style":hf(t,a,r);break;case"dangerouslySetInnerHTML":if(a!=null){if(typeof a!="object"||!("__html"in a))throw Error(o(61));if(n=a.__html,n!=null){if(u.children!=null)throw Error(o(60));t.innerHTML=n}}break;case"children":typeof a=="string"?Xa(t,a):(typeof a=="number"||typeof a=="bigint")&&Xa(t,""+a);break;case"onScroll":a!=null&&vt("scroll",t);break;case"onScrollEnd":a!=null&&vt("scrollend",t);break;case"onClick":a!=null&&(t.onclick=Fu);break;case"suppressContentEditableWarning":case"suppressHydrationWar Line truncated
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/var Xh;function v1(){if(Xh)return zt;Xh=1;var l=typeof Symbol=="function"&&Symbol.for,i=l?Symbol.for("react.element"):60103,c=l?Symbol.for("react.portal"):60106,o=l?Symbol.for("react.fragment"):60107,s=l?Symbol.for("react.strict_mode"):60108,d=l?Symbol.for("react.profiler"):60114,m=l?Symbol.for("react.provider"):60109,b=l?Symbol.for("react.context"):60110,v=l?Symbol.for("react.async_mode"):60111,p=l?Symbol.for("react.concurrent_mode"):60111,C=l?Symbol.for("react.forward_ref"):60112,_=l?Symbol.for("react.suspense"):60113,w=l?Symbol.for("react.suspense_list"):60120,j=l?Symbol.for("react.memo"):60115,B=l?Symbol.for("react.lazy"):60116,U=l?Symbol.for("react.block"):60121,X=l?Symbol.for("react.fundamental"):60117,Q=l?Symbol.for("react.responder"):60118,F=l?Symbol.for("react.scope"):60119;function V(O){if(typeof O=="object"&&O!==null){var $=O.$$typeof;switch($){case i:switch(O=O.type,O){case v:case p:case o:case d:case s:case _:return O;default:switch(O=O&&O.$$typeof,O){case b:case C:case B:case j:case m:return O;default:return $}}case c:return $}}}function L(O){return V(O)===p}return zt.AsyncMode=v,zt.ConcurrentMode=p,zt.ContextConsumer=b,zt.ContextProvider=m,zt.Element=i,zt.ForwardRef=C,zt.Fragment=o,zt.Lazy=B,zt.Memo=j,zt.Portal=c,zt.Profiler=d,zt.StrictMode=s,zt.Suspense=_,zt.isAsyncMode=function(O){return L(O)||V(O)===v},zt.isConcurrentMode=L,zt.isContextConsumer=function(O){return V(O)===b},zt.isContextProvider=function(O){return V(O)===m},zt.isElement=function(O){return typeof O=="object"&&O!==null&&O.$$typeof===i},zt.isForwardRef=function(O){return V(O)===C},zt.isFragment=function(O){return V(O)===o},zt.isLazy=function(O){return V(O)===B},zt.isMemo=function(O){return V(O)===j},zt.isPortal=function(O){return V(O)===c},zt.isProfiler=function(O){return V(O)===d},zt.isStrictMode=function(O){return V(O)===s},zt.isSuspense=function(O){return V(O)===_},zt.isValidElementType=function(O){return typeof O=="string"||typeof O=="function"||O===o||O===p||O===d||O===s||O===_||O===w||typeof O=="object"&&O!==null&&(O.$$typeof===B||O.$$typeof===j||O.$$typeof===m||O.$$typeof===b||O.$$typeof===C||O.$$typeof===X||O.$$typeof===Q||O.$$typeof===F||O.$$typeof===U)},zt.typeOf=V,zt}var $h;function S1(){return $h||($h=1,ns.exports=v1()),ns.exports}var as,kh;function T1(){if(kh)return as;kh=1;var l=S1(),i={childContextTypes:!0,contextType:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,getDerivedStateFromError:!0,getDerivedStateFromProps:!0,mixins:!0,propTypes:!0,type:!0},c={name:!0,length:!0,prototype:!0,caller:!0,callee:!0,arguments:!0,arity:!0},o={$$typeof:!0,render:!0,defaultProps:!0,displayName:!0,propTypes:!0},s={$$typeof:!0,compare:!0,defaultProps:!0,displayName:!0,propTypes:!0,type:!0},d={};d[l.ForwardRef]=o,d[l.Memo]=s;function m(B){return l.isMemo(B)?s:d[B.$$typeof]||i}var b=Object.defineProperty,v=Object.getOwnPropertyNames,p=Object.getOwnPropertySymbols,C=Object.getOwnPropertyDescriptor,_=Object.getPrototypeOf,w=Object.prototype;function j(B,U,X){if(typeof U!="string"){if(w){var Q=_(U);Q&&Q!==w&&j(B,Q,X)}var F=v(U);p&&(F=F.concat(p(U)));for(var V=m(B),L=m(U),O=0;O<F.length;++O){var $=F[O];if(!c[$]&&!(X&&X[$])&&!(L&&L[$])&&!(V&&V[$])){var W=C(U,$);try{b(B,$,W)}catch{}}}}return B}return as=j,as}T1();var A1=!0;function Cm(l,i,c){var o="";return c.split(" ").forEach(function(s){l[s]!==void 0?i.push(l[s]+";"):s&&(o+=s+" ")}),o}var Rs=function(i,c,o){var s=i.key+"-"+c.name;(o===!1||A1===!1)&&i.registered[s]===void 0&&(i.registered[s]=c.styles)},Ms=function(i,c,o){Rs(i,c,o);var s=i.key+"-"+c.name;if(i.inserted[c.name]===void 0){var d=c;do i.insert(c===d?"."+s:"",d,i.sheet,!0),d=d.next;while(d!==void 0)}};function E1(l){for(var i=0,c,o=0,s=l.length;s>=4;++o,s-=4)c=l.charCodeAt(o)&255|(l.charCodeAt(++o)&255)<<8|(l.charCodeAt(++o)&255)<<16|(l.charCodeAt(++o)&255)<<24,c=(c&65535)*1540483477+((c>>>16)*59797<<16),c^=c>>>24,i=(c&65535)*1540483477+((c>>>16)*59797<<16)^(i&65535)*1540483477+((i>>>16)*59797<<16);switch(s){case 3:i^=(l.charCodeAt(o+2)&255)<<16;case 2:i^=(l.charCodeAt(o+1)&255)<<8;case 1:i^=l.charCodeAt(o)&255,i=(i&65535)*1540483477+((i>>>16)*59797<<16)}return i^=i>>>13,i=(i&65535)*1540483477+((i>>>16)*59797<<16),((i^i>>>15)>>>0).toString(36)}var x1={animationIterationCount:1,aspectRatio:1,borderImageOutset:1,borderImageSlice:1,borderImageWidth:1,boxFlex:1,boxFlexGroup:1,boxOrdinalGroup:1,columnCount:1,columns:1,flex:1,flexGrow:1,flexPositive:1,flexShrink:1,flexNegative:1,flexOrder:1,gridRow:1,gridRowEnd:1,gridRowSpan:1,gridRowStart:1,gridColumn:1,gridColumnEnd:1,gridColumnSpan:1,gridColumnStart:1,msGridRow:1,msGridRowSpan:1,msGridColumn:1,msGridColumnSpan:1,fontWeight:1,lineHeight:1,opacity:1,order:1,orphans:1,scale:1,tabSize:1,widows:1,zIndex:1,zoom:1,WebkitLineClamp:1,fillOpacity:1,floodOpacity:1,stopOpacity:1,strokeDasharray:1,strokeDashoffset:1,strokeMiterlimit:1,strokeOpacity:1,strokeWidth:1},_1=/[A-Z]|^ms/g,O1=/_EMO_([^_]+?)_([^]*?)_EMO_/g,zm=function(i){return i.charCodeAt(1)===45},Qh=functioLine truncated
* @mui/styled-engine v6.3.0
*
* @license MIT
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/function Dm(l,i){return hs(l,i)}function k1(l,i){Array.isArray(l.__emotion_styles)&&(l.__emotion_styles=i(l.__emotion_styles))}const Ph=[];function Ih(l){return Ph[0]=l,Wi(Ph)}function dn(l){if(typeof l!="object"||l===null)return!1;const i=Object.getPrototypeOf(l);return(i===null||i===Object.prototype||Object.getPrototypeOf(i)===null)&&!(Symbol.toStringTag in l)&&!(Symbol.iterator in l)}function Bm(l){if(k.isValidElement(l)||!dn(l))return l;const i={};return Object.keys(l).forEach(c=>{i[c]=Bm(l[c])}),i}function Me(l,i,c={clone:!0}){const o=c.clone?{...l}:l;return dn(l)&&dn(i)&&Object.keys(i).forEach(s=>{k.isValidElement(i[s])?o[s]=i[s]:dn(i[s])&&Object.prototype.hasOwnProperty.call(l,s)&&dn(l[s])?o[s]=Me(l[s],i[s],c):c.clone?o[s]=dn(i[s])?Bm(i[s]):i[s]:o[s]=i[s]}),o}const Q1=l=>{const i=Object.keys(l).map(c=>({key:c,val:l[c]}))||[];return i.sort((c,o)=>c.val-o.val),i.reduce((c,o)=>({...c,[o.key]:o.val}),{})};function Z1(l){const{values:i={xs:0,sm:600,md:900,lg:1200,xl:1536},unit:c="px",step:o=5,...s}=l,d=Q1(i),m=Object.keys(d);function b(w){return`@media (min-width:${typeof i[w]=="number"?i[w]:w}${c})`}function v(w){return`@media (max-width:${(typeof i[w]=="number"?i[w]:w)-o/100}${c})`}function p(w,j){const B=m.indexOf(j);return`@media (min-width:${typeof i[w]=="number"?i[w]:w}${c}) and (max-width:${(B!==-1&&typeof i[m[B]]=="number"?i[m[B]]:j)-o/100}${c})`}function C(w){return m.indexOf(w)+1<m.length?p(w,m[m.indexOf(w)+1]):b(w)}function _(w){const j=m.indexOf(w);return j===0?b(m[1]):j===m.length-1?v(m[j]):p(w,m[m.indexOf(w)+1]).replace("@media","@media not all and")}return{keys:m,values:d,up:b,down:v,between:p,only:C,not:_,unit:c,...s}}function K1(l,i){if(!l.containerQueries)return i;const c=Object.keys(i).filter(o=>o.startsWith("@container")).sort((o,s)=>{var m,b;const d=/min-width:\s*([0-9.]+)/;return+(((m=o.match(d))==null?void 0:m[1])||0)-+(((b=s.match(d))==null?void 0:b[1])||0)});return c.length?c.reduce((o,s)=>{const d=i[s];return delete o[s],o[s]=d,o},{...i}):i}function W1(l,i){return i==="@"||i.startsWith("@")&&(l.some(c=>i.startsWith(`@${c}`))||!!i.match(/^@\d/))}function J1(l,i){const c=i.match(/^@([^/]+)?\/?(.+)?$/);if(!c)return null;const[,o,s]=c,d=Number.isNaN(+o)?o||0:+o;return l.containerQueries(s).up(d)}function F1(l){const i=(d,m)=>d.replace("@media",m?`@container ${m}`:"@container");function c(d,m){d.up=(...b)=>i(l.breakpoints.up(...b),m),d.down=(...b)=>i(l.breakpoints.down(...b),m),d.between=(...b)=>i(l.breakpoints.between(...b),m),d.only=(...b)=>i(l.breakpoints.only(...b),m),d.not=(...b)=>{const v=i(l.breakpoints.not(...b),m);return v.includes("not all and")?v.replace("not all and ","").replace("min-width:","width<").replace("max-width:","width>").replace("and","or"):v}}const o={},s=d=>(c(o,d),o);return c(s),{...l,containerQueries:s}}const P1={borderRadius:4};function Yi(l,i){return i?Me(l,i,{clone:!1}):l}const Br={xs:0,sm:600,md:900,lg:1200,xl:1536},tm={keys:["xs","sm","md","lg","xl"],up:l=>`@media (min-width:${Br[l]}px)`},I1={containerQueries:l=>({up:i=>{let c=typeof i=="number"?i:Br[i]||i;return typeof c=="number"&&(c=`${c}px`),l?`@container ${l} (min-width:${c})`:`@container (min-width:${c})`}})};function Nn(l,i,c){const o=l.theme||{};if(Array.isArray(i)){const d=o.breakpoints||tm;return i.reduce((m,b,v)=>(m[d.up(d.keys[v])]=c(i[v]),m),{})}if(typeof i=="object"){const d=o.breakpoints||tm;return Object.keys(i).reduce((m,b)=>{if(W1(d.keys,b)){const v=J1(o.containerQueries?o:I1,b);v&&(m[v]=c(i[b],b))}else if(Object.keys(d.values||Br).includes(b)){const v=d.up(b);m[v]=c(i[b],b)}else{const v=b;m[v]=i[v]}return m},{})}return c(i)}function tb(l={}){var c;return((c=l.keys)==null?void 0:c.reduce((o,s)=>{const d=l.up(s);return o[d]={},o},{}))||{}}function eb(l,i){return l.reduce((c,o)=>{const s=c[o];return(!s||Object.keys(s).length===0)&&delete c[o],c},i)}function jt(l){if(typeof l!="string")throw new Error(Ba(7));return l.charAt(0).toUpperCase()+l.slice(1)}function Nr(l,i,c=!0){if(!i||typeof i!="string")return null;if(l&&l.vars&&c){const o=`vars.${i}`.split(".").reduce((s,d)=>s&&s[d]?s[d]:null,l);if(o!=null)return o}return i.split(".").reduce((o,s)=>o&&o[s]!=null?o[s]:null,l)}function _r(l,i,c,o=c){let s;return typeof l=="function"?s=l(c):Array.isArray(l)?s=l[c]||o:s=Nr(l,c)||o,i&&(s=i(s,o,l)),s}function Kt(l){const{prop:i,cssProperty:c=l.prop,themeKey:o,transform:s}=l,d=m=>{if(m[i]==null)return null;const b=m[i],v=m.theme,p=Nr(v,o)||{};return Nn(m,b,_=>{let w=_r(p,s,_);return _===w&&typeof _=="string"&&(w=_r(p,s,`${i}${_==="default"?"":jt(_)}`,_)),c===!1?w:{[c]:w}})};return d.propTypes={},d.filterProps=[i],d}function nb(l){const i={};return c=>(i[c]===void 0&&(i[c]=l(c)),i[c])}const ab={m:"margin",p:"padding"},lb={t:"Top",r:"Right",b:"Bottom",l:"Left",x:["Left","Right"],y:["Top","Bottom"]},em={marginX:"mx",marginY:"my",paddingX:"px",paddingY:"py"},ib=nb(l=>{if(l.length>2)if(em[l])l=em[l];else return[l];const[i,c]=l.split(""),o=ab[i],s=lb[c]||"";return Array.isArray(s)?s.map(d=>o+d):[o+s]Line truncated
const theme = ${JSON.stringify(i,null,2)};
theme.breakpoints = createBreakpoints(theme.breakpoints || {});
theme.transitions = createTransitions(theme.transitions || {});
export default theme;`}function ys(l={},...i){const{breakpoints:c,mixins:o={},spacing:s,palette:d={},transitions:m={},typography:b={},shape:v,...p}=l;if(l.vars)throw new Error(Ba(20));const C=Ys(d),_=qs(l);let w=Me(_,{mixins:Bv(_.breakpoints,o),palette:C,shadows:Lv.slice(),typography:Uv(C,b),transitions:Xv(m),zIndex:{...$v}});return w=Me(w,p),w=i.reduce((j,B)=>Me(j,B),w),w.unstable_sxConfig={...Pi,...p==null?void 0:p.unstable_sxConfig},w.unstable_sx=function(B){return Na({sx:B,theme:this})},w.toRuntimeSource=Qm,w}function Qv(l){let i;return l<1?i=5.11916*l**2:i=4.5*Math.log(l+1)+2,Math.round(i*10)/1e3}const Zv=[...Array(25)].map((l,i)=>{if(i===0)return"none";const c=Qv(i);return`linear-gradient(rgba(255 255 255 / ${c}), rgba(255 255 255 / ${c}))`});function Zm(l){return{inputPlaceholder:l==="dark"?.5:.42,inputUnderline:l==="dark"?.7:.42,switchTrackDisabled:l==="dark"?.2:.12,switchTrack:l==="dark"?.3:.38}}function Km(l){return l==="dark"?Zv:[]}function Kv(l){const{palette:i={mode:"light"},opacity:c,overlays:o,...s}=l,d=Ys(i);return{palette:d,opacity:{...Zm(d.mode),...c},overlays:o||Km(d.mode),...s}}function Wv(l){var i;return!!l[0].match(/(cssVarPrefix|colorSchemeSelector|rootSelector|typography|mixins|breakpoints|direction|transitions)/)||!!l[0].match(/sxConfig$/)||l[0]==="palette"&&!!((i=l[1])!=null&&i.match(/(mode|contrastThreshold|tonalOffset)/))}const Jv=l=>[...[...Array(25)].map((i,c)=>`--${l?`${l}-`:""}overlays-${c}`),`--${l?`${l}-`:""}palette-AppBar-darkBg`,`--${l?`${l}-`:""}palette-AppBar-darkColor`],Fv=l=>(i,c)=>{const o=l.rootSelector||":root",s=l.colorSchemeSelector;let d=s;if(s==="class"&&(d=".%s"),s==="data"&&(d="[data-%s]"),s!=null&&s.startsWith("data-")&&!s.includes("%s")&&(d=`[${s}="%s"]`),l.defaultColorScheme===i){if(i==="dark"){const m={};return Jv(l.cssVarPrefix).forEach(b=>{m[b]=c[b],delete c[b]}),d==="media"?{[o]:c,"@media (prefers-color-scheme: dark)":{[o]:m}}:d?{[d.replace("%s",i)]:m,[`${o}, ${d.replace("%s",i)}`]:c}:{[o]:{...c,...m}}}if(d&&d!=="media")return`${o}, ${d.replace("%s",String(i))}`}else if(i){if(d==="media")return{[`@media (prefers-color-scheme: ${String(i)})`]:{[o]:c}};if(d)return d.replace("%s",String(i))}return o};function Pv(l,i){i.forEach(c=>{l[c]||(l[c]={})})}function R(l,i,c){!l[i]&&c&&(l[i]=c)}function Gi(l){return typeof l!="string"||!l.startsWith("hsl")?l:Vm(l)}function Mn(l,i){`${i}Channel`in l||(l[`${i}Channel`]=Li(Gi(l[i])))}function Iv(l){return typeof l=="number"?`${l}px`:typeof l=="string"||typeof l=="function"||Array.isArray(l)?l:"8px"}const on=l=>{try{return l()}catch{}},tS=(l="mui")=>Sv(l);function rs(l,i,c,o){if(!i)return;i=i===!0?{}:i;const s=o==="dark"?"dark":"light";if(!c){l[o]=Kv({...i,palette:{mode:s,...i==null?void 0:i.palette}});return}const{palette:d,...m}=ys({...c,palette:{mode:s,...i==null?void 0:i.palette}});return l[o]={...i,palette:d,opacity:{...Zm(s),...i==null?void 0:i.opacity},overlays:(i==null?void 0:i.overlays)||Km(s)},m}function eS(l={},...i){const{colorSchemes:c={light:!0},defaultColorScheme:o,disableCssColorScheme:s=!1,cssVarPrefix:d="mui",shouldSkipGeneratingVar:m=Wv,colorSchemeSelector:b=c.light&&c.dark?"media":void 0,rootSelector:v=":root",...p}=l,C=Object.keys(c)[0],_=o||(c.light&&C!=="light"?"light":C),w=tS(d),{[_]:j,light:B,dark:U,...X}=c,Q={...X};let F=j;if((_==="dark"&&!("dark"in c)||_==="light"&&!("light"in c))&&(F=!0),!F)throw new Error(Ba(21,_));const V=rs(Q,F,p,_);B&&!Q.light&&rs(Q,B,void 0,"light"),U&&!Q.dark&&rs(Q,U,void 0,"dark");let L={defaultColorScheme:_,...V,cssVarPrefix:d,colorSchemeSelector:b,rootSelector:v,getCssVar:w,colorSchemes:Q,font:{...Dv(V.typography),...V.font},spacing:Iv(p.spacing)};Object.keys(L.colorSchemes).forEach(K=>{const y=L.colorSchemes[K].palette,Y=et=>{const ct=et.split("-"),St=ct[1],_t=ct[2];return w(et,y[St][_t])};if(y.mode==="light"&&(R(y.common,"background","#fff"),R(y.common,"onBackground","#000")),y.mode==="dark"&&(R(y.common,"background","#000"),R(y.common,"onBackground","#fff")),Pv(y,["Alert","AppBar","Avatar","Button","Chip","FilledInput","LinearProgress","Skeleton","Slider","SnackbarContent","SpeedDialAction","StepConnector","StepContent","Switch","TableCell","Tooltip"]),y.mode==="light"){R(y.Alert,"errorColor",Dt(y.error.light,.6)),R(y.Alert,"infoColor",Dt(y.info.light,.6)),R(y.Alert,"successColor",Dt(y.success.light,.6)),R(y.Alert,"warningColor",Dt(y.warning.light,.6)),R(y.Alert,"errorFilledBg",Y("palette-error-main")),R(y.Alert,"infoFilledBg",Y("palette-info-main")),R(y.Alert,"successFilledBg",Y("palette-success-main")),R(y.Alert,"warningFilledBg",Y("palette-warning-main")),R(y.Alert,"errorFilledColor",on(()=>y.getContrastText(y.error.main))),R(y.Alert,"infoFilledColor",on(()=>y.getContrastText(y.info.main))),R(y.Alert,"successFilledColor",on(()=>y.getContrastText(y.success.main))),R(y.Alert,"warningFilledColor",on(()=>y.getContrastText(y.warning.main))),R(y.Alert,"errorStandardBg",Bt(y.error.light,.9)),R(y.Alert,"infoStandardBg",Bt(y.info.light,.9)),R(y.Alert,"successStandardB Line truncated
0% {
transform: scale(0);
opacity: 0.1;
}
100% {
transform: scale(1);
opacity: 0.3;
}
`,bS=Dl`
0% {
opacity: 1;
}
100% {
opacity: 0;
}
`,vS=Dl`
0% {
transform: scale(1);
}
50% {
transform: scale(0.92);
}
100% {
transform: scale(1);
}
`,SS=Ie("span",{name:"MuiTouchRipple",slot:"Root"})({overflow:"hidden",pointerEvents:"none",position:"absolute",zIndex:0,top:0,right:0,bottom:0,left:0,borderRadius:"inherit"}),TS=Ie(yS,{name:"MuiTouchRipple",slot:"Ripple"})`
opacity: 0;
position: absolute;
&.${ke.rippleVisible} {
opacity: 0.3;
transform: scale(1);
animation-name: ${gS};
animation-duration: ${gs}ms;
animation-timing-function: ${({theme:l})=>l.transitions.easing.easeInOut};
}
&.${ke.ripplePulsate} {
animation-duration: ${({theme:l})=>l.transitions.duration.shorter}ms;
}
& .${ke.child} {
opacity: 1;
display: block;
width: 100%;
height: 100%;
border-radius: 50%;
background-color: currentColor;
}
& .${ke.childLeaving} {
opacity: 0;
animation-name: ${bS};
animation-duration: ${gs}ms;
animation-timing-function: ${({theme:l})=>l.transitions.easing.easeInOut};
}
& .${ke.childPulsate} {
position: absolute;
/* @noflip */
left: 0px;
top: 0;
animation-name: ${vS};
animation-duration: 2500ms;
animation-timing-function: ${({theme:l})=>l.transitions.easing.easeInOut};
animation-iteration-count: infinite;
animation-delay: 200ms;
}
`,AS=k.forwardRef(function(i,c){const o=Ul({props:i,name:"MuiTouchRipple"}),{center:s=!1,classes:d={},className:m,...b}=o,[v,p]=k.useState([]),C=k.useRef(0),_=k.useRef(null);k.useEffect(()=>{_.current&&(_.current(),_.current=null)},[v]);const w=k.useRef(!1),j=hv(),B=k.useRef(null),U=k.useRef(null),X=k.useCallback(L=>{const{pulsate:O,rippleX:$,rippleY:W,rippleSize:gt,cb:K}=L;p(y=>[...y,rt.jsx(TS,{classes:{ripple:pe(d.ripple,ke.ripple),rippleVisible:pe(d.rippleVisible,ke.rippleVisible),ripplePulsate:pe(d.ripplePulsate,ke.ripplePulsate),child:pe(d.child,ke.child),childLeaving:pe(d.childLeaving,ke.childLeaving),childPulsate:pe(d.childPulsate,ke.childPulsate)},timeout:gs,pulsate:O,rippleX:$,rippleY:W,rippleSize:gt},C.current)]),C.current+=1,_.current=K},[d]),Q=k.useCallback((L={},O={},$=()=>{})=>{const{pulsate:W=!1,center:gt=s||O.pulsate,fakeElement:K=!1}=O;if((L==null?void 0:L.type)==="mousedown"&&w.current){w.current=!1;return}(L==null?void 0:L.type)==="touchstart"&&(w.current=!0);const y=K?null:U.current,Y=y?y.getBoundingClientRect():{width:0,height:0,left:0,top:0};let et,ct,St;if(gt||L===void 0||L.clientX===0&&L.clientY===0||!L.clientX&&!L.touches)et=Math.round(Y.width/2),ct=Math.round(Y.height/2);else{const{clientX:_t,clientY:G}=L.touches&&L.touches.length>0?L.touches[0]:L;et=Math.round(_t-Y.left),ct=Math.round(G-Y.top)}if(gt)St=Math.sqrt((2*Y.width**2+Y.height**2)/3),St%2===0&&(St+=1);else{const _t=Math.max(Math.abs((y?y.clientWidth:0)-et),et)*2+2,G=Math.max(Math.abs((y?y.clientHeight:0)-ct),ct)*2+2;St=Math.sqrt(_t**2+G**2)}L!=null&&L.touches?B.current===null&&(B.current=()=>{X({pulsate:W,rippleX:et,rippleY:ct,rippleSize:St,cb:$})},j.start(pS,()=>{B.current&&(B.current(),B.current=null)})):X({pulsate:W,rippleX:et,rippleY:ct,rippleSize:St,cb:$})},[s,X,j]),F=k.useCallback(()=>{Q({},{pulsate:!0})},[Q]),V=k.useCallback((L,O)=>{if(j.clear(),(L==null?void 0:L.type)==="touchend"&&B.current){B.current(),B.current=null,j.start(0,()=>{V(L,O)});return}B.current=null,p($=>$.length>0?$.slice(1):$),_.current=O},[j]);return k.useImperativeHandle(c,()=>({pulsate:F,start:Q,stop:V}),[F,Q,V]),rt.jsx(SS,{className:pe(ke.root,d.root,m),ref:U,...b,children:rt.jsx(Xs,{component:null,exit:!0,children:v})})});function ES(l){return Ii("MuiButtonBase",l)}const xS=Bl("MuiButtonBase",["root","disabled","focusVisible"]),_S=l=>{const{disabled:i,focusVisible:c,focusVisibleClassName:o,classes:s}=l,m=Xr({root:["root",i&&"disabled",c&&"focusVisible"]},ES,s);return c&&o&&(m.root+=` ${o}`),m},OS=Ie("button",{name:"MuiButtonBase",slot:"Root",overridesResolver:(l,i)=>i.root})({display:"inline-flex",alignItems:"center",justifyContent:"center",position:"relative",boxSizing:"border-box",WebkitTapHighlightColor:"transparent",backgroundColor:"transparent",outline:0,border:0,margin:0,borderRadius:0,padding:0,cursor:"pointer",userSelect:"none",verticalAlign:"middle",MozAppearance:"none",WebkitAppearance:"none",textDecoration:"none",color:"inherit","&::-moz-focus-inner":{borderStyle:"none"},[`&.${xS.disabled}`]:{pointerEvents:"none",cursor:"default"},"@media print":{colorAdjust:"exact"}}),CS=k.forwardRef(function(i,c){const o=Ul({props:i,name:"MuiButtonBase"}),{action:s,centerRipple:d=!1,children:m,className:b,component:v="button",disabled:p=!1,disableRipple:C=!1,disableTouchRipple:_=!1,focusRipple:w=!1,focusVisibleClassName:j,LinkComponent:B="a",onBlur:U,onClick:X,onContextMenu:Q,onDragLeave:F,onFocus:V,onFocusVisible:L,onKeyDown:O,onKeyUp:$,onMouseDown:W,onMouseLeave:gt,onMouseUp:K,onTouchEnd:y,onTouchMove:Y,onTouchStart:et,tabIndex:ct=0,TouchRippleProps:St,touchRippleRef:_t,type:G,...it}=o,tt=k.useRef(null),ot=hS(),S=am(ot.ref,_t),[q,at]=k.useState(!1);p&&q&&at(!1),k.useImperativeHandle(s,()=>({focusVisible:()=>{at(!0),tt.current.focus()}}),[]);const lt=ot.shouldMount&&!C&&!p;k.useEffect(()=>{q&&w&&!C&&ot.pulsate()},[C,w,q,ot]);const J=Dn(ot,"start",W,_),bt=Dn(ot,"stop",Q,_),ft=Dn(ot,"stop",F,_),ie=Dn(ot,"stop",K,_),At=Dn(ot,"stop",dt=>{q&&dt.preventDefault(),gt&&gt(dt)},_),Yt=Dn(ot,"start",et,_),Nt=Dn(ot,"stop",y,_),De=Dn(ot,"stop",Y,_),oa=Dn(ot,"stop",dt=>{im(dt.target)||at(!1),U&&U(dt)},!1),tn=vr(dt=>{tt.current||(tt.current=dt.currentTarget),im(dt.target)&&(at(!0),L&&L(dt)),V&&V(dt)}),Un=()=>{const dt=tt.current;return v&&v!=="button"&&!(dt.tagName==="A"&&dt.href)},Ha=vr(dt=>{w&&!dt.repeat&&q&&dt.key===" "&&ot.stop(dt,()=>{ot.start(dt)}),dt.target===dt.currentTarget&&Un()&&dt.key===" "&&dt.preventDefault(),O&&O(dt),dt.target===dt.currentTarget&&Un()&&dt.key==="Enter"&&!p&&(dt.preventDefault(),X&&X(dt))}),Hn=vr(dt=>{w&&dt.key===" "&&q&&!dt.defaultPrevented&&ot.stop(dt,()=>{ot.pulsate(dt)}),$&&$(dt),X&&dt.target===dt.currentTarget&&Un()&&dt.key===" "&&!dt.defaultPrevented&&X(dt)});let jn=v;jn==="button"&&(it.href||it.to)&&(jn=B);const en={};jn==="button"?(en.type=G===void 0?"button":G,en.disabled=p):(!it.href&&!it.to&&(en.role="button"),p&&(en["aria-disabled"]=p));const Hl=am(c,tt),ja={...o,centerRipple:d,component:v,disabled:p,disableRipple:C,di Line truncated
0% {
left: -35%;
right: 100%;
}
60% {
left: 100%;
right: -90%;
}
100% {
left: 100%;
right: -90%;
}
`,FS=typeof Ss!="string"?Dr`
animation: ${Ss} 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite;
`:null,Ts=Dl`
0% {
left: -200%;
right: 100%;
}
60% {
left: 107%;
right: -8%;
}
100% {
left: 107%;
right: -8%;
}
`,PS=typeof Ts!="string"?Dr`
animation: ${Ts} 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite;
`:null,As=Dl`
0% {
opacity: 1;
background-position: 0 -23px;
}
60% {
opacity: 0;
background-position: 0 -23px;
}
100% {
opacity: 1;
background-position: -200px -23px;
}
`,IS=typeof As!="string"?Dr`
animation: ${As} 3s infinite linear;
`:null,t2=l=>{const{classes:i,variant:c,color:o}=l,s={root:["root",`color${jt(o)}`,c],dashed:["dashed",`dashedColor${jt(o)}`],bar1:["bar",`barColor${jt(o)}`,(c==="indeterminate"||c==="query")&&"bar1Indeterminate",c==="determinate"&&"bar1Determinate",c==="buffer"&&"bar1Buffer"],bar2:["bar",c!=="buffer"&&`barColor${jt(o)}`,c==="buffer"&&`color${jt(o)}`,(c==="indeterminate"||c==="query")&&"bar2Indeterminate",c==="buffer"&&"bar2Buffer"]};return Xr(s,JS,i)},ks=(l,i)=>l.vars?l.vars.palette.LinearProgress[`${i}Bg`]:l.palette.mode==="light"?Vr(l.palette[i].main,.62):Yr(l.palette[i].main,.5),e2=Ie("span",{name:"MuiLinearProgress",slot:"Root",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.root,i[`color${jt(c.color)}`],i[c.variant]]}})(Nl(({theme:l})=>({position:"relative",overflow:"hidden",display:"block",height:4,zIndex:0,"@media print":{colorAdjust:"exact"},variants:[...Object.entries(l.palette).filter(Ua()).map(([i])=>({props:{color:i},style:{backgroundColor:ks(l,i)}})),{props:({ownerState:i})=>i.color==="inherit"&&i.variant!=="buffer",style:{"&::before":{content:'""',position:"absolute",left:0,top:0,right:0,bottom:0,backgroundColor:"currentColor",opacity:.3}}},{props:{variant:"buffer"},style:{backgroundColor:"transparent"}},{props:{variant:"query"},style:{transform:"rotate(180deg)"}}]}))),n2=Ie("span",{name:"MuiLinearProgress",slot:"Dashed",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.dashed,i[`dashedColor${jt(c.color)}`]]}})(Nl(({theme:l})=>({position:"absolute",marginTop:0,height:"100%",width:"100%",backgroundSize:"10px 10px",backgroundPosition:"0 -23px",variants:[{props:{color:"inherit"},style:{opacity:.3,backgroundImage:"radial-gradient(currentColor 0%, currentColor 16%, transparent 42%)"}},...Object.entries(l.palette).filter(Ua()).map(([i])=>{const c=ks(l,i);return{props:{color:i},style:{backgroundImage:`radial-gradient(${c} 0%, ${c} 16%, transparent 42%)`}}})]})),IS||{animation:`${As} 3s infinite linear`}),a2=Ie("span",{name:"MuiLinearProgress",slot:"Bar1",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.bar,i[`barColor${jt(c.color)}`],(c.variant==="indeterminate"||c.variant==="query")&&i.bar1Indeterminate,c.variant==="determinate"&&i.bar1Determinate,c.variant==="buffer"&&i.bar1Buffer]}})(Nl(({theme:l})=>({width:"100%",position:"absolute",left:0,bottom:0,top:0,transition:"transform 0.2s linear",transformOrigin:"left",variants:[{props:{color:"inherit"},style:{backgroundColor:"currentColor"}},...Object.entries(l.palette).filter(Ua()).map(([i])=>({props:{color:i},style:{backgroundColor:(l.vars||l).palette[i].main}})),{props:{variant:"determinate"},style:{transition:`transform .${vs}s linear`}},{props:{variant:"buffer"},style:{zIndex:1,transition:`transform .${vs}s linear`}},{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:{width:"auto"}},{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:FS||{animation:`${Ss} 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite`}}]}))),l2=Ie("span",{name:"MuiLinearProgress",slot:"Bar2",overridesResolver:(l,i)=>{const{ownerState:c}=l;return[i.bar,i[`barColor${jt(c.color)}`],(c.variant==="indeterminate"||c.variant==="query")&&i.bar2Indeterminate,c.variant==="buffer"&&i.bar2Buffer]}})(Nl(({theme:l})=>({width:"100%",position:"absolute",left:0,bottom:0,top:0,transition:"transform 0.2s linear",transformOrigin:"left",variants:[...Object.entries(l.palette).filter(Ua()).map(([i])=>({props:{color:i},style:{"--LinearProgressBar2-barColor":(l.vars||l).palette[i].main}})),{props:({ownerState:i})=>i.variant!=="buffer"&&i.color!=="inherit",style:{backgroundColor:"var(--LinearProgressBar2-barColor, currentColor)"}},{props:({ownerState:i})=>i.variant!=="buffer"&&i.color==="inherit",style:{backgroundColor:"currentColor"}},{props:{color:"inherit"},style:{opacity:.3}},...Object.entries(l.palette).filter(Ua()).map(([i])=>({props:{color:i,variant:"buffer"},style:{backgroundColor:ks(l,i),transition:`transform .${vs}s linear`}})),{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:{width:"auto"}},{props:({ownerState:i})=>i.variant==="indeterminate"||i.variant==="query",style:PS||{animation:`${Ts} 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite`}}]}))),i2=k.forwardRef(function(i,c){const o=Ul({props:i,name:"MuiLinearProgress"}),{className:s,color:d="primary",value:m,valueBuffer:b,variant:v="indeterminate",...p}=o,C={...o,color:d,variant:v},_=t2(C),w=yv(),j={},B={bar1:{},bar2:{}};if((v==="determinate"||v==="buffer")&&m!==void 0){j["aria-valuenow"]=Math.round(m),j["aria-valuemin"]=0,j["aria-valuemax"]=100;let U=m-100;w&&(U=-U),B.bar1.transform=`translateX(${U}%)`}if(v==="buffer"&&b!==void 0){let U=(b||0)-100;w&&(U=-U),B.bar2.transform=`translateX(${U}%)`}return rt.jsxs(e2,{className:pe(_.root,s),ownerState:C,role:"progressbar",...j,ref:c,...p,children:[v==="buffer"?rt.jsx(n2,{className:_.dashed,ownerState:C}):null,rt.jsx(a2,{className:_.bar1,ownerState:C,style:B.bar1}),v== Line truncated
+2 -2
View File
@@ -4,8 +4,8 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>GlobalProtect</title> <title>GP Connect Helper</title>
<script type="module" crossorigin src="/assets/main-CQPVXkdn.js"></script> <script type="module" crossorigin src="/assets/main-BQzTuCOL.js"></script>
<link rel="stylesheet" crossorigin href="/assets/main-B3YRsHQ2.css"> <link rel="stylesheet" crossorigin href="/assets/main-B3YRsHQ2.css">
</head> </head>
<body> <body>
+1 -1
View File
@@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>GlobalProtect</title> <title>GP Connect Helper</title>
</head> </head>
<body> <body>
<script> <script>
+19 -19
View File
@@ -10,28 +10,28 @@
}, },
"dependencies": { "dependencies": {
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0", "@emotion/styled": "^11.14.1",
"@mui/icons-material": "^6.3.0", "@mui/icons-material": "^7.3.6",
"@mui/material": "^6.3.0", "@mui/material": "^7.3.6",
"@tauri-apps/api": "^2.1.1", "@tauri-apps/api": "^2.9.1",
"react": "^19.0.0", "react": "^19.2.3",
"react-dom": "^19.0.0" "react-dom": "^19.2.3"
}, },
"devDependencies": { "devDependencies": {
"@tauri-apps/cli": "^2.1.0", "@tauri-apps/cli": "^2.9.6",
"@types/node": "^22.10.2", "@types/node": "^22.19.3",
"@types/react": "^19.0.2", "@types/react": "^19.2.7",
"@types/react-dom": "^19.0.2", "@types/react-dom": "^19.2.3",
"@typescript-eslint/eslint-plugin": "^8.18.2", "@typescript-eslint/eslint-plugin": "^8.50.0",
"@typescript-eslint/parser": "^8.18.2", "@typescript-eslint/parser": "^8.50.0",
"@vitejs/plugin-react": "^4.3.4", "@vitejs/plugin-react": "^5.1.2",
"eslint": "^9.17.0", "eslint": "^9.39.2",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^10.1.8",
"eslint-plugin-react": "^7.37.3", "eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-react-hooks": "^7.0.1",
"prettier": "3.4.2", "prettier": "3.4.2",
"typescript": "^5.7.2", "typescript": "^5.9.3",
"vite": "^6.0.5" "vite": "^7.3.0"
}, },
"packageManager": "[email protected]" "packageManager": "[email protected]"
} }
+1246 -1126
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -10,7 +10,7 @@ license.workspace = true
tauri-build = { version = "2", features = [] } tauri-build = { version = "2", features = [] }
[dependencies] [dependencies]
gpapi = { path = "../../../crates/gpapi", features = ["tauri"] } gpapi = { path = "../../../crates/gpapi", features = ["tauri", "clap"] }
tauri.workspace = true tauri.workspace = true
tokio.workspace = true tokio.workspace = true
@@ -24,4 +24,4 @@ tempfile.workspace = true
reqwest = { workspace = true, features = ["stream"] } reqwest = { workspace = true, features = ["stream"] }
[features] [features]
custom-protocol = ["tauri/custom-protocol"] default = ["tauri/custom-protocol"]
+13 -5
View File
@@ -1,6 +1,9 @@
use clap::Parser; use clap::Parser;
use gpapi::utils::{base64, env_utils}; use gpapi::{
use log::{info, LevelFilter}; clap::InfoLevelVerbosity,
utils::{base64, env_utils},
};
use log::info;
use crate::app::App; use crate::app::App;
@@ -15,6 +18,9 @@ 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,
#[command(flatten)]
verbose: InfoLevelVerbosity,
} }
impl Cli { impl Cli {
@@ -41,14 +47,16 @@ impl Cli {
} }
} }
fn init_logger() { fn init_logger(cli: &Cli) {
env_logger::builder().filter_level(LevelFilter::Info).init(); env_logger::builder()
.filter_level(cli.verbose.log_level_filter())
.init();
} }
pub fn run() { pub fn run() {
let cli = Cli::parse(); let cli = Cli::parse();
init_logger(); init_logger(&cli);
info!("gpgui-helper started: {}", VERSION); info!("gpgui-helper started: {}", VERSION);
if let Err(e) = cli.run() { if let Err(e) = cli.run() {
+1 -1
View File
@@ -15,7 +15,7 @@
}, },
"windows": [ "windows": [
{ {
"title": "GlobalProtect GUI Helper", "title": "GP Connect Helper",
"center": true, "center": true,
"resizable": true, "resizable": true,
"width": 500, "width": 500,
+3 -2
View File
@@ -5,11 +5,12 @@ edition.workspace = true
license.workspace = true license.workspace = true
[dependencies] [dependencies]
gpapi = { path = "../../crates/gpapi" } common = { path = "../../crates/common" }
gpapi = { path = "../../crates/gpapi", features = ["clap", "logger"] }
openconnect = { path = "../../crates/openconnect" } openconnect = { path = "../../crates/openconnect" }
clap.workspace = true clap.workspace = true
anyhow.workspace = true anyhow.workspace = true
tokio.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] }
tokio-util.workspace = true tokio-util.workspace = true
axum = { workspace = true, features = ["ws"] } axum = { workspace = true, features = ["ws"] }
futures.workspace = true futures.workspace = true
+96 -30
View File
@@ -3,13 +3,15 @@ use std::{collections::HashMap, io::Write};
use anyhow::bail; use anyhow::bail;
use clap::Parser; use clap::Parser;
use common::constants::GP_SERVICE_LOCK_FILE;
use gpapi::clap::InfoLevelVerbosity;
use gpapi::logger;
use gpapi::{ use gpapi::{
process::gui_launcher::GuiLauncher, process::gui_launcher::GuiLauncher,
service::{request::WsRequest, vpn_state::VpnState}, service::{request::WsRequest, vpn_state::VpnState},
utils::{crypto::generate_key, env_utils, lock_file::LockFile, redact::Redaction, shutdown_signal}, utils::{crypto::generate_key, env_utils, lock_file::LockFile, redact::Redaction, shutdown_signal},
GP_SERVICE_LOCK_FILE,
}; };
use log::{info, warn, LevelFilter}; use log::{info, warn};
use tokio::sync::{mpsc, watch}; use tokio::sync::{mpsc, watch};
use crate::{vpn_task::VpnTask, ws_server::WsServer}; use crate::{vpn_task::VpnTask, ws_server::WsServer};
@@ -26,11 +28,18 @@ struct Cli {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
#[clap(long)] #[clap(long)]
no_gui: bool, no_gui: bool,
#[command(flatten)]
verbose: InfoLevelVerbosity,
} }
impl Cli { impl Cli {
async fn run(&mut self, redaction: Arc<Redaction>) -> anyhow::Result<()> { async fn run(&mut self) -> anyhow::Result<()> {
let lock_file = Arc::new(LockFile::new(GP_SERVICE_LOCK_FILE)); let redaction = self.init_logger();
info!("gpservice started: {}", VERSION);
let pid = std::process::id();
let lock_file = Arc::new(LockFile::new(GP_SERVICE_LOCK_FILE, pid));
if lock_file.check_health().await { if lock_file.check_health().await {
bail!("Another instance of the service is already running"); bail!("Another instance of the service is already running");
@@ -48,9 +57,17 @@ impl Cli {
let (shutdown_tx, mut shutdown_rx) = mpsc::channel::<()>(4); let (shutdown_tx, mut shutdown_rx) = mpsc::channel::<()>(4);
let shutdown_tx_clone = shutdown_tx.clone(); let shutdown_tx_clone = shutdown_tx.clone();
let vpn_task_token = vpn_task.cancel_token(); let vpn_task_cancel_token = vpn_task.cancel_token();
let server_token = ws_server.cancel_token(); let server_token = ws_server.cancel_token();
#[cfg(unix)]
{
let vpn_ctx = vpn_task.context();
let ws_ctx = ws_server.context();
tokio::spawn(async move { signals::handle_signals(vpn_ctx, ws_ctx).await });
}
let vpn_task_handle = tokio::spawn(async move { vpn_task.start(server_token).await }); let vpn_task_handle = tokio::spawn(async move { vpn_task.start(server_token).await });
let ws_server_handle = tokio::spawn(async move { ws_server.start(shutdown_tx_clone).await }); let ws_server_handle = tokio::spawn(async move { ws_server.start(shutdown_tx_clone).await });
@@ -82,7 +99,7 @@ impl Cli {
} }
} }
vpn_task_token.cancel(); vpn_task_cancel_token.cancel();
let _ = tokio::join!(vpn_task_handle, ws_server_handle); let _ = tokio::join!(vpn_task_handle, ws_server_handle);
lock_file.unlock()?; lock_file.unlock()?;
@@ -92,6 +109,33 @@ impl Cli {
Ok(()) Ok(())
} }
fn init_logger(&self) -> Arc<Redaction> {
let redaction = Arc::new(Redaction::new());
let redaction_clone = Arc::clone(&redaction);
let inner_logger = env_logger::builder()
// Set the log level to the Trace level, the logs will be filtered
.filter_level(log::LevelFilter::Trace)
.format(move |buf, record| {
let timestamp = buf.timestamp();
writeln!(
buf,
"[{} {:<5} {}] {}",
timestamp,
record.level(),
record.module_path().unwrap_or_default(),
redaction_clone.redact_str(&record.args().to_string())
)
})
.build();
let level = self.verbose.log_level_filter().to_level().unwrap_or(log::Level::Info);
logger::init_with_logger(level, inner_logger);
redaction
}
fn prepare_api_key(&self) -> Vec<u8> { fn prepare_api_key(&self) -> Vec<u8> {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if self.no_gui { if self.no_gui {
@@ -102,27 +146,52 @@ impl Cli {
} }
} }
fn init_logger() -> Arc<Redaction> { #[cfg(unix)]
let redaction = Arc::new(Redaction::new()); mod signals {
let redaction_clone = Arc::clone(&redaction); use std::sync::Arc;
// let target = Box::new(File::create("log.txt").expect("Can't create file"));
env_logger::builder()
.filter_level(LevelFilter::Info)
.format(move |buf, record| {
let timestamp = buf.timestamp();
writeln!(
buf,
"[{} {} {}] {}",
timestamp,
record.level(),
record.module_path().unwrap_or_default(),
redaction_clone.redact_str(&record.args().to_string())
)
})
// .target(env_logger::Target::Pipe(target))
.init();
redaction use log::{info, warn};
use crate::vpn_task::VpnTaskContext;
use crate::ws_server::WsServerContext;
const DISCONNECTED_PID_FILE: &str = "/tmp/gpservice_disconnected.pid";
pub async fn handle_signals(vpn_ctx: Arc<VpnTaskContext>, ws_ctx: Arc<WsServerContext>) {
use gpapi::service::event::WsEvent;
use tokio::signal::unix::{signal, Signal, SignalKind};
let (mut user_sig1, mut user_sig2) = match || -> anyhow::Result<(Signal, Signal)> {
let user_sig1 = signal(SignalKind::user_defined1())?;
let user_sig2 = signal(SignalKind::user_defined2())?;
Ok((user_sig1, user_sig2))
}() {
Ok(signals) => signals,
Err(err) => {
warn!("Failed to create signal: {}", err);
return;
}
};
loop {
tokio::select! {
_ = user_sig1.recv() => {
info!("Received SIGUSR1 signal");
if vpn_ctx.disconnect().await {
// Write the PID to a dedicated file to indicate that the VPN task is disconnected via SIGUSR1
let pid = std::process::id();
if let Err(err) = tokio::fs::write(DISCONNECTED_PID_FILE, pid.to_string()).await {
warn!("Failed to write PID to file: {}", err);
}
}
}
_ = user_sig2.recv() => {
info!("Received SIGUSR2 signal");
ws_ctx.send_event(WsEvent::ResumeConnection).await;
}
}
}
}
} }
async fn launch_gui(envs: Option<HashMap<String, String>>, api_key: Vec<u8>, mut minimized: bool) { async fn launch_gui(envs: Option<HashMap<String, String>>, api_key: Vec<u8>, mut minimized: bool) {
@@ -153,10 +222,7 @@ async fn launch_gui(envs: Option<HashMap<String, String>>, api_key: Vec<u8>, mut
pub async fn run() { pub async fn run() {
let mut cli = Cli::parse(); let mut cli = Cli::parse();
let redaction = init_logger(); if let Err(e) = cli.run().await {
info!("gpservice started: {}", VERSION);
if let Err(e) = cli.run(redaction).await {
eprintln!("Error: {}", e); eprintln!("Error: {}", e);
std::process::exit(1); std::process::exit(1);
} }
+3 -4
View File
@@ -1,5 +1,4 @@
use std::{ use std::{
borrow::Cow,
fs::{File, Permissions}, fs::{File, Permissions},
io::BufReader, io::BufReader,
ops::ControlFlow, ops::ControlFlow,
@@ -12,17 +11,17 @@ use anyhow::bail;
use axum::{ use axum::{
body::Bytes, body::Bytes,
extract::{ extract::{
ws::{self, CloseFrame, Message, WebSocket}, ws::{self, CloseFrame, Message, Utf8Bytes, WebSocket},
State, WebSocketUpgrade, State, WebSocketUpgrade,
}, },
http::StatusCode, http::StatusCode,
response::IntoResponse, response::IntoResponse,
}; };
use common::constants::GP_GUI_BINARY;
use futures::{SinkExt, StreamExt}; use futures::{SinkExt, StreamExt};
use gpapi::{ use gpapi::{
service::{event::WsEvent, request::UpdateGuiRequest}, service::{event::WsEvent, request::UpdateGuiRequest},
utils::checksum::verify_checksum, utils::checksum::verify_checksum,
GP_GUI_BINARY,
}; };
use log::{info, warn}; use log::{info, warn};
use tar::Archive; use tar::Archive;
@@ -133,7 +132,7 @@ async fn handle_socket(mut socket: WebSocket, ctx: Arc<WsServerContext>) {
let close_msg = Message::Close(Some(CloseFrame { let close_msg = Message::Close(Some(CloseFrame {
code: ws::close_code::NORMAL, code: ws::close_code::NORMAL,
reason: Cow::from("Goodbye"), reason: Utf8Bytes::from("Goodbye"),
})); }));
if let Err(err) = sender.send(close_msg).await { if let Err(err) = sender.send(close_msg).await {
+24 -3
View File
@@ -1,8 +1,11 @@
use std::{sync::Arc, thread}; use std::{sync::Arc, thread};
use gpapi::service::{ use gpapi::{
request::{ConnectRequest, WsRequest}, logger,
service::{
request::{ConnectRequest, UpdateLogLevelRequest, WsRequest},
vpn_state::VpnState, vpn_state::VpnState,
},
}; };
use log::{info, warn}; use log::{info, warn};
use openconnect::Vpn; use openconnect::Vpn;
@@ -39,9 +42,12 @@ impl VpnTaskContext {
.script(args.vpnc_script()) .script(args.vpnc_script())
.user_agent(args.user_agent()) .user_agent(args.user_agent())
.os(args.openconnect_os()) .os(args.openconnect_os())
.os_version(args.os_version())
.client_version(args.client_version())
.certificate(args.certificate()) .certificate(args.certificate())
.sslkey(args.sslkey()) .sslkey(args.sslkey())
.key_password(args.key_password()) .key_password(args.key_password())
.hip(args.hip())
.csd_uid(args.csd_uid()) .csd_uid(args.csd_uid())
.csd_wrapper(args.csd_wrapper()) .csd_wrapper(args.csd_wrapper())
.reconnect_timeout(args.reconnect_timeout()) .reconnect_timeout(args.reconnect_timeout())
@@ -87,7 +93,7 @@ impl VpnTaskContext {
}); });
} }
pub async fn disconnect(&self) { pub async fn disconnect(&self) -> bool {
if let Some(disconnect_rx) = self.disconnect_rx.write().await.take() { if let Some(disconnect_rx) = self.disconnect_rx.write().await.take() {
info!("Disconnecting VPN..."); info!("Disconnecting VPN...");
if let Some(vpn) = self.vpn_handle.read().await.as_ref() { if let Some(vpn) = self.vpn_handle.read().await.as_ref() {
@@ -98,9 +104,13 @@ impl VpnTaskContext {
// Wait for the VPN to be disconnected // Wait for the VPN to be disconnected
disconnect_rx.await.ok(); disconnect_rx.await.ok();
info!("VPN disconnected"); info!("VPN disconnected");
true
} else { } else {
info!("VPN is not connected, skip disconnect"); info!("VPN is not connected, skip disconnect");
self.vpn_state_tx.send(VpnState::Disconnected).ok(); self.vpn_state_tx.send(VpnState::Disconnected).ok();
false
} }
} }
} }
@@ -143,6 +153,10 @@ impl VpnTask {
server_cancel_token.cancel(); server_cancel_token.cancel();
} }
pub fn context(&self) -> Arc<VpnTaskContext> {
return Arc::clone(&self.ctx);
}
async fn recv(&mut self) { async fn recv(&mut self) {
while let Some(req) = self.ws_req_rx.recv().await { while let Some(req) = self.ws_req_rx.recv().await {
tokio::spawn(process_ws_req(req, self.ctx.clone())); tokio::spawn(process_ws_req(req, self.ctx.clone()));
@@ -158,5 +172,12 @@ async fn process_ws_req(req: WsRequest, ctx: Arc<VpnTaskContext>) {
WsRequest::Disconnect(_) => { WsRequest::Disconnect(_) => {
ctx.disconnect().await; ctx.disconnect().await;
} }
WsRequest::UpdateLogLevel(UpdateLogLevelRequest(level)) => {
let level = level.parse().unwrap_or_else(|_| log::Level::Info);
info!("Updating log level to: {}", level);
if let Err(err) = logger::set_max_level(level) {
warn!("Failed to update log level: {}", err);
}
}
} }
} }
+2 -2
View File
@@ -20,7 +20,7 @@ impl WsConnection {
pub async fn send_event(&self, event: &WsEvent) -> anyhow::Result<()> { pub async fn send_event(&self, event: &WsEvent) -> anyhow::Result<()> {
let encrypted = self.crypto.encrypt(event)?; let encrypted = self.crypto.encrypt(event)?;
let msg = Message::Binary(encrypted); let msg = Message::Binary(encrypted.into());
self.tx.send(msg).await?; self.tx.send(msg).await?;
@@ -29,7 +29,7 @@ impl WsConnection {
pub fn recv_msg(&self, msg: Message) -> ControlFlow<(), WsRequest> { pub fn recv_msg(&self, msg: Message) -> ControlFlow<(), WsRequest> {
match msg { match msg {
Message::Binary(data) => match self.crypto.decrypt(data) { Message::Binary(data) => match self.crypto.decrypt(data.into()) {
Ok(ws_req) => ControlFlow::Continue(ws_req), Ok(ws_req) => ControlFlow::Continue(ws_req),
Err(err) => { Err(err) => {
info!("Failed to decrypt message: {}", err); info!("Failed to decrypt message: {}", err);
+18 -6
View File
@@ -1,11 +1,13 @@
use std::sync::Arc; use std::sync::Arc;
use axum::extract::ws::Message; use axum::extract::ws::Message;
use common::constants::GP_AUTH_BINARY;
use gpapi::{ use gpapi::{
service::{event::WsEvent, request::WsRequest, vpn_state::VpnState}, service::{event::WsEvent, request::WsRequest, vpn_env::VpnEnv, vpn_state::VpnState},
utils::{crypto::Crypto, lock_file::LockFile, redact::Redaction}, utils::{crypto::Crypto, lock_file::LockFile, redact::Redaction},
}; };
use log::{info, warn}; use log::{info, warn};
use openconnect::{find_csd_wrapper, find_vpnc_script};
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use tokio::{ use tokio::{
net::TcpListener, net::TcpListener,
@@ -56,9 +58,15 @@ impl WsServerContext {
let conn = Arc::new(WsConnection::new(Arc::clone(&self.crypto), tx)); let conn = Arc::new(WsConnection::new(Arc::clone(&self.crypto), tx));
// Send current VPN state to new client // Send current VPN state to new client
info!("Sending current VPN state to new client"); info!("Sending current environment to new client");
let vpn_state = self.vpn_state_rx.borrow().clone(); let vpn_env = VpnEnv {
if let Err(err) = conn.send_event(&WsEvent::VpnState(vpn_state)).await { vpn_state: self.vpn_state_rx.borrow().clone(),
vpnc_script: find_vpnc_script().map(|s| s.to_owned()),
csd_wrapper: find_csd_wrapper().map(|s| s.to_owned()),
auth_executable: GP_AUTH_BINARY.to_owned(),
};
if let Err(err) = conn.send_event(&WsEvent::VpnEnv(vpn_env)).await {
warn!("Failed to send VPN state to new client: {}", err); warn!("Failed to send VPN state to new client: {}", err);
} }
@@ -113,6 +121,10 @@ impl WsServer {
} }
} }
pub fn context(&self) -> Arc<WsServerContext> {
Arc::clone(&self.ctx)
}
pub fn cancel_token(&self) -> CancellationToken { pub fn cancel_token(&self) -> CancellationToken {
self.cancel_token.clone() self.cancel_token.clone()
} }
@@ -124,7 +136,7 @@ impl WsServer {
warn!("Failed to start WS server: {}", err); warn!("Failed to start WS server: {}", err);
let _ = shutdown_tx.send(()).await; let _ = shutdown_tx.send(()).await;
return; return;
}, }
}; };
tokio::select! { tokio::select! {
@@ -149,7 +161,7 @@ impl WsServer {
info!("WS server listening on port: {}", port); info!("WS server listening on port: {}", port);
self.lock_file.lock(port.to_string())?; self.lock_file.lock(&port.to_string())?;
Ok(listener) Ok(listener)
} }
+55
View File
@@ -1,5 +1,60 @@
# Changelog # Changelog
## 2.5.1 - 2025-12-22
- Fix the `.deb` package installation issue (fix [#563](https://github.com/yuezk/GlobalProtect-openconnect/issues/563))
- GUI: fix the tray icon size issue on GNOME Flashback (fix [#564](https://github.com/yuezk/GlobalProtect-openconnect/issues/564))
- Improve the HIP report generation logic
## 2.5.0 - 2025-12-08
- GUI/CLI: statically link OpenConnect
- GUI/CLI: support configure the client version
- CLI: add the `-S/--script-tun` option to pass traffic to the `--script` handler
- GUI: update the branding to `GP Connect`
## 2.4.7 - 2025-11-12
- Support NixOS package installation
- Fix the VPNC script location on Void Linux
- Upgrade to Rust 1.85
- `--browser` without argument uses the system default browser
## 2.4.6 - 2025-10-15
- GUI: support the default configuration file for GUI client (fix [#492](https://github.com/yuezk/GlobalProtect-openconnect/issues/492))
- GUI: add the option to not reuse the authentication cookies (fix [#540](https://github.com/yuezk/GlobalProtect-openconnect/issues/540))
- GUI: improve the license validation logic (fix [#502](https://github.com/yuezk/GlobalProtect-openconnect/issues/502))
- CLI: support the `--browser remote` option to use the remote browser for authentication ([#544](https://github.com/yuezk/GlobalProtect-openconnect/pull/544) by [@dark12](https://github.com/dark12))
- CLI: fix gpclient disconnect bailing with client is already running issue ([#542](https://github.com/yuezk/GlobalProtect-openconnect/pull/542) by [@zeroepoch](https://github.com/zeroepoch))
- CLI: fix the `--passwd-on-stdin` reads again on gateway failure ([#546](https://github.com/yuezk/GlobalProtect-openconnect/issues/546))
## 2.4.5 - 2025-07-16
- GUI/CLI: fix the issue that the custom port is not supported issue (fix [#404](https://github.com/yuezk/GlobalProtect-openconnect/issues/404))
- CLI: add the `--force-dpd` option to specify the interval for DPD (Dead Peer Detection).
- CLI: add the `-i/--interface` option to specify the interface to use.
## 2.4.4 - 2025-02-09
- GUI: fix multiple tray icons issue (fix [#464](https://github.com/yuezk/GlobalProtect-openconnect/issues/464))
- CLI: check the cli running state before running the `gpclient` command (fix [#447](https://github.com/yuezk/GlobalProtect-openconnect/issues/447))
## 2.4.3 - 2025-01-21
- Do not use static default value for `--os-version` option.
## 2.4.2 - 2025-01-20
- Disconnect the VPN when sleep (fix [#166](https://github.com/yuezk/GlobalProtect-openconnect/issues/166), [#267](https://github.com/yuezk/GlobalProtect-openconnect/issues/267))
## 2.4.1 - 2025-01-09
- Fix the network issue with OpenSSL < 3.0.4
- GUI: fix the Wayland compatibility issue
- Support configure the log level
- Log the detailed error message when network error occurs
## 2.4.0 - 2024-12-26 ## 2.4.0 - 2024-12-26
- Upgrade to Tauri 2.0 - Upgrade to Tauri 2.0
+12 -1
View File
@@ -8,6 +8,7 @@ edition.workspace = true
license.workspace = true license.workspace = true
[dependencies] [dependencies]
common = { path = "../common" }
gpapi = { path = "../gpapi" } gpapi = { path = "../gpapi" }
# Shared dependencies # Shared dependencies
@@ -31,6 +32,12 @@ html-escape = { version = "0.2.13", optional = true }
[target.'cfg(not(target_os = "macos"))'.dependencies] [target.'cfg(not(target_os = "macos"))'.dependencies]
webkit2gtk = { version = "2", optional = true } webkit2gtk = { version = "2", optional = true }
[target.'cfg(target_os = "macos")'.dependencies]
block2 = { version = "0.6", optional = true }
objc2 = { version = "0.6", optional = true }
objc2-foundation = { version = "0.3", optional = true }
objc2-web-kit = { version = "0.3", optional = true }
[features] [features]
browser-auth = [ browser-auth = [
"dep:webbrowser", "dep:webbrowser",
@@ -40,10 +47,14 @@ browser-auth = [
"dep:uuid", "dep:uuid",
] ]
webview-auth = [ webview-auth = [
"gpapi/tauri",
"dep:tauri", "dep:tauri",
"dep:regex", "dep:regex",
"dep:tokio-util", "dep:tokio-util",
"dep:html-escape", "dep:html-escape",
"dep:webkit2gtk", "dep:webkit2gtk",
"gpapi/tauri", "dep:block2",
"dep:objc2",
"dep:objc2-foundation",
"dep:objc2-web-kit",
] ]
-60
View File
@@ -1,60 +0,0 @@
use std::borrow::Cow;
use anyhow::bail;
use gpapi::{
gp_params::GpParams,
portal::{prelogin, Prelogin},
};
pub struct Authenticator<'a> {
server: &'a str,
auth_request: Option<&'a str>,
pub(crate) gp_params: &'a GpParams,
#[cfg(feature = "webview-auth")]
pub(crate) clean: bool,
#[cfg(feature = "webview-auth")]
pub(crate) is_retrying: tokio::sync::RwLock<bool>,
}
impl<'a> Authenticator<'a> {
pub fn new(server: &'a str, gp_params: &'a GpParams) -> Self {
Self {
server,
gp_params,
auth_request: None,
#[cfg(feature = "webview-auth")]
clean: false,
#[cfg(feature = "webview-auth")]
is_retrying: Default::default(),
}
}
pub fn with_auth_request(mut self, auth_request: &'a str) -> Self {
if !auth_request.is_empty() {
self.auth_request = Some(auth_request);
}
self
}
pub(crate) async fn initial_auth_request(&self) -> anyhow::Result<Cow<'a, str>> {
if let Some(auth_request) = self.auth_request {
return Ok(Cow::Borrowed(auth_request));
}
let auth_request = self.portal_prelogin().await?;
Ok(Cow::Owned(auth_request))
}
pub(crate) async fn portal_prelogin(&self) -> anyhow::Result<String> {
auth_prelogin(self.server, self.gp_params).await
}
}
pub async fn auth_prelogin(server: &str, gp_params: &GpParams) -> anyhow::Result<String> {
match prelogin(server, gp_params).await? {
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
}
}
+4
View File
@@ -0,0 +1,4 @@
mod auth_server;
mod browser_auth;
pub use browser_auth::BrowserAuthenticator;
@@ -10,8 +10,8 @@ pub(super) struct AuthServer {
} }
impl AuthServer { impl AuthServer {
pub fn new() -> anyhow::Result<Self> { pub fn new(addr: &str) -> anyhow::Result<Self> {
let server = Server::http("127.0.0.1:0").map_err(|err| anyhow::anyhow!(err))?; let server = Server::http(addr).map_err(|err| anyhow::anyhow!(err))?;
let auth_id = Uuid::new_v4().to_string(); let auth_id = Uuid::new_v4().to_string();
Ok(Self { server, auth_id }) Ok(Self { server, auth_id })
+178
View File
@@ -0,0 +1,178 @@
use std::{env::temp_dir, fs, os::unix::fs::PermissionsExt};
use common::constants::GP_CALLBACK_PORT_FILENAME;
use gpapi::auth::SamlAuthData;
use log::info;
use tokio::{
io::AsyncReadExt,
net::{TcpListener, UdpSocket},
};
use crate::browser::auth_server::AuthServer;
pub enum Browser<'a> {
Default,
Chrome,
Firefox,
Remote,
Other(&'a str),
}
impl<'a> Browser<'a> {
pub fn from_str(browser: &'a str) -> Self {
match browser.to_lowercase().as_str() {
"default" => Browser::Default,
"chrome" => Browser::Chrome,
"firefox" => Browser::Firefox,
"remote" => Browser::Remote,
_ => Browser::Other(browser),
}
}
fn as_str(&self) -> &str {
match self {
Browser::Default => "default",
Browser::Chrome => "chrome",
Browser::Firefox => "firefox",
Browser::Remote => "remote",
Browser::Other(browser) => browser,
}
}
}
pub struct BrowserAuthenticator<'a> {
auth_request: &'a str,
browser: Browser<'a>,
}
impl<'a> BrowserAuthenticator<'a> {
pub fn new(auth_request: &'a str, browser: &'a str) -> Self {
Self {
auth_request,
browser: Browser::from_str(browser),
}
}
pub async fn authenticate(&self) -> anyhow::Result<SamlAuthData> {
let addr = self.determine_addr().await?;
let auth_server = AuthServer::new(&addr)?;
let auth_url = auth_server.auth_url();
let auth_request = self.auth_request.to_string();
tokio::spawn(async move {
auth_server.serve_request(&auth_request);
});
match self.browser {
Browser::Remote => {
info!(
r#"
==== Manual Authentication Required ====
Please open the following URL in your browser:
{}
After completing the authentication, please paste the authentication data back to this terminal.
(The data should start with "globalprotectcallback:...")
Note that the URL is only valid for a single use.
"#,
auth_url
);
return read_auth_data_from_stdin();
}
Browser::Default => {
info!("Launching the default browser...");
webbrowser::open(&auth_url)?;
}
_ => {
let app = find_browser_path(&self.browser);
info!("Launching browser: {}", app);
open::with_detached(auth_url, app)?;
}
}
info!("Please continue the authentication process in the default browser");
wait_auth_data().await
}
async fn determine_addr(&self) -> anyhow::Result<String> {
if matches!(self.browser, Browser::Remote) {
let local_ip = detect_local_ip().await?;
Ok(format!("{}:0", local_ip))
} else {
Ok("127.0.0.1:0".to_string())
}
}
}
/// Detect the local IP address by creating a UDP socket and connecting to an external address
async fn detect_local_ip() -> anyhow::Result<String> {
let socket = UdpSocket::bind("0.0.0.0:0").await?;
if let Err(err) = socket.connect("1.1.1.1:80").await {
anyhow::bail!("Failed to connect to external address to determine local IP: {}", err);
}
let local_addr = socket.local_addr()?;
let ip = local_addr.ip().to_string();
info!("Determined local IP address: {}", ip);
Ok(ip.to_string())
}
fn find_browser_path(browser: &Browser) -> String {
match browser {
Browser::Chrome => {
const CHROME_VARIANTS: &[&str] = &["google-chrome-stable", "google-chrome", "chromium"];
CHROME_VARIANTS
.iter()
.find_map(|&browser_name| which::which(browser_name).ok())
.map(|path| path.to_string_lossy().to_string())
.unwrap_or_else(|| browser.as_str().to_string())
}
_ => browser.as_str().to_string(),
}
}
async fn wait_auth_data() -> anyhow::Result<SamlAuthData> {
// Start a local server to receive the browser authentication data
let listener = TcpListener::bind("127.0.0.1:0").await?;
let port = listener.local_addr()?.port();
let port_file = temp_dir().join(GP_CALLBACK_PORT_FILENAME);
// Write the port to a file
fs::write(&port_file, port.to_string())?;
fs::set_permissions(&port_file, fs::Permissions::from_mode(0o600))?;
// Remove the previous log file
let callback_log = temp_dir().join("gpcallback.log");
let _ = fs::remove_file(&callback_log);
info!("Listening authentication data on port {}", port);
info!(
"If it hangs, please check the logs at `{}` for more information",
callback_log.display()
);
let (mut socket, _) = listener.accept().await?;
info!("Received the browser authentication data from the socket");
let mut data = String::new();
socket.read_to_string(&mut data).await?;
// Remove the port file
fs::remove_file(&port_file)?;
let auth_data = SamlAuthData::from_gpcallback(&data)?;
Ok(auth_data)
}
fn read_auth_data_from_stdin() -> anyhow::Result<SamlAuthData> {
let mut data = String::new();
std::io::stdin().read_line(&mut data)?;
let auth_data = SamlAuthData::from_gpcallback(data.trim())?;
Ok(auth_data)
}
-5
View File
@@ -1,5 +0,0 @@
mod auth_server;
mod browser_auth_ext;
mod browser_auth_impl;
pub use browser_auth_ext::BrowserAuthenticator;
@@ -1,22 +0,0 @@
use std::future::Future;
use gpapi::auth::SamlAuthData;
use crate::{browser_auth::browser_auth_impl::BrowserAuthenticatorImpl, Authenticator};
pub trait BrowserAuthenticator {
fn browser_authenticate(&self, browser: Option<&str>) -> impl Future<Output = anyhow::Result<SamlAuthData>> + Send;
}
impl BrowserAuthenticator for Authenticator<'_> {
async fn browser_authenticate(&self, browser: Option<&str>) -> anyhow::Result<SamlAuthData> {
let auth_request = self.initial_auth_request().await?;
let browser_auth = if let Some(browser) = browser {
BrowserAuthenticatorImpl::new_with_browser(&auth_request, browser)
} else {
BrowserAuthenticatorImpl::new(&auth_request)
};
browser_auth.authenticate().await
}
}
@@ -1,100 +0,0 @@
use std::{env::temp_dir, fs, os::unix::fs::PermissionsExt};
use gpapi::{auth::SamlAuthData, GP_CALLBACK_PORT_FILENAME};
use log::info;
use tokio::{io::AsyncReadExt, net::TcpListener};
use super::auth_server::AuthServer;
pub(super) struct BrowserAuthenticatorImpl<'a> {
auth_request: &'a str,
browser: Option<&'a str>,
}
impl BrowserAuthenticatorImpl<'_> {
pub fn new(auth_request: &str) -> BrowserAuthenticatorImpl {
BrowserAuthenticatorImpl {
auth_request,
browser: None,
}
}
pub fn new_with_browser<'a>(auth_request: &'a str, browser: &'a str) -> BrowserAuthenticatorImpl<'a> {
let browser = browser.trim();
BrowserAuthenticatorImpl {
auth_request,
browser: if browser.is_empty() || browser == "default" {
None
} else {
Some(browser)
},
}
}
pub async fn authenticate(&self) -> anyhow::Result<SamlAuthData> {
let auth_server = AuthServer::new()?;
let auth_url = auth_server.auth_url();
let auth_request = self.auth_request.to_string();
tokio::spawn(async move {
auth_server.serve_request(&auth_request);
});
if let Some(browser) = self.browser {
let app = find_browser_path(browser);
info!("Launching browser: {}", app);
open::with_detached(auth_url, app)?;
} else {
info!("Launching the default browser...");
webbrowser::open(&auth_url)?;
}
info!("Please continue the authentication process in the default browser");
wait_auth_data().await
}
}
fn find_browser_path(browser: &str) -> String {
if browser == "chrome" {
which::which("google-chrome-stable")
.or_else(|_| which::which("google-chrome"))
.or_else(|_| which::which("chromium"))
.map(|path| path.to_string_lossy().to_string())
.unwrap_or_else(|_| browser.to_string())
} else {
browser.into()
}
}
async fn wait_auth_data() -> anyhow::Result<SamlAuthData> {
// Start a local server to receive the browser authentication data
let listener = TcpListener::bind("127.0.0.1:0").await?;
let port = listener.local_addr()?.port();
let port_file = temp_dir().join(GP_CALLBACK_PORT_FILENAME);
// Write the port to a file
fs::write(&port_file, port.to_string())?;
fs::set_permissions(&port_file, fs::Permissions::from_mode(0o600))?;
// Remove the previous log file
let callback_log = temp_dir().join("gpcallback.log");
let _ = fs::remove_file(&callback_log);
info!("Listening authentication data on port {}", port);
info!(
"If it hangs, please check the logs at `{}` for more information",
callback_log.display()
);
let (mut socket, _) = listener.accept().await?;
info!("Received the browser authentication data from the socket");
let mut data = String::new();
socket.read_to_string(&mut data).await?;
// Remove the port file
fs::remove_file(&port_file)?;
let auth_data = SamlAuthData::from_gpcallback(&data)?;
Ok(auth_data)
}
+17 -7
View File
@@ -1,13 +1,23 @@
mod authenticator; use anyhow::bail;
pub use authenticator::auth_prelogin; use gpapi::{
pub use authenticator::Authenticator; gp_params::GpParams,
portal::{prelogin, Prelogin},
};
#[cfg(feature = "browser-auth")] #[cfg(feature = "browser-auth")]
mod browser_auth; mod browser;
#[cfg(feature = "browser-auth")] #[cfg(feature = "browser-auth")]
pub use browser_auth::BrowserAuthenticator; pub use browser::*;
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
mod webview_auth; mod webview;
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
pub use webview_auth::WebviewAuthenticator; pub use webview::*;
pub async fn auth_prelogin(server: &str, gp_params: &GpParams) -> anyhow::Result<String> {
match prelogin(server, gp_params).await? {
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
}
}
+8
View File
@@ -0,0 +1,8 @@
mod auth_messenger;
mod webview_auth;
#[cfg_attr(not(target_os = "macos"), path = "webview/unix.rs")]
#[cfg_attr(target_os = "macos", path = "webview/macos.rs")]
mod platform_impl;
pub use webview_auth::WebviewAuthenticator;
+229
View File
@@ -0,0 +1,229 @@
use anyhow::bail;
use gpapi::{auth::SamlAuthData, error::AuthDataParseError};
use log::{error, info};
use regex::Regex;
use tokio::sync::{mpsc, RwLock};
use tokio_util::sync::CancellationToken;
#[derive(Debug)]
pub(crate) enum AuthDataLocation {
#[cfg(not(target_os = "macos"))]
Headers,
Body,
}
#[derive(Debug)]
pub(crate) enum AuthError {
/// Failed to load page due to TLS error
#[cfg(not(target_os = "macos"))]
TlsError,
/// 1. Found auth data in headers/body but it's invalid
/// 2. Loaded an empty page, failed to load page. etc.
Invalid(anyhow::Error, AuthDataLocation),
/// No auth data found in headers/body
NotFound(AuthDataLocation),
}
impl AuthError {
pub fn invalid_from_body(err: anyhow::Error) -> Self {
Self::Invalid(err, AuthDataLocation::Body)
}
pub fn not_found_in_body() -> Self {
Self::NotFound(AuthDataLocation::Body)
}
}
#[cfg(not(target_os = "macos"))]
impl AuthError {
pub fn not_found_in_headers() -> Self {
Self::NotFound(AuthDataLocation::Headers)
}
}
pub(crate) enum AuthEvent {
Data(SamlAuthData, AuthDataLocation),
Error(AuthError),
RaiseWindow,
Close,
}
pub struct AuthMessenger {
tx: mpsc::UnboundedSender<AuthEvent>,
rx: RwLock<mpsc::UnboundedReceiver<AuthEvent>>,
raise_window_cancel_token: RwLock<Option<CancellationToken>>,
}
impl AuthMessenger {
pub fn new() -> Self {
let (tx, rx) = mpsc::unbounded_channel();
Self {
tx,
rx: RwLock::new(rx),
raise_window_cancel_token: Default::default(),
}
}
pub async fn subscribe(&self) -> anyhow::Result<AuthEvent> {
let mut rx = self.rx.write().await;
if let Some(event) = rx.recv().await {
return Ok(event);
}
bail!("Failed to receive auth event");
}
pub fn send_auth_event(&self, event: AuthEvent) {
if let Err(event) = self.tx.send(event) {
error!("Failed to send auth event: {}", event);
}
}
pub fn send_auth_error(&self, err: AuthError) {
self.send_auth_event(AuthEvent::Error(err));
}
fn send_auth_data(&self, data: SamlAuthData, location: AuthDataLocation) {
self.send_auth_event(AuthEvent::Data(data, location));
}
pub fn schedule_raise_window(&self, delay: u64) {
let Ok(mut guard) = self.raise_window_cancel_token.try_write() else {
return;
};
// Return if the previous raise window task is still running
if let Some(token) = guard.as_ref() {
if !token.is_cancelled() {
info!("Raise window task is still running, skipping...");
return;
}
}
let cancel_token = CancellationToken::new();
let cancel_token_clone = cancel_token.clone();
*guard = Some(cancel_token_clone);
let tx = self.tx.clone();
tokio::spawn(async move {
info!("Displaying the window in {} second(s)...", delay);
tokio::select! {
_ = tokio::time::sleep(tokio::time::Duration::from_secs(delay)) => {
cancel_token.cancel();
if let Err(err) = tx.send(AuthEvent::RaiseWindow) {
error!("Failed to send raise window event: {}", err);
}
}
_ = cancel_token.cancelled() => {
info!("Cancelled raise window task");
}
}
});
}
pub fn cancel_raise_window(&self) {
if let Ok(mut cancel_token) = self.raise_window_cancel_token.try_write() {
if let Some(token) = cancel_token.take() {
token.cancel();
}
}
}
pub fn read_from_html(&self, html: &str) {
if html.contains("Temporarily Unavailable") {
return self.send_auth_error(AuthError::invalid_from_body(anyhow::anyhow!("Temporarily Unavailable")));
}
let auth_result = SamlAuthData::from_html(html).or_else(|err| {
info!("Read auth data from html failed: {}, extracting gpcallback...", err);
if let Some(gpcallback) = extract_gpcallback(html) {
info!("Found gpcallback from html...");
SamlAuthData::from_gpcallback(&gpcallback)
} else {
Err(err)
}
});
match auth_result {
Ok(data) => self.send_auth_data(data, AuthDataLocation::Body),
Err(AuthDataParseError::Invalid(err)) => self.send_auth_error(AuthError::invalid_from_body(err)),
Err(AuthDataParseError::NotFound) => self.send_auth_error(AuthError::not_found_in_body()),
}
}
#[cfg(not(target_os = "macos"))]
pub fn read_from_response(&self, auth_response: &impl super::webview_auth::GetHeader) {
use log::warn;
let Some(status) = auth_response.get_header("saml-auth-status") else {
return self.send_auth_error(AuthError::not_found_in_headers());
};
// Do not send auth error when reading from headers, as the html body may contain the auth data
if status != "1" {
warn!("Found invalid saml-auth-status in headers: {}", status);
return;
}
let username = auth_response.get_header("saml-username");
let prelogin_cookie = auth_response.get_header("prelogin-cookie");
let portal_userauthcookie = auth_response.get_header("portal-userauthcookie");
match SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie) {
Ok(auth_data) => self.send_auth_data(auth_data, AuthDataLocation::Headers),
Err(err) => {
warn!("Failed to read auth data from headers: {}", err);
}
}
}
}
fn extract_gpcallback(html: &str) -> Option<String> {
let re = Regex::new(r#"globalprotectcallback:[^"]+"#).unwrap();
re.captures(html)
.and_then(|captures| captures.get(0))
.map(|m| html_escape::decode_html_entities(m.as_str()).to_string())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn extract_gpcallback_some() {
let html = r#"
<meta http-equiv="refresh" content="0; URL=globalprotectcallback:PGh0bWw+PCEtLSA8c">
<meta http-equiv="refresh" content="0; URL=globalprotectcallback:PGh0bWw+PCEtLSA8c">
"#;
assert_eq!(
extract_gpcallback(html).as_deref(),
Some("globalprotectcallback:PGh0bWw+PCEtLSA8c")
);
}
#[test]
fn extract_gpcallback_cas() {
let html = r#"
<meta http-equiv="refresh" content="0; URL=globalprotectcallback:cas-as=1&amp;[email protected]&amp;token=very_long_string">
"#;
assert_eq!(
extract_gpcallback(html).as_deref(),
Some("globalprotectcallback:cas-as=1&[email protected]&token=very_long_string")
);
}
#[test]
fn extract_gpcallback_none() {
let html = r#"
<meta http-equiv="refresh" content="0; URL=PGh0bWw+PCEtLSA8c">
"#;
assert_eq!(extract_gpcallback(html), None);
}
}
+58
View File
@@ -0,0 +1,58 @@
use block2::RcBlock;
use log::warn;
use objc2::runtime::AnyObject;
use objc2_foundation::{NSError, NSString, NSURLRequest, NSURL};
use objc2_web_kit::WKWebView;
use tauri::webview::PlatformWebview;
use super::webview_auth::PlatformWebviewExt;
impl PlatformWebviewExt for PlatformWebview {
fn ignore_tls_errors(&self) -> anyhow::Result<()> {
warn!("Ignoring TLS errors is not supported on macOS");
Ok(())
}
fn load_url(&self, url: &str) -> anyhow::Result<()> {
unsafe {
let wv: &WKWebView = &*self.inner().cast();
let url = NSURL::URLWithString(&NSString::from_str(url)).ok_or_else(|| anyhow::anyhow!("Invalid URL"))?;
let request = NSURLRequest::requestWithURL(&url);
wv.loadRequest(&request);
}
Ok(())
}
fn load_html(&self, html: &str) -> anyhow::Result<()> {
unsafe {
let wv: &WKWebView = &*self.inner().cast();
wv.loadHTMLString_baseURL(&NSString::from_str(html), None);
}
Ok(())
}
fn get_html(&self, callback: Box<dyn Fn(anyhow::Result<String>) + 'static>) {
unsafe {
let wv: &WKWebView = &*self.inner().cast();
let js_callback = RcBlock::new(move |body: *mut AnyObject, err: *mut NSError| {
if let Some(err) = err.as_ref() {
let code = err.code();
let message = err.localizedDescription();
callback(Err(anyhow::anyhow!("Error {}: {}", code, message)));
} else {
let body: &NSString = &*body.cast();
callback(Ok(body.to_string()));
}
});
wv.evaluateJavaScript_completionHandler(
&NSString::from_str("document.documentElement.outerHTML"),
Some(&js_callback),
);
}
}
}
+105
View File
@@ -0,0 +1,105 @@
use std::sync::Arc;
use anyhow::bail;
use gpapi::utils::redact::redact_uri;
use log::warn;
use tauri::webview::PlatformWebview;
use webkit2gtk::{
gio::Cancellable, glib::GString, LoadEvent, TLSErrorsPolicy, URIResponseExt, WebResource, WebResourceExt, WebViewExt,
WebsiteDataManagerExt,
};
use super::{
auth_messenger::AuthError,
webview_auth::{GetHeader, PlatformWebviewExt},
};
impl GetHeader for WebResource {
fn get_header(&self, key: &str) -> Option<String> {
self
.response()
.and_then(|response| response.http_headers())
.and_then(|headers| headers.one(key))
.map(GString::into)
}
}
impl PlatformWebviewExt for PlatformWebview {
fn ignore_tls_errors(&self) -> anyhow::Result<()> {
if let Some(manager) = self.inner().website_data_manager() {
manager.set_tls_errors_policy(TLSErrorsPolicy::Ignore);
return Ok(());
}
bail!("Failed to get website data manager");
}
fn load_url(&self, url: &str) -> anyhow::Result<()> {
self.inner().load_uri(url);
Ok(())
}
fn load_html(&self, html: &str) -> anyhow::Result<()> {
self.inner().load_html(html, None);
Ok(())
}
fn get_html(&self, callback: Box<dyn Fn(anyhow::Result<String>) + 'static>) {
let script = "document.documentElement.outerHTML";
self
.inner()
.evaluate_javascript(script, None, None, Cancellable::NONE, move |result| match result {
Ok(value) => callback(Ok(value.to_string())),
Err(err) => callback(Err(anyhow::anyhow!(err))),
});
}
}
pub trait PlatformWebviewOnResponse {
fn on_response(&self, callback: Box<dyn Fn(anyhow::Result<WebResource, AuthError>) + 'static>);
}
impl PlatformWebviewOnResponse for PlatformWebview {
fn on_response(&self, callback: Box<dyn Fn(anyhow::Result<WebResource, AuthError>) + 'static>) {
let wv = self.inner();
let callback = Arc::new(callback);
let callback_clone = Arc::clone(&callback);
wv.connect_load_changed(move |wv, event| {
if event != LoadEvent::Finished {
return;
}
let Some(web_resource) = wv.main_resource() else {
return;
};
let uri = web_resource.uri().unwrap_or("".into());
if uri.is_empty() {
callback_clone(Err(AuthError::invalid_from_body(anyhow::anyhow!("Empty URI"))));
} else {
callback_clone(Ok(web_resource));
}
});
wv.connect_load_failed_with_tls_errors(move |_wv, uri, cert, err| {
let redacted_uri = redact_uri(uri);
warn!(
"Failed to load uri: {} with error: {}, cert: {}",
redacted_uri, err, cert
);
callback(Err(AuthError::TlsError));
true
});
wv.connect_load_failed(move |_wv, _event, uri, err| {
let redacted_uri = redact_uri(uri);
if !uri.starts_with("globalprotectcallback:") {
warn!("Failed to load uri: {} with error: {}", redacted_uri, err);
}
// NOTE: Don't send error here, since load_changed event will be triggered after this
// true to stop other handlers from being invoked for the event. false to propagate the event further.
true
});
}
}
+278
View File
@@ -0,0 +1,278 @@
use std::{sync::Arc, time::Duration};
use anyhow::bail;
use gpapi::{auth::SamlAuthData, gp_params::GpParams, utils::redact::redact_uri};
use log::{info, warn};
use tauri::{
webview::{PageLoadEvent, PageLoadPayload},
AppHandle, WebviewUrl, WebviewWindow, WindowEvent,
};
use tokio::{sync::oneshot, time};
use crate::auth_prelogin;
use super::auth_messenger::{AuthError, AuthEvent, AuthMessenger};
pub trait PlatformWebviewExt {
fn ignore_tls_errors(&self) -> anyhow::Result<()>;
fn load_url(&self, url: &str) -> anyhow::Result<()>;
fn load_html(&self, html: &str) -> anyhow::Result<()>;
fn get_html(&self, callback: Box<dyn Fn(anyhow::Result<String>) + 'static>);
fn load_auth_request(&self, auth_request: &str) -> anyhow::Result<()> {
if auth_request.starts_with("http") {
info!("Loading auth request as URL: {}", redact_uri(auth_request));
self.load_url(auth_request)
} else {
info!("Loading auth request as HTML...");
self.load_html(auth_request)
}
}
}
#[cfg(not(target_os = "macos"))]
pub trait GetHeader {
fn get_header(&self, key: &str) -> Option<String>;
}
pub struct WebviewAuthenticator<'a> {
server: &'a str,
gp_params: &'a GpParams,
auth_request: Option<&'a str>,
clean: bool,
is_retrying: tokio::sync::RwLock<bool>,
}
impl<'a> WebviewAuthenticator<'a> {
pub fn new(server: &'a str, gp_params: &'a GpParams) -> Self {
Self {
server,
gp_params,
auth_request: None,
clean: false,
is_retrying: Default::default(),
}
}
pub fn with_auth_request(mut self, auth_request: &'a str) -> Self {
self.auth_request = Some(auth_request);
self
}
pub fn with_clean(mut self, clean: bool) -> Self {
self.clean = clean;
self
}
pub async fn authenticate(&self, app_handle: &AppHandle) -> anyhow::Result<SamlAuthData> {
let auth_messenger = Arc::new(AuthMessenger::new());
let auth_messenger_clone = Arc::clone(&auth_messenger);
let on_page_load = move |auth_window: WebviewWindow, event: PageLoadPayload<'_>| {
let auth_messenger_clone = Arc::clone(&auth_messenger_clone);
let redacted_url = redact_uri(event.url().as_str());
match event.event() {
PageLoadEvent::Started => {
info!("Started loading page: {}", redacted_url);
auth_messenger_clone.cancel_raise_window();
}
PageLoadEvent::Finished => {
info!("Finished loading page: {}", redacted_url);
}
}
// Read auth data from the page no matter whether it's finished loading or not
// Because we found that the finished event may not be triggered in some cases (e.g., on macOS)
let _ = auth_window.with_webview(move |wv| {
wv.get_html(Box::new(move |html| match html {
Ok(html) => auth_messenger_clone.read_from_html(&html),
Err(err) => warn!("Failed to get html: {}", err),
}));
});
};
let title_bar_height = if cfg!(target_os = "macos") { 28.0 } else { 0.0 };
let auth_window = WebviewWindow::builder(app_handle, "auth_window", WebviewUrl::default())
.on_page_load(on_page_load)
.title("GlobalProtect Login")
.inner_size(900.0, 650.0 + title_bar_height)
.focused(true)
// when clean is true, the window is expected to be shown because the cookies are cleared
.visible(self.clean)
.center()
.build()?;
self
.setup_auth_window(&auth_window, Arc::clone(&auth_messenger))
.await?;
loop {
match auth_messenger.subscribe().await? {
AuthEvent::Close => bail!("Authentication cancelled"),
AuthEvent::RaiseWindow => self.raise_window(&auth_window),
#[cfg(not(target_os = "macos"))]
AuthEvent::Error(AuthError::TlsError) => bail!(gpapi::error::PortalError::TlsError),
AuthEvent::Error(AuthError::NotFound(location)) => {
info!(
"No auth data found in {:?}, it may not be the /SAML20/SP/ACS endpoint",
location
);
self.handle_not_found(&auth_window, &auth_messenger);
}
AuthEvent::Error(AuthError::Invalid(err, location)) => {
warn!("Got invalid auth data in {:?}: {}", location, err);
self.retry_auth(&auth_window).await;
}
AuthEvent::Data(auth_data, location) => {
info!("Got auth data from {:?}", location);
auth_window.close()?;
return Ok(auth_data);
}
}
}
}
async fn setup_auth_window(
&self,
auth_window: &WebviewWindow,
auth_messenger: Arc<AuthMessenger>,
) -> anyhow::Result<()> {
info!("Setting up auth window...");
if self.clean {
info!("Clearing all browsing data...");
auth_window.clear_all_browsing_data()?;
}
// Handle window close event
let auth_messenger_clone = Arc::clone(&auth_messenger);
auth_window.on_window_event(move |event| {
if let WindowEvent::CloseRequested { .. } = event {
auth_messenger_clone.send_auth_event(AuthEvent::Close);
}
});
// Show the window after 10 seconds, so that the user can see the window if the auth process is stuck
let auth_messenger_clone = Arc::clone(&auth_messenger);
tokio::spawn(async move {
time::sleep(Duration::from_secs(10)).await;
auth_messenger_clone.send_auth_event(AuthEvent::RaiseWindow);
});
let auth_request = match self.auth_request {
Some(auth_request) => auth_request.to_string(),
None => auth_prelogin(&self.server, &self.gp_params).await?,
};
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
let ignore_tls_errors = self.gp_params.ignore_tls_errors();
// Set up webview
auth_window.with_webview(move |wv| {
#[cfg(not(target_os = "macos"))]
{
use super::platform_impl::PlatformWebviewOnResponse;
wv.on_response(Box::new(move |response| match response {
Ok(response) => auth_messenger.read_from_response(&response),
Err(err) => auth_messenger.send_auth_error(err),
}));
}
let result = || -> anyhow::Result<()> {
if ignore_tls_errors {
wv.ignore_tls_errors()?;
}
wv.load_auth_request(&auth_request)
}();
if let Err(result) = tx.send(result) {
warn!("Failed to send setup auth window result: {:?}", result);
}
})?;
rx.await??;
info!("Auth window setup completed");
Ok(())
}
fn handle_not_found(&self, auth_window: &WebviewWindow, auth_messenger: &Arc<AuthMessenger>) {
let visible = auth_window.is_visible().unwrap_or(false);
if visible {
return;
}
auth_messenger.schedule_raise_window(2);
}
async fn retry_auth(&self, auth_window: &WebviewWindow) {
let mut is_retrying = self.is_retrying.write().await;
if *is_retrying {
info!("Already retrying authentication, skipping...");
return;
}
*is_retrying = true;
drop(is_retrying);
if let Err(err) = self.retry_auth_impl(auth_window).await {
warn!("Failed to retry authentication: {}", err);
}
*self.is_retrying.write().await = false;
}
async fn retry_auth_impl(&self, auth_window: &WebviewWindow) -> anyhow::Result<()> {
info!("Retrying authentication...");
auth_window.eval( r#"
var loading = document.createElement("div");
loading.innerHTML = '<div style="position: absolute; width: 100%; text-align: center; font-size: 20px; font-weight: bold; top: 50%; left: 50%; transform: translate(-50%, -50%);">Got invalid token, retrying...</div>';
loading.style = "position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.85); z-index: 99999;";
document.body.appendChild(loading);
"#)?;
let auth_request = auth_prelogin(&self.server, &self.gp_params).await?;
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
auth_window.with_webview(move |wv| {
let result = wv.load_auth_request(&auth_request);
if let Err(result) = tx.send(result) {
warn!("Failed to send retry auth result: {:?}", result);
}
})?;
rx.await??;
Ok(())
}
fn raise_window(&self, auth_window: &WebviewWindow) {
let visible = auth_window.is_visible().unwrap_or(false);
if visible {
return;
}
info!("Raising auth window...");
#[cfg(target_os = "macos")]
let result = auth_window.show();
#[cfg(not(target_os = "macos"))]
let result = {
use gpapi::utils::window::WindowExt;
auth_window.raise()
};
if let Err(err) = result {
warn!("Failed to raise window: {}", err);
}
}
}
-9
View File
@@ -1,9 +0,0 @@
mod auth_messenger;
mod auth_response;
mod auth_settings;
mod webview_auth_ext;
#[cfg_attr(not(target_os = "macos"), path = "webview_auth/unix.rs")]
mod platform_impl;
pub use webview_auth_ext::WebviewAuthenticator;
@@ -1,108 +0,0 @@
use anyhow::bail;
use gpapi::auth::SamlAuthData;
use log::{error, info};
use tokio::sync::{mpsc, RwLock};
use tokio_util::sync::CancellationToken;
pub enum AuthError {
/// Failed to load page due to TLS error
TlsError,
/// 1. Found auth data in headers/body but it's invalid
/// 2. Loaded an empty page, failed to load page. etc.
Invalid,
/// No auth data found in headers/body
NotFound,
}
pub type AuthResult = anyhow::Result<SamlAuthData, AuthError>;
pub enum AuthEvent {
Data(SamlAuthData),
Error(AuthError),
RaiseWindow,
Close,
}
pub struct AuthMessenger {
tx: mpsc::UnboundedSender<AuthEvent>,
rx: RwLock<mpsc::UnboundedReceiver<AuthEvent>>,
raise_window_cancel_token: RwLock<Option<CancellationToken>>,
}
impl AuthMessenger {
pub fn new() -> Self {
let (tx, rx) = mpsc::unbounded_channel();
Self {
tx,
rx: RwLock::new(rx),
raise_window_cancel_token: Default::default(),
}
}
pub async fn subscribe(&self) -> anyhow::Result<AuthEvent> {
let mut rx = self.rx.write().await;
if let Some(event) = rx.recv().await {
return Ok(event);
}
bail!("Failed to receive auth event");
}
pub fn send_auth_event(&self, event: AuthEvent) {
if let Err(event) = self.tx.send(event) {
error!("Failed to send auth event: {}", event);
}
}
pub fn send_auth_result(&self, result: AuthResult) {
match result {
Ok(data) => self.send_auth_data(data),
Err(err) => self.send_auth_error(err),
}
}
pub fn send_auth_error(&self, err: AuthError) {
self.send_auth_event(AuthEvent::Error(err));
}
pub fn send_auth_data(&self, data: SamlAuthData) {
self.send_auth_event(AuthEvent::Data(data));
}
pub fn schedule_raise_window(&self, delay: u64) {
let cancel_token = CancellationToken::new();
let cancel_token_clone = cancel_token.clone();
if let Ok(mut guard) = self.raise_window_cancel_token.try_write() {
// Cancel the previous raise window task if it exists
if let Some(token) = guard.take() {
token.cancel();
}
*guard = Some(cancel_token_clone);
}
let tx = self.tx.clone();
tokio::spawn(async move {
info!("Displaying the window in {} second(s)...", delay);
tokio::select! {
_ = tokio::time::sleep(tokio::time::Duration::from_secs(delay)) => {
if let Err(err) = tx.send(AuthEvent::RaiseWindow) {
error!("Failed to send raise window event: {}", err);
}
}
_ = cancel_token.cancelled() => {
info!("Cancelled raise window task");
}
}
});
}
pub fn cancel_raise_window(&self) {
if let Ok(mut cancel_token) = self.raise_window_cancel_token.try_write() {
if let Some(token) = cancel_token.take() {
token.cancel();
}
}
}
}
@@ -1,152 +0,0 @@
use std::sync::Arc;
use gpapi::{
auth::{AuthDataParseResult, SamlAuthData},
error::AuthDataParseError,
};
use log::{info, warn};
use regex::Regex;
use crate::webview_auth::auth_messenger::{AuthError, AuthMessenger};
/// Trait for handling authentication response
pub trait AuthResponse {
fn get_header(&self, key: &str) -> Option<String>;
fn get_body<F>(&self, cb: F)
where
F: FnOnce(anyhow::Result<Vec<u8>>) + 'static;
fn url(&self) -> Option<String>;
fn is_acs_endpoint(&self) -> bool {
self.url().map_or(false, |url| url.ends_with("/SAML20/SP/ACS"))
}
}
pub fn read_auth_data(auth_response: &impl AuthResponse, auth_messenger: &Arc<AuthMessenger>) {
let auth_messenger = Arc::clone(auth_messenger);
match read_from_headers(auth_response) {
Ok(auth_data) => {
info!("Found auth data in headers");
auth_messenger.send_auth_data(auth_data);
}
Err(header_err) => {
info!("Failed to read auth data from headers: {}", header_err);
let is_acs_endpoint = auth_response.is_acs_endpoint();
read_from_body(auth_response, move |auth_result| {
// If the endpoint is `/SAML20/SP/ACS` and no auth data found in body, it should be considered as invalid
let auth_result = auth_result.map_err(move |e| {
info!("Failed to read auth data from body: {}", e);
if is_acs_endpoint || e.is_invalid() || header_err.is_invalid() {
AuthError::Invalid
} else {
AuthError::NotFound
}
});
auth_messenger.send_auth_result(auth_result);
});
}
}
}
fn read_from_headers(auth_response: &impl AuthResponse) -> AuthDataParseResult {
let Some(status) = auth_response.get_header("saml-auth-status") else {
info!("No SAML auth status found in headers");
return Err(AuthDataParseError::NotFound);
};
if status != "1" {
info!("Found invalid auth status: {}", status);
return Err(AuthDataParseError::Invalid);
}
let username = auth_response.get_header("saml-username");
let prelogin_cookie = auth_response.get_header("prelogin-cookie");
let portal_userauthcookie = auth_response.get_header("portal-userauthcookie");
SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie).map_err(|e| {
warn!("Found invalid auth data: {}", e);
AuthDataParseError::Invalid
})
}
fn read_from_body<F>(auth_response: &impl AuthResponse, cb: F)
where
F: FnOnce(AuthDataParseResult) + 'static,
{
auth_response.get_body(|body| match body {
Ok(body) => {
let html = String::from_utf8_lossy(&body);
cb(read_from_html(&html))
}
Err(err) => {
info!("Failed to read body: {}", err);
cb(Err(AuthDataParseError::Invalid))
}
});
}
fn read_from_html(html: &str) -> AuthDataParseResult {
if html.contains("Temporarily Unavailable") {
info!("Found 'Temporarily Unavailable' in HTML, auth failed");
return Err(AuthDataParseError::Invalid);
}
SamlAuthData::from_html(html).or_else(|err| {
if let Some(gpcallback) = extract_gpcallback(html) {
info!("Found gpcallback from html...");
SamlAuthData::from_gpcallback(&gpcallback)
} else {
Err(err)
}
})
}
fn extract_gpcallback(html: &str) -> Option<String> {
let re = Regex::new(r#"globalprotectcallback:[^"]+"#).unwrap();
re.captures(html)
.and_then(|captures| captures.get(0))
.map(|m| html_escape::decode_html_entities(m.as_str()).to_string())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn extract_gpcallback_some() {
let html = r#"
<meta http-equiv="refresh" content="0; URL=globalprotectcallback:PGh0bWw+PCEtLSA8c">
<meta http-equiv="refresh" content="0; URL=globalprotectcallback:PGh0bWw+PCEtLSA8c">
"#;
assert_eq!(
extract_gpcallback(html).as_deref(),
Some("globalprotectcallback:PGh0bWw+PCEtLSA8c")
);
}
#[test]
fn extract_gpcallback_cas() {
let html = r#"
<meta http-equiv="refresh" content="0; URL=globalprotectcallback:cas-as=1&amp;[email protected]&amp;token=very_long_string">
"#;
assert_eq!(
extract_gpcallback(html).as_deref(),
Some("globalprotectcallback:cas-as=1&[email protected]&token=very_long_string")
);
}
#[test]
fn extract_gpcallback_none() {
let html = r#"
<meta http-equiv="refresh" content="0; URL=PGh0bWw+PCEtLSA8c">
"#;
assert_eq!(extract_gpcallback(html), None);
}
}
@@ -1,25 +0,0 @@
use std::sync::Arc;
use super::auth_messenger::AuthMessenger;
pub struct AuthRequest<'a>(&'a str);
impl<'a> AuthRequest<'a> {
pub fn new(auth_request: &'a str) -> Self {
Self(auth_request)
}
pub fn is_url(&self) -> bool {
self.0.starts_with("http")
}
pub fn as_str(&self) -> &str {
self.0
}
}
pub struct AuthSettings<'a> {
pub auth_request: AuthRequest<'a>,
pub auth_messenger: Arc<AuthMessenger>,
pub ignore_tls_errors: bool,
}
-136
View File
@@ -1,136 +0,0 @@
use std::sync::Arc;
use anyhow::bail;
use gpapi::utils::redact::redact_uri;
use log::{info, warn};
use webkit2gtk::{
gio::Cancellable,
glib::{GString, TimeSpan},
LoadEvent, TLSErrorsPolicy, URIResponseExt, WebResource, WebResourceExt, WebView, WebViewExt, WebsiteDataManagerExt,
WebsiteDataManagerExtManual, WebsiteDataTypes,
};
use crate::webview_auth::{
auth_messenger::AuthError,
auth_response::read_auth_data,
auth_settings::{AuthRequest, AuthSettings},
};
use super::auth_response::AuthResponse;
impl AuthResponse for WebResource {
fn get_header(&self, key: &str) -> Option<String> {
self
.response()
.and_then(|response| response.http_headers())
.and_then(|headers| headers.one(key))
.map(GString::into)
}
fn get_body<F>(&self, cb: F)
where
F: FnOnce(anyhow::Result<Vec<u8>>) + 'static,
{
let cancellable = Cancellable::NONE;
self.data(cancellable, |data| cb(data.map_err(|e| anyhow::anyhow!(e))));
}
fn url(&self) -> Option<String> {
self.uri().map(GString::into)
}
}
pub fn clear_data<F>(wv: &WebView, cb: F)
where
F: FnOnce(anyhow::Result<()>) + Send + 'static,
{
let Some(data_manager) = wv.website_data_manager() else {
cb(Err(anyhow::anyhow!("Failed to get website data manager")));
return;
};
data_manager.clear(
WebsiteDataTypes::COOKIES,
TimeSpan(0),
Cancellable::NONE,
move |result| {
cb(result.map_err(|e| anyhow::anyhow!(e)));
},
);
}
pub fn setup_webview(wv: &WebView, auth_settings: AuthSettings) -> anyhow::Result<()> {
let AuthSettings {
auth_request,
auth_messenger,
ignore_tls_errors,
} = auth_settings;
let auth_messenger_clone = Arc::clone(&auth_messenger);
let Some(data_manager) = wv.website_data_manager() else {
bail!("Failed to get website data manager");
};
if ignore_tls_errors {
data_manager.set_tls_errors_policy(TLSErrorsPolicy::Ignore);
}
wv.connect_load_changed(move |wv, event| {
if event == LoadEvent::Started {
auth_messenger_clone.cancel_raise_window();
return;
}
if event != LoadEvent::Finished {
return;
}
let Some(main_resource) = wv.main_resource() else {
return;
};
let uri = main_resource.uri().unwrap_or("".into());
if uri.is_empty() {
warn!("Loaded an empty URI");
auth_messenger_clone.send_auth_error(AuthError::Invalid);
return;
}
read_auth_data(&main_resource, &auth_messenger_clone);
});
wv.connect_load_failed_with_tls_errors(move |_wv, uri, cert, err| {
let redacted_uri = redact_uri(uri);
warn!(
"Failed to load uri: {} with error: {}, cert: {}",
redacted_uri, err, cert
);
auth_messenger.send_auth_error(AuthError::TlsError);
true
});
wv.connect_load_failed(move |_wv, _event, uri, err| {
let redacted_uri = redact_uri(uri);
if !uri.starts_with("globalprotectcallback:") {
warn!("Failed to load uri: {} with error: {}", redacted_uri, err);
}
// NOTE: Don't send error here, since load_changed event will be triggered after this
// true to stop other handlers from being invoked for the event. false to propagate the event further.
true
});
load_auth_request(wv, &auth_request);
Ok(())
}
pub fn load_auth_request(wv: &WebView, auth_request: &AuthRequest) {
if auth_request.is_url() {
info!("Loading auth request as URI...");
wv.load_uri(auth_request.as_str());
} else {
info!("Loading auth request as HTML...");
wv.load_html(auth_request.as_str(), None);
}
}
@@ -1,194 +0,0 @@
use std::{
future::Future,
sync::Arc,
time::{Duration, Instant},
};
use anyhow::bail;
use gpapi::{auth::SamlAuthData, error::PortalError, utils::window::WindowExt};
use log::{info, warn};
use tauri::{AppHandle, WebviewUrl, WebviewWindow, WindowEvent};
use tokio::{sync::oneshot, time};
use crate::{
webview_auth::{
auth_messenger::{AuthError, AuthEvent, AuthMessenger},
auth_settings::{AuthRequest, AuthSettings},
platform_impl,
},
Authenticator,
};
pub trait WebviewAuthenticator {
fn with_clean(self, clean: bool) -> Self;
fn webview_authenticate(&self, app_handle: &AppHandle) -> impl Future<Output = anyhow::Result<SamlAuthData>> + Send;
}
impl WebviewAuthenticator for Authenticator<'_> {
fn with_clean(mut self, clean: bool) -> Self {
self.clean = clean;
self
}
async fn webview_authenticate(&self, app_handle: &AppHandle) -> anyhow::Result<SamlAuthData> {
let auth_window = WebviewWindow::builder(app_handle, "auth_window", WebviewUrl::default())
.title("GlobalProtect Login")
.focused(true)
.visible(false)
.center()
.build()?;
self.auth_loop(&auth_window).await
}
}
impl Authenticator<'_> {
async fn auth_loop(&self, auth_window: &WebviewWindow) -> anyhow::Result<SamlAuthData> {
if self.clean {
self.clear_webview_data(&auth_window).await?;
}
let auth_messenger = self.setup_auth_window(&auth_window).await?;
loop {
match auth_messenger.subscribe().await? {
AuthEvent::Close => bail!("Authentication cancelled"),
AuthEvent::RaiseWindow => self.raise_window(auth_window),
AuthEvent::Error(AuthError::TlsError) => bail!(PortalError::TlsError),
AuthEvent::Error(AuthError::NotFound) => self.handle_not_found(auth_window, &auth_messenger),
AuthEvent::Error(AuthError::Invalid) => self.retry_auth(auth_window).await,
AuthEvent::Data(auth_data) => {
auth_window.close()?;
return Ok(auth_data);
}
}
}
}
async fn clear_webview_data(&self, auth_window: &WebviewWindow) -> anyhow::Result<()> {
info!("Clearing webview data...");
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
let now = Instant::now();
auth_window.with_webview(|webview| {
platform_impl::clear_data(&webview.inner(), |result| {
if let Err(result) = tx.send(result) {
warn!("Failed to send clear data result: {:?}", result);
}
})
})?;
rx.await??;
info!("Webview data cleared in {:?}", now.elapsed());
Ok(())
}
async fn setup_auth_window(&self, auth_window: &WebviewWindow) -> anyhow::Result<Arc<AuthMessenger>> {
info!("Setting up auth window...");
let auth_messenger = Arc::new(AuthMessenger::new());
let auth_request = self.initial_auth_request().await?.into_owned();
let ignore_tls_errors = self.gp_params.ignore_tls_errors();
// Handle window close event
let auth_messenger_clone = Arc::clone(&auth_messenger);
auth_window.on_window_event(move |event| {
if let WindowEvent::CloseRequested { .. } = event {
auth_messenger_clone.send_auth_event(AuthEvent::Close);
}
});
// Show the window after 10 seconds, so that the user can see the window if the auth process is stuck
let auth_messenger_clone = Arc::clone(&auth_messenger);
tokio::spawn(async move {
time::sleep(Duration::from_secs(10)).await;
auth_messenger_clone.send_auth_event(AuthEvent::RaiseWindow);
});
// setup webview
let auth_messenger_clone = Arc::clone(&auth_messenger);
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
auth_window.with_webview(move |webview| {
let auth_settings = AuthSettings {
auth_request: AuthRequest::new(&auth_request),
auth_messenger: auth_messenger_clone,
ignore_tls_errors,
};
let result = platform_impl::setup_webview(&webview.inner(), auth_settings);
if let Err(result) = tx.send(result) {
warn!("Failed to send setup auth window result: {:?}", result);
}
})?;
rx.await??;
info!("Auth window setup completed");
Ok(auth_messenger)
}
fn handle_not_found(&self, auth_window: &WebviewWindow, auth_messenger: &Arc<AuthMessenger>) {
info!("No auth data found, it may not be the /SAML20/SP/ACS endpoint");
let visible = auth_window.is_visible().unwrap_or(false);
if visible {
return;
}
auth_messenger.schedule_raise_window(1);
}
async fn retry_auth(&self, auth_window: &WebviewWindow) {
let mut is_retrying = self.is_retrying.write().await;
if *is_retrying {
info!("Already retrying authentication, skipping...");
return;
}
*is_retrying = true;
drop(is_retrying);
if let Err(err) = self.retry_auth_impl(auth_window).await {
warn!("Failed to retry authentication: {}", err);
}
*self.is_retrying.write().await = false;
}
async fn retry_auth_impl(&self, auth_window: &WebviewWindow) -> anyhow::Result<()> {
info!("Retrying authentication...");
auth_window.eval( r#"
var loading = document.createElement("div");
loading.innerHTML = '<div style="position: absolute; width: 100%; text-align: center; font-size: 20px; font-weight: bold; top: 50%; left: 50%; transform: translate(-50%, -50%);">Got invalid token, retrying...</div>';
loading.style = "position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.85); z-index: 99999;";
document.body.appendChild(loading);
"#)?;
let auth_request = self.portal_prelogin().await?;
let (tx, rx) = oneshot::channel::<()>();
auth_window.with_webview(move |webview| {
let auth_request = AuthRequest::new(&auth_request);
platform_impl::load_auth_request(&webview.inner(), &auth_request);
tx.send(()).expect("Failed to send message to the channel")
})?;
rx.await?;
Ok(())
}
fn raise_window(&self, auth_window: &WebviewWindow) {
let visible = auth_window.is_visible().unwrap_or(false);
if visible {
return;
}
info!("Raising auth window...");
if let Err(err) = auth_window.raise() {
warn!("Failed to raise window: {}", err);
}
}
}
-3
View File
@@ -6,6 +6,3 @@ authors.workspace = true
homepage.workspace = true homepage.workspace = true
edition.workspace = true edition.workspace = true
license.workspace = true license.workspace = true
[dependencies]
is_executable.workspace = true
@@ -14,6 +14,9 @@ fn main() {
println!("cargo:rustc-env=GP_SERVICE_BINARY={}", gp_service_binary.display()); println!("cargo:rustc-env=GP_SERVICE_BINARY={}", gp_service_binary.display());
println!("cargo:rustc-env=GP_CLIENT_BINARY={}", gp_client_binary.display()); println!("cargo:rustc-env=GP_CLIENT_BINARY={}", gp_client_binary.display());
println!("cargo:rustc-env=GP_AUTH_BINARY={}", gp_auth_binary.display()); println!("cargo:rustc-env=GP_AUTH_BINARY={}", gp_auth_binary.display());
println!("cargo:rustc-env=GP_GUI_HELPER_BINARY={}", gp_gui_helper_binary.display()); println!(
"cargo:rustc-env=GP_GUI_HELPER_BINARY={}",
gp_gui_helper_binary.display()
);
println!("cargo:rustc-env=GP_GUI_BINARY={}", gp_gui_binary.display()); println!("cargo:rustc-env=GP_GUI_BINARY={}", gp_gui_binary.display());
} }
+40
View File
@@ -0,0 +1,40 @@
pub const GP_USER_AGENT: &str = "PAN GlobalProtect";
pub const GP_CLIENT_VERSION: &str = "6.3.0-33";
pub const GP_SERVICE_LOCK_FILE: &str = "/var/run/gpservice.lock";
pub const GP_CALLBACK_PORT_FILENAME: &str = "gpcallback.port";
// Release binaries - macOS (Apple Silicon Homebrew)
#[cfg(all(not(debug_assertions), target_os = "macos"))]
pub const GP_CLIENT_BINARY: &str = "/opt/homebrew/bin/gpclient";
#[cfg(all(not(debug_assertions), target_os = "macos"))]
pub const GP_SERVICE_BINARY: &str = "/opt/homebrew/bin/gpservice";
#[cfg(all(not(debug_assertions), target_os = "macos"))]
pub const GP_GUI_BINARY: &str = "/opt/homebrew/bin/gpgui";
#[cfg(all(not(debug_assertions), target_os = "macos"))]
pub const GP_GUI_HELPER_BINARY: &str = "/opt/homebrew/bin/gpgui-helper";
#[cfg(all(not(debug_assertions), target_os = "macos"))]
pub const GP_AUTH_BINARY: &str = "/opt/homebrew/bin/gpauth";
// Release binaries - Linux
#[cfg(all(not(debug_assertions), not(target_os = "macos")))]
pub const GP_CLIENT_BINARY: &str = "/usr/bin/gpclient";
#[cfg(all(not(debug_assertions), not(target_os = "macos")))]
pub const GP_SERVICE_BINARY: &str = "/usr/bin/gpservice";
#[cfg(all(not(debug_assertions), not(target_os = "macos")))]
pub const GP_GUI_BINARY: &str = "/usr/bin/gpgui";
#[cfg(all(not(debug_assertions), not(target_os = "macos")))]
pub const GP_GUI_HELPER_BINARY: &str = "/usr/bin/gpgui-helper";
#[cfg(all(not(debug_assertions), not(target_os = "macos")))]
pub const GP_AUTH_BINARY: &str = "/usr/bin/gpauth";
// Debug binaries are set in build.rs via environment variables
#[cfg(debug_assertions)]
pub const GP_CLIENT_BINARY: &str = env!("GP_CLIENT_BINARY");
#[cfg(debug_assertions)]
pub const GP_SERVICE_BINARY: &str = env!("GP_SERVICE_BINARY");
#[cfg(debug_assertions)]
pub const GP_GUI_BINARY: &str = env!("GP_GUI_BINARY");
#[cfg(debug_assertions)]
pub const GP_GUI_HELPER_BINARY: &str = env!("GP_GUI_HELPER_BINARY");
#[cfg(debug_assertions)]
pub const GP_AUTH_BINARY: &str = env!("GP_AUTH_BINARY");
+1 -1
View File
@@ -1 +1 @@
pub mod vpn_utils; pub mod constants;
+21 -3
View File
@@ -6,18 +6,20 @@ edition.workspace = true
license = "MIT" license = "MIT"
[dependencies] [dependencies]
common = { path = "../common" }
anyhow.workspace = true anyhow.workspace = true
base64.workspace = true base64.workspace = true
dns-lookup.workspace = true dns-lookup.workspace = true
log.workspace = true log.workspace = true
reqwest.workspace = true reqwest.workspace = true
openssl.workspace = true openssl.workspace = true
version-compare = "0.2"
pem.workspace = true pem.workspace = true
roxmltree.workspace = true xmltree.workspace = true
serde.workspace = true serde.workspace = true
specta = { workspace = true, features = ["derive"] } specta = { workspace = true, features = ["derive"] }
urlencoding.workspace = true urlencoding.workspace = true
tokio.workspace = true tokio = { workspace = true, features = ["process", "signal", "macros"] }
serde_json.workspace = true serde_json.workspace = true
whoami.workspace = true whoami.workspace = true
tempfile.workspace = true tempfile.workspace = true
@@ -30,11 +32,27 @@ uzers.workspace = true
serde_urlencoded.workspace = true serde_urlencoded.workspace = true
md5.workspace = true md5.workspace = true
sha256.workspace = true sha256.workspace = true
machine-uid.workspace = true
uuid = { workspace = true, features = ["v5"] }
# Optional dependencies for features
tauri = { workspace = true, optional = true } tauri = { workspace = true, optional = true }
clap = { workspace = true, optional = true } clap = { workspace = true, optional = true }
clap-verbosity-flag = { workspace = true, optional = true }
env_logger = { workspace = true, optional = true }
log-reload = { version = "0.1", optional = true }
# Dependencies for macOS and Windows only
[target.'cfg(any(target_os="macos", target_os="windows"))'.dependencies]
os_info = { version = "3", default-features = false }
# Dependencies for Linux and other OSes only
[target.'cfg(not(any(target_os="macos", target_os="windows")))'.dependencies]
gtk = "0.18"
[features] [features]
tauri = ["dep:tauri"] tauri = ["dep:tauri"]
clap = ["dep:clap"] clap = ["dep:clap", "dep:clap-verbosity-flag"]
webview-auth = [] webview-auth = []
logger = ["dep:env_logger", "dep:log-reload"]
+8 -11
View File
@@ -72,15 +72,12 @@ impl SamlAuthData {
let prelogin_cookie = parse_xml_tag(html, "prelogin-cookie"); let prelogin_cookie = parse_xml_tag(html, "prelogin-cookie");
let portal_userauthcookie = parse_xml_tag(html, "portal-userauthcookie"); let portal_userauthcookie = parse_xml_tag(html, "portal-userauthcookie");
SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie).map_err(|e| { SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie).map_err(AuthDataParseError::Invalid)
warn!("Failed to parse auth data: {}", e);
AuthDataParseError::Invalid
})
}
Some(status) => {
warn!("Found invalid auth status: {}", status);
Err(AuthDataParseError::Invalid)
} }
Some(status) => Err(AuthDataParseError::Invalid(anyhow::anyhow!(
"SAML auth status: {}",
status
))),
None => Err(AuthDataParseError::NotFound), None => Err(AuthDataParseError::NotFound),
} }
} }
@@ -100,7 +97,7 @@ impl SamlAuthData {
let auth_data: SamlAuthData = serde_urlencoded::from_str(auth_data.borrow()).map_err(|e| { let auth_data: SamlAuthData = serde_urlencoded::from_str(auth_data.borrow()).map_err(|e| {
warn!("Failed to parse token auth data: {}", e); warn!("Failed to parse token auth data: {}", e);
warn!("Auth data: {}", auth_data); warn!("Auth data: {}", auth_data);
AuthDataParseError::Invalid AuthDataParseError::Invalid(anyhow::anyhow!(e))
})?; })?;
return Ok(auth_data); return Ok(auth_data);
@@ -108,7 +105,7 @@ impl SamlAuthData {
let auth_data = decode_to_string(auth_data).map_err(|e| { let auth_data = decode_to_string(auth_data).map_err(|e| {
warn!("Failed to decode SAML auth data: {}", e); warn!("Failed to decode SAML auth data: {}", e);
AuthDataParseError::Invalid AuthDataParseError::Invalid(anyhow::anyhow!(e))
})?; })?;
let auth_data = Self::from_html(&auth_data)?; let auth_data = Self::from_html(&auth_data)?;
@@ -128,7 +125,7 @@ impl SamlAuthData {
} }
} }
pub fn parse_xml_tag(html: &str, tag: &str) -> Option<String> { fn parse_xml_tag(html: &str, tag: &str) -> Option<String> {
let re = Regex::new(&format!("<{}>(.*)</{}>", tag, tag)).unwrap(); let re = Regex::new(&format!("<{}>(.*)</{}>", tag, tag)).unwrap();
re.captures(html) re.captures(html)
.and_then(|captures| captures.get(1)) .and_then(|captures| captures.get(1))
+54 -1
View File
@@ -1,3 +1,6 @@
use clap_verbosity_flag::{LogLevel, Verbosity, VerbosityFilter};
use log::Level;
use crate::error::PortalError; use crate::error::PortalError;
pub mod args; pub mod args;
@@ -8,7 +11,7 @@ pub trait Args {
} }
pub fn handle_error(err: anyhow::Error, args: &impl Args) { pub fn handle_error(err: anyhow::Error, args: &impl Args) {
eprintln!("\nError: {}", err); eprintln!("\nError: {:?}", err);
let Some(err) = err.downcast_ref::<PortalError>() else { let Some(err) = err.downcast_ref::<PortalError>() else {
return; return;
@@ -26,3 +29,53 @@ pub fn handle_error(err: anyhow::Error, args: &impl Args) {
eprintln!("{} --ignore-tls-errors {}\n", args[0], args[1..].join(" ")); eprintln!("{} --ignore-tls-errors {}\n", args[0], args[1..].join(" "));
} }
} }
#[derive(Debug)]
pub struct InfoLevel;
pub type InfoLevelVerbosity = Verbosity<InfoLevel>;
impl LogLevel for InfoLevel {
fn default_filter() -> VerbosityFilter {
VerbosityFilter::Info
}
fn verbose_help() -> Option<&'static str> {
Some("Enable verbose output, -v for debug, -vv for trace")
}
fn quiet_help() -> Option<&'static str> {
Some("Decrease logging verbosity, -q for warnings, -qq for errors")
}
}
pub trait ToVerboseArg {
fn to_verbose_arg(&self) -> Option<&'static str>;
}
/// Convert the verbosity to the CLI argument value
/// The default verbosity is `Info`, which means no argument is needed
impl ToVerboseArg for InfoLevelVerbosity {
fn to_verbose_arg(&self) -> Option<&'static str> {
match self.filter() {
VerbosityFilter::Off => Some("-qqq"),
VerbosityFilter::Error => Some("-qq"),
VerbosityFilter::Warn => Some("-q"),
VerbosityFilter::Info => None,
VerbosityFilter::Debug => Some("-v"),
VerbosityFilter::Trace => Some("-vv"),
}
}
}
impl ToVerboseArg for Level {
fn to_verbose_arg(&self) -> Option<&'static str> {
match self {
Level::Error => Some("-qq"),
Level::Warn => Some("-q"),
Level::Info => None,
Level::Debug => Some("-v"),
Level::Trace => Some("-vv"),
}
}
}
+7 -4
View File
@@ -4,10 +4,13 @@ use thiserror::Error;
pub enum PortalError { pub enum PortalError {
#[error("Prelogin error: {0}")] #[error("Prelogin error: {0}")]
PreloginError(String), PreloginError(String),
#[error("Portal config error: {0}")] #[error("Portal config error: {0}")]
ConfigError(String), ConfigError(String),
#[error("Network error: {0}")]
#[error(transparent)]
NetworkError(#[from] reqwest::Error), NetworkError(#[from] reqwest::Error),
#[error("TLS error")] #[error("TLS error")]
TlsError, TlsError,
} }
@@ -26,12 +29,12 @@ impl PortalError {
pub enum AuthDataParseError { pub enum AuthDataParseError {
#[error("No auth data found")] #[error("No auth data found")]
NotFound, NotFound,
#[error("Invalid auth data")] #[error(transparent)]
Invalid, Invalid(#[from] anyhow::Error),
} }
impl AuthDataParseError { impl AuthDataParseError {
pub fn is_invalid(&self) -> bool { pub fn is_invalid(&self) -> bool {
matches!(self, AuthDataParseError::Invalid) matches!(self, AuthDataParseError::Invalid(_))
} }
} }
+12 -13
View File
@@ -2,9 +2,13 @@ use std::collections::HashMap;
use log::{info, warn}; use log::{info, warn};
use reqwest::Client; use reqwest::Client;
use roxmltree::Document; use xmltree::Element;
use crate::{gp_params::GpParams, process::hip_launcher::HipLauncher, utils::normalize_server}; use crate::{
gp_params::GpParams,
process::hip_launcher::HipLauncher,
utils::{normalize_server, xml::ElementExt},
};
struct HipReporter<'a> { struct HipReporter<'a> {
server: String, server: String,
@@ -65,13 +69,11 @@ impl HipReporter<'_> {
let res = self.client.post(&config_url).form(&params).send().await?; let res = self.client.post(&config_url).form(&params).send().await?;
let res_xml = res.error_for_status()?.text().await?; let res_xml = res.error_for_status()?.text().await?;
let doc = Document::parse(&res_xml)?; let root = Element::parse(res_xml.as_bytes())?;
// Get <ip-address> // Get <ip-address>
let ip = doc let ip = root
.descendants() .descendant_text("ip-address")
.find(|n| n.has_tag_name("ip-address"))
.and_then(|n| n.text())
.ok_or_else(|| anyhow::anyhow!("ip-address not found"))?; .ok_or_else(|| anyhow::anyhow!("ip-address not found"))?;
Ok(ip.to_string()) Ok(ip.to_string())
@@ -122,12 +124,9 @@ impl HipReporter<'_> {
} }
fn is_hip_needed(res_xml: &str) -> anyhow::Result<bool> { fn is_hip_needed(res_xml: &str) -> anyhow::Result<bool> {
let doc = Document::parse(res_xml)?; let root = Element::parse(res_xml.as_bytes())?;
let hip_needed = root
let hip_needed = doc .descendant_text("hip-report-needed")
.descendants()
.find(|n| n.has_tag_name("hip-report-needed"))
.and_then(|n| n.text())
.ok_or_else(|| anyhow::anyhow!("hip-report-needed not found"))?; .ok_or_else(|| anyhow::anyhow!("hip-report-needed not found"))?;
Ok(hip_needed == "yes") Ok(hip_needed == "yes")
+19 -17
View File
@@ -1,14 +1,16 @@
use std::borrow::Cow;
use anyhow::bail; use anyhow::bail;
use log::{info, warn}; use log::{debug, info, warn};
use reqwest::Client; use reqwest::Client;
use roxmltree::Document;
use urlencoding::encode; use urlencoding::encode;
use xmltree::Element;
use crate::{ use crate::{
credential::Credential, credential::Credential,
error::PortalError, error::PortalError,
gp_params::GpParams, gp_params::GpParams,
utils::{normalize_server, parse_gp_response, remove_url_scheme}, utils::{normalize_server, parse_gp_response, remove_url_scheme, xml::ElementExt},
}; };
pub enum GatewayLogin { pub enum GatewayLogin {
@@ -31,12 +33,10 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam
info!("Perform gateway login, user_agent: {}", gp_params.user_agent()); info!("Perform gateway login, user_agent: {}", gp_params.user_agent());
let res = client let res = client.post(&login_url).form(&params).send().await.map_err(|e| {
.post(&login_url) warn!("Network error: {:?}", e);
.form(&params) anyhow::anyhow!(PortalError::NetworkError(e))
.send() })?;
.await
.map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e)))?;
let res = parse_gp_response(res).await.map_err(|err| { let res = parse_gp_response(res).await.map_err(|err| {
warn!("{err}"); warn!("{err}");
@@ -52,18 +52,20 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam
return Ok(GatewayLogin::Mfa(message, input_str)); return Ok(GatewayLogin::Mfa(message, input_str));
} }
let doc = Document::parse(&res)?; debug!("Gateway login response: {}", res);
let cookie = build_gateway_token(&doc, gp_params.computer())?; let root = Element::parse(res.as_bytes())?;
let cookie = build_gateway_token(&root, gp_params.computer())?;
Ok(GatewayLogin::Cookie(cookie)) Ok(GatewayLogin::Cookie(cookie))
} }
fn build_gateway_token(doc: &Document, computer: &str) -> anyhow::Result<String> { fn build_gateway_token(element: &Element, computer: &str) -> anyhow::Result<String> {
let args = doc let args = element
.descendants() .descendants("argument")
.filter(|n| n.has_tag_name("argument")) .iter()
.map(|n| n.text().unwrap_or("").to_string()) .map(|e| e.get_text().unwrap_or_default())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let params = [ let params = [
@@ -84,7 +86,7 @@ fn build_gateway_token(doc: &Document, computer: &str) -> anyhow::Result<String>
Ok(token) Ok(token)
} }
fn read_args<'a>(args: &'a [String], index: usize, key: &'a str) -> anyhow::Result<(&'a str, &'a str)> { fn read_args<'a>(args: &'a [Cow<'_, str>], index: usize, key: &'a str) -> anyhow::Result<(&'a str, &'a str)> {
args args
.get(index) .get(index)
.ok_or_else(|| anyhow::anyhow!("Failed to read {key} from args")) .ok_or_else(|| anyhow::anyhow!("Failed to read {key} from args"))
+36 -36
View File
@@ -1,64 +1,64 @@
use log::info; use log::info;
use roxmltree::Node; use xmltree::Element;
use crate::utils::xml::NodeExt; use crate::utils::xml::ElementExt;
use super::{Gateway, PriorityRule}; use super::{Gateway, PriorityRule};
pub(crate) fn parse_gateways(node: &Node, prefer_internal: bool) -> Option<Vec<Gateway>> { pub(crate) fn parse_gateways(element: &Element, prefer_internal: bool) -> Option<Vec<Gateway>> {
let node_gateways = node.find_descendant("gateways")?; let node_gateways = element.descendant("gateways")?;
let internal_gateway_list = if prefer_internal { let internal_gateway_list = if prefer_internal {
info!("Try to parse the internal gateways..."); info!("Try to parse the internal gateways...");
node_gateways.find_descendant("internal").and_then(|n| n.find_child("list")) node_gateways.descendant("internal").and_then(|n| n.child("list"))
} else { } else {
None None
}; };
let gateway_list = internal_gateway_list.or_else(|| { let gateway_list = internal_gateway_list.or_else(|| {
info!("Try to parse the external gateways..."); info!("Try to parse the external gateways...");
node_gateways.find_descendant("external").and_then(|n| n.find_child("list")) node_gateways.descendant("external").and_then(|n| n.child("list"))
})?; })?;
let gateways = gateway_list let gateways = gateway_list
.children() .children("entry")
.filter_map(|gateway_item| { .iter()
if !gateway_item.has_tag_name("entry") { .map(|gateway_item| {
return None; let address = gateway_item.attr("name").map(|s| s.to_string()).unwrap_or_default();
} let name = gateway_item.child_text("description").unwrap_or_default();
let address = gateway_item.attribute("name").unwrap_or_default().to_string(); let priority = parse_priority(gateway_item);
let name = gateway_item.child_text("description").unwrap_or_default().to_string();
let priority = gateway_item
.child_text("priority")
.and_then(|s| s.parse().ok())
.unwrap_or(u32::MAX);
let priority_rules = gateway_item let priority_rules = gateway_item
.find_child("priority-rule") .child("priority-rule")
.map(|n| { .map(|n| parse_priority_rules(n))
n.children()
.filter_map(|n| {
if !n.has_tag_name("entry") {
return None;
}
let name = n.attribute("name").unwrap_or_default().to_string();
let priority: u32 = n
.child_text("priority")
.and_then(|s| s.parse().ok())
.unwrap_or(u32::MAX);
Some(PriorityRule { name, priority })
})
.collect()
})
.unwrap_or_default(); .unwrap_or_default();
Some(Gateway { Gateway {
name, name,
address, address,
priority, priority,
priority_rules, priority_rules,
}) }
}) })
.collect(); .collect();
Some(gateways) Some(gateways)
} }
fn parse_priority_rules(element: &Element) -> Vec<PriorityRule> {
element
.children("entry")
.iter()
.map(|n| {
let name = n.attr("name").map(|s| s.to_string()).unwrap_or_default();
let priority: u32 = parse_priority(n);
PriorityRule { name, priority }
})
.collect()
}
fn parse_priority(element: &Element) -> u32 {
element
.child_text("priority")
.and_then(|s| s.parse().ok())
.unwrap_or(u32::MAX)
}
+4 -2
View File
@@ -1,17 +1,19 @@
use std::collections::HashMap; use std::collections::HashMap;
use common::constants::GP_USER_AGENT;
use log::info; use log::info;
use reqwest::Client; use reqwest::Client;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta::Type; use specta::Type;
use crate::{utils::request::create_identity, GP_USER_AGENT}; use crate::utils::request::create_identity;
#[derive(Debug, Serialize, Deserialize, Clone, Type, Default)] #[derive(Debug, Serialize, Deserialize, Clone, Type, Default)]
pub enum ClientOs { pub enum ClientOs {
#[default] #[cfg_attr(not(target_os = "macos"), default)]
Linux, Linux,
Windows, Windows,
#[cfg_attr(target_os = "macos", default)]
Mac, Mac,
} }
+3 -26
View File
@@ -8,34 +8,11 @@ pub mod process;
pub mod service; pub mod service;
pub mod utils; pub mod utils;
#[cfg(feature = "logger")]
pub mod logger;
#[cfg(feature = "clap")] #[cfg(feature = "clap")]
pub mod clap; pub mod clap;
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
pub const GP_API_KEY: &[u8; 32] = &[0; 32]; pub const GP_API_KEY: &[u8; 32] = &[0; 32];
pub const GP_USER_AGENT: &str = "PAN GlobalProtect";
pub const GP_SERVICE_LOCK_FILE: &str = "/var/run/gpservice.lock";
pub const GP_CALLBACK_PORT_FILENAME: &str = "gpcallback.port";
#[cfg(not(debug_assertions))]
pub const GP_CLIENT_BINARY: &str = "/usr/bin/gpclient";
#[cfg(not(debug_assertions))]
pub const GP_SERVICE_BINARY: &str = "/usr/bin/gpservice";
#[cfg(not(debug_assertions))]
pub const GP_GUI_BINARY: &str = "/usr/bin/gpgui";
#[cfg(not(debug_assertions))]
pub const GP_GUI_HELPER_BINARY: &str = "/usr/bin/gpgui-helper";
#[cfg(not(debug_assertions))]
pub(crate) const GP_AUTH_BINARY: &str = "/usr/bin/gpauth";
#[cfg(debug_assertions)]
pub const GP_CLIENT_BINARY: &str = env!("GP_CLIENT_BINARY");
#[cfg(debug_assertions)]
pub const GP_SERVICE_BINARY: &str = env!("GP_SERVICE_BINARY");
#[cfg(debug_assertions)]
pub const GP_GUI_BINARY: &str = env!("GP_GUI_BINARY");
#[cfg(debug_assertions)]
pub const GP_GUI_HELPER_BINARY: &str = env!("GP_GUI_HELPER_BINARY");
#[cfg(debug_assertions)]
pub(crate) const GP_AUTH_BINARY: &str = env!("GP_AUTH_BINARY");
+44
View File
@@ -0,0 +1,44 @@
use std::sync::OnceLock;
use anyhow::bail;
use env_logger::Logger;
use log::{warn, Level};
use log_reload::{ReloadHandle, ReloadLog};
static LOG_HANDLE: OnceLock<ReloadHandle<log_reload::LevelFilter<Logger>>> = OnceLock::new();
pub fn init(level: Level) {
// Initialize the env_logger and global max level to trace, the logs will be
// filtered by the outer logger
let logger = env_logger::builder().filter_level(log::LevelFilter::Trace).build();
init_with_logger(level, logger);
}
pub fn init_with_logger(level: Level, logger: Logger) {
if let Some(_) = LOG_HANDLE.get() {
warn!("Logger already initialized");
return;
}
log::set_max_level(log::LevelFilter::Trace);
// Create a new logger that will filter the logs based on the max level
let level_filter_logger = log_reload::LevelFilter::new(level, logger);
let reload_log = ReloadLog::new(level_filter_logger);
let handle = reload_log.handle();
// Register the logger to be used by the log crate
let _ = log::set_boxed_logger(Box::new(reload_log));
let _ = LOG_HANDLE.set(handle);
}
pub fn set_max_level(level: Level) -> anyhow::Result<()> {
let Some(handle) = LOG_HANDLE.get() else {
bail!("Logger not initialized")
};
handle
.modify(|logger| logger.set_level(level))
.map_err(|e| anyhow::anyhow!(e))
}
+25 -17
View File
@@ -2,16 +2,16 @@ use anyhow::bail;
use dns_lookup::lookup_addr; use dns_lookup::lookup_addr;
use log::{debug, info, warn}; use log::{debug, info, warn};
use reqwest::{Client, StatusCode}; use reqwest::{Client, StatusCode};
use roxmltree::{Document, Node};
use serde::Serialize; use serde::Serialize;
use specta::Type; use specta::Type;
use xmltree::Element;
use crate::{ use crate::{
credential::{AuthCookieCredential, Credential}, credential::{AuthCookieCredential, Credential},
error::PortalError, error::PortalError,
gateway::{parse_gateways, Gateway}, gateway::{Gateway, parse_gateways},
gp_params::GpParams, gp_params::GpParams,
utils::{normalize_server, parse_gp_response, remove_url_scheme, xml::NodeExt}, utils::{normalize_server, parse_gp_response, remove_url_scheme, xml::ElementExt},
}; };
#[derive(Debug, Serialize, Type)] #[derive(Debug, Serialize, Type)]
@@ -29,6 +29,10 @@ pub struct PortalConfig {
* - Some(true): Internal host detection is supported and the user is connected to the internal network * - Some(true): Internal host detection is supported and the user is connected to the internal network
*/ */
internal_host_detection: Option<bool>, internal_host_detection: Option<bool>,
/**
* The version returned by the portal config, if any
*/
version: Option<String>,
} }
impl PortalConfig { impl PortalConfig {
@@ -52,6 +56,10 @@ impl PortalConfig {
self.internal_host_detection self.internal_host_detection
} }
pub fn version(&self) -> Option<&str> {
self.version.as_deref()
}
/// In-place sort the gateways by region /// In-place sort the gateways by region
pub fn sort_gateways(&mut self, region: &str) { pub fn sort_gateways(&mut self, region: &str) {
let preferred_gateway = self.find_preferred_gateway(region); let preferred_gateway = self.find_preferred_gateway(region);
@@ -111,12 +119,10 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
info!("Retrieve the portal config, user_agent: {}", gp_params.user_agent()); info!("Retrieve the portal config, user_agent: {}", gp_params.user_agent());
let res = client let res = client.post(&url).form(&params).send().await.map_err(|e| {
.post(&url) warn!("Network error: {:?}", e);
.form(&params) anyhow::anyhow!(PortalError::NetworkError(e))
.send() })?;
.await
.map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e)))?;
let res_xml = parse_gp_response(res).await.or_else(|err| { let res_xml = parse_gp_response(res).await.or_else(|err| {
if err.status == StatusCode::NOT_FOUND { if err.status == StatusCode::NOT_FOUND {
@@ -136,13 +142,11 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
} }
debug!("Portal config response: {}", res_xml); debug!("Portal config response: {}", res_xml);
let root = Element::parse(res_xml.as_bytes()).map_err(|e| PortalError::ConfigError(e.to_string()))?;
let doc = Document::parse(&res_xml).map_err(|e| PortalError::ConfigError(e.to_string()))?;
let root = doc.root();
let mut ihd_enabled = false; let mut ihd_enabled = false;
let mut prefer_internal = false; let mut prefer_internal = false;
if let Some(ihd_node) = root.find_descendant("internal-host-detection") { if let Some(ihd_node) = root.descendant("internal-host-detection") {
ihd_enabled = true; ihd_enabled = true;
prefer_internal = internal_host_detect(&ihd_node) prefer_internal = internal_host_detect(&ihd_node)
} }
@@ -162,21 +166,25 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
gateways.push(Gateway::new(server.to_string(), server.to_string())); gateways.push(Gateway::new(server.to_string(), server.to_string()));
} }
let version = root.descendant_text("version").map(|s| s.to_string());
info!("Detected portal version: {:?}", version);
Ok(PortalConfig { Ok(PortalConfig {
portal: server.to_string(), portal: server.to_string(),
auth_cookie: AuthCookieCredential::new(cred.username(), user_auth_cookie, prelogon_user_auth_cookie), auth_cookie: AuthCookieCredential::new(cred.username(), &user_auth_cookie, &prelogon_user_auth_cookie),
config_cred: cred.clone(), config_cred: cred.clone(),
gateways, gateways,
config_digest: config_digest.map(|s| s.to_string()), config_digest: config_digest.map(|s| s.to_string()),
internal_host_detection: if ihd_enabled { Some(prefer_internal) } else { None }, internal_host_detection: if ihd_enabled { Some(prefer_internal) } else { None },
version,
}) })
} }
// Perform DNS lookup and compare the result with the expected hostname // Perform DNS lookup and compare the result with the expected hostname
fn internal_host_detect(node: &Node) -> bool { fn internal_host_detect(element: &Element) -> bool {
let ip_info = [ let ip_info = [
(node.child_text("ip-address"), node.child_text("host")), (element.child_text("ip-address"), element.child_text("host")),
(node.child_text("ipv6-address"), node.child_text("ipv6-host")), (element.child_text("ipv6-address"), element.child_text("ipv6-host")),
]; ];
info!("Found internal-host-detection, performing DNS lookup"); info!("Found internal-host-detection, performing DNS lookup");
+24 -33
View File
@@ -1,14 +1,14 @@
use anyhow::{anyhow, bail}; use anyhow::{anyhow, bail};
use log::{info, warn}; use log::{debug, info, warn};
use reqwest::{Client, StatusCode}; use reqwest::{Client, StatusCode};
use roxmltree::Document;
use serde::Serialize; use serde::Serialize;
use specta::Type; use specta::Type;
use xmltree::Element;
use crate::{ use crate::{
error::PortalError, error::PortalError,
gp_params::GpParams, gp_params::GpParams,
utils::{base64, normalize_server, parse_gp_response, xml::NodeExt}, utils::{base64, normalize_server, parse_gp_response, xml::ElementExt},
}; };
const REQUIRED_PARAMS: [&str; 8] = [ const REQUIRED_PARAMS: [&str; 8] = [
@@ -116,12 +116,10 @@ pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prel
let client = Client::try_from(gp_params)?; let client = Client::try_from(gp_params)?;
let res = client let res = client.post(&prelogin_url).form(&params).send().await.map_err(|e| {
.post(&prelogin_url) warn!("Network error: {:?}", e);
.form(&params) anyhow::anyhow!(PortalError::NetworkError(e))
.send() })?;
.await
.map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e)))?;
let res_xml = parse_gp_response(res).await.or_else(|err| { let res_xml = parse_gp_response(res).await.or_else(|err| {
if err.status == StatusCode::NOT_FOUND { if err.status == StatusCode::NOT_FOUND {
@@ -136,6 +134,8 @@ pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prel
Err(anyhow!(PortalError::PreloginError(err.reason))) Err(anyhow!(PortalError::PreloginError(err.reason)))
})?; })?;
debug!("Prelogin response XML: {}", res_xml);
let prelogin = parse_res_xml(&res_xml, is_gateway).map_err(|err| { let prelogin = parse_res_xml(&res_xml, is_gateway).map_err(|err| {
warn!("Parse response error, response: {}", res_xml); warn!("Parse response error, response: {}", res_xml);
PortalError::PreloginError(err.to_string()) PortalError::PreloginError(err.to_string())
@@ -145,32 +145,30 @@ pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prel
} }
fn parse_res_xml(res_xml: &str, is_gateway: bool) -> anyhow::Result<Prelogin> { fn parse_res_xml(res_xml: &str, is_gateway: bool) -> anyhow::Result<Prelogin> {
let doc = Document::parse(res_xml)?; let root = Element::parse(res_xml.as_bytes())?;
let root = doc.root();
let status = root let status = root
.descendant_text("status") .descendant_text("status")
.ok_or_else(|| anyhow::anyhow!("Prelogin response does not contain status element"))?; .ok_or_else(|| anyhow::anyhow!("Prelogin response does not contain status element"))?;
// Check the status of the prelogin response // Check the status of the prelogin response
if status.to_uppercase() != "SUCCESS" { if status.to_uppercase() != "SUCCESS" {
let msg = root.descendant_text("msg").unwrap_or("Unknown error"); let msg = root
.descendant_text("msg")
.unwrap_or_else(|| String::from("Unknown error"));
bail!("{}", msg) bail!("{}", msg)
} }
let region = root let region = root.descendant_text("region").unwrap_or_else(|| {
.descendant_text("region")
.unwrap_or_else(|| {
info!("Prelogin response does not contain region element"); info!("Prelogin response does not contain region element");
"Unknown" String::from("Unknown")
}) });
.to_string();
let saml_method = root.descendant_text("saml-auth-method"); let saml_method = root.descendant_text("saml-auth-method");
let saml_request = root.descendant_text("saml-request"); let saml_request = root.descendant_text("saml-request");
let saml_default_browser = root.descendant_text("saml-default-browser"); let saml_default_browser = root.descendant_text("saml-default-browser");
// Check if the prelogin response is SAML // Check if the prelogin response is SAML
if saml_method.is_some() && saml_request.is_some() { if saml_method.is_some() && saml_request.is_some() {
let saml_request = base64::decode_to_string(saml_request.unwrap())?; let saml_request = base64::decode_to_string(&saml_request.unwrap())?;
let support_default_browser = saml_default_browser.map(|s| s.to_lowercase() == "yes").unwrap_or(false); let support_default_browser = saml_default_browser.map(|s| s.to_lowercase() == "yes").unwrap_or(false);
let saml_prelogin = SamlPrelogin { let saml_prelogin = SamlPrelogin {
@@ -183,25 +181,18 @@ fn parse_res_xml(res_xml: &str, is_gateway: bool) -> anyhow::Result<Prelogin> {
return Ok(Prelogin::Saml(saml_prelogin)); return Ok(Prelogin::Saml(saml_prelogin));
} }
let label_username = root let label_username = root.descendant_text("username-label").unwrap_or_else(|| {
.descendant_text("username-label")
.unwrap_or_else(|| {
info!("Username label has no value, using default"); info!("Username label has no value, using default");
"Username" String::from("Username")
}) });
.to_string(); let label_password = root.descendant_text("password-label").unwrap_or_else(|| {
let label_password = root
.descendant_text("password-label")
.unwrap_or_else(|| {
info!("Password label has no value, using default"); info!("Password label has no value, using default");
"Password" String::from("Password")
}) });
.to_string();
let auth_message = root let auth_message = root
.descendant_text("authentication-message") .descendant_text("authentication-message")
.unwrap_or("Please enter the login credentials") .unwrap_or_else(|| String::from("Please enter the login credentials"));
.to_string();
let standard_prelogin = StandardPrelogin { let standard_prelogin = StandardPrelogin {
region, region,
is_gateway, is_gateway,
+22 -2
View File
@@ -1,14 +1,16 @@
use std::process::Stdio; use std::process::Stdio;
use anyhow::bail; use anyhow::bail;
use common::constants::GP_AUTH_BINARY;
use tokio::process::Command; use tokio::process::Command;
use crate::{auth::SamlAuthResult, credential::Credential, GP_AUTH_BINARY}; use crate::{auth::SamlAuthResult, credential::Credential};
use super::command_traits::CommandExt; use super::command_traits::CommandExt;
pub struct SamlAuthLauncher<'a> { pub struct SamlAuthLauncher<'a> {
server: &'a str, server: &'a str,
auth_executable: Option<&'a str>,
gateway: bool, gateway: bool,
saml_request: Option<&'a str>, saml_request: Option<&'a str>,
user_agent: Option<&'a str>, user_agent: Option<&'a str>,
@@ -23,12 +25,14 @@ pub struct SamlAuthLauncher<'a> {
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
default_browser: bool, default_browser: bool,
browser: Option<&'a str>, browser: Option<&'a str>,
verbose: Option<&'a str>,
} }
impl<'a> SamlAuthLauncher<'a> { impl<'a> SamlAuthLauncher<'a> {
pub fn new(server: &'a str) -> Self { pub fn new(server: &'a str) -> Self {
Self { Self {
server, server,
auth_executable: None,
gateway: false, gateway: false,
saml_request: None, saml_request: None,
user_agent: None, user_agent: None,
@@ -43,9 +47,15 @@ impl<'a> SamlAuthLauncher<'a> {
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
default_browser: false, default_browser: false,
browser: None, browser: None,
verbose: None,
} }
} }
pub fn auth_executable(mut self, auth_executable: Option<&'a str>) -> Self {
self.auth_executable = auth_executable;
self
}
pub fn gateway(mut self, gateway: bool) -> Self { pub fn gateway(mut self, gateway: bool) -> Self {
self.gateway = gateway; self.gateway = gateway;
self self
@@ -104,9 +114,15 @@ impl<'a> SamlAuthLauncher<'a> {
self self
} }
pub fn verbose(mut self, verbose: Option<&'a str>) -> Self {
self.verbose = verbose;
self
}
/// Launch the authenticator binary as the current user or SUDO_USER if available. /// Launch the authenticator binary as the current user or SUDO_USER if available.
pub async fn launch(self) -> anyhow::Result<Credential> { pub async fn launch(self) -> anyhow::Result<Credential> {
let mut auth_cmd = Command::new(GP_AUTH_BINARY); let program = self.auth_executable.unwrap_or(GP_AUTH_BINARY);
let mut auth_cmd = Command::new(program);
auth_cmd.arg(self.server); auth_cmd.arg(self.server);
if self.gateway { if self.gateway {
@@ -156,6 +172,10 @@ impl<'a> SamlAuthLauncher<'a> {
auth_cmd.arg("--browser").arg(browser); auth_cmd.arg("--browser").arg(browser);
} }
if let Some(verbose) = self.verbose {
auth_cmd.arg(verbose);
}
let mut non_root_cmd = auth_cmd.into_non_root()?; let mut non_root_cmd = auth_cmd.into_non_root()?;
let output = non_root_cmd let output = non_root_cmd
.kill_on_drop(true) .kill_on_drop(true)
+9 -1
View File
@@ -11,11 +11,19 @@ pub trait CommandExt {
impl CommandExt for Command { impl CommandExt for Command {
fn new_pkexec<S: AsRef<OsStr>>(program: S) -> Command { fn new_pkexec<S: AsRef<OsStr>>(program: S) -> Command {
#[cfg(target_os = "macos")]
{
let mut cmd = Command::new("sudo");
cmd.arg(program);
cmd
}
#[cfg(not(target_os = "macos"))]
{
let mut cmd = Command::new("pkexec"); let mut cmd = Command::new("pkexec");
cmd.arg("--user").arg("root").arg(program); cmd.arg("--user").arg("root").arg(program);
cmd cmd
} }
}
fn into_non_root(mut self) -> anyhow::Result<Command> { fn into_non_root(mut self) -> anyhow::Result<Command> {
let user = get_non_root_user().map_err(|_| anyhow::anyhow!("{:?} cannot be run as root", self))?; let user = get_non_root_user().map_err(|_| anyhow::anyhow!("{:?} cannot be run as root", self))?;
@@ -1,10 +1,11 @@
use std::{collections::HashMap, path::PathBuf, process::Stdio}; use std::{collections::HashMap, path::PathBuf, process::Stdio};
use anyhow::bail; use anyhow::bail;
use common::constants::GP_GUI_HELPER_BINARY;
use log::info; use log::info;
use tokio::{io::AsyncWriteExt, process::Command}; use tokio::{io::AsyncWriteExt, process::Command};
use crate::{process::command_traits::CommandExt, utils, GP_GUI_HELPER_BINARY}; use crate::{process::command_traits::CommandExt, utils};
pub struct GuiHelperLauncher<'a> { pub struct GuiHelperLauncher<'a> {
program: PathBuf, program: PathBuf,
+2 -1
View File
@@ -5,10 +5,11 @@ use std::{
}; };
use anyhow::bail; use anyhow::bail;
use common::constants::GP_GUI_BINARY;
use log::info; use log::info;
use tokio::{io::AsyncWriteExt, process::Command}; use tokio::{io::AsyncWriteExt, process::Command};
use crate::{process::gui_helper_launcher::GuiHelperLauncher, utils::base64, GP_GUI_BINARY}; use crate::{process::gui_helper_launcher::GuiHelperLauncher, utils::base64};
use super::command_traits::CommandExt; use super::command_traits::CommandExt;
+15 -5
View File
@@ -4,32 +4,33 @@ use std::{
process::{ExitStatus, Stdio}, process::{ExitStatus, Stdio},
}; };
use common::constants::GP_SERVICE_BINARY;
use tokio::process::Command; use tokio::process::Command;
use crate::GP_SERVICE_BINARY;
use super::command_traits::CommandExt; use super::command_traits::CommandExt;
pub struct ServiceLauncher { pub struct ServiceLauncher<'a> {
program: PathBuf, program: PathBuf,
minimized: bool, minimized: bool,
env_file: Option<String>, env_file: Option<String>,
log_file: Option<String>, log_file: Option<String>,
verbose: Option<&'a str>,
} }
impl Default for ServiceLauncher { impl Default for ServiceLauncher<'_> {
fn default() -> Self { fn default() -> Self {
Self::new() Self::new()
} }
} }
impl ServiceLauncher { impl<'a> ServiceLauncher<'a> {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
program: GP_SERVICE_BINARY.into(), program: GP_SERVICE_BINARY.into(),
minimized: false, minimized: false,
env_file: None, env_file: None,
log_file: None, log_file: None,
verbose: None,
} }
} }
@@ -48,6 +49,11 @@ impl ServiceLauncher {
self self
} }
pub fn verbose(mut self, verbose: Option<&'a str>) -> Self {
self.verbose = verbose;
self
}
pub async fn launch(&self) -> anyhow::Result<ExitStatus> { pub async fn launch(&self) -> anyhow::Result<ExitStatus> {
let mut cmd = Command::new_pkexec(&self.program); let mut cmd = Command::new_pkexec(&self.program);
@@ -59,6 +65,10 @@ impl ServiceLauncher {
cmd.arg("--env-file").arg(env_file); cmd.arg("--env-file").arg(env_file);
} }
if let Some(verbose) = self.verbose {
cmd.arg(verbose);
}
if let Some(log_file) = &self.log_file { if let Some(log_file) = &self.log_file {
let log_file = File::create(log_file)?; let log_file = File::create(log_file)?;
let stdio = Stdio::from(log_file); let stdio = Stdio::from(log_file);
+3 -1
View File
@@ -1,10 +1,12 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use super::vpn_state::VpnState; use crate::service::{vpn_env::VpnEnv, vpn_state::VpnState};
/// Events that can be emitted by the service /// Events that can be emitted by the service
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub enum WsEvent { pub enum WsEvent {
VpnEnv(VpnEnv),
VpnState(VpnState), VpnState(VpnState),
ActiveGui, ActiveGui,
ResumeConnection,
} }
+1
View File
@@ -1,3 +1,4 @@
pub mod event; pub mod event;
pub mod request; pub mod request;
pub mod vpn_env;
pub mod vpn_state; pub mod vpn_state;
+41
View File
@@ -31,13 +31,20 @@ impl LaunchGuiRequest {
pub struct ConnectArgs { pub struct ConnectArgs {
cookie: String, cookie: String,
vpnc_script: Option<String>, vpnc_script: Option<String>,
user_agent: Option<String>, user_agent: Option<String>,
os: Option<ClientOs>, os: Option<ClientOs>,
os_version: Option<String>,
client_version: Option<String>,
certificate: Option<String>, certificate: Option<String>,
sslkey: Option<String>, sslkey: Option<String>,
key_password: Option<String>, key_password: Option<String>,
hip: bool,
csd_uid: u32, csd_uid: u32,
csd_wrapper: Option<String>, csd_wrapper: Option<String>,
reconnect_timeout: u32, reconnect_timeout: u32,
mtu: u32, mtu: u32,
disable_ipv6: bool, disable_ipv6: bool,
@@ -51,9 +58,12 @@ impl ConnectArgs {
vpnc_script: None, vpnc_script: None,
user_agent: None, user_agent: None,
os: None, os: None,
os_version: None,
client_version: None,
certificate: None, certificate: None,
sslkey: None, sslkey: None,
key_password: None, key_password: None,
hip: false,
csd_uid: 0, csd_uid: 0,
csd_wrapper: None, csd_wrapper: None,
reconnect_timeout: 300, reconnect_timeout: 300,
@@ -79,6 +89,14 @@ impl ConnectArgs {
self.os.as_ref().map(|os| os.to_openconnect_os().to_string()) self.os.as_ref().map(|os| os.to_openconnect_os().to_string())
} }
pub fn os_version(&self) -> Option<String> {
self.os_version.clone()
}
pub fn client_version(&self) -> Option<String> {
self.client_version.clone()
}
pub fn certificate(&self) -> Option<String> { pub fn certificate(&self) -> Option<String> {
self.certificate.clone() self.certificate.clone()
} }
@@ -91,6 +109,10 @@ impl ConnectArgs {
self.key_password.clone() self.key_password.clone()
} }
pub fn hip(&self) -> bool {
self.hip
}
pub fn csd_uid(&self) -> u32 { pub fn csd_uid(&self) -> u32 {
self.csd_uid self.csd_uid
} }
@@ -135,6 +157,11 @@ impl ConnectRequest {
self self
} }
pub fn with_hip(mut self, hip: bool) -> Self {
self.args.hip = hip;
self
}
pub fn with_csd_uid(mut self, csd_uid: u32) -> Self { pub fn with_csd_uid(mut self, csd_uid: u32) -> Self {
self.args.csd_uid = csd_uid; self.args.csd_uid = csd_uid;
self self
@@ -155,6 +182,16 @@ impl ConnectRequest {
self self
} }
pub fn with_os_version<T: Into<Option<String>>>(mut self, os_version: T) -> Self {
self.args.os_version = os_version.into();
self
}
pub fn with_client_version(mut self, client_version: &str) -> Self {
self.args.client_version = Some(client_version.to_string());
self
}
pub fn with_certificate<T: Into<Option<String>>>(mut self, certificate: T) -> Self { pub fn with_certificate<T: Into<Option<String>>>(mut self, certificate: T) -> Self {
self.args.certificate = certificate.into(); self.args.certificate = certificate.into();
self self
@@ -206,11 +243,15 @@ impl ConnectRequest {
#[derive(Debug, Deserialize, Serialize, Type)] #[derive(Debug, Deserialize, Serialize, Type)]
pub struct DisconnectRequest; pub struct DisconnectRequest;
#[derive(Debug, Deserialize, Serialize)]
pub struct UpdateLogLevelRequest(pub String);
/// Requests that can be sent to the service /// Requests that can be sent to the service
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub enum WsRequest { pub enum WsRequest {
Connect(Box<ConnectRequest>), Connect(Box<ConnectRequest>),
Disconnect(DisconnectRequest), Disconnect(DisconnectRequest),
UpdateLogLevel(UpdateLogLevelRequest),
} }
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
+22
View File
@@ -0,0 +1,22 @@
use serde::{Deserialize, Serialize};
use crate::service::vpn_state::VpnState;
/// Represents the VPN environment configuration.
/// When a client connects, the gpservice sends the current VPN environment
/// to the client so that it can configure itself accordingly.
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct VpnEnv {
/// The VPN connection state
pub vpn_state: VpnState,
/// The default VPN script path
pub vpnc_script: Option<String>,
/// The default CSD wrapper script path
pub csd_wrapper: Option<String>,
/// The gpauth executable path
/// Used by the client to launch gpauth for authentication
pub auth_executable: String,
}
+3 -3
View File
@@ -1,6 +1,6 @@
use chacha20poly1305::{ use chacha20poly1305::{
aead::{Aead, OsRng}, aead::{Aead, OsRng},
AeadCore, ChaCha20Poly1305, Key, KeyInit, Nonce, AeadCore, ChaCha20Poly1305, Key, KeyInit,
}; };
use serde::{de::DeserializeOwned, Serialize}; use serde::{de::DeserializeOwned, Serialize};
@@ -31,10 +31,10 @@ where
{ {
let cipher = ChaCha20Poly1305::new(key); let cipher = ChaCha20Poly1305::new(key);
let nonce = Nonce::from_slice(&encrypted[..12]); let nonce = &encrypted[..12];
let cipher_text = &encrypted[12..]; let cipher_text = &encrypted[12..];
let plaintext = cipher.decrypt(nonce, cipher_text)?; let plaintext = cipher.decrypt(nonce.into(), cipher_text)?;
let value = serde_json::from_slice(&plaintext)?; let value = serde_json::from_slice(&plaintext)?;
+4 -5
View File
@@ -1,10 +1,9 @@
use tokio::fs; use super::lock_file::gpservice_lock_info;
use crate::GP_SERVICE_LOCK_FILE;
async fn read_port() -> anyhow::Result<String> { async fn read_port() -> anyhow::Result<String> {
let port = fs::read_to_string(GP_SERVICE_LOCK_FILE).await?; let lock_info = gpservice_lock_info().await?;
Ok(port.trim().to_string())
Ok(lock_info.port.to_string())
} }
pub async fn http_endpoint() -> anyhow::Result<String> { pub async fn http_endpoint() -> anyhow::Result<String> {
+3 -7
View File
@@ -39,17 +39,13 @@ pub fn load_env_vars<T: AsRef<Path>>(env_file: T) -> anyhow::Result<HashMap<Stri
pub fn patch_gui_runtime_env(hidpi: bool) { pub fn patch_gui_runtime_env(hidpi: bool) {
// This is to avoid blank screen on some systems // This is to avoid blank screen on some systems
std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1"); unsafe { std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1") };
// Workaround for https://github.com/tauri-apps/tao/issues/929
let desktop = env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().to_lowercase();
if desktop.contains("gnome") {
env::set_var("GDK_BACKEND", "x11");
}
if hidpi { if hidpi {
info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5"); info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
unsafe {
std::env::set_var("GDK_SCALE", "2"); std::env::set_var("GDK_SCALE", "2");
std::env::set_var("GDK_DPI_SCALE", "0.5"); std::env::set_var("GDK_DPI_SCALE", "0.5");
};
} }
} }
+108
View File
@@ -0,0 +1,108 @@
use std::sync::OnceLock;
const DEFAULT_MACOS_VERSION: &str = "13.4.0";
#[cfg(not(target_os = "linux"))]
const DEFAULT_LINUX_DISTRO: &str = "Ubuntu 24.04.3 LTS";
#[cfg(not(target_os = "windows"))]
const DEFAULT_WINDOWS_DISTRO: &str = "Windows 11 Pro";
const DEFAULT_WINDOWS_VERSION: &str = "10.0.22631.0";
const DEFAULT_MACHINE_ID: &str = "DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF";
static MACHINE_ID: OnceLock<&'static str> = OnceLock::new();
static MACOS_VERSION: OnceLock<&'static str> = OnceLock::new();
static MACOS_OS_STRING: OnceLock<String> = OnceLock::new();
static LINUX_OS_STRING: OnceLock<String> = OnceLock::new();
static WINDOWS_VERSION: OnceLock<&'static str> = OnceLock::new();
static WINDOWS_OS_STRING: OnceLock<String> = OnceLock::new();
/// On macOS, get the OS version, or fallback to default
/// On other OSes, always return default
pub fn get_macos_version() -> &'static str {
MACOS_VERSION.get_or_init(|| {
#[cfg(target_os = "macos")]
{
match os_info::get().version() {
os_info::Version::Unknown => DEFAULT_MACOS_VERSION,
v => v.to_string().leak(),
}
}
#[cfg(not(target_os = "macos"))]
DEFAULT_MACOS_VERSION
})
}
pub fn get_macos_os_string() -> &'static str {
MACOS_OS_STRING.get_or_init(|| format!("Apple Mac OS X {}", get_macos_version()))
}
/// On Linux, use the real distro name if possible
/// On other OSes, fallback to default
pub fn get_linux_os_string() -> &'static str {
LINUX_OS_STRING.get_or_init(|| {
#[cfg(target_os = "linux")]
{
format!("Linux {}", whoami::distro())
}
#[cfg(not(target_os = "linux"))]
{
format!("Linux {}", DEFAULT_LINUX_DISTRO)
}
})
}
/// On Windows, get the OS version, or fallback to default
/// On other OSes, always return default
pub fn get_windows_version() -> &'static str {
WINDOWS_VERSION.get_or_init(|| {
#[cfg(target_os = "windows")]
{
match os_info::get().version() {
os_info::Version::Unknown => DEFAULT_WINDOWS_VERSION,
v => format!("{}.0", v).leak(),
}
}
#[cfg(not(target_os = "windows"))]
DEFAULT_WINDOWS_VERSION
})
}
/// On Windows, use the real edition if possible
/// On other OSes, fallback to default
/// The trailing space is intentional
pub fn get_windows_os_string() -> &'static str {
WINDOWS_OS_STRING.get_or_init(|| {
#[cfg(target_os = "windows")]
{
let edition = os_info::get()
.edition()
.map(|e| e.to_string())
.unwrap_or_else(|| whoami::distro());
format!("Microsoft {} , 64-bit", edition)
}
#[cfg(not(target_os = "windows"))]
{
format!("Microsoft {} , 64-bit", DEFAULT_WINDOWS_DISTRO)
}
})
}
/// Get machine ID or fallback to default
pub fn get_machine_id() -> &'static str {
MACHINE_ID.get_or_init(|| {
machine_uid::get()
.map(|id| id.to_string().leak() as &'static str)
.unwrap_or(DEFAULT_MACHINE_ID)
})
}
/// Generate a UUID v5 based on machine ID and provided seeds
pub fn derive_uuid(seeds: &[&str]) -> String {
use uuid::Uuid;
let namespace = Uuid::NAMESPACE_DNS;
let name = format!("{}-{}", get_machine_id(), seeds.join("-"));
let uuid = Uuid::new_v5(&namespace, name.as_bytes());
uuid.hyphenated().to_string()
}
+93 -3
View File
@@ -1,19 +1,25 @@
use std::path::PathBuf; use std::path::PathBuf;
use common::constants::GP_SERVICE_LOCK_FILE;
use thiserror::Error;
use tokio::fs;
pub struct LockFile { pub struct LockFile {
path: PathBuf, path: PathBuf,
pid: u32,
} }
impl LockFile { impl LockFile {
pub fn new<P: Into<PathBuf>>(path: P) -> Self { pub fn new<P: Into<PathBuf>>(path: P, pid: u32) -> Self {
Self { path: path.into() } Self { path: path.into(), pid }
} }
pub fn exists(&self) -> bool { pub fn exists(&self) -> bool {
self.path.exists() self.path.exists()
} }
pub fn lock(&self, content: impl AsRef<[u8]>) -> anyhow::Result<()> { pub fn lock(&self, content: &str) -> anyhow::Result<()> {
let content = format!("{}:{}", self.pid, content);
std::fs::write(&self.path, content)?; std::fs::write(&self.path, content)?;
Ok(()) Ok(())
} }
@@ -37,3 +43,87 @@ impl LockFile {
} }
} }
} }
#[derive(Error, Debug)]
pub enum LockFileError {
#[error("Failed to read lock file: {0}")]
IoError(#[from] std::io::Error),
#[error("Invalid lock file format: expected 'pid:port'")]
InvalidFormat,
#[error("Invalid PID value: {0}")]
InvalidPid(std::num::ParseIntError),
#[error("Invalid port value: {0}")]
InvalidPort(std::num::ParseIntError),
}
pub struct LockInfo {
pub pid: u32,
pub port: u32,
}
impl LockInfo {
async fn from_file(path: impl AsRef<std::path::Path>) -> Result<Self, LockFileError> {
let content = fs::read_to_string(path).await?;
Self::parse(&content)
}
fn parse(content: &str) -> Result<Self, LockFileError> {
let mut parts = content.trim().split(':');
let pid = parts
.next()
.ok_or(LockFileError::InvalidFormat)?
.parse()
.map_err(LockFileError::InvalidPid)?;
let port = parts
.next()
.ok_or(LockFileError::InvalidFormat)?
.parse()
.map_err(LockFileError::InvalidPort)?;
// Ensure there are no extra parts after pid:port
if parts.next().is_some() {
return Err(LockFileError::InvalidFormat);
}
Ok(Self { pid, port })
}
}
pub async fn gpservice_lock_info() -> Result<LockInfo, LockFileError> {
LockInfo::from_file(GP_SERVICE_LOCK_FILE).await
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_parse_valid_input() {
let info = LockInfo::parse("1234:8080").unwrap();
assert_eq!(info.pid, 1234);
assert_eq!(info.port, 8080);
}
#[test]
fn test_parse_invalid_format() {
assert!(matches!(
LockInfo::parse("123:456:789"),
Err(LockFileError::InvalidFormat)
));
}
#[test]
fn test_parse_invalid_numbers() {
assert!(matches!(LockInfo::parse("abc:8080"), Err(LockFileError::InvalidPid(_))));
assert!(matches!(
LockInfo::parse("1234:abc"),
Err(LockFileError::InvalidPort(_))
));
}
}
+1
View File
@@ -5,6 +5,7 @@ pub mod checksum;
pub mod crypto; pub mod crypto;
pub mod endpoint; pub mod endpoint;
pub mod env_utils; pub mod env_utils;
pub mod host_utils;
pub mod lock_file; pub mod lock_file;
pub mod openssl; pub mod openssl;
pub mod redact; pub mod redact;
+60 -2
View File
@@ -1,9 +1,12 @@
use std::path::Path; use std::path::Path;
use log::{info, warn};
use regex::Regex;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use version_compare::{compare_to, Cmp};
pub fn openssl_conf() -> String { pub fn openssl_conf() -> String {
let option = "UnsafeLegacyServerConnect"; let option = get_openssl_option();
format!( format!(
"openssl_conf = openssl_init "openssl_conf = openssl_init
@@ -43,7 +46,62 @@ pub fn fix_openssl_env() -> anyhow::Result<NamedTempFile> {
let openssl_conf_path = openssl_conf.path(); let openssl_conf_path = openssl_conf.path();
fix_openssl(openssl_conf_path)?; fix_openssl(openssl_conf_path)?;
std::env::set_var("OPENSSL_CONF", openssl_conf_path); unsafe { std::env::set_var("OPENSSL_CONF", openssl_conf_path) };
Ok(openssl_conf) Ok(openssl_conf)
} }
// See: https://stackoverflow.com/questions/75763525/curl-35-error0a000152ssl-routinesunsafe-legacy-renegotiation-disabled
fn get_openssl_option() -> &'static str {
let version_str = openssl::version::version();
let default_option = "UnsafeLegacyServerConnect";
let Some(version) = extract_openssl_version(version_str) else {
warn!("Failed to extract OpenSSL version from '{}'", version_str);
return default_option;
};
let older_than_3_0_4 = match compare_to(version, "3.0.4", Cmp::Lt) {
Ok(result) => result,
Err(_) => {
warn!("Failed to compare OpenSSL version: {}", version);
return default_option;
}
};
if older_than_3_0_4 {
info!("Using 'UnsafeLegacyRenegotiation' option");
"UnsafeLegacyRenegotiation"
} else {
info!("Using 'UnsafeLegacyServerConnect' option");
default_option
}
}
fn extract_openssl_version(version: &str) -> Option<&str> {
let re = Regex::new(r"OpenSSL (\d+\.\d+\.\d+[^\s]*)").unwrap();
re.captures(version).and_then(|caps| caps.get(1)).map(|m| m.as_str())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_extract_version() {
let input = "OpenSSL 3.4.0 22 Oct 2024 (Library: OpenSSL 3.4.0 22 Oct 2024)";
assert_eq!(extract_openssl_version(input), Some("3.4.0"));
}
#[test]
fn test_different_format() {
let input = "OpenSSL 1.1.1t 7 Feb 2023";
assert_eq!(extract_openssl_version(input), Some("1.1.1t"));
}
#[test]
fn test_invalid_input() {
let input = "Invalid string without version";
assert_eq!(extract_openssl_version(input), None);
}
}
+33 -9
View File
@@ -1,26 +1,49 @@
use std::{process::ExitStatus, time::Duration};
use anyhow::bail;
use log::info;
use tauri::WebviewWindow; use tauri::WebviewWindow;
use tokio::process::Command;
pub trait WindowExt { pub trait WindowExt {
fn raise(&self) -> anyhow::Result<()>; fn raise(&self) -> anyhow::Result<()>;
} }
impl WindowExt for WebviewWindow { impl WindowExt for WebviewWindow {
#[cfg(any(target_os = "macos", target_os = "windows"))]
fn raise(&self) -> anyhow::Result<()> { fn raise(&self) -> anyhow::Result<()> {
raise_window(self) self.show()?;
Ok(())
}
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
fn raise(&self) -> anyhow::Result<()> {
unix::raise_window(self)
} }
} }
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
mod unix {
use std::{process::ExitStatus, time::Duration};
use anyhow::bail;
use gtk::{
glib::Cast,
traits::{EventBoxExt, GtkWindowExt, WidgetExt},
EventBox,
};
use log::info;
use tauri::WebviewWindow;
use tokio::process::Command;
pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> { pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland"; let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
if is_wayland { if is_wayland {
win.hide()?; let gtk_win = win.gtk_window()?;
win.show()?; if let Some(header) = gtk_win.titlebar() {
let _ = header.downcast::<EventBox>().map(|event_box| {
event_box.set_above_child(false);
});
}
gtk_win.hide();
gtk_win.show_all();
} else { } else {
if !win.is_visible()? { if !win.is_visible()? {
win.show()?; win.show()?;
@@ -33,7 +56,7 @@ pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
}); });
} }
// Calling window.show() on Windows will cause the menu to be shown. // Calling window.show() on window object will cause the menu to be shown.
// We need to hide it again. // We need to hide it again.
win.hide_menu()?; win.hide_menu()?;
@@ -71,3 +94,4 @@ async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
Ok(exit_status) Ok(exit_status)
} }
}
+75 -15
View File
@@ -1,27 +1,87 @@
use roxmltree::Node; use xmltree::Element;
pub(crate) trait NodeExt<'a> { pub(crate) trait ElementExt {
fn find_descendant(&self, name: &str) -> Option<Node<'a, 'a>>; /// Recursively find all descendants with the given name
fn descendant_text(&self, name: &str) -> Option<&'a str>; fn descendants(&self, name: &str) -> Vec<&Element>;
fn find_child(&self, name: &str) -> Option<Node<'a, 'a>>; /// Recursively find the first descendant with the given name
fn child_text(&self, name: &str) -> Option<&'a str>; fn descendant(&self, name: &str) -> Option<&Element>;
/// Recursively find the text of the first descendant with the given name
fn descendant_text(&self, name: &str) -> Option<String>;
/// Find the first child with the given name
fn child(&self, name: &str) -> Option<&Element>;
/// Find the text of the first child with the given name
fn child_text(&self, name: &str) -> Option<String>;
/// Get the direct child element with the given name
fn children(&self, name: &str) -> Vec<&Element>;
/// Get the attribute value by name
fn attr(&self, name: &str) -> Option<&str>;
} }
impl<'a> NodeExt<'a> for Node<'a, 'a> { impl ElementExt for Element {
fn find_descendant(&self, name: &str) -> Option<Node<'a, 'a>> { fn descendants(&self, name: &str) -> Vec<&Element> {
self.descendants().find(|n| n.has_tag_name(name)) let mut results = Vec::new();
if self.name == name {
results.push(self);
} }
fn descendant_text(&self, name: &str) -> Option<&'a str> { for child in &self.children {
self.find_descendant(name).and_then(|node| node.text()) if let Some(element) = child.as_element() {
results.extend(element.descendants(name));
}
} }
fn find_child(&self, name: &str) -> Option<Node<'a, 'a>> { results
self.children().find(|n| n.has_tag_name(name))
} }
fn child_text(&self, name: &str) -> Option<&'a str> { fn descendant(&self, name: &str) -> Option<&Element> {
self.find_child(name).and_then(|node| node.text()) if self.name == name {
return Some(self);
}
for child in &self.children {
if let Some(element) = child.as_element() {
if let Some(found) = element.descendant(name) {
return Some(found);
}
}
}
None
}
fn descendant_text(&self, name: &str) -> Option<String> {
self
.descendant(name)
.and_then(|element| element.get_text().map(|s| s.to_string()))
}
fn child(&self, name: &str) -> Option<&Element> {
self.get_child(name)
}
fn child_text(&self, name: &str) -> Option<String> {
self
.get_child(name)
.and_then(|element| element.get_text().map(|s| s.to_string()))
}
fn children(&self, name: &str) -> Vec<&Element> {
self
.children
.iter()
.filter_map(|child| child.as_element())
.filter(|element| element.name == name)
.collect()
}
fn attr(&self, name: &str) -> Option<&str> {
self.attributes.get(name).map(|s| s.as_str())
} }
} }
+4 -1
View File
@@ -6,8 +6,11 @@ license.workspace = true
links = "openconnect" links = "openconnect"
[dependencies] [dependencies]
common = { path = "../common" }
log.workspace = true log.workspace = true
is_executable.workspace = true
[build-dependencies] [build-dependencies]
cc = "1" cc = "1"
autotools = "0.2"
pkg-config = "0.3"
fs_extra = "1"
+192 -4
View File
@@ -1,9 +1,197 @@
use std::{env, path::PathBuf, process::Command};
fn apply_patches(patches_dir: &PathBuf, build_src: &PathBuf) {
let patches = std::fs::read_dir(patches_dir)
.expect("Failed to read patches directory")
.filter_map(|entry| entry.ok())
.filter(|entry| entry.path().extension().and_then(|s| s.to_str()) == Some("patch"))
.map(|entry| entry.path())
.collect::<Vec<_>>();
// Sort patches to ensure they are applied in order
let mut patches = patches;
patches.sort();
for patch in patches {
println!("cargo:rerun-if-changed={}", patch.display());
println!("Applying patch: {}", patch.display());
let status = Command::new("patch")
.arg("-p1") // Strip one level of path (standard for git diffs)
.arg("-i") // Input file
.arg(&patch)
.current_dir(build_src) // Run INSIDE the copied dir
.status()
.expect("Failed to execute patch command");
if !status.success() {
panic!("Failed to apply patch file: {}", patch.display());
}
}
}
fn build_libxml2(deps_dir: &PathBuf, out_dir: &PathBuf) -> PathBuf {
let libxml2_dir = deps_dir.join("libxml2");
// The temporary location where we will build
let build_src = out_dir.join("libxml2_build");
// Track changes so cargo rebuilds if submodule changes
println!("cargo:rerun-if-changed={}", libxml2_dir.display());
// Prepare the build directory
// If the directory exists from a previous run, remove it to ensure a clean slate
if build_src.exists() {
std::fs::remove_dir_all(&build_src).unwrap();
}
std::fs::create_dir_all(&build_src).unwrap();
// Copy the source code to OUT_DIR
// We use fs_extra options to copy contents recursively
let mut options = fs_extra::dir::CopyOptions::new();
options.overwrite = true;
options.content_only = true; // Copy content of src into dest, not src folder itself
fs_extra::dir::copy(&libxml2_dir, &build_src, &options).expect("Failed to copy C source code to OUT_DIR");
// Build the libxml2 library using autotools
let dst = autotools::Config::new(&build_src)
.reconf("-ivf")
.enable_static()
.disable_shared()
// Disable optional features that complicate static builds
.with("python", Some("no"))
.with("icu", Some("no"))
.with("http", Some("no"))
.with("ftp", Some("no"))
.with("catalog", Some("no"))
.with("docbook", Some("no"))
.with("legacy", Some("no"))
.with("threads", Some("no"))
.with("zlib", Some("no"))
.with("lzma", Some("no"))
// Ensure position-independent code (safe for static linking)
.cflag("-fPIC")
.build();
let lib_dir = dst.join("lib");
let include_dir = dst.join("include/libxml2");
// Tell rustc where to find the static library
println!("cargo:rustc-link-search=native={}", lib_dir.display());
// Static linking of libxml2
println!("cargo:rustc-link-lib=static=xml2");
// Export include path for downstream use (bindgen / cc)
println!("cargo:include={}", include_dir.display());
dst
}
fn build_openconnect(deps_dir: &PathBuf, out_dir: &PathBuf) -> PathBuf {
let openconnect_dir = deps_dir.join("openconnect");
let patches_dir = deps_dir.join("patches");
// The temporary location where we will build
let build_src = out_dir.join("openconnect_build");
// Track changes so cargo rebuilds if patch or submodule changes
println!("cargo:rerun-if-changed={}", openconnect_dir.display());
// Prepare the build directory
// If the directory exists from a previous run, remove it to ensure a clean slate
if build_src.exists() {
std::fs::remove_dir_all(&build_src).unwrap();
}
std::fs::create_dir_all(&build_src).unwrap();
// Copy the source code to OUT_DIR
// We use fs_extra options to copy contents recursively
let mut options = fs_extra::dir::CopyOptions::new();
options.overwrite = true;
options.content_only = true; // Copy content of src into dest, not src folder itself
fs_extra::dir::copy(&openconnect_dir, &build_src, &options).expect("Failed to copy C source code to OUT_DIR");
// Apply all patches from the patches directory
apply_patches(&patches_dir, &build_src);
// Build the OpenConnect library using autotools
// We explicitly enable static and disable shared to ensure we get a .a file.
// .reconf("-ivf") is CRITICAL for git submodules because 'configure'
// usually doesn't exist yet and needs to be generated.
let dst = autotools::Config::new(&build_src)
.reconf("-ivf")
.enable_static()
.disable_shared()
.disable("nls", None) // disable translations to save space
.disable("docs", None)
.disable("dsa-tests", None)
.without("libproxy", None)
.without("stoken", None)
.without("libpcsclite", None)
.without("libpskc", None)
.without("gssapi", None)
.with("gnutls-tss2", Some("no"))
.with("vpnc-script", Some("/etc/vpnc/vpnc-script")) // Specify vpnc-script, otherwise it will fail on macOS
.build();
let lib_dir = dst.join("lib");
let include_dir = dst.join("include");
// Tell rustc where to find the static library
println!("cargo:rustc-link-search=native={}", lib_dir.display());
// Static linking of openconnect
println!("cargo:rustc-link-lib=static=openconnect");
// Export include path for downstream use (bindgen / cc)
println!("cargo:include={}", include_dir.display());
dst
}
fn main() { fn main() {
// Link to the native openconnect library let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
println!("cargo:rustc-link-lib=openconnect"); let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let deps_dir = PathBuf::from(manifest_dir).join("deps");
let oc_dst = build_openconnect(&deps_dir, &out_dir);
// Only statically link libxml2 if `LIBXML2_STATIC` is set
if env::var("LIBXML2_STATIC").is_ok() {
let _libxml2_dst = build_libxml2(&deps_dir, &out_dir);
} else {
// Using pkg-config to find system libxml2
pkg_config::probe_library("libxml-2.0").unwrap();
}
// Using pkg-config to find system deps
pkg_config::probe_library("zlib").unwrap();
pkg_config::probe_library("liblz4").unwrap();
pkg_config::probe_library("gnutls").unwrap();
// Below are required by gnutls
pkg_config::probe_library("p11-kit-1").unwrap();
pkg_config::probe_library("hogweed").unwrap();
pkg_config::probe_library("nettle").unwrap();
pkg_config::probe_library("gmp").unwrap();
// Compile the vpn.c file
println!("cargo:rerun-if-changed=src/ffi/vpn.c"); println!("cargo:rerun-if-changed=src/ffi/vpn.c");
println!("cargo:rerun-if-changed=src/ffi/vpn.h"); println!("cargo:rerun-if-changed=src/ffi/vpn.h");
// Compile the vpn.c file // Prevent silent fallback to dynamic libraries
cc::Build::new().file("src/ffi/vpn.c").include("src/ffi").compile("vpn"); #[cfg(target_os = "linux")]
{
println!("cargo:rustc-link-arg=-Wl,-Bstatic");
println!("cargo:rustc-link-arg=-Wl,-Bdynamic");
}
cc::Build::new()
.file("src/ffi/vpn.c")
.include("src/ffi")
.include(&oc_dst.join("include"))
.compile("vpn");
} }
Loaded 100 of 124 files, more files were not shown because too many files have changed in this diff. Show more