Update build.yaml

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 
 ARG USERNAME=vscode
 ARG USER_UID=1000
@@ -7,9 +7,8 @@ ARG USER_GID=$USER_UID
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.80.0
+    RUST_VERSION=1.75.0
 
-# Install common dependencies
 RUN set -eux; \
   apt-get update; \
   apt-get install -y --no-install-recommends \
@@ -19,50 +18,34 @@ RUN set -eux; \
     gnupg \
     git \
     less \
-    software-properties-common
+    software-properties-common \
-
+    # Tauri dependencies
-# Create a non-root user
+    libwebkit2gtk-4.0-dev build-essential wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev; \
-RUN set -eux; \
+  # Install openconnect
+  add-apt-repository ppa:yuezk/globalprotect-openconnect; \
+  apt-get update; \
+  apt-get install -y openconnect libopenconnect-dev; \
+  # Create a non-root user
   groupadd --gid $USER_GID $USERNAME; \
   useradd --uid $USER_UID --gid $USER_GID -m $USERNAME; \
   echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME; \
-  chmod 0440 /etc/sudoers.d/$USERNAME
+  chmod 0440 /etc/sudoers.d/$USERNAME; \
-
+  # Install Node.js
-# Install Rust
+  mkdir -p /etc/apt/keyrings; \
-RUN set -eux; \
+  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
+  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
+  apt-get update; \
+  apt-get install -y nodejs; \
+  corepack enable; \
+  # Install diff-so-fancy
+  npm install -g diff-so-fancy; \
+  # Install Rust
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUST_VERSION; \
   chown -R $USERNAME:$USERNAME $RUSTUP_HOME $CARGO_HOME; \
   rustup --version; \
   cargo --version; \
   rustc --version
 
-# Install Node.js
-RUN set -eux; \
-  curl -fsSL https://deb.nodesource.com/setup_20.x | bash -; \
-  apt-get install -y nodejs; \
-  corepack enable; \
-  # Install diff-so-fancy
-  npm install -g diff-so-fancy
-
-# Install openconnect
-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
 
 # Install Oh My Zsh

.editorconfig

@@ -8,5 +8,5 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{Makefile,Makefile.in}]
+[Makefile]
 indent_style = tab

.github/workflows/build.yaml

@@ -9,253 +9,385 @@ on:
     branches:
       - main
       - dev
-      - hotfix/*
-      - feature/*
-      - release/*
     tags:
+      - latest
       - v*.*.*
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  # Include arm64 if ref is a tag
-  setup-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Set up matrix
-        id: set-matrix
-        run: |
-          # 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
-            echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}, {"runner": "arm64", "arch": "arm64"}]' >> $GITHUB_OUTPUT
-          else
-            echo 'matrix=[{"runner": "ubuntu-latest", "arch": "amd64"}]' >> $GITHUB_OUTPUT
-          fi
-
   tarball:
     runs-on: ubuntu-latest
-    needs: [setup-matrix]
     steps:
-    - uses: pnpm/action-setup@v4
+    - uses: pnpm/action-setup@v2
       with:
-        version: 9
+        version: 8
-    - name: Prepare workspace
-      run: rm -rf source && mkdir -p source/artifacts
-
     - name: Checkout GlobalProtect-openconnect
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         token: ${{ secrets.GH_PAT }}
         repository: yuezk/GlobalProtect-openconnect
-        ref: ${{ github.ref }}
+        path: gp
-        path: source/gp
-
     - name: Create tarball
       run: |
-        cd source/gp
+        cd gp
-        # Generate the SNAPSHOT file for non-tagged commits
-        if [[ "${{ github.ref }}" != "refs/tags/"* ]]; then
-          touch SNAPSHOT
-        fi
         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
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
-        name: artifact-source
+        name: artifact-tarball
-        if-no-files-found: error
         path: |
-          source/artifacts/*
+          globalprotect-openconnect-*.tar.gz
-
+  deb:
-  tarball-offline:
-    if: ${{ github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
-    needs:
+    needs: [tarball]
-    - tarball
+    container:
+      image: yuezk/gpdev:main
+      credentials:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     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
+      uses: actions/download-artifact@v3
       with:
-        name: artifact-source
+        name: artifact-tarball
-        path: source-offline
+    - name: Build DEB package
-
-    - name: Create offline tarball
       run: |
-        cd source-offline
+        tar -xzf globalprotect-openconnect-*.tar.gz
+        cd globalprotect-openconnect-*
+        make deb
+    - name: Install DEB package
+      run: |
+        sudo dpkg -i globalprotect-openconnect_*.deb
 
-        offline_tarball=$(basename *.tar.gz .tar.gz).offline.tar.gz
+        gpclient --version
-
+        gpservice --version
-        # Extract the tarball
+        gpauth --version
-        tar -xzf *.tar.gz
+        gpgui-helper --version
-
+    - name: Upload DEB package
-        cd */
+      uses: actions/upload-artifact@v3
-        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-deb
-        name: artifact-source-offline
-        if-no-files-found: error
-
-  build-gp:
-    needs:
-    - setup-matrix
-    - tarball
-    strategy:
-      matrix:
-        # Only build gp on amd64, as the arm64 package will be built in release.yaml
-        os: [{runner: ubuntu-latest, arch: amd64}]
-        package: [deb, rpm, pkg, binary]
-    runs-on: ${{ matrix.os.runner }}
-    name: build-gp (${{ matrix.package }}, ${{ matrix.os.arch }})
-    steps:
-    - name: Prepare workspace
-      run: |
-        rm -rf build-gp-${{ matrix.package }}
-        mkdir -p build-gp-${{ matrix.package }}
-    - name: Download tarball
-      uses: actions/download-artifact@v4
-      with:
-        name: artifact-source
-        path: build-gp-${{ matrix.package }}
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build ${{ matrix.package }} package in Docker
-      run: |
-        docker run --pull=always --rm \
-          -e COREPACK_INTEGRITY_KEYS=0 \
-          -v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \
-          yuezk/gpdev:${{ matrix.package }}-builder-tauri2
-    - name: Install ${{ matrix.package }} package in Docker
-      run: |
-        docker run --pull=always --rm \
-          -e COREPACK_INTEGRITY_KEYS=0 \
-          -e GPGUI_INSTALLED=0 \
-          -v $(pwd)/build-gp-${{ matrix.package }}:/${{ matrix.package }} \
-          yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
-          bash install.sh
-    - name: Upload ${{ matrix.package }} package
-      uses: actions/upload-artifact@v4
-      with:
-        name: artifact-gp-${{ matrix.package }}-${{ matrix.os.arch }}
-        if-no-files-found: error
         path: |
-          build-gp-${{ matrix.package }}/artifacts/*
+          globalprotect-openconnect_*.deb
 
-  build-gpgui:
+  rpm:
-    needs:
-    - setup-matrix
-    strategy:
-      matrix:
-        os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
-    runs-on: ${{ matrix.os.runner }}
-    name: build-gpgui (${{ matrix.os.arch }})
-    steps:
-    - uses: pnpm/action-setup@v4
-      with:
-        version: 9
-    - name: Prepare workspace
-      run: rm -rf gpgui-source && mkdir gpgui-source
-    - name: Checkout GlobalProtect-openconnect
-      uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.GH_PAT }}
-        repository: yuezk/GlobalProtect-openconnect
-        ref: ${{ github.ref }}
-        path: gpgui-source/gp
-    - name: Checkout gpgui@${{ github.ref_name }}
-      uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.GH_PAT }}
-        repository: yuezk/gpgui
-        ref: ${{ github.ref_name }}
-        path: gpgui-source/gpgui
-    - name: Tarball
-      run: |
-        cd gpgui-source
-        tar -czf gpgui.tar.gz gpgui gp
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build gpgui in Docker
-      run: |
-        docker run --pull=always --rm \
-          -e COREPACK_INTEGRITY_KEYS=0 \
-          -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder-tauri2
-    - name: Install gpgui in Docker
-      run: |
-        cd gpgui-source
-        tar -xJf *.bin.tar.xz
-        docker run --pull=always --rm \
-          -e COREPACK_INTEGRITY_KEYS=0 \
-          -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder-tauri2 \
-          bash -c "cd /gpgui/gpgui_*/ && ./gpgui --version"
-    - name: Upload gpgui
-      uses: actions/upload-artifact@v4
-      with:
-        name: artifact-gpgui-${{ matrix.os.arch }}
-        if-no-files-found: error
-        path: |
-          gpgui-source/*.bin.tar.xz
-          gpgui-source/*.bin.tar.xz.sha256
-
-  gh-release:
-    if: ${{ github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
-    needs:
+    needs: [tarball]
-      - tarball
+    container:
-      - tarball-offline
+      image: yuezk/gpdev:rpm-builder
-      - build-gp
+      credentials:
-      - build-gpgui
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
     steps:
-    - name: Prepare workspace
+    - name: Download tarball
-      run: rm -rf gh-release && mkdir gh-release
+      uses: actions/download-artifact@v3
-
-    - name: Checkout GlobalProtect-openconnect
-      uses: actions/checkout@v4
       with:
-        token: ${{ secrets.GH_PAT }}
+        name: artifact-tarball
-        repository: yuezk/GlobalProtect-openconnect
+    - name: Build RPM package
-        ref: ${{ github.ref }}
-        path: gh-release/gp
-
-    - name: Download all artifacts
-      uses: actions/download-artifact@v4
-      with:
-        path: gh-release/gp/.build/artifacts
-
-    - name: Create GH release
-      env:
-        GH_TOKEN: ${{ secrets.GH_PAT }}
-        RELEASE_TAG: ${{ github.ref == 'refs/heads/dev' && 'snapshot' || github.ref_name }}
       run: |
-        cd gh-release/gp/scripts && ./gh-release.sh "$RELEASE_TAG"
+        tar -xzf globalprotect-openconnect-*.tar.gz
+        cd globalprotect-openconnect-*/
+        make rpm
+    - name: Install RPM package
+      run: |
+        cd globalprotect-openconnect-*/
+        ls -l .rpm
+    - name: Upload RPM package
+      uses: actions/upload-artifact@v3
+      with:
+        name: artifact-rpm
+        path: |
+          globalprotect-openconnect-*/.rpm/*.rpm
+
+  # Include arm64 if ref is a tag
+  # setup-matrix:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     matrix: ${{ steps.set-matrix.outputs.matrix }}
+  #   steps:
+  #     - name: Set up matrix
+  #       id: set-matrix
+  #       run: |
+  #         if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
+  #           echo "matrix=[\"amd64\", \"arm64\"]" >> $GITHUB_OUTPUT
+  #         else
+  #           echo "matrix=[\"amd64\"]" >> $GITHUB_OUTPUT
+  #         fi
+
+  # build-fe:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout gpgui repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/gpgui
+
+  #     - name: Install Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: 18
+
+  #     - uses: pnpm/action-setup@v2
+  #       with:
+  #         version: 8
+
+  #     - name: Install dependencies
+  #       run: |
+  #         cd app
+  #         pnpm install
+  #     - name: Build
+  #       run: |
+  #         cd app
+  #         pnpm run build
+
+  #     - name: Upload artifacts
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: gpgui-fe
+  #         path: app/dist
+
+  # build-tauri-amd64:
+  #   needs: [build-fe]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout gpgui repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/gpgui
+  #         path: gpgui
+
+  #     - name: Checkout gp repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/GlobalProtect-openconnect
+  #         path: gp
+
+  #     - name: Download gpgui-fe artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: gpgui-fe
+  #         path: gpgui/app/dist
+
+  #     - name: Login to Docker Hub
+  #       uses: docker/login-action@v3
+  #       with:
+  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
+  #         password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+  #     - name: Build Tauri in Docker
+  #       run: |
+  #         docker run \
+  #           --rm \
+  #           -v $(pwd):/${{ github.workspace }} \
+  #           -w ${{ github.workspace }} \
+  #           -e CI=true \
+  #           yuezk/gpdev:main \
+  #           "./gpgui/scripts/build.sh"
+
+  #     - name: Upload artifacts
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-amd64-tauri
+  #         path: |
+  #           gpgui/.tmp/artifact
+
+  # build-tauri-arm64:
+  #   if: startsWith(github.ref, 'refs/tags/')
+  #   needs: [build-fe]
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Checkout gpgui repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/gpgui
+  #         path: gpgui
+
+  #     - name: Checkout gp repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/GlobalProtect-openconnect
+  #         path: gp
+
+  #     - name: Download gpgui-fe artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: gpgui-fe
+  #         path: gpgui/app/dist
+  #     - name: Build Tauri
+  #       run: |
+  #         ./gpgui/scripts/build.sh
+
+  #     - name: Upload artifacts
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-arm64-tauri
+  #         path: |
+  #           gpgui/.tmp/artifact
+
+  # package-tarball:
+  #   needs: [build-tauri-amd64, build-tauri-arm64]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout gpgui repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/gpgui
+  #         path: gpgui
+
+  #     - name: Download artifact-amd64-tauri
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: artifact-amd64-tauri
+  #         path: gpgui/.tmp/artifact
+
+  #     - name: Download artifact-arm64-tauri
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: artifact-arm64-tauri
+  #         path: gpgui/.tmp/artifact
+
+  #     - name: Create tarball
+  #       run: |
+  #         ./gpgui/scripts/build-tarball.sh
+
+  #     - name: Upload tarball
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-tarball
+  #         path: |
+  #           gpgui/.tmp/tarball/*.tar.gz
+
+  # package-rpm:
+  #   needs: [setup-matrix, package-tarball]
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
+  #   steps:
+  #     - name: Checkout gpgui repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/gpgui
+  #         path: gpgui
+
+  #     - name: Download package tarball
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: artifact-tarball
+  #         path: gpgui/.tmp/artifact
+
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #       with:
+  #         platforms: ${{ matrix.arch }}
+
+  #     - name: Login to Docker Hub
+  #       uses: docker/login-action@v3
+  #       with:
+  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
+  #         password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+  #     - name: Create RPM package
+  #       run: |
+  #         docker run \
+  #           --rm \
+  #           -v $(pwd):/${{ github.workspace }} \
+  #           -w ${{ github.workspace }} \
+  #           --platform linux/${{ matrix.arch }} \
+  #           yuezk/gpdev:rpm-builder \
+  #           "./gpgui/scripts/build-rpm.sh"
+
+  #     - name: Upload rpm artifacts
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-${{ matrix.arch }}-rpm
+  #         path: |
+  #           gpgui/.tmp/artifact/*.rpm
+
+  # package-pkgbuild:
+  #   needs: [setup-matrix, build-tauri-amd64, build-tauri-arm64]
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
+  #   steps:
+  #     - name: Checkout gpgui repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         repository: yuezk/gpgui
+  #         path: gpgui
+
+  #     - name: Download artifact-${{ matrix.arch }}
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: artifact-${{ matrix.arch }}-tauri
+  #         path: gpgui/.tmp/artifact
+
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #       with:
+  #         platforms: ${{ matrix.arch }}
+
+  #     - name: Login to Docker Hub
+  #       uses: docker/login-action@v3
+  #       with:
+  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
+  #         password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+  #     - name: Generate PKGBUILD
+  #       run: |
+  #         export CI_ARCH=${{ matrix.arch }}
+  #         ./gpgui/scripts/generate-pkgbuild.sh
+
+  #     - name: Build PKGBUILD package
+  #       run: |
+  #         # Build package
+  #         docker run \
+  #           --rm \
+  #           -v $(pwd)/gpgui/.tmp/pkgbuild:/pkgbuild \
+  #           --platform linux/${{ matrix.arch }} \
+  #           yuezk/gpdev:pkgbuild
+
+  #     - name: Upload pkgbuild artifacts
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: artifact-${{ matrix.arch }}-pkgbuild
+  #         path: |
+  #           gpgui/.tmp/pkgbuild/*.pkg.tar.zst
+
+  # gh-release:
+  #   if: startsWith(github.ref, 'refs/tags/')
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - package-rpm
+  #     - package-pkgbuild
+
+  #   steps:
+  #     - name: Download artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         path: artifact
+  #         # pattern: artifact-*
+  #         # merge-multiple: true
+
+  #     # - name: Generate checksum
+  #     #   uses: jmgilman/actions-generate-checksum@v1
+  #     #   with:
+  #     #     output: checksums.txt
+  #     #     patterns: |
+  #     #       artifact/*
+
+  #     - name: Create GH release
+  #       uses: softprops/action-gh-release@v1
+  #       with:
+  #         token: ${{ secrets.GH_PAT }}
+  #         prerelease: ${{ contains(github.ref, 'latest') }}
+  #         fail_on_unmatched_files: true
+  #         files: |
+  #           artifact/artifact-*/*

.github/workflows/publish.yaml

@@ -1,102 +0,0 @@
-name: Publish Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Tag to publish'
-        required: true
-      revision:
-        description: 'Package revision'
-        required: true
-        default: "1"
-      ppa:
-        description: 'Publish to PPA'
-        type: boolean
-        required: true
-        default: true
-      obs:
-        description: 'Publish to OBS'
-        type: boolean
-        required: true
-        default: true
-      aur:
-        description: 'Publish to AUR'
-        type: boolean
-        required: true
-        default: true
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check tag exists
-      uses: mukunku/tag-exists-action@v1.6.0
-      id: check-tag
-      with:
-        tag: ${{ inputs.tag }}
-    - name: Exit if tag does not exist
-      run: |
-        if [[ "${{ steps.check-tag.outputs.exists }}" == "false" ]]; then
-          echo "Tag ${{ inputs.tag }} does not exist"
-          exit 1
-        fi
-
-  publish-ppa:
-    needs: check
-    if: ${{ inputs.ppa }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: pnpm/action-setup@v4
-      with:
-        version: 9
-    - name: Prepare workspace
-      run: rm -rf publish-ppa && mkdir publish-ppa
-    - name: Download ${{ inputs.tag }} offline source code
-      env:
-        GH_TOKEN: ${{ secrets.GH_PAT }}
-      run: |
-        gh -R yuezk/GlobalProtect-openconnect \
-          release download ${{ inputs.tag }} \
-          --pattern '*.offline.tar.gz' \
-          --dir publish-ppa
-    - name: Patch the source code
-      run: |
-        cd publish-ppa
-
-        # 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
-        mkdir -p .build/debian
-
-        cp -v packaging/deb/control.in .build/debian/control
-        cp -v packaging/deb/rules.in .build/debian/rules
-        cp -v packaging/deb/compat .build/debian/compat
-        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/@BUILD_GUI@/1/g" .build/debian/rules
-        sed -i "s/@RUST_VERSION@/1.80/g" .build/debian/rules
-
-    - name: Publish to PPA
-      uses: yuezk/publish-ppa-package@gp
-      with:
-        repository: "yuezk/globalprotect-openconnect"
-        gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
-        gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
-        tarball: publish-ppa/globalprotect-openconnect-*.tar.gz
-        debian_dir: publish-ppa/globalprotect-openconnect-*/.build/debian
-        deb_email: "k3vinyue@gmail.com"
-        deb_fullname: "Kevin Yue"
-        extra_ppa: "yuezk/globalprotect-openconnect liushuyu-011/rust-updates-1.80"
-        # Ubuntu 18.04 and 20.04 are excluded because tauri2 no longer supports them
-        excluded_series: "bionic focal"
-        revision: ${{ inputs.revision }}

.github/workflows/release.yaml

@@ -1,156 +0,0 @@
-name: GH Release Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Tag to release'
-        required: true
-      arch:
-        type: choice
-        description: 'Architecture to build'
-        required: true
-        default: all
-        options:
-          - all
-          - x86_64
-          - arm64
-      release-deb:
-        type: boolean
-        description: 'Build DEB package'
-        required: true
-        default: true
-      release-rpm:
-        type: boolean
-        description: 'Build RPM package'
-        required: true
-        default: true
-      release-pkg:
-        type: boolean
-        description: 'Build PKG package'
-        required: true
-        default: true
-      release-binary:
-        type: boolean
-        description: 'Build binary package'
-        required: true
-        default: true
-      gh-release:
-        type: boolean
-        description: 'Update GitHub release'
-        required: true
-        default: true
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check tag exists
-      uses: mukunku/tag-exists-action@v1.6.0
-      id: check-tag
-      with:
-        tag: ${{ inputs.tag }}
-    - name: Exit if tag does not exist
-      run: |
-        if [[ "${{ steps.check-tag.outputs.exists }}" == "false" ]]; then
-          echo "Tag ${{ inputs.tag }} does not exist"
-          exit 1
-        fi
-
-  setup-matrix:
-    needs:
-    - check
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.result }}
-    steps:
-    - name: Set up matrix
-      id: set-matrix
-      uses: actions/github-script@v7
-      with:
-        result-encoding: string
-        script: |
-          const inputs = ${{ toJson(inputs) }}
-          const { arch } = inputs
-          const osMap = {
-            "all": ["ubuntu-latest", "arm64"],
-            "x86_64": ["ubuntu-latest"],
-            "arm64": ["arm64"]
-          }
-
-          const package = Object.entries(inputs)
-            .filter(([key, value]) => key.startsWith('release-') && value)
-            .map(([key, value]) => key.replace('release-', ''))
-
-          return JSON.stringify({
-            os: osMap[arch],
-            package,
-          })
-
-  build:
-    needs:
-    - setup-matrix
-    strategy:
-      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Prepare workspace
-      run: rm -rf build-${{ matrix.package }} && mkdir -p build-${{ matrix.package }}
-
-    - name: Download ${{ inputs.tag }} source code
-      env:
-        GH_TOKEN: ${{ secrets.GH_PAT }}
-      run: |
-        gh -R yuezk/GlobalProtect-openconnect \
-          release download ${{ inputs.tag }} \
-          --pattern '*[^offline].tar.gz' \
-          --dir build-${{ matrix.package }}
-
-    - name: Docker Login
-      run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-    - name: Build ${{ matrix.package }} package in Docker
-      run: |
-        docker run --pull=always --rm \
-          -v $(pwd)/build-${{ matrix.package }}:/${{ matrix.package }} \
-          -e COREPACK_INTEGRITY_KEYS=0 \
-          -e INCLUDE_GUI=1 \
-          yuezk/gpdev:${{ matrix.package }}-builder-tauri2
-
-    - name: Install ${{ matrix.package }} package in Docker
-      run: |
-        docker run --pull=always --rm \
-          -e COREPACK_INTEGRITY_KEYS=0 \
-          -v $(pwd)/build-${{ matrix.package }}:/${{ matrix.package }} \
-          yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
-          bash install.sh
-
-    - name: Upload ${{ matrix.package }} package
-      uses: actions/upload-artifact@v4
-      with:
-        name: artifact-${{ matrix.os }}-${{ matrix.package }}
-        if-no-files-found: error
-        path: |
-          build-${{ matrix.package }}/artifacts/*
-
-  gh-release:
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    if: ${{ inputs.gh-release }}
-    steps:
-    - name: Prepare workspace
-      run: rm -rf gh-release && mkdir gh-release
-    - name: Download artifact
-      uses: actions/download-artifact@v4
-      with:
-        path: gh-release
-    - name: Update release
-      uses: softprops/action-gh-release@v1
-      with:
-        token: ${{ secrets.GH_PAT }}
-        prerelease: ${{ contains(github.ref, 'snapshot') }}
-        fail_on_unmatched_files: true
-        tag_name: ${{ inputs.tag }}
-        files: |
-          gh-release/artifact-*/*
-

.gitignore

@@ -6,8 +6,4 @@
 *.tar.xz
 
 .cargo
-.build
+.rpm
-SNAPSHOT
-
-# Tauri generated files
-gen

.vscode/c_cpp_properties.json

@@ -1,14 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "Mac",
-      "includePath": ["/opt/homebrew/include"],
-      "macFrameworkPath": ["/System/Library/Frameworks", "/Library/Frameworks"],
-      "intelliSenseMode": "macos-clang-x64",
-      "compilerPath": "/usr/bin/clang",
-      "cStandard": "c17",
-      "cppStandard": "c++17"
-    }
-  ],
-  "version": 4
-}

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
     "cSpell.words": [
         "authcookie",
-        "badssl",
         "bincode",
         "chacha",
         "clientos",
@@ -11,7 +10,6 @@
         "distro",
         "dotenv",
         "dotenvy",
-        "dtls",
         "getconfig",
         "globalprotect",
         "globalprotectcallback",
@@ -23,17 +21,11 @@
         "gpgui",
         "gpservice",
         "hidpi",
-        "Ivars",
         "jnlp",
         "LOGNAME",
-        "NSHTTPURL",
-        "NSURL",
-        "objc",
         "oneshot",
         "openconnect",
-        "pkcs",
         "pkexec",
-        "pkey",
         "Prelogin",
         "prelogon",
         "prelogonuserauthcookie",
@@ -43,7 +35,6 @@
         "rspc",
         "servercert",
         "specta",
-        "sslkey",
         "sysinfo",
         "tanstack",
         "tauri",
@@ -59,16 +50,9 @@
         "Vite",
         "vpnc",
         "vpninfo",
-        "webbrowser",
         "wmctrl",
         "XAUTHORITY",
         "yuezk"
     ],
     "rust-analyzer.cargo.features": "all",
-    "files.associations": {
-        "unistd.h": "c",
-        "utsname.h": "c",
-        "vpn.h": "c",
-        "openconnect.h": "c"
-    },
 }

Cargo.toml

@@ -1,17 +1,10 @@
 [workspace]
 resolver = "2"
 
-members = [
+members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"]
-  "crates/*",
-  "apps/gpclient",
-  "apps/gpservice",
-  "apps/gpauth",
-  "apps/gpgui-helper/src-tauri",
-]
 
 [workspace.package]
-rust-version = "1.80"
+version = "2.0.0"
-version = "2.4.4"
 authors = ["Kevin Yue <k3vinyue@gmail.com>"]
 homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
 edition = "2021"
@@ -19,44 +12,43 @@ license = "GPL-3.0"
 
 [workspace.dependencies]
 anyhow = "1.0"
-base64 = "0.22"
+base64 = "0.21"
-clap = { version = "4", features = ["derive"] }
+clap = { version = "4.4.2", features = ["derive"] }
-clap-verbosity-flag = "3"
 ctrlc = "3.4"
 directories = "5.0"
-dns-lookup = "2.0.4"
+env_logger = "0.10"
-env_logger = "0.11"
 is_executable = "1.0"
 log = "0.4"
 regex = "1"
-reqwest = { version = "0.12", features = ["native-tls", "json"] }
+reqwest = { version = "0.11", features = ["native-tls-vendored", "json"] }
-openssl = "0.10"
+roxmltree = "0.18"
-pem = "3"
-roxmltree = "0.20"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sysinfo = "0.33"
+sysinfo = "0.29"
 tempfile = "3.8"
-tokio = { version = "1" }
+tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7"
 url = "2.4"
 urlencoding = "2.1.3"
-axum = "0.8"
+axum = "0.7"
 futures = "0.3"
 futures-util = "0.3"
-uzers = "0.12"
+tokio-tungstenite = "0.20.1"
+uzers = "0.11"
 whoami = "1"
-thiserror = "2"
+thiserror = "1"
 redact-engine = "0.1"
+dotenvy_macro = "0.15"
 compile-time = "0.2"
 serde_urlencoded = "0.7"
-md5 = "0.7"
+md5="0.7"
-sha256 = "1"
+sha256="1"
-which = "7"
 
 # Tauri dependencies
-tauri = { version = "2" }
+tauri = { version = "1.5" }
-specta = "=2.0.0-rc.20"
+specta = "=2.0.0-rc.1"
+specta-macros = "=2.0.0-rc.1"
+rspc = { version = "1.0.0-rc.5", features = ["tauri"] }
 
 [profile.release]
 opt-level = 'z'   # Optimize for size

Makefile

@@ -1,33 +1,15 @@
-.SHELLFLAGS += -e
-
 OFFLINE ?= 0
-BUILD_FE ?= 1
-INCLUDE_GUI ?= 0
 CARGO ?= cargo
-RUST_VERSION = 1.80
 
 VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
 REVISION ?= 1
-RPM_SOURCE ?= %{name}.tar.gz
-
 PPA_REVISION ?= 1
 PKG_NAME = globalprotect-openconnect
 PKG = $(PKG_NAME)-$(VERSION)
 SERIES ?= $(shell lsb_release -cs)
-PUBLISH ?= 0
-
-# Indicates whether to build the GUI components
-BUILD_GUI ?= 1
 
 export DEBEMAIL = k3vinyue@gmail.com
 export DEBFULLNAME = Kevin Yue
-export SNAPSHOT = $(shell test -f SNAPSHOT && echo "true" || echo "false")
-
-ifeq ($(SNAPSHOT), true)
-	RELEASE_TAG = snapshot
-else
-	RELEASE_TAG = v$(VERSION)
-endif
 
 CARGO_BUILD_ARGS = --release
 
@@ -40,101 +22,56 @@ default: build
 version:
 	@echo $(VERSION)
 
-clean-tarball:
+# Generate a vendor tarball and a .cargo/config.toml file
-	rm -rf .build/tarball
+cargo-vendor:
-	rm -rf .vendor
+	mkdir -p .cargo
-	rm -rf vendor.tar.xz
-	rm -rf .cargo
 
-# Create a tarball, include the cargo dependencies if OFFLINE is set to 1
+	$(CARGO) vendor .vendor > .cargo/config.toml
-tarball: clean-tarball
+	tar -cJf vendor.tar.xz .vendor
-	if [ $(BUILD_GUI) -eq 1 ] && [ $(BUILD_FE) -eq 1 ]; then \
-		echo "Building frontend..."; \
-		cd apps/gpgui-helper && pnpm install && pnpm build; \
-	fi
 
-	# Remove node_modules to reduce the tarball size
+tarball: clean clean-tarball build-fe cargo-vendor
 	rm -rf apps/gpgui-helper/node_modules
 
-	mkdir -p .cargo
+	tar --transform 's,^,${PKG}/,' -czf ../${PKG}.tar.gz * .cargo
-	mkdir -p .build/tarball
 
-	# If OFFLINE is set to 1, vendor all cargo dependencies
+# Extract the vendor tarball to the .vendor directory if it exists
-	if [ $(OFFLINE) -eq 1 ]; then \
+extract-vendor:
-		$(CARGO) vendor .vendor > .cargo/config.toml; \
+	if [ -f vendor.tar.xz ]; then tar -xJf vendor.tar.xz; fi
-		tar -cJf vendor.tar.xz .vendor; \
-	fi
 
-	@echo "Creating tarball..."
+build: extract-vendor build-fe build-rs gpgui-helper
-	tar --exclude .vendor --exclude target --transform 's,^,${PKG}/,' -czf .build/tarball/${PKG}.tar.gz * .cargo
-
-download-gui:
-	rm -rf .build/gpgui
-
-	if [ $(INCLUDE_GUI) -eq 1 ]; then \
-		echo "Downloading GlobalProtect GUI..."; \
-		mkdir -p .build/gpgui; \
-		curl -sSL https://github.com/yuezk/GlobalProtect-openconnect/releases/download/$(RELEASE_TAG)/gpgui_$(shell uname -m).bin.tar.xz \
-			-o .build/gpgui/gpgui_$(shell uname -m).bin.tar.xz; \
-		tar -xJf .build/gpgui/*.tar.xz -C .build/gpgui; \
-	else \
-		echo "Skipping GlobalProtect GUI download (INCLUDE_GUI=0)"; \
-	fi
-
-build: download-gui build-fe build-rs
 
 # Install and build the frontend
 # If OFFLINE is set to 1, skip it
 build-fe:
-	if [ $(BUILD_GUI) -eq 0 ] || [ $(OFFLINE) -eq 1 ] || [ $(BUILD_FE) -eq 0 ]; then \
+	if [ $(OFFLINE) -eq 0 ]; then \
-		echo "Skipping frontend build (BUILD_GUI=0 or OFFLINE=1 or BUILD_FE=0)"; \
-	else \
 		cd apps/gpgui-helper && pnpm install && pnpm build; \
 	fi
 
-	if [ $(BUILD_GUI) -eq 1 ] && [ ! -d apps/gpgui-helper/dist ]; then \
+	if [ ! -d apps/gpgui-helper/dist ]; then \
 		echo "Error: frontend build failed"; \
 		exit 1; \
 	fi
 
 build-rs:
-	if [ $(OFFLINE) -eq 1 ]; then \
+	$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpauth -p gpservice
-		tar -xJf vendor.tar.xz; \
-	fi
 
-	# Only build the GUI components if BUILD_GUI is set to 1
+gpgui-helper:
-	if [ $(BUILD_GUI) -eq 1 ]; then \
+	$(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"
-		$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth; \
-		$(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"; \
-	else \
-		$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth --no-default-features; \
-	fi
 
 clean:
 	$(CARGO) clean
-	rm -rf .build
 	rm -rf .vendor
 	rm -rf apps/gpgui-helper/node_modules
 
-install:
+clean-tarball:
-	@echo "Installing $(PKG_NAME)..."
+	rm -rf vendor.tar.xz
+	rm -rf ../$(PKG).tar.gz
 
+install:
 	install -Dm755 target/release/gpclient $(DESTDIR)/usr/bin/gpclient
 	install -Dm755 target/release/gpauth $(DESTDIR)/usr/bin/gpauth
 	install -Dm755 target/release/gpservice $(DESTDIR)/usr/bin/gpservice
-
+	install -Dm755 target/release/gpgui-helper $(DESTDIR)/usr/bin/gpgui-helper
-	# Install the GUI components if BUILD_GUI is set to 1
-	if [ $(BUILD_GUI) -eq 1 ]; then \
-		install -Dm755 target/release/gpgui-helper $(DESTDIR)/usr/bin/gpgui-helper; \
-	fi
-
-	if [ -f .build/gpgui/gpgui_*/gpgui ]; then \
-		install -Dm755 .build/gpgui/gpgui_*/gpgui $(DESTDIR)/usr/bin/gpgui; \
-	fi
-
-	# 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/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
@@ -144,16 +81,10 @@ install:
 	install -Dm644 packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
 
 uninstall:
-	@echo "Uninstalling $(PKG_NAME)..."
-
 	rm -f $(DESTDIR)/usr/bin/gpclient
 	rm -f $(DESTDIR)/usr/bin/gpauth
 	rm -f $(DESTDIR)/usr/bin/gpservice
 	rm -f $(DESTDIR)/usr/bin/gpgui-helper
-	rm -f $(DESTDIR)/usr/bin/gpgui
-
-	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/icons/hicolor/scalable/apps/gpgui.svg
@@ -162,137 +93,66 @@ uninstall:
 	rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
 	rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
 
-clean-debian:
+init-debian:
-	rm -rf .build/deb
+	rm -rf .vendor
+	rm -rf debian
 
-# Generate the debian package structure, without the changelog
+	debmake
-init-debian: clean-debian tarball
-	mkdir -p .build/deb
-	cp .build/tarball/${PKG}.tar.gz .build/deb
 
-	tar -xzf .build/deb/${PKG}.tar.gz -C .build/deb
+	cp -f packaging/deb/control debian/control
-	cd .build/deb/${PKG} && debmake
+	cp -f packaging/deb/rules debian/rules
-
+	rm -f debian/changelog
-	cp -f packaging/deb/control.in .build/deb/$(PKG)/debian/control
-	cp -f packaging/deb/rules.in .build/deb/$(PKG)/debian/rules
-	cp -f packaging/deb/postrm .build/deb/$(PKG)/debian/postrm
-	cp -f packaging/deb/compat .build/deb/$(PKG)/debian/compat
-
-	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/@RUST_VERSION@/$(RUST_VERSION)/g" .build/deb/$(PKG)/debian/rules
-
-	# Remove the GUI dependencies if BUILD_GUI is set to 0
-	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 "/libayatana-appindicator3-1/d" .build/deb/$(PKG)/debian/control; \
-		sed -i "/gnome-keyring/d" .build/deb/$(PKG)/debian/control; \
-		sed -i "/libwebkit2gtk-4.1-dev/d" .build/deb/$(PKG)/debian/control; \
-	fi
-
-	rm -f .build/deb/$(PKG)/debian/changelog
 
 deb: init-debian
-	# Remove the rust build dependency from the control file
+	dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
-	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."
+	debuild --preserve-env -e PATH -us -uc -b
-
-	cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b
-
-check-ppa:
-	if [ $(OFFLINE) -eq 0 ]; then \
-		echo "Error: ppa build requires offline mode (OFFLINE=1)"; \
-	fi
-
-# Usage: make ppa SERIES=focal OFFLINE=1 PUBLISH=1
-ppa: check-ppa init-debian
-	sed -i "s/@RUST@/cargo-1.80/g" .build/deb/$(PKG)/debian/control
 
+# Usage: make ppa SERIES=focal
+ppa: init-debian
 	$(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1))
 	@echo "Building for $(SERIES) $(SERIES_VER)"
 
-	rm -rf .build/deb/$(PKG)/debian/changelog
+	dch --create --distribution $(SERIES) --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION)ppa$(PPA_REVISION)~ubuntu$(SERIES_VER) "Bugfix and improvements."
-	cd .build/deb/$(PKG) && dch --create --distribution $(SERIES) --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION)ppa$(PPA_REVISION)~ubuntu$(SERIES_VER) "Bugfix and improvements."
 
-	cd .build/deb/$(PKG) && echo "y" | debuild -e PATH -S -sa -k"$(GPG_KEY_ID)" -p"gpg --batch --passphrase $(GPG_KEY_PASS) --pinentry-mode loopback"
+	echo "y" | debuild -e PATH -S -sa -k"$(GPG_KEY_ID)" -p"gpg --batch --passphrase $(GPG_KEY_PASS) --pinentry-mode loopback"
 
-	if [ $(PUBLISH) -eq 1 ]; then \
+publish-ppa: ppa
-		cd .build/deb/$(PKG) && dput ppa:yuezk/globalprotect-openconnect ../*.changes; \
+	dput ppa:yuezk/globalprotect-openconnect ../*.changes
-	else \
-		echo "Skipping ppa publish (PUBLISH=0)"; \
-	fi
-
-clean-rpm:
-	rm -rf .build/rpm
 
 # Generate RPM sepc file
-init-rpm: clean-rpm
+rpm-spec:
-	mkdir -p .build/rpm
+	rm -rf .rpm
+	mkdir -p .rpm
 
-	cp packaging/rpm/globalprotect-openconnect.spec.in .build/rpm/globalprotect-openconnect.spec
+	cp packaging/rpm/globalprotect-openconnect.spec.in .rpm/globalprotect-openconnect.spec
-	cp packaging/rpm/globalprotect-openconnect.changes.in .build/rpm/globalprotect-openconnect.changes
+	cp packaging/rpm/globalprotect-openconnect.changes.in .rpm/globalprotect-openconnect.changes
 
-	sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
+	sed -i "s/@VERSION@/$(VERSION)/g" .rpm/globalprotect-openconnect.spec
-	sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
+	sed -i "s/@REVISION@/$(REVISION)/g" .rpm/globalprotect-openconnect.spec
-	sed -i "s|@SOURCE@|$(RPM_SOURCE)|g" .build/rpm/globalprotect-openconnect.spec
+	sed -i "s/@DATE@/$(shell date "+%a %b %d %Y")/g" .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/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.changes
+	sed -i "s/@VERSION@/$(VERSION)/g" .rpm/globalprotect-openconnect.changes
-	sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .build/rpm/globalprotect-openconnect.changes
+	sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .rpm/globalprotect-openconnect.changes
+
+# Ensure ../globalprotect-openconnect-*.tar.gz exists.
+rpm: rpm-spec
+	if [ ! -f ../$(PKG).tar.gz ]; then \
+		echo "Missing ../$(PKG).tar.gz"; \
+		exit 1; \
+	fi
 
-rpm: init-rpm tarball
 	rm -rf $(HOME)/rpmbuild
 	rpmdev-setuptree
 
-	cp .build/tarball/${PKG}.tar.gz $(HOME)/rpmbuild/SOURCES/${PKG_NAME}.tar.gz
+	cp ../$(PKG).tar.gz $(HOME)/rpmbuild/SOURCES/$(PKG_NAME).tar.gz
-	rpmbuild -ba .build/rpm/globalprotect-openconnect.spec
 
-	# Copy RPM package from build directory
+	rpmbuild -ba .rpm/globalprotect-openconnect.spec
-	cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .build/rpm
+
+	# Copy RPM package
+	cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .rpm
 
 	# Copy the SRPM only for x86_64.
 	if [ "$(shell uname -m)" = "x86_64" ]; then \
-		cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .build/rpm; \
+		cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .rpm \
 	fi
-
-clean-pkgbuild:
-	rm -rf .build/pkgbuild
-
-init-pkgbuild: clean-pkgbuild tarball
-	mkdir -p .build/pkgbuild
-
-	cp .build/tarball/${PKG}.tar.gz .build/pkgbuild
-	cp packaging/pkgbuild/PKGBUILD.in .build/pkgbuild/PKGBUILD
-
-	sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/pkgbuild/PKGBUILD
-	sed -i "s/@VERSION@/$(VERSION)/g" .build/pkgbuild/PKGBUILD
-	sed -i "s/@REVISION@/$(REVISION)/g" .build/pkgbuild/PKGBUILD
-	sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/pkgbuild/PKGBUILD
-
-pkgbuild: init-pkgbuild
-	cd .build/pkgbuild && makepkg -s --noconfirm
-
-clean-binary:
-	rm -rf .build/binary
-
-binary: clean-binary tarball
-	mkdir -p .build/binary
-
-	cp .build/tarball/${PKG}.tar.gz .build/binary
-	tar -xzf .build/binary/${PKG}.tar.gz -C .build/binary
-
-	mkdir -p .build/binary/$(PKG_NAME)_$(VERSION)/artifacts
-
-	make -C .build/binary/${PKG} build OFFLINE=$(OFFLINE) BUILD_FE=0 INCLUDE_GUI=$(INCLUDE_GUI)
-	make -C .build/binary/${PKG} install DESTDIR=$(PWD)/.build/binary/$(PKG_NAME)_$(VERSION)/artifacts
-
-	cp packaging/binary/Makefile.in .build/binary/$(PKG_NAME)_$(VERSION)/Makefile
-
-	# Create a tarball for the binary package
-	tar -cJf .build/binary/$(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz -C .build/binary $(PKG_NAME)_$(VERSION)
-
-	# Generate sha256sum
-	cd .build/binary && sha256sum $(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz | cut -d' ' -f1 > $(PKG_NAME)_$(VERSION)_$(shell uname -m).bin.tar.xz.sha256

README.md

@@ -13,7 +13,6 @@ A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authenticati
 - [x] Support both SSO and non-SSO authentication
 - [x] Support the FIDO2 authentication (e.g., YubiKey)
 - [x] Support authentication using default browser
-- [x] Support client certificate authentication
 - [x] Support multiple portals
 - [x] Support gateway selection
 - [x] Support connect gateway directly
@@ -44,20 +43,6 @@ Options:
 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:
-
-```bash
-sudo -E gpclient connect --browser default <portal>
-```
-
-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.
@@ -68,12 +53,23 @@ The GUI version is also available after you installed it. You can launch it from
 
 ## Installation
 
+> [!Note]
+>
+> This instruction is for the 2.x version. The 1.x version is still available on the [1.x](https://github.com/yuezk/GlobalProtect-openconnect/tree/1.x) branch, you can build it from the source code by following the instructions in the `README.md` file.
+
+> [!Warning]
+>
+> The client requires `openconnect >= 8.20, pkexec, and gnome-keyring`, please make sure you have them installed.
+> Installing the client from PPA will automatically install the required version of `openconnect`.
+
 ### Debian/Ubuntu based distributions
 
 #### Install from PPA
 
 ```
+sudo apt-get install gir1.2-gtk-3.0 gir1.2-webkit2-4.0
 sudo add-apt-repository ppa:yuezk/globalprotect-openconnect
+sudo apt-get update
 sudo apt-get install globalprotect-openconnect
 ```
 
@@ -83,10 +79,10 @@ sudo apt-get install globalprotect-openconnect
 
 #### Install from deb package
 
-Download the latest deb package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Then install it with `apt`:
+Download the latest deb package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Then install it with `dpkg`:
 
 ```bash
-sudo apt install --fix-broken globalprotect-openconnect_*.deb
+sudo dpkg -i globalprotect-openconnect_*.deb
 ```
 
 ### Arch Linux / Manjaro
@@ -95,7 +91,7 @@ sudo apt install --fix-broken globalprotect-openconnect_*.deb
 
 Install from AUR: [globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/)
 
-```bash
+```
 yay -S globalprotect-openconnect-git
 ```
 
@@ -107,80 +103,40 @@ Download the latest package from [releases](https://github.com/yuezk/GlobalProte
 sudo pacman -U globalprotect-openconnect-*.pkg.tar.zst
 ```
 
-### Fedora 38 and later / Fedora Rawhide
+### Fedora/OpenSUSE/CentOS/RHEL
 
 #### 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:
 
-```bash
+```
 sudo dnf copr enable yuezk/globalprotect-openconnect
 sudo dnf install globalprotect-openconnect
 ```
 
-### openSUSE Leap 15.6 / openSUSE 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.
 
-### Other RPM-based distributions
-
 #### Install from RPM package
 
 Download the latest RPM package from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
 
-```bash
-sudo rpm -i globalprotect-openconnect-*.rpm
-```
-
-### Gentoo
-
-It is available via `guru` and `lamdness` overlays.
-
-```bash
-sudo eselect repository enable guru
-sudo emerge -r guru sync
-sudo emerge -av net-vpn/GlobalProtect-openconnect
-```
-
 ### Other distributions
 
 - Install `openconnect >= 8.20`, `webkit2gtk`, `libsecret`, `libayatana-appindicator` or `libappindicator-gtk3`.
-- Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
+- Download `globalprotect-openconnect.tar.gz` from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page.
-- Extract the tarball with `tar -xJf globalprotect-openconnect_${version}_${arch}.bin.tar.xz`.
+- Extract the tarball and run `make build` to build the client.
-- Run `sudo make install` to install the client.
+- Run `make install` to install the client.
-
-## Build from source
-
-You can also build the client from source, steps are as follows:
-
-### Prerequisites
-
-- [Install Rust 1.80 or later](https://www.rust-lang.org/tools/install)
-- Install Tauri dependencies: https://tauri.app/start/prerequisites/
-- Install `perl` and `jq`
-- Install `openconnect >= 8.20` and `libopenconnect-dev` (or `openconnect-devel` on RPM-based distributions)
-- Install `pkexec`, `gnome-keyring` (or `pam_kwallet` on KDE)
-- 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
-
-1. Download the source code tarball from [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page. Choose `globalprotect-openconnect-${version}.tar.gz`.
-2. Extract the tarball with `tar -xzf globalprotect-openconnect-${version}.tar.gz`.
-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
 
 1. How to deal with error `Secure Storage not ready`
-
+  
-   Try upgrade the client to `2.2.0` or later, which will use a file-based storage as a fallback.
-
    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)).
 
 2. How to deal with error `(gpauth:18869): Gtk-WARNING **: 10:33:37.566: cannot open display:`
-
+  
    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)).
 
 ## About Trial
@@ -190,13 +146,6 @@ The CLI version is always free, while the GUI version is paid. There are two tri
 1. 10-day trial: You can use the GUI stable release for 10 days after the installation.
 2. 14-day trial: Each beta release has a fresh trial period (at most 14 days) after released.
 
-## License
+## [License](./LICENSE)
 
-- crate [gpapi](./crates/gpapi): [MIT](./crates/gpapi/LICENSE)
+GPLv3
-- crate [openconnect](./crates/openconnect): [GPL-3.0](./crates/openconnect/LICENSE)
-- crate [common](./crates/common): [GPL-3.0](./crates/common/LICENSE)
-- crate [auth](./crates/auth): [GPL-3.0](./crates/auth/LICENSE)
-- app [gpservice](./apps/gpservice): [GPL-3.0](./apps/gpservice/LICENSE)
-- app [gpclient](./apps/gpclient): [GPL-3.0](./apps/gpclient/LICENSE)
-- app [gpauth](./apps/gpauth): [GPL-3.0](./apps/gpauth/LICENSE)
-- app [gpgui-helper](./apps/gpgui-helper): [GPL-3.0](./apps/gpgui-helper/LICENSE)

apps/gpauth/Cargo.toml

@@ -1,35 +1,23 @@
 [package]
 name = "gpauth"
-rust-version.workspace = true
-authors.workspace = true
 version.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [build-dependencies]
-tauri-build = { version = "2", features = [], optional = true }
+tauri-build = { version = "1.5", features = [] }
 
 [dependencies]
-gpapi = { path = "../../crates/gpapi", features = ["clap"] }
+gpapi = { path = "../../crates/gpapi", features = ["tauri", "clap"] }
-
-auth = { path = "../../crates/auth", features = ["browser-auth"] }
-
-# Shared dependencies
 anyhow.workspace = true
 clap.workspace = true
 env_logger.workspace = true
 log.workspace = true
+regex.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
+tokio-util.workspace = true
 tempfile.workspace = true
+webkit2gtk = "0.18.2"
+tauri = { workspace = true, features = ["http-all"] }
 compile-time.workspace = true
-
-# Pin the version of home because the latest version requires Rust 1.81
-home = "=0.5.9"
-
-# webview auth dependencies
-tauri = { workspace = true, optional = true }
-
-[features]
-default = ["webview-auth"]
-webview-auth = ["auth/webview-auth", "dep:tauri", "dep:tauri-build"]

apps/gpauth/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

apps/gpauth/build.rs

@@ -1,4 +1,3 @@
 fn main() {
-  #[cfg(feature = "webview-auth")]
   tauri_build::build()
 }

apps/gpauth/src/auth_window.rs

@@ -0,0 +1,491 @@
+use std::{
+  rc::Rc,
+  sync::Arc,
+  time::{Duration, Instant},
+};
+
+use anyhow::bail;
+use gpapi::{
+  auth::SamlAuthData,
+  gp_params::GpParams,
+  portal::{prelogin, Prelogin},
+  utils::{redact::redact_uri, window::WindowExt},
+};
+use log::{info, warn};
+use regex::Regex;
+use tauri::{AppHandle, Window, WindowEvent, WindowUrl};
+use tokio::sync::{mpsc, oneshot, RwLock};
+use tokio_util::sync::CancellationToken;
+use webkit2gtk::{
+  gio::Cancellable,
+  glib::{GString, TimeSpan},
+  LoadEvent, SettingsExt, TLSErrorsPolicy, URIResponse, URIResponseExt, WebContextExt, WebResource, WebResourceExt,
+  WebView, WebViewExt, WebsiteDataManagerExtManual, WebsiteDataTypes,
+};
+
+enum AuthDataError {
+  /// 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,
+}
+
+type AuthResult = Result<SamlAuthData, AuthDataError>;
+
+pub(crate) struct AuthWindow<'a> {
+  app_handle: AppHandle,
+  server: &'a str,
+  saml_request: &'a str,
+  user_agent: &'a str,
+  gp_params: Option<GpParams>,
+  clean: bool,
+}
+
+impl<'a> AuthWindow<'a> {
+  pub fn new(app_handle: AppHandle) -> Self {
+    Self {
+      app_handle,
+      server: "",
+      saml_request: "",
+      user_agent: "",
+      gp_params: None,
+      clean: false,
+    }
+  }
+
+  pub fn server(mut self, server: &'a str) -> Self {
+    self.server = server;
+    self
+  }
+
+  pub fn saml_request(mut self, saml_request: &'a str) -> Self {
+    self.saml_request = saml_request;
+    self
+  }
+
+  pub fn user_agent(mut self, user_agent: &'a str) -> Self {
+    self.user_agent = user_agent;
+    self
+  }
+
+  pub fn gp_params(mut self, gp_params: GpParams) -> Self {
+    self.gp_params.replace(gp_params);
+    self
+  }
+
+  pub fn clean(mut self, clean: bool) -> Self {
+    self.clean = clean;
+    self
+  }
+
+  pub async fn open(&self) -> anyhow::Result<SamlAuthData> {
+    info!("Open auth window, user_agent: {}", self.user_agent);
+
+    let window = Window::builder(&self.app_handle, "auth_window", WindowUrl::default())
+      .title("GlobalProtect Login")
+      // .user_agent(self.user_agent)
+      .focused(true)
+      .visible(false)
+      .center()
+      .build()?;
+
+    let window = Arc::new(window);
+
+    let cancel_token = CancellationToken::new();
+    let cancel_token_clone = cancel_token.clone();
+
+    window.on_window_event(move |event| {
+      if let WindowEvent::CloseRequested { .. } = event {
+        cancel_token_clone.cancel();
+      }
+    });
+
+    let window_clone = Arc::clone(&window);
+    let timeout_secs = 15;
+    tokio::spawn(async move {
+      tokio::time::sleep(Duration::from_secs(timeout_secs)).await;
+      let visible = window_clone.is_visible().unwrap_or(false);
+      if !visible {
+        info!("Try to raise auth window after {} seconds", timeout_secs);
+        raise_window(&window_clone);
+      }
+    });
+
+    tokio::select! {
+      _ = cancel_token.cancelled() => {
+        bail!("Auth cancelled");
+      }
+      saml_result = self.auth_loop(&window) => {
+        window.close()?;
+        saml_result
+      }
+    }
+  }
+
+  async fn auth_loop(&self, window: &Arc<Window>) -> anyhow::Result<SamlAuthData> {
+    let saml_request = self.saml_request.to_string();
+    let (auth_result_tx, mut auth_result_rx) = mpsc::unbounded_channel::<AuthResult>();
+    let raise_window_cancel_token: Arc<RwLock<Option<CancellationToken>>> = Default::default();
+    let gp_params = self.gp_params.as_ref().unwrap();
+    let tls_err_policy = if gp_params.ignore_tls_errors() {
+      TLSErrorsPolicy::Ignore
+    } else {
+      TLSErrorsPolicy::Fail
+    };
+
+    if self.clean {
+      clear_webview_cookies(window).await?;
+    }
+
+    let raise_window_cancel_token_clone = Arc::clone(&raise_window_cancel_token);
+    window.with_webview(move |wv| {
+      let wv = wv.inner();
+
+      if let Some(context) = wv.context() {
+        context.set_tls_errors_policy(tls_err_policy);
+      }
+
+      if let Some(settings) = wv.settings() {
+        let ua = settings.user_agent().unwrap_or("".into());
+        info!("Auth window user agent: {}", ua);
+      }
+
+      // Load the initial SAML request
+      load_saml_request(&wv, &saml_request);
+
+      let auth_result_tx_clone = auth_result_tx.clone();
+      wv.connect_load_changed(move |wv, event| {
+        if event == LoadEvent::Started {
+          let Ok(mut cancel_token) = raise_window_cancel_token_clone.try_write() else {
+            return;
+          };
+
+          // Cancel the raise window task
+          if let Some(cancel_token) = cancel_token.take() {
+            cancel_token.cancel();
+          }
+          return;
+        }
+
+        if event != LoadEvent::Finished {
+          return;
+        }
+
+        if let Some(main_resource) = wv.main_resource() {
+          let uri = main_resource.uri().unwrap_or("".into());
+
+          if uri.is_empty() {
+            warn!("Loaded an empty uri");
+            send_auth_result(&auth_result_tx_clone, Err(AuthDataError::Invalid));
+            return;
+          }
+
+          info!("Loaded uri: {}", redact_uri(&uri));
+          read_auth_data(&main_resource, auth_result_tx_clone.clone());
+        }
+      });
+
+      let auth_result_tx_clone = auth_result_tx.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
+        );
+
+        send_auth_result(&auth_result_tx_clone, Err(AuthDataError::TlsError));
+        true
+      });
+
+      wv.connect_load_failed(move |_wv, _event, uri, err| {
+        let redacted_uri = redact_uri(uri);
+        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
+        // send_auth_result(&auth_result_tx, Err(AuthDataError::Invalid));
+        // true to stop other handlers from being invoked for the event. false to propagate the event further.
+        true
+      });
+    })?;
+
+    let portal = self.server.to_string();
+
+    loop {
+      if let Some(auth_result) = auth_result_rx.recv().await {
+        match auth_result {
+          Ok(auth_data) => return Ok(auth_data),
+          Err(AuthDataError::TlsError) => bail!("TLS error: certificate verify failed"),
+          Err(AuthDataError::NotFound) => {
+            info!("No auth data found, it may not be the /SAML20/SP/ACS endpoint");
+
+            // The user may need to interact with the auth window, raise it in 3 seconds
+            if !window.is_visible().unwrap_or(false) {
+              let window = Arc::clone(window);
+              let cancel_token = CancellationToken::new();
+
+              raise_window_cancel_token.write().await.replace(cancel_token.clone());
+
+              tokio::spawn(async move {
+                let delay_secs = 1;
+
+                info!("Raise window in {} second(s)", delay_secs);
+                tokio::select! {
+                  _ = tokio::time::sleep(Duration::from_secs(delay_secs)) => {
+                    raise_window(&window);
+                  }
+                  _ = cancel_token.cancelled() => {
+                    info!("Raise window cancelled");
+                  }
+                }
+              });
+            }
+          }
+          Err(AuthDataError::Invalid) => {
+            info!("Got invalid auth data, retrying...");
+
+            window.with_webview(|wv| {
+              let wv = wv.inner();
+              wv.run_javascript(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);
+              "#,
+                  Cancellable::NONE,
+                  |_| info!("Injected loading element successfully"),
+              );
+            })?;
+
+            let saml_request = portal_prelogin(&portal, gp_params).await?;
+            window.with_webview(move |wv| {
+              let wv = wv.inner();
+              load_saml_request(&wv, &saml_request);
+            })?;
+          }
+        }
+      }
+    }
+  }
+}
+
+fn raise_window(window: &Arc<Window>) {
+  let visible = window.is_visible().unwrap_or(false);
+  if !visible {
+    if let Err(err) = window.raise() {
+      warn!("Failed to raise window: {}", err);
+    }
+  }
+}
+
+pub async fn portal_prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<String> {
+  match prelogin(portal, gp_params).await? {
+    Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
+    Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
+  }
+}
+
+fn send_auth_result(auth_result_tx: &mpsc::UnboundedSender<AuthResult>, auth_result: AuthResult) {
+  if let Err(err) = auth_result_tx.send(auth_result) {
+    warn!("Failed to send auth event: {}", err);
+  }
+}
+
+fn load_saml_request(wv: &Rc<WebView>, saml_request: &str) {
+  if saml_request.starts_with("http") {
+    info!("Load the SAML request as URI...");
+    wv.load_uri(saml_request);
+  } else {
+    info!("Load the SAML request as HTML...");
+    wv.load_html(saml_request, None);
+  }
+}
+
+fn read_auth_data_from_headers(response: &URIResponse) -> AuthResult {
+  response.http_headers().map_or_else(
+    || {
+      info!("No headers found in response");
+      Err(AuthDataError::NotFound)
+    },
+    |mut headers| match headers.get("saml-auth-status") {
+      Some(status) if status == "1" => {
+        let username = headers.get("saml-username").map(GString::into);
+        let prelogin_cookie = headers.get("prelogin-cookie").map(GString::into);
+        let portal_userauthcookie = headers.get("portal-userauthcookie").map(GString::into);
+
+        if SamlAuthData::check(&username, &prelogin_cookie, &portal_userauthcookie) {
+          return Ok(SamlAuthData::new(
+            username.unwrap(),
+            prelogin_cookie,
+            portal_userauthcookie,
+          ));
+        }
+
+        info!("Found invalid auth data in headers");
+        Err(AuthDataError::Invalid)
+      }
+      Some(status) => {
+        info!("Found invalid SAML status: {} in headers", status);
+        Err(AuthDataError::Invalid)
+      }
+      None => {
+        info!("No saml-auth-status header found");
+        Err(AuthDataError::NotFound)
+      }
+    },
+  )
+}
+
+fn read_auth_data_from_body<F>(main_resource: &WebResource, callback: F)
+where
+  F: FnOnce(AuthResult) + Send + 'static,
+{
+  main_resource.data(Cancellable::NONE, |data| match data {
+    Ok(data) => {
+      let html = String::from_utf8_lossy(&data);
+      callback(read_auth_data_from_html(&html));
+    }
+    Err(err) => {
+      info!("Failed to read response body: {}", err);
+      callback(Err(AuthDataError::Invalid))
+    }
+  });
+}
+
+fn read_auth_data_from_html(html: &str) -> AuthResult {
+  if html.contains("Temporarily Unavailable") {
+    info!("Found 'Temporarily Unavailable' in HTML, auth failed");
+    return Err(AuthDataError::Invalid);
+  }
+
+  match parse_xml_tag(html, "saml-auth-status") {
+    Some(saml_status) if saml_status == "1" => {
+      let username = parse_xml_tag(html, "saml-username");
+      let prelogin_cookie = parse_xml_tag(html, "prelogin-cookie");
+      let portal_userauthcookie = parse_xml_tag(html, "portal-userauthcookie");
+
+      if SamlAuthData::check(&username, &prelogin_cookie, &portal_userauthcookie) {
+        return Ok(SamlAuthData::new(
+          username.unwrap(),
+          prelogin_cookie,
+          portal_userauthcookie,
+        ));
+      }
+
+      info!("Found invalid auth data in HTML");
+      Err(AuthDataError::Invalid)
+    }
+    Some(status) => {
+      info!("Found invalid SAML status {} in HTML", status);
+      Err(AuthDataError::Invalid)
+    }
+    None => {
+      info!("No auth data found in HTML");
+      Err(AuthDataError::NotFound)
+    }
+  }
+}
+
+fn read_auth_data(main_resource: &WebResource, auth_result_tx: mpsc::UnboundedSender<AuthResult>) {
+  if main_resource.response().is_none() {
+    info!("No response found in main resource");
+    send_auth_result(&auth_result_tx, Err(AuthDataError::Invalid));
+    return;
+  }
+
+  let response = main_resource.response().unwrap();
+  info!("Trying to read auth data from response headers...");
+
+  match read_auth_data_from_headers(&response) {
+    Ok(auth_data) => {
+      info!("Got auth data from headers");
+      send_auth_result(&auth_result_tx, Ok(auth_data));
+    }
+    Err(AuthDataError::Invalid) => {
+      info!("Found invalid auth data in headers, trying to read from body...");
+      read_auth_data_from_body(main_resource, move |auth_result| {
+        // Since we have already found invalid auth data in headers, which means this could be the `/SAML20/SP/ACS` endpoint
+        // any error result from body should be considered as invalid, and trigger a retry
+        let auth_result = auth_result.map_err(|_| AuthDataError::Invalid);
+        send_auth_result(&auth_result_tx, auth_result);
+      });
+    }
+    Err(AuthDataError::NotFound) => {
+      info!("No auth data found in headers, trying to read from body...");
+      let url = main_resource.uri().unwrap_or("".into());
+      let is_acs_endpoint = url.contains("/SAML20/SP/ACS");
+
+      read_auth_data_from_body(main_resource, 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(|err| {
+          if matches!(err, AuthDataError::NotFound) && is_acs_endpoint {
+            AuthDataError::Invalid
+          } else {
+            err
+          }
+        });
+
+        send_auth_result(&auth_result_tx, auth_result)
+      });
+    }
+    Err(AuthDataError::TlsError) => {
+      // NOTE: This is unreachable
+      info!("TLS error found in headers, trying to read from body...");
+      send_auth_result(&auth_result_tx, Err(AuthDataError::TlsError));
+    }
+  }
+}
+
+fn parse_xml_tag(html: &str, tag: &str) -> Option<String> {
+  let re = Regex::new(&format!("<{}>(.*)</{}>", tag, tag)).unwrap();
+  re.captures(html)
+    .and_then(|captures| captures.get(1))
+    .map(|m| m.as_str().to_string())
+}
+
+pub(crate) async fn clear_webview_cookies(window: &Window) -> anyhow::Result<()> {
+  let (tx, rx) = oneshot::channel::<Result<(), String>>();
+
+  window.with_webview(|wv| {
+    let send_result = move |result: Result<(), String>| {
+      if let Err(err) = tx.send(result) {
+        info!("Failed to send result: {:?}", err);
+      }
+    };
+
+    let wv = wv.inner();
+    let context = match wv.context() {
+      Some(context) => context,
+      None => {
+        send_result(Err("No webview context found".into()));
+        return;
+      }
+    };
+    let data_manager = match context.website_data_manager() {
+      Some(manager) => manager,
+      None => {
+        send_result(Err("No data manager found".into()));
+        return;
+      }
+    };
+
+    let now = Instant::now();
+    data_manager.clear(
+      WebsiteDataTypes::COOKIES,
+      TimeSpan(0),
+      Cancellable::NONE,
+      move |result| match result {
+        Err(err) => {
+          send_result(Err(err.to_string()));
+        }
+        Ok(_) => {
+          info!("Cookies cleared in {} ms", now.elapsed().as_millis());
+          send_result(Ok(()));
+        }
+      },
+    );
+  })?;
+
+  rx.await?.map_err(|err| anyhow::anyhow!(err))
+}

apps/gpauth/src/cli.rs

@@ -1,97 +1,87 @@
-use auth::{auth_prelogin, BrowserAuthenticator};
 use clap::Parser;
 use gpapi::{
   auth::{SamlAuthData, SamlAuthResult},
-  clap::{args::Os, handle_error, Args, InfoLevelVerbosity},
+  clap::args::Os,
   gp_params::{ClientOs, GpParams},
   utils::{normalize_server, openssl},
   GP_USER_AGENT,
 };
-use log::info;
+use log::{info, LevelFilter};
 use serde_json::json;
+use tauri::{App, AppHandle, RunEvent};
 use tempfile::NamedTempFile;
 
+use crate::auth_window::{portal_prelogin, AuthWindow};
+
 const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")");
 
-#[derive(Parser)]
+#[derive(Parser, Clone)]
-#[command(
+#[command(version = VERSION)]
-  version = VERSION,
-  author,
-  about = "The authentication component for the GlobalProtect VPN client, supports the SSO authentication method.",
-  help_template = "\
-{before-help}{name} {version}
-{author}
-
-{about}
-
-{usage-heading} {usage}
-
-{all-args}{after-help}
-
-See 'gpauth -h' for more information.
-"
-)]
 struct Cli {
-  #[arg(help = "The portal server to authenticate")]
   server: String,
-
+  #[arg(long)]
-  #[arg(long, help = "Treating the server as a gateway")]
   gateway: bool,
-
+  #[arg(long)]
-  #[arg(long, help = "The SAML authentication request")]
   saml_request: Option<String>,
-
+  #[arg(long, default_value = GP_USER_AGENT)]
-  #[arg(long, default_value = GP_USER_AGENT, help = "The user agent to use")]
   user_agent: String,
-
   #[arg(long, default_value = "Linux")]
   os: Os,
-
   #[arg(long)]
   os_version: Option<String>,
-
+  #[arg(long)]
-  #[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
-  fix_openssl: bool,
-
-  #[arg(long, help = "Ignore TLS errors")]
-  ignore_tls_errors: bool,
-
-  #[cfg(feature = "webview-auth")]
-  #[arg(long, help = "Use the default browser for authentication")]
-  default_browser: bool,
-
-  #[arg(
-    long,
-    help = "The browser to use for authentication, e.g., `default`, `firefox`, `chrome`, `chromium`, or the path to the browser executable"
-  )]
-  browser: Option<String>,
-
-  #[cfg(feature = "webview-auth")]
-  #[arg(long, help = "The HiDPI mode, useful for high-resolution screens")]
   hidpi: bool,
-
+  #[arg(long)]
-  #[cfg(feature = "webview-auth")]
+  fix_openssl: bool,
-  #[arg(long, help = "Clean the cache of the embedded browser")]
+  #[arg(long)]
-  pub clean: bool,
+  ignore_tls_errors: bool,
-
+  #[arg(long)]
-  #[command(flatten)]
+  clean: bool,
-  verbose: InfoLevelVerbosity,
-}
-
-impl Args for Cli {
-  fn fix_openssl(&self) -> bool {
-    self.fix_openssl
-  }
-
-  fn ignore_tls_errors(&self) -> bool {
-    self.ignore_tls_errors
-  }
 }
 
 impl Cli {
+  async fn run(&mut self) -> anyhow::Result<()> {
+    if self.ignore_tls_errors {
+      info!("TLS errors will be ignored");
+    }
+
+    let mut openssl_conf = self.prepare_env()?;
+
+    self.server = normalize_server(&self.server)?;
+    let gp_params = self.build_gp_params();
+
+    // Get the initial SAML request
+    let saml_request = match self.saml_request {
+      Some(ref saml_request) => saml_request.clone(),
+      None => portal_prelogin(&self.server, &gp_params).await?,
+    };
+
+    self.saml_request.replace(saml_request);
+
+    let app = create_app(self.clone())?;
+
+    app.run(move |_app_handle, event| {
+      if let RunEvent::Exit = event {
+        if let Some(file) = openssl_conf.take() {
+          if let Err(err) = file.close() {
+            info!("Error closing OpenSSL config file: {}", err);
+          }
+        }
+      }
+    });
+
+    Ok(())
+  }
+
   fn prepare_env(&self) -> anyhow::Result<Option<NamedTempFile>> {
-    #[cfg(feature = "webview-auth")]
+    std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
-    gpapi::utils::env_utils::patch_gui_runtime_env(self.hidpi);
+
+    if self.hidpi {
+      info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
+
+      std::env::set_var("GDK_SCALE", "2");
+      std::env::set_var("GDK_DPI_SCALE", "0.5");
+    }
 
     if self.fix_openssl {
       info!("Fixing OpenSSL environment");
@@ -103,47 +93,6 @@ impl Cli {
     Ok(None)
   }
 
-  async fn run(&self) -> anyhow::Result<()> {
-    if self.ignore_tls_errors {
-      info!("TLS errors will be ignored");
-    }
-
-    let openssl_conf = self.prepare_env()?;
-
-    let server = normalize_server(&self.server)?;
-    let gp_params = self.build_gp_params();
-
-    let auth_request = match self.saml_request.as_deref() {
-      Some(auth_request) => auth_request.to_string(),
-      None => auth_prelogin(&server, &gp_params).await?,
-    };
-
-    #[cfg(feature = "webview-auth")]
-    let browser = self
-      .browser
-      .as_deref()
-      .or_else(|| self.default_browser.then(|| "default"));
-
-    #[cfg(not(feature = "webview-auth"))]
-    let browser = self.browser.as_deref().or(Some("default"));
-
-    if let Some(browser) = browser {
-      let authenticator = BrowserAuthenticator::new(&auth_request, browser);
-      let auth_result = authenticator.authenticate().await;
-
-      print_auth_result(auth_result);
-
-      // explicitly drop openssl_conf to avoid the unused variable warning
-      drop(openssl_conf);
-      return Ok(());
-    }
-
-    #[cfg(feature = "webview-auth")]
-    crate::webview_auth::authenticate(server, gp_params, auth_request, self.clean, openssl_conf).await?;
-
-    Ok(())
-  }
-
   fn build_gp_params(&self) -> GpParams {
     let gp_params = GpParams::builder()
       .user_agent(&self.user_agent)
@@ -155,31 +104,59 @@ impl Cli {
 
     gp_params
   }
-}
 
-fn init_logger(cli: &Cli) {
+  async fn saml_auth(&self, app_handle: AppHandle) -> anyhow::Result<SamlAuthData> {
-  env_logger::builder()
+    let auth_window = AuthWindow::new(app_handle)
-    .filter_level(cli.verbose.log_level_filter())
+      .server(&self.server)
-    .init();
+      .user_agent(&self.user_agent)
-}
+      .gp_params(self.build_gp_params())
+      .saml_request(self.saml_request.as_ref().unwrap())
+      .clean(self.clean);
 
-pub async fn run() {
+    auth_window.open().await
-  let cli = Cli::parse();
-
-  init_logger(&cli);
-  info!("gpauth started: {}", VERSION);
-
-  if let Err(err) = cli.run().await {
-    handle_error(err, &cli);
-    std::process::exit(1);
   }
 }
 
-pub fn print_auth_result(auth_result: anyhow::Result<SamlAuthData>) {
+fn create_app(cli: Cli) -> anyhow::Result<App> {
-  let auth_result = match auth_result {
+  let app = tauri::Builder::default()
-    Ok(auth_data) => SamlAuthResult::Success(auth_data),
+    .setup(|app| {
-    Err(err) => SamlAuthResult::Failure(format!("{}", err)),
+      let app_handle = app.handle();
-  };
 
-  println!("{}", json!(auth_result));
+      tauri::async_runtime::spawn(async move {
+        let auth_result = match cli.saml_auth(app_handle.clone()).await {
+          Ok(auth_data) => SamlAuthResult::Success(auth_data),
+          Err(err) => SamlAuthResult::Failure(format!("{}", err)),
+        };
+
+        println!("{}", json!(auth_result));
+      });
+      Ok(())
+    })
+    .build(tauri::generate_context!())?;
+
+  Ok(app)
+}
+
+fn init_logger() {
+  env_logger::builder().filter_level(LevelFilter::Info).init();
+}
+
+pub async fn run() {
+  let mut cli = Cli::parse();
+
+  init_logger();
+  info!("gpauth started: {}", VERSION);
+
+  if let Err(err) = cli.run().await {
+    eprintln!("\nError: {}", err);
+
+    if err.to_string().contains("unsafe legacy renegotiation") && !cli.fix_openssl {
+      eprintln!("\nRe-run it with the `--fix-openssl` option to work around this issue, e.g.:\n");
+      // Print the command
+      let args = std::env::args().collect::<Vec<_>>();
+      eprintln!("{} --fix-openssl {}\n", args[0], args[1..].join(" "));
+    }
+
+    std::process::exit(1);
+  }
 }

apps/gpauth/src/main.rs

@@ -1,10 +1,8 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+mod auth_window;
 mod cli;
 
-#[cfg(feature = "webview-auth")]
-mod webview_auth;
-
 #[tokio::main]
 async fn main() {
   cli::run().await;

apps/gpauth/src/webview_auth.rs

@@ -1,46 +0,0 @@
-use auth::WebviewAuthenticator;
-use gpapi::gp_params::GpParams;
-use log::info;
-use tauri::RunEvent;
-use tempfile::NamedTempFile;
-
-use crate::cli::print_auth_result;
-
-pub async fn authenticate(
-  server: String,
-  gp_params: GpParams,
-  auth_request: String,
-  clean: bool,
-  mut openssl_conf: Option<NamedTempFile>,
-) -> anyhow::Result<()> {
-  tauri::Builder::default()
-    .setup(move |app| {
-      let app_handle = app.handle().clone();
-
-      tauri::async_runtime::spawn(async move {
-        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);
-
-        // Ensure the app exits after the authentication process
-        app_handle.exit(0);
-      });
-
-      Ok(())
-    })
-    .build(tauri::generate_context!())?
-    .run(move |_app_handle, event| {
-      if let RunEvent::Exit = event {
-        if let Some(file) = openssl_conf.take() {
-          if let Err(err) = file.close() {
-            info!("Error closing OpenSSL config file: {}", err);
-          }
-        }
-      }
-    });
-
-  Ok(())
-}

apps/gpauth/tauri.conf.json

@@ -1,16 +1,47 @@
 {
-  "$schema": "https://cdn.jsdelivr.net/gh/tauri-apps/tauri@tauri-v2.1.1/crates/tauri-cli/config.schema.json",
+  "$schema": "https://cdn.jsdelivr.net/gh/tauri-apps/tauri@tauri-v1.5.0/tooling/cli/schema.json",
   "build": {
-    "frontendDist": ["index.html"],
+    "distDir": [
+      "index.html"
+    ],
+    "devPath": [
+      "index.html"
+    ],
     "beforeDevCommand": "",
-    "beforeBuildCommand": ""
+    "beforeBuildCommand": "",
+    "withGlobalTauri": false
   },
-  "identifier": "com.yuezk.gpauth",
+  "package": {
-  "productName": "gpauth",
+    "productName": "gpauth",
-  "app": {
+    "version": "0.0.0"
-    "withGlobalTauri": false,
+  },
+  "tauri": {
+    "allowlist": {
+      "all": false,
+      "http": {
+        "all": true,
+        "request": true,
+        "scope": [
+          "http://**",
+          "https://**"
+        ]
+      }
+    },
+    "bundle": {
+      "active": true,
+      "targets": "deb",
+      "identifier": "com.yuezk.gpauth",
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ]
+    },
     "security": {
       "csp": null
-    }
+    },
+    "windows": []
   }
 }

apps/gpclient/Cargo.toml

@@ -1,30 +1,23 @@
 [package]
 name = "gpclient"
-rust-version.workspace = true
 authors.workspace = true
 version.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [dependencies]
-common = { path = "../../crates/common" }
 gpapi = { path = "../../crates/gpapi", features = ["clap"] }
 openconnect = { path = "../../crates/openconnect" }
-
 anyhow.workspace = true
 clap.workspace = true
 env_logger.workspace = true
-inquire = "0.7"
+inquire = "0.6.2"
 log.workspace = true
-tokio = { workspace = true, features = ["rt-multi-thread"] }
+tokio.workspace = true
 sysinfo.workspace = true
 serde_json.workspace = true
 whoami.workspace = true
 tempfile.workspace = true
 reqwest.workspace = true
-directories.workspace = true
+directories = "5.0"
 compile-time.workspace = true
-
-[features]
-default = ["webview-auth"]
-webview-auth = ["gpapi/webview-auth"]

apps/gpclient/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

apps/gpclient/src/cli.rs

@@ -1,37 +1,27 @@
-use std::{env::temp_dir, fs::File, str::FromStr};
-
-use anyhow::bail;
 use clap::{Parser, Subcommand};
-use gpapi::{
+use gpapi::utils::openssl;
-  clap::{handle_error, Args, InfoLevelVerbosity},
+use log::{info, LevelFilter};
-  utils::openssl,
-};
-use log::info;
-use sysinfo::{Pid, System};
 use tempfile::NamedTempFile;
-use tokio::fs;
 
 use crate::{
   connect::{ConnectArgs, ConnectHandler},
-  disconnect::{DisconnectArgs, DisconnectHandler},
+  disconnect::DisconnectHandler,
   launch_gui::{LaunchGuiArgs, LaunchGuiHandler},
-  GP_CLIENT_LOCK_FILE,
 };
 
 const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), " (", compile_time::date_str!(), ")");
 
-pub(crate) struct SharedArgs<'a> {
+pub(crate) struct SharedArgs {
   pub(crate) fix_openssl: bool,
   pub(crate) ignore_tls_errors: bool,
-  pub(crate) verbose: &'a InfoLevelVerbosity,
 }
 
 #[derive(Subcommand)]
 enum CliCommand {
   #[command(about = "Connect to a portal server")]
-  Connect(Box<ConnectArgs>),
+  Connect(ConnectArgs),
   #[command(about = "Disconnect from the server")]
-  Disconnect(DisconnectArgs),
+  Disconnect,
   #[command(about = "Launch the GUI")]
   LaunchGui(LaunchGuiArgs),
 }
@@ -58,48 +48,13 @@ struct Cli {
   #[command(subcommand)]
   command: CliCommand,
 
-  #[arg(
+  #[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
-    long,
-    help = "Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats."
-  )]
   fix_openssl: bool,
   #[arg(long, help = "Ignore the TLS errors")]
   ignore_tls_errors: bool,
-
-  #[command(flatten)]
-  verbose: InfoLevelVerbosity,
-}
-
-impl Args for Cli {
-  fn fix_openssl(&self) -> bool {
-    self.fix_openssl
-  }
-
-  fn ignore_tls_errors(&self) -> bool {
-    self.ignore_tls_errors
-  }
 }
 
 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>> {
     if self.fix_openssl {
       let file = openssl::fix_openssl_env()?;
@@ -110,18 +65,12 @@ impl Cli {
   }
 
   async fn run(&self) -> anyhow::Result<()> {
-    // check if an instance is running
-    if 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
     // So, declare it here to ensure it's not dropped
     let _file = self.fix_openssl()?;
     let shared_args = SharedArgs {
       fix_openssl: self.fix_openssl,
       ignore_tls_errors: self.ignore_tls_errors,
-      verbose: &self.verbose,
     };
 
     if self.ignore_tls_errors {
@@ -130,39 +79,41 @@ impl Cli {
 
     match &self.command {
       CliCommand::Connect(args) => ConnectHandler::new(args, &shared_args).handle().await,
-      CliCommand::Disconnect(args) => DisconnectHandler::new(args).handle().await,
+      CliCommand::Disconnect => DisconnectHandler::new().handle(),
       CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await,
     }
   }
 }
 
-fn init_logger(cli: &Cli) {
+fn init_logger() {
-  let mut builder = env_logger::builder();
+  env_logger::builder().filter_level(LevelFilter::Info).init();
-  builder.filter_level(cli.verbose.log_level_filter());
-
-  // Output the log messages to a file if the command is the auth callback
-  if let CliCommand::LaunchGui(args) = &cli.command {
-    let auth_data = args.auth_data.as_deref().unwrap_or_default();
-    if !auth_data.is_empty() {
-      if let Ok(log_file) = File::create(temp_dir().join("gpcallback.log")) {
-        let target = Box::new(log_file);
-        builder.target(env_logger::Target::Pipe(target));
-      }
-    }
-  }
-
-  builder.init();
 }
 
 pub(crate) async fn run() {
   let cli = Cli::parse();
 
-  init_logger(&cli);
+  init_logger();
-
   info!("gpclient started: {}", VERSION);
 
   if let Err(err) = cli.run().await {
-    handle_error(err, &cli);
+    eprintln!("\nError: {}", err);
+
+    let err = err.to_string();
+
+    if err.contains("unsafe legacy renegotiation") && !cli.fix_openssl {
+      eprintln!("\nRe-run it with the `--fix-openssl` option to work around this issue, e.g.:\n");
+      // Print the command
+      let args = std::env::args().collect::<Vec<_>>();
+      eprintln!("{} --fix-openssl {}\n", args[0], args[1..].join(" "));
+    }
+
+    if err.contains("certificate verify failed") && !cli.ignore_tls_errors {
+      eprintln!("\nRe-run it with the `--ignore-tls-errors` option to ignore the certificate error, e.g.:\n");
+      // Print the command
+      let args = std::env::args().collect::<Vec<_>>();
+      eprintln!("{} --ignore-tls-errors {}\n", args[0], args[1..].join(" "));
+    }
+
     std::process::exit(1);
   }
 }

apps/gpclient/src/connect.rs

@@ -1,25 +1,21 @@
-use std::{cell::RefCell, fs, sync::Arc};
+use std::{fs, sync::Arc};
 
-use anyhow::bail;
 use clap::Args;
-use common::vpn_utils::find_csd_wrapper;
 use gpapi::{
-  auth::SamlAuthResult,
+  clap::args::Os,
-  clap::{args::Os, ToVerboseArg},
   credential::{Credential, PasswordCredential},
-  error::PortalError,
+  gateway::gateway_login,
-  gateway::{gateway_login, GatewayLogin},
   gp_params::{ClientOs, GpParams},
-  portal::{prelogin, retrieve_config, Prelogin},
+  portal::{prelogin, retrieve_config, PortalError, Prelogin},
   process::{
     auth_launcher::SamlAuthLauncher,
     users::{get_non_root_user, get_user_by_name},
   },
-  utils::{request::RequestIdentityError, shutdown_signal},
+  utils::shutdown_signal,
   GP_USER_AGENT,
 };
 use inquire::{Password, PasswordDisplayMode, Select, Text};
-use log::{info, warn};
+use log::info;
 use openconnect::Vpn;
 
 use crate::{cli::SharedArgs, GP_CLIENT_LOCK_FILE};
@@ -28,102 +24,38 @@ use crate::{cli::SharedArgs, GP_CLIENT_LOCK_FILE};
 pub(crate) struct ConnectArgs {
   #[arg(help = "The portal server to connect to")]
   server: String,
-
   #[arg(short, long, help = "The gateway to connect to, it will prompt if not specified")]
   gateway: Option<String>,
-
   #[arg(short, long, help = "The username to use, it will prompt if not specified")]
   user: Option<String>,
-
-  #[arg(long, help = "Read the password from standard input")]
-  passwd_on_stdin: bool,
-
-  #[arg(long, help = "Read the cookie from standard input")]
-  cookie_on_stdin: bool,
-
   #[arg(long, short, help = "The VPNC script to use")]
   script: Option<String>,
 
-  #[arg(long, help = "Connect the server as a gateway, instead of a portal")]
-  as_gateway: bool,
-
-  #[arg(
-    long,
-    help = "Use the default CSD wrapper to generate the HIP report and send it to the server"
-  )]
-  hip: bool,
-
-  #[arg(
-    short,
-    long,
-    help = "Use SSL client certificate file in pkcs#8 (.pem) or pkcs#12 (.p12, .pfx) format"
-  )]
-  certificate: Option<String>,
-
-  #[arg(short = 'k', long, help = "Use SSL private key file in pkcs#8 (.pem) format")]
-  sslkey: Option<String>,
-
-  #[arg(short = 'p', long, help = "The key passphrase of the private key")]
-  key_password: Option<String>,
-
   #[arg(long, help = "Same as the '--csd-user' option in the openconnect command")]
   csd_user: Option<String>,
 
   #[arg(long, help = "Same as the '--csd-wrapper' option in the openconnect command")]
   csd_wrapper: Option<String>,
 
-  #[arg(long, default_value = "300", help = "Reconnection retry timeout in seconds")]
-  reconnect_timeout: u32,
-
   #[arg(short, long, help = "Request MTU from server (legacy servers only)")]
   mtu: Option<u32>,
 
-  #[arg(long, help = "Do not ask for IPv6 connectivity")]
-  disable_ipv6: bool,
-
   #[arg(long, default_value = GP_USER_AGENT, help = "The user agent to use")]
   user_agent: String,
-
+  #[arg(long, default_value = "Linux")]
-  #[arg(long, value_enum, default_value_t = ConnectArgs::default_os())]
   os: Os,
-
+  #[arg(long)]
-  #[arg(long, help = "If not specified, it will be computed based on the --os option")]
   os_version: Option<String>,
-
+  #[arg(long, help = "The HiDPI mode, useful for high resolution screens")]
-  #[arg(long, help = "Disable DTLS and ESP")]
-  no_dtls: bool,
-
-  #[cfg(feature = "webview-auth")]
-  #[arg(long, help = "The HiDPI mode, useful for high-resolution screens")]
   hidpi: bool,
-
-  #[cfg(feature = "webview-auth")]
   #[arg(long, help = "Do not reuse the remembered authentication cookie")]
   clean: bool,
-
-  #[cfg(feature = "webview-auth")]
-  #[arg(long, help = "Use the default browser to authenticate")]
-  default_browser: bool,
-
-  #[arg(
-    long,
-    help = "Use the specified browser to authenticate, e.g., `default`, `firefox`, `chrome`, `chromium`, or the path to the browser executable"
-  )]
-  browser: Option<String>,
 }
 
 impl ConnectArgs {
-  fn default_os() -> Os {
-    if cfg!(target_os = "macos") {
-      Os::Mac
-    } else {
-      Os::Linux
-    }
-  }
-
   fn os_version(&self) -> String {
-    if let Some(os_version) = self.os_version.as_deref() {
+    if let Some(os_version) = &self.os_version {
-      return os_version.to_string();
+      return os_version.to_owned();
     }
 
     match self.os {
@@ -136,17 +68,12 @@ impl ConnectArgs {
 
 pub(crate) struct ConnectHandler<'a> {
   args: &'a ConnectArgs,
-  shared_args: &'a SharedArgs<'a>,
+  shared_args: &'a SharedArgs,
-  latest_key_password: RefCell<Option<String>>,
 }
 
 impl<'a> ConnectHandler<'a> {
   pub(crate) fn new(args: &'a ConnectArgs, shared_args: &'a SharedArgs) -> Self {
-    Self {
+    Self { args, shared_args }
-      args,
-      shared_args,
-      latest_key_password: Default::default(),
-    }
   }
 
   fn build_gp_params(&self) -> GpParams {
@@ -155,74 +82,23 @@ impl<'a> ConnectHandler<'a> {
       .client_os(ClientOs::from(&self.args.os))
       .os_version(self.args.os_version())
       .ignore_tls_errors(self.shared_args.ignore_tls_errors)
-      .certificate(self.args.certificate.clone())
-      .sslkey(self.args.sslkey.clone())
-      .key_password(self.latest_key_password.borrow().clone())
       .build()
   }
 
   pub(crate) async fn handle(&self) -> anyhow::Result<()> {
-    #[cfg(feature = "webview-auth")]
-    if self.args.default_browser && self.args.browser.is_some() {
-      bail!("Cannot use `--default-browser` and `--browser` options at the same time");
-    }
-
-    self.latest_key_password.replace(self.args.key_password.clone());
-
-    loop {
-      let Err(err) = self.handle_impl().await else {
-        return Ok(());
-      };
-
-      let Some(root_cause) = err.root_cause().downcast_ref::<RequestIdentityError>() else {
-        return Err(err);
-      };
-
-      match root_cause {
-        RequestIdentityError::NoKey => {
-          eprintln!("ERROR: No private key found in the certificate file");
-          eprintln!("ERROR: Please provide the private key file using the `-k` option");
-          return Ok(());
-        }
-        RequestIdentityError::NoPassphrase(cert_type) | RequestIdentityError::DecryptError(cert_type) => {
-          // Decrypt the private key error, ask for the key password
-          let message = format!("Enter the {} passphrase:", cert_type);
-          let password = Password::new(&message)
-            .without_confirmation()
-            .with_display_mode(PasswordDisplayMode::Masked)
-            .prompt()?;
-
-          self.latest_key_password.replace(Some(password));
-        }
-      }
-    }
-  }
-
-  pub(crate) async fn handle_impl(&self) -> anyhow::Result<()> {
     let server = self.args.server.as_str();
-    let as_gateway = self.args.as_gateway;
-
-    if as_gateway {
-      info!("Treating the server as a gateway");
-      return self.connect_gateway_with_prelogin(server).await;
-    }
 
     let Err(err) = self.connect_portal_with_prelogin(server).await else {
       return Ok(());
     };
 
-    warn!("Failed to connect portal with prelogin: {}", err);
+    info!("Failed to connect portal with prelogin: {}", err);
     if err.root_cause().downcast_ref::<PortalError>().is_some() {
       info!("Trying the gateway authentication workflow...");
-      self.connect_gateway_with_prelogin(server).await?;
+      return self.connect_gateway_with_prelogin(server).await;
-
-      eprintln!("\nNOTE: the server may be a gateway, not a portal.");
-      eprintln!("NOTE: try to use the `--as-gateway` option if you were authenticated twice.");
-
-      Ok(())
-    } else {
-      Err(err)
     }
+
+    Err(err)
   }
 
   async fn connect_portal_with_prelogin(&self, portal: &str) -> anyhow::Result<()> {
@@ -236,19 +112,16 @@ impl<'a> ConnectHandler<'a> {
     let selected_gateway = match &self.args.gateway {
       Some(gateway) => portal_config
         .find_gateway(gateway)
-        .ok_or_else(|| anyhow::anyhow!("Cannot find gateway specified: {}", gateway))?,
+        .ok_or_else(|| anyhow::anyhow!("Cannot find gateway {}", gateway))?,
       None => {
         portal_config.sort_gateways(prelogin.region());
         let gateways = portal_config.gateways();
 
         if gateways.len() > 1 {
-          let gateway = Select::new("Which gateway do you want to connect to?", gateways)
+          Select::new("Which gateway do you want to connect to?", gateways)
             .with_vim_mode(true)
-            .prompt()?;
+            .prompt()?
-          info!("Connecting to the selected gateway: {}", gateway);
-          gateway
         } else {
-          info!("Connecting to the only available gateway: {}", gateways[0]);
           gateways[0]
         }
       }
@@ -257,7 +130,7 @@ impl<'a> ConnectHandler<'a> {
     let gateway = selected_gateway.server();
     let cred = portal_config.auth_cookie().into();
 
-    let cookie = match self.login_gateway(gateway, &cred, &gp_params).await {
+    let cookie = match gateway_login(gateway, &cred, &gp_params).await {
       Ok(cookie) => cookie,
       Err(err) => {
         info!("Gateway login failed: {}", err);
@@ -269,62 +142,28 @@ impl<'a> ConnectHandler<'a> {
   }
 
   async fn connect_gateway_with_prelogin(&self, gateway: &str) -> anyhow::Result<()> {
-    info!("Performing the gateway authentication...");
-
     let mut gp_params = self.build_gp_params();
     gp_params.set_is_gateway(true);
 
     let prelogin = prelogin(gateway, &gp_params).await?;
     let cred = self.obtain_credential(&prelogin, gateway).await?;
 
-    let cookie = self.login_gateway(gateway, &cred, &gp_params).await?;
+    let cookie = gateway_login(gateway, &cred, &gp_params).await?;
 
     self.connect_gateway(gateway, &cookie).await
   }
 
-  async fn login_gateway(&self, gateway: &str, cred: &Credential, gp_params: &GpParams) -> anyhow::Result<String> {
-    let mut gp_params = gp_params.clone();
-
-    loop {
-      match gateway_login(gateway, cred, &gp_params).await? {
-        GatewayLogin::Cookie(cookie) => return Ok(cookie),
-        GatewayLogin::Mfa(message, input_str) => {
-          let otp = Text::new(&message).prompt()?;
-          gp_params.set_input_str(&input_str);
-          gp_params.set_otp(&otp);
-
-          info!("Retrying gateway login with MFA...");
-        }
-      }
-    }
-  }
-
   async fn connect_gateway(&self, gateway: &str, cookie: &str) -> anyhow::Result<()> {
-    let mtu = self.args.mtu.unwrap_or(0);
     let csd_uid = get_csd_uid(&self.args.csd_user)?;
-    let csd_wrapper = if self.args.csd_wrapper.is_some() {
+    let mtu = self.args.mtu.unwrap_or(0);
-      self.args.csd_wrapper.clone()
-    } else if self.args.hip {
-      find_csd_wrapper()
-    } else {
-      None
-    };
 
-    let os = ClientOs::from(&self.args.os).to_openconnect_os().to_string();
     let vpn = Vpn::builder(gateway, cookie)
-      .script(self.args.script.clone())
       .user_agent(self.args.user_agent.clone())
-      .os(Some(os))
+      .script(self.args.script.clone())
-      .certificate(self.args.certificate.clone())
-      .sslkey(self.args.sslkey.clone())
-      .key_password(self.latest_key_password.borrow().clone())
       .csd_uid(csd_uid)
-      .csd_wrapper(csd_wrapper)
+      .csd_wrapper(self.args.csd_wrapper.clone())
-      .reconnect_timeout(self.args.reconnect_timeout)
       .mtu(mtu)
-      .disable_ipv6(self.args.disable_ipv6)
+      .build();
-      .no_dtls(self.args.no_dtls)
-      .build()?;
 
     let vpn = Arc::new(vpn);
     let vpn_clone = vpn.clone();
@@ -347,47 +186,23 @@ impl<'a> ConnectHandler<'a> {
   }
 
   async fn obtain_credential(&self, prelogin: &Prelogin, server: &str) -> anyhow::Result<Credential> {
-    if self.args.cookie_on_stdin {
-      return read_cookie_from_stdin();
-    }
-
     let is_gateway = prelogin.is_gateway();
 
     match prelogin {
       Prelogin::Saml(prelogin) => {
-        let browser = if prelogin.support_default_browser() {
+        SamlAuthLauncher::new(&self.args.server)
-          self.args.browser.as_deref()
-        } 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");
-        } else {
-          None
-        };
-
-        let os_version = self.args.os_version();
-        let verbose = self.shared_args.verbose.to_verbose_arg();
-        let auth_launcher = SamlAuthLauncher::new(&self.args.server)
           .gateway(is_gateway)
           .saml_request(prelogin.saml_request())
           .user_agent(&self.args.user_agent)
           .os(self.args.os.as_str())
-          .os_version(Some(&os_version))
+          .os_version(Some(&self.args.os_version()))
+          .hidpi(self.args.hidpi)
           .fix_openssl(self.shared_args.fix_openssl)
           .ignore_tls_errors(self.shared_args.ignore_tls_errors)
-          .browser(browser)
-          .verbose(verbose);
-
-        #[cfg(feature = "webview-auth")]
-        let use_default_browser = prelogin.support_default_browser() && self.args.default_browser;
-        #[cfg(feature = "webview-auth")]
-        let auth_launcher = auth_launcher
-          .hidpi(self.args.hidpi)
           .clean(self.args.clean)
-          .default_browser(use_default_browser);
+          .launch()
-
+          .await
-        let cred = auth_launcher.launch().await?;
-        Ok(cred)
       }
-
       Prelogin::Standard(prelogin) => {
         let prefix = if is_gateway { "Gateway" } else { "Portal" };
         println!("{} ({}: {})", prelogin.auth_message(), prefix, server);
@@ -396,18 +211,10 @@ impl<'a> ConnectHandler<'a> {
           || Text::new(&format!("{}:", prelogin.label_username())).prompt(),
           |user| Ok(user.to_owned()),
         )?;
-
+        let password = Password::new(&format!("{}:", prelogin.label_password()))
-        let password = if self.args.passwd_on_stdin {
+          .without_confirmation()
-          info!("Reading password from standard input");
+          .with_display_mode(PasswordDisplayMode::Masked)
-          let mut input = String::new();
+          .prompt()?;
-          std::io::stdin().read_line(&mut input)?;
-          input.trim_end().to_owned()
-        } else {
-          Password::new(&format!("{}:", prelogin.label_password()))
-            .without_confirmation()
-            .with_display_mode(PasswordDisplayMode::Masked)
-            .prompt()?
-        };
 
         let password_cred = PasswordCredential::new(&user, &password);
 
@@ -417,19 +224,6 @@ impl<'a> ConnectHandler<'a> {
   }
 }
 
-fn read_cookie_from_stdin() -> anyhow::Result<Credential> {
-  info!("Reading cookie from standard input");
-
-  let mut cookie = String::new();
-  std::io::stdin().read_line(&mut cookie)?;
-
-  let Ok(auth_result) = serde_json::from_str::<SamlAuthResult>(cookie.trim_end()) else {
-    bail!("Failed to parse auth data")
-  };
-
-  Credential::try_from(auth_result)
-}
-
 fn write_pid_file() {
   let pid = std::process::id();
 

apps/gpclient/src/disconnect.rs

@@ -1,63 +1,31 @@
 use crate::GP_CLIENT_LOCK_FILE;
-use clap::Args;
-use gpapi::utils::lock_file::gpservice_lock_info;
 use log::{info, warn};
-use std::{fs, str::FromStr, thread, time::Duration};
+use std::fs;
-use sysinfo::{Pid, Signal, System};
+use sysinfo::{Pid, ProcessExt, Signal, System, SystemExt};
 
-#[derive(Args)]
+pub(crate) struct DisconnectHandler;
-pub struct DisconnectArgs {
-  #[arg(
-    long,
-    required = false,
-    help = "The time in seconds to wait for the VPN connection to disconnect"
-  )]
-  wait: Option<u64>,
-}
 
-pub struct DisconnectHandler<'a> {
+impl DisconnectHandler {
-  args: &'a DisconnectArgs,
+  pub(crate) fn new() -> Self {
-}
+    Self
-
-impl<'a> DisconnectHandler<'a> {
-  pub fn new(args: &'a DisconnectArgs) -> Self {
-    Self { args }
   }
 
-  pub async fn handle(&self) -> anyhow::Result<()> {
+  pub(crate) fn handle(&self) -> anyhow::Result<()> {
-    // Try to disconnect the CLI client
+    if fs::metadata(GP_CLIENT_LOCK_FILE).is_err() {
-    if let Ok(c) = fs::read_to_string(GP_CLIENT_LOCK_FILE) {
+      warn!("PID file not found, maybe the client is not running");
-      send_signal(c.trim(), Signal::Interrupt).unwrap_or_else(|err| {
+      return Ok(());
-        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));
     }
 
+    let pid = fs::read_to_string(GP_CLIENT_LOCK_FILE)?;
+    let pid = pid.trim().parse::<usize>()?;
+    let s = System::new_all();
+
+    if let Some(process) = s.process(Pid::from(pid)) {
+      info!("Found process {}, killing...", pid);
+      if process.kill_with(Signal::Interrupt).is_none() {
+        warn!("Failed to kill process {}", pid);
+      }
+    }
     Ok(())
   }
 }
-
-fn send_signal(pid: &str, signal: Signal) -> anyhow::Result<()> {
-  let s = System::new_all();
-  let pid = Pid::from_str(pid)?;
-
-  if let Some(process) = s.process(pid) {
-    info!("Found process {}, sending signal...", pid);
-
-    if process.kill_with(signal).is_none() {
-      warn!("Failed to kill process {}", pid);
-    }
-  }
-  Ok(())
-}

apps/gpclient/src/launch_gui.rs

@@ -1,14 +1,12 @@
-use std::{collections::HashMap, env::temp_dir, fs, path::PathBuf};
+use std::{collections::HashMap, fs, path::PathBuf};
 
 use clap::Args;
 use directories::ProjectDirs;
 use gpapi::{
   process::service_launcher::ServiceLauncher,
-  utils::{endpoint::http_endpoint, env_utils, shutdown_signal},
+  utils::{endpoint::http_endpoint, env_file, shutdown_signal},
-  GP_CALLBACK_PORT_FILENAME,
 };
 use log::info;
-use tokio::io::AsyncWriteExt;
 
 #[derive(Args)]
 pub(crate) struct LaunchGuiArgs {
@@ -16,7 +14,7 @@ pub(crate) struct LaunchGuiArgs {
     required = false,
     help = "The authentication data, used for the default browser authentication"
   )]
-  pub auth_data: Option<String>,
+  auth_data: Option<String>,
   #[arg(long, help = "Launch the GUI minimized")]
   minimized: bool,
 }
@@ -39,7 +37,6 @@ impl<'a> LaunchGuiHandler<'a> {
 
     let auth_data = self.args.auth_data.as_deref().unwrap_or_default();
     if !auth_data.is_empty() {
-      info!("Received auth callback data");
       // Process the authentication data, its format is `globalprotectcallback:<data>`
       return feed_auth_data(auth_data).await;
     }
@@ -63,7 +60,7 @@ impl<'a> LaunchGuiHandler<'a> {
     extra_envs.insert("GP_LOG_FILE".into(), log_file_path.clone());
 
     // Persist the environment variables to a file
-    let env_file = env_utils::persist_env_vars(Some(extra_envs))?;
+    let env_file = env_file::persist_env_vars(Some(extra_envs))?;
     let env_file = env_file.into_temp_path();
     let env_file_path = env_file.to_string_lossy().to_string();
 
@@ -81,21 +78,14 @@ impl<'a> LaunchGuiHandler<'a> {
 }
 
 async fn feed_auth_data(auth_data: &str) -> anyhow::Result<()> {
-  if let Err(err) = feed_auth_data_cli(auth_data).await {
+  let service_endpoint = http_endpoint().await?;
-    info!("Failed to feed auth data to the CLI: {}", err);
-  }
 
-  Ok(())
+  reqwest::Client::default()
-}
+    .post(format!("{}/auth-data", service_endpoint))
-
+    .json(&auth_data)
-async fn feed_auth_data_cli(auth_data: &str) -> anyhow::Result<()> {
+    .send()
-  info!("Feeding auth data to the CLI");
+    .await?
-
+    .error_for_status()?;
-  let port_file = temp_dir().join(GP_CALLBACK_PORT_FILENAME);
-  let port = tokio::fs::read_to_string(port_file).await?;
-  let mut stream = tokio::net::TcpStream::connect(format!("127.0.0.1:{}", port.trim())).await?;
-
-  stream.write_all(auth_data.as_bytes()).await?;
 
   Ok(())
 }
@@ -112,7 +102,7 @@ async fn try_active_gui() -> anyhow::Result<()> {
   Ok(())
 }
 
-fn get_log_file() -> anyhow::Result<PathBuf> {
+pub fn get_log_file() -> anyhow::Result<PathBuf> {
   let dirs = ProjectDirs::from("com.yuezk", "GlobalProtect-openconnect", "gpclient")
     .ok_or_else(|| anyhow::anyhow!("Failed to get project dirs"))?;
 

apps/gpgui-helper/.gitignore

@@ -8,6 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+dist
 dist-ssr
 *.local
 

apps/gpgui-helper/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

apps/gpgui-helper/dist/assets/icon-BlfaAlWe.svg

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 96 96"
-   style="enable-background:new 0 0 96 96;"
-   xml:space="preserve"
-   sodipodi:docname="com.yuezk.qt.gpclient.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
-   id="metadata14"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-   id="defs12" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1006"
-   id="namedview10"
-   showgrid="false"
-   inkscape:zoom="6.9532168"
-   inkscape:cx="7.9545315"
-   inkscape:cy="59.062386"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g8499" />
-<style
-   type="text/css"
-   id="style2">
-	.st0{fill:#2980B9;}
-	.st1{fill:#3498DB;}
-	.st2{fill:#2ECC71;}
-	.st3{fill:#27AE60;}
-</style>
-
-<g
-   id="g8499"
-   transform="matrix(1.3407388,0,0,1.3407388,-16.409202,-16.355463)"><g
-     id="XMLID_1_">
-	<circle
-   r="32.5"
-   cy="48"
-   cx="48"
-   class="st0"
-   id="XMLID_3_"
-   style="fill:#2980b9" />
-	<path
-   d="m 48,15.5 v 65 C 65.9,80.5 80.5,65.7 80.5,48 80.5,30 65.9,15.5 48,15.5 Z"
-   class="st1"
-   id="XMLID_4_"
-   inkscape:connector-curvature="0"
-   style="fill:#3498db" />
-	<path
-   d="m 48,15.5 v 0.6 l 1.2,-0.3 c 0.3,-0.3 0.4,-0.3 0.6,-0.3 h -1.1 z m 7.3,0.9 c -0.1,0 0.4,0.9 1.1,1.8 0.8,1.5 1.1,2.1 1.3,2.1 0.3,-0.3 1.9,-1.2 3,-2.1 -1.7,-0.9 -3.5,-1.5 -5.4,-1.8 z m 10.3,6.2 c -0.1,0 -0.4,0 -0.9,0.6 l -0.8,0.9 0.6,0.6 c 0.3,0.6 0.8,0.9 1,1.2 0.5,0.6 0.6,0.6 0.1,1.5 -0.2,0.6 -0.3,0.9 -0.3,0.9 0.1,0.3 0.3,0.3 1.4,0.3 h 1.6 c 0.1,0 0.3,-0.6 0.4,-1.2 l 0.1,-0.9 -1.1,-0.9 c -1,-0.9 -1,-0.9 -1.4,-1.8 -0.3,-0.6 -0.6,-1.2 -0.7,-1.2 z m -3,2.4 c -0.2,0 -1.3,2.1 -1.3,2.4 0,0 0.3,0.6 0.7,0.9 0.4,0.3 0.7,0.6 0.7,0.6 0.1,0 1.2,-1.2 1.4,-1.5 C 64.2,27.1 64,26.8 63.5,26.2 63.1,25.5 62.7,25 62.6,25 Z m 9.5,1.1 0.2,0.3 c 0,0.3 -0.7,0.9 -1.4,1.5 -1.2,0.9 -1.4,1.2 -2,1.2 -0.6,0 -0.9,0.3 -1.8,0.9 -0.6,0.6 -1.2,0.9 -1.2,1.2 0,0 0.2,0.3 0.6,0.9 0.7,0.6 0.7,0.9 0.2,1.8 l -0.4,0.3 h -1.1 c -0.6,0 -1.5,0 -1.8,-0.3 -0.9,0 -0.8,0 -0.1,2.1 1,3 1.1,3.2 1.3,3.2 0.1,0 1.3,-1.2 2.8,-2.4 1.5,-1.2 2.7,-2.4 2.8,-2.4 l 0.6,0.3 c 0.4,0.3 0.5,0 1.3,-0.6 l 0.8,-0.6 0.8,0.6 c 1.9,1.2 2.2,1.5 2.3,2.4 0.2,1.5 0.3,1.8 0.5,1.8 0.1,0 1.3,-1.5 1.6,-1.8 0.1,-0.3 -0.1,-0.6 -1.1,-2.1 -0.7,-0.9 -1.1,-1.8 -1.1,-2.1 0,0 0.1,0 0.3,-0.3 0.2,0 0.4,0.3 1,0.9 -1.6,-2.3 -3.2,-4.7 -5.1,-6.8 z m 2.8,10.7 c -0.2,0 -0.9,0.9 -0.8,1.2 l 0.5,0.3 H 75 c 0.2,0 0.3,0 0.2,-0.3 C 75.1,37.4 75,36.8 74.9,36.8 Z M 72.3,38 h -2.4 l -2.4,0.3 -4.5,3.5 -4.4,3.8 v 3.5 c 0,2.1 0,3.8 0.1,3.8 0.1,0 0.7,0.9 1.5,1.5 0.8,0.9 1.5,1.5 1.8,1.8 0.4,0.3 0.5,0.3 4,0.6 l 3.4,0.3 1.6,0.9 c 0.8,0.6 1.5,1.2 1.6,1.2 0.1,0 -0.3,0.3 -0.6,0.6 l -0.6,0.6 1,1.2 c 0.5,0.6 1.3,1.5 1.7,1.8 l 0.6,0.9 v 1.7 0.9 c 3.7,-5 5.9,-11.5 6.1,-18.3 0.1,-2.7 -0.3,-5.3 -0.8,-8 l -0.6,-0.3 c -0.1,0 -0.5,0.3 -1,0.6 -0.5,0.3 -1,0.9 -1.1,0.9 -0.1,0 -0.8,-0.3 -1.8,-0.6 l -1.8,-0.6 v -0.9 c 0,-0.6 0,-0.9 -0.6,-1.5 z M 48,63.7 V 64 h 0.2 z"
-   class="st2"
-   id="XMLID_13_"
-   inkscape:connector-curvature="0"
-   style="fill:#2ecc71" />
-	<path
-   d="m 48,15.5 c -3.1,0 -6.2,0.5 -9,1.3 0.3,0.4 0.3,0.4 0.6,0.9 1.5,2.5 1.7,2.8 2.1,2.9 0.3,0 0.9,0.1 1.6,0.1 h 1.2 l 0.9,-2 0.8,-1.9 1.8,-0.6 z m -16.9,4.7 c -2.8,1.7 -5.4,3.9 -7.6,6.4 -3.8,4.3 -6.3,9.6 -7.4,15.4 0.5,0 0.9,-0.1 1.8,-0.1 2.8,0.1 2.5,0 3.4,1.4 0.5,0.8 0.6,0.8 1.4,0.8 1,0.1 0.9,0 0.5,-1.6 -0.2,-0.6 -0.3,-1.2 -0.3,-1.4 0,-0.2 0.5,-0.7 1.7,-1.6 1.9,-1.5 1.8,-1.3 1.5,-2.9 -0.1,-0.3 0.1,-0.6 0.6,-1.2 0.7,-0.7 0.7,-0.6 1.4,-0.6 h 0.7 l 0.1,-1.2 c 0.1,-0.7 0.1,-1.3 0.2,-1.3 0,0 1.9,-1.1 4.1,-2.3 2.2,-1.2 4.1,-2.2 4.2,-2.3 0.2,-0.2 -0.3,-0.8 -2.7,-3.8 -1.5,-1.9 -2.8,-3.6 -2.9,-3.7 z m -5.8,23 c -0.1,0 -0.1,0.3 -0.1,0.6 0,0.6 0,0.7 0.6,1 0.8,0.4 0.9,0.5 0.8,0.2 -0.1,-0.4 -1.2,-1.9 -1.3,-1.8 z m -3.4,2.1 -0.5,1.8 c 0.1,0.1 0.9,0.3 1.8,0.5 1,0.2 1.6,0.4 1.8,0.3 l 0.5,-1.3 z m -3.8,1 -1.1,0.6 c -0.6,0.3 -1.2,0.6 -1.4,0.6 h -0.1 c 0,1.4 0.1,2.8 0.3,4.2 l 0.6,0.4 1,-0.1 h 1 l 0.6,1.4 c 0.3,0.7 0.7,1.4 0.8,1.5 0.1,0.1 1,0.1 1.8,0.1 h 1.5 L 23,56.2 c 0,1.2 0,1.3 -0.6,2.2 -0.4,0.5 -0.6,1.2 -0.6,1.4 0,0.2 0.7,2.1 1.6,4.3 l 1.5,4 1.6,0.8 c 1.2,0.6 1.5,0.8 1.5,1 0,0.1 -0.4,2.1 -0.6,3.1 3,2.5 6.4,4.5 10.2,5.8 3.5,-3.6 6.8,-7.1 7.3,-7.6 l 0.7,-0.7 0.2,-1.9 c 0.2,-1.1 0.4,-2.1 0.4,-2.2 0,-0.1 0.5,-0.6 1,-1.2 0.5,-0.5 0.8,-1 0.8,-1.1 v -0.2 c -0.1,-0.1 -1.4,-1.1 -3,-2.2 l -3.1,-2.1 -1.1,-0.1 c -0.8,0 -1.2,0 -1.3,-0.2 C 39.4,59.2 39.2,58.5 39.1,57.7 39,56.9 38.9,56.2 38.8,56.1 38.8,56 38,56 37.1,56 36.2,56 35.4,55.9 35.3,55.8 35.2,55.7 35.2,55.1 35.1,54.3 35,53.6 34.9,53 34.8,52.9 34.7,52.8 33.7,52.7 32.5,52.6 30.5,52.5 30.1,52.5 29.1,52 l -1.2,-0.6 -1.6,0.7 -1.7,0.9 -1.8,-0.1 c -2,0 -1.9,0.2 -2.1,-1.6 C 20.6,50.7 20.6,50.1 20.5,50.1 20.4,50 20,50 19.6,49.9 L 18.9,49.7 19,49.2 c 0,-0.3 0,-1 0.1,-1.4 L 19.2,47 18.7,46.5 Z m 9.1,1.1 C 27.1,47.5 27.1,47.8 27,48 l -0.1,0.5 2.9,1.2 c 2.9,1.1 3.4,1.2 3.9,0.7 0.2,-0.2 0.1,-0.2 -0.3,-0.4 -0.3,-0.1 -1.7,-0.9 -3.2,-1.6 -1.7,-0.7 -2.9,-1.1 -3,-1 z"
-   class="st3"
-   id="XMLID_20_"
-   inkscape:connector-curvature="0"
-   style="fill:#27ae60" />
-</g><g
-     transform="matrix(1.458069,0,0,1.458069,-22.631538,-19.615144)"
-     id="g7664"><path
-       inkscape:connector-curvature="0"
-       id="XMLID_6_"
-       class="st3"
-       d="m 38.8,56.1 c 0,1.2 1,2.2 2.2,2.2 h 15.2 c 1.2,0 2.2,-1 2.2,-2.2 V 45.3 c 0,-1.2 -1,-2.2 -2.2,-2.2 H 40.9 c -1.2,0 -2.2,1 -2.2,2.2 v 10.8 z"
-       style="fill:#f1aa27;fill-opacity:1" /><path
-       style="fill:#e6e6e6"
-       inkscape:connector-curvature="0"
-       id="XMLID_7_"
-       class="st4"
-       d="m 55.5,43.1 h -3.3 v -3.7 c 0,-2.1 -1.7,-3.8 -3.8,-3.8 -2.1,0 -3.8,1.7 -3.8,3.8 v 3.8 h -3.1 v -3.8 c 0,-3.9 3.2,-7 7,-7 3.9,0 7,3.2 7,7 z" /><path
-       style="fill:#e6e6e6;fill-opacity:1"
-       inkscape:connector-curvature="0"
-       id="XMLID_8_"
-       class="st5"
-       d="m 50.35,48.2 c 0,-1 -0.8,-1.8 -1.8,-1.8 -1,0 -1.8,0.8 -1.8,1.8 0,0.7 0.4,1.3 1,1.6 l -1,5.2 h 3.6 l -1,-5.2 c 0.6,-0.3 1,-0.9 1,-1.6 z" /></g></g></svg>

apps/gpgui-helper/dist/assets/main-B3YRsHQ2.css

@@ -1 +0,0 @@
-html,body,#root{height:100%;margin:0;padding:0;-webkit-user-select:none;user-select:none;cursor:default}

apps/gpgui-helper/dist/index.html

@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>GlobalProtect</title>
-    <script type="module" crossorigin src="/assets/main-sEPcTvJX.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/main-B3YRsHQ2.css">
-  </head>
-  <body>
-    <script>
-      /* workaround to webview font size auto scaling */
-      var htmlFontSize = getComputedStyle(document.documentElement).fontSize;
-      var ratio = parseInt(htmlFontSize, 10) / 16;
-      document.documentElement.style.fontSize = 16 / ratio + "px";
-    </script>
-    <div id="root" data-tauri-drag-region></div>
-  </body>
-</html>

apps/gpgui-helper/dist/tauri.svg

@@ -1,6 +0,0 @@
-<svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
-<ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
-</svg>

apps/gpgui-helper/dist/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

apps/gpgui-helper/package.json

@@ -9,29 +9,28 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@emotion/react": "^11.14.0",
+    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.14.0",
+    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^6.4.3",
+    "@mui/icons-material": "^5.14.18",
-    "@mui/material": "^6.4.3",
+    "@mui/material": "^5.14.18",
-    "@tauri-apps/api": "^2.2.0",
+    "@tauri-apps/api": "^1.5.0",
-    "react": "^19.0.0",
+    "react": "^18.2.0",
-    "react-dom": "^19.0.0"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.2.7",
+    "@tauri-apps/cli": "^1.5.0",
-    "@types/node": "^22.13.1",
+    "@types/node": "^20.8.10",
-    "@types/react": "^19.0.8",
+    "@types/react": "^18.2.15",
-    "@types/react-dom": "^19.0.3",
+    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/parser": "^6.12.0",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.0.3",
-    "eslint": "^9.20.0",
+    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
-    "prettier": "3.4.2",
+    "prettier": "3.1.0",
-    "typescript": "^5.7.3",
+    "typescript": "^5.0.2",
-    "vite": "^6.1.0"
+    "vite": "^4.4.4"
-  },
+  }
-  "packageManager": "pnpm@9.15.1"
 }

apps/gpgui-helper/src-tauri/Cargo.toml

@@ -1,18 +1,16 @@
 [package]
 name = "gpgui-helper"
-rust-version.workspace = true
 authors.workspace = true
 version.workspace = true
 edition.workspace = true
 license.workspace = true
 
 [build-dependencies]
-tauri-build = { version = "2", features = [] }
+tauri-build = { version = "1.5", features = [] }
 
 [dependencies]
-gpapi = { path = "../../../crates/gpapi", features = ["tauri", "clap"] }
+gpapi = { path = "../../../crates/gpapi", features = ["tauri"] }
-tauri.workspace = true
+tauri = { workspace = true, features = ["window-start-dragging"] }
-
 tokio.workspace = true
 anyhow.workspace = true
 log.workspace = true

apps/gpgui-helper/src-tauri/capabilities/default.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "Capability for the main window",
-  "windows": ["main"],
-  "permissions": [
-    "core:window:allow-start-dragging",
-    "core:event:allow-listen",
-    "core:event:allow-emit",
-    "core:event:allow-unlisten"
-  ]
-}

apps/gpgui-helper/src-tauri/src/app.rs

@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
+use gpapi::utils::window::WindowExt;
 use log::info;
-use tauri::{Listener, Manager};
+use tauri::Manager;
 
 use crate::updater::{GuiUpdater, Installer, ProgressNotifier};
 
@@ -24,15 +25,15 @@ impl App {
 
     tauri::Builder::default()
       .setup(move |app| {
-        let win = app.get_webview_window("main").expect("no main window");
+        let win = app.get_window("main").expect("no main window");
-        let _ = win.hide_menu();
+        win.hide_menu();
 
         let notifier = ProgressNotifier::new(win.clone());
         let installer = Installer::new(api_key);
         let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer));
 
         let win_clone = win.clone();
-        app.listen_any("app://update-done", move |_event| {
+        app.listen_global("app://update-done", move |_event| {
           info!("Update done");
           let _ = win_clone.close();
         });
@@ -40,15 +41,12 @@ impl App {
         // Listen for the update event
         win.listen("app://update", move |_event| {
           let updater = Arc::clone(&updater);
-          if updater.is_in_progress() {
-            info!("Update already in progress");
-            updater.notify_progress();
-            return;
-          }
-
           tokio::spawn(async move { updater.update().await });
         });
 
+        // Update the GUI on startup
+        win.trigger("app://update", None);
+
         Ok(())
       })
       .run(tauri::generate_context!())?;

apps/gpgui-helper/src-tauri/src/cli.rs

@@ -1,9 +1,6 @@
 use clap::Parser;
-use gpapi::{
+use gpapi::utils::base64;
-  clap::InfoLevelVerbosity,
+use log::{info, LevelFilter};
-  utils::{base64, env_utils},
-};
-use log::info;
 
 use crate::app::App;
 
@@ -18,9 +15,6 @@ struct Cli {
 
   #[arg(long, default_value = env!("CARGO_PKG_VERSION"), help = "The version of the GUI")]
   gui_version: String,
-
-  #[command(flatten)]
-  verbose: InfoLevelVerbosity,
 }
 
 impl Cli {
@@ -28,8 +22,6 @@ impl Cli {
     let api_key = self.read_api_key()?;
     let app = App::new(api_key, &self.gui_version);
 
-    env_utils::patch_gui_runtime_env(false);
-
     app.run()
   }
 
@@ -47,16 +39,14 @@ impl Cli {
   }
 }
 
-fn init_logger(cli: &Cli) {
+fn init_logger() {
-  env_logger::builder()
+  env_logger::builder().filter_level(LevelFilter::Info).init();
-    .filter_level(cli.verbose.log_level_filter())
-    .init();
 }
 
 pub fn run() {
   let cli = Cli::parse();
 
-  init_logger(&cli);
+  init_logger();
   info!("gpgui-helper started: {}", VERSION);
 
   if let Err(e) = cli.run() {

apps/gpgui-helper/src-tauri/src/updater.rs

@@ -1,39 +1,33 @@
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
 
 use gpapi::{
   service::request::UpdateGuiRequest,
   utils::{checksum::verify_checksum, crypto::Crypto, endpoint::http_endpoint},
 };
 use log::{info, warn};
-use tauri::{Emitter, WebviewWindow};
+use tauri::{Manager, Window};
 
 use crate::downloader::{ChecksumFetcher, FileDownloader};
 
-#[cfg(not(debug_assertions))]
-const SNAPSHOT: &str = match option_env!("SNAPSHOT") {
-  Some(val) => val,
-  None => "false",
-};
-
 pub struct ProgressNotifier {
-  win: WebviewWindow,
+  win: Window,
 }
 
 impl ProgressNotifier {
-  pub fn new(win: WebviewWindow) -> Self {
+  pub fn new(win: Window) -> Self {
     Self { win }
   }
 
   fn notify(&self, progress: Option<f64>) {
-    let _ = self.win.emit("app://update-progress", progress);
+    let _ = self.win.emit_all("app://update-progress", progress);
   }
 
   fn notify_error(&self) {
-    let _ = self.win.emit("app://update-error", ());
+    let _ = self.win.emit_all("app://update-error", ());
   }
 
   fn notify_done(&self) {
-    let _ = self.win.emit("app://update-done", ());
+    let _ = self.win.emit_and_trigger("app://update-done", ());
   }
 }
 
@@ -72,8 +66,6 @@ pub struct GuiUpdater {
   version: String,
   notifier: Arc<ProgressNotifier>,
   installer: Installer,
-  in_progress: RwLock<bool>,
-  progress: Arc<RwLock<Option<f64>>>,
 }
 
 impl GuiUpdater {
@@ -82,32 +74,18 @@ impl GuiUpdater {
       version,
       notifier: Arc::new(notifier),
       installer,
-      in_progress: Default::default(),
-      progress: Default::default(),
     }
   }
 
   pub async fn update(&self) {
     info!("Update GUI, version: {}", self.version);
 
-    #[cfg(debug_assertions)]
-    let release_tag = "snapshot";
-    #[cfg(not(debug_assertions))]
-    let release_tag = if SNAPSHOT == "true" {
-      String::from("snapshot")
-    } else {
-      format!("v{}", self.version)
-    };
-
     #[cfg(target_arch = "x86_64")]
-    let arch = "x86_64";
+    let arch = "amd64";
     #[cfg(target_arch = "aarch64")]
-    let arch = "aarch64";
+    let arch = "arm64";
 
-    let file_url = format!(
+    let file_url = format!("https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v{}/gpgui-linux-{}", self.version, arch);
-      "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}.bin.tar.xz",
-      release_tag, arch
-    );
     let checksum_url = format!("{}.sha256", file_url);
 
     info!("Downloading file: {}", file_url);
@@ -116,23 +94,15 @@ impl GuiUpdater {
     let cf = ChecksumFetcher::new(&checksum_url);
     let notifier = Arc::clone(&self.notifier);
 
-    let progress_ref = Arc::clone(&self.progress);
+    dl.on_progress(move |progress| notifier.notify(progress));
-    dl.on_progress(move |progress| {
-      // Save progress to shared state so that it can be notified to the UI when needed
-      if let Ok(mut guard) = progress_ref.try_write() {
-        *guard = progress;
-      }
-      notifier.notify(progress);
-    });
 
-    self.set_in_progress(true);
     let res = tokio::try_join!(dl.download(), cf.fetch());
 
     let (file, checksum) = match res {
       Ok((file, checksum)) => (file, checksum),
       Err(err) => {
         warn!("Download error: {}", err);
-        self.notify_error();
+        self.notifier.notify_error();
         return;
       }
     };
@@ -142,7 +112,7 @@ impl GuiUpdater {
 
     if let Err(err) = verify_checksum(&file_path, &checksum) {
       warn!("Checksum error: {}", err);
-      self.notify_error();
+      self.notifier.notify_error();
       return;
     }
 
@@ -150,48 +120,10 @@ impl GuiUpdater {
 
     if let Err(err) = self.installer.install(&file_path, &checksum).await {
       warn!("Install error: {}", err);
-      self.notify_error();
+      self.notifier.notify_error();
     } else {
       info!("Install success");
-      self.notify_done();
+      self.notifier.notify_done();
     }
   }
-
-  pub fn is_in_progress(&self) -> bool {
-    if let Ok(guard) = self.in_progress.try_read() {
-      *guard
-    } else {
-      info!("Failed to acquire in_progress lock");
-      false
-    }
-  }
-
-  fn set_in_progress(&self, in_progress: bool) {
-    if let Ok(mut guard) = self.in_progress.try_write() {
-      *guard = in_progress;
-    } else {
-      info!("Failed to acquire in_progress lock");
-    }
-  }
-
-  fn notify_error(&self) {
-    self.set_in_progress(false);
-    self.notifier.notify_error();
-  }
-
-  fn notify_done(&self) {
-    self.set_in_progress(false);
-    self.notifier.notify_done();
-  }
-
-  pub fn notify_progress(&self) {
-    let progress = if let Ok(guard) = self.progress.try_read() {
-      *guard
-    } else {
-      info!("Failed to acquire progress lock");
-      None
-    };
-
-    self.notifier.notify(progress);
-  }
 }

apps/gpgui-helper/src-tauri/tauri.conf.json

@@ -1,15 +1,35 @@
 {
-  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
     "beforeDevCommand": "pnpm dev",
     "beforeBuildCommand": "pnpm build",
-    "devUrl": "http://localhost:1421",
+    "devPath": "http://localhost:1421",
-    "frontendDist": "../dist"
+    "distDir": "../dist",
+    "withGlobalTauri": false
   },
-  "identifier": "com.yuezk.gpgui-helper",
+  "package": {
-  "productName": "gpgui-helper",
+    "productName": "gpgui-helper"
-  "app": {
+  },
-    "withGlobalTauri": false,
+  "tauri": {
+    "allowlist": {
+      "all": false,
+      "window": {
+        "all": false,
+        "startDragging": true
+      }
+    },
+    "bundle": {
+      "active": false,
+      "targets": "deb",
+      "identifier": "com.yuezk.gpgui-helper",
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ]
+    },
     "security": {
       "csp": null
     },
@@ -28,16 +48,5 @@
         "decorations": false
       }
     ]
-  },
-  "bundle": {
-    "active": false,
-    "targets": "deb",
-    "icon": [
-      "icons/32x32.png",
-      "icons/128x128.png",
-      "icons/128x128@2x.png",
-      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
   }
 }

apps/gpgui-helper/src/components/App/App.tsx

@@ -1,12 +1,10 @@
 import { Box, Button, CssBaseline, LinearProgress, Typography } from "@mui/material";
-import { getCurrentWindow } from "@tauri-apps/api/window";
+import { appWindow } from "@tauri-apps/api/window";
 import logo from "../../assets/icon.svg";
 import { useEffect, useState } from "react";
 
 import "./styles.css";
 
-const appWindow = getCurrentWindow();
-
 function useUpdateProgress() {
   const [progress, setProgress] = useState<number | null>(null);
 
@@ -27,8 +25,6 @@ export default function App() {
   const [error, setError] = useState(false);
 
   useEffect(() => {
-    appWindow.emit("app://update");
-
     const unlisten = appWindow.listen("app://update-error", () => {
       setError(true);
     });

apps/gpservice/Cargo.toml

@@ -5,11 +5,11 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-gpapi = { path = "../../crates/gpapi", features = ["clap", "logger"] }
+gpapi = { path = "../../crates/gpapi" }
 openconnect = { path = "../../crates/openconnect" }
 clap.workspace = true
 anyhow.workspace = true
-tokio = { workspace = true, features = ["rt-multi-thread"] }
+tokio.workspace = true
 tokio-util.workspace = true
 axum = { workspace = true, features = ["ws"] }
 futures.workspace = true
@@ -18,5 +18,3 @@ serde_json.workspace = true
 env_logger.workspace = true
 log.workspace = true
 compile-time.workspace = true
-xz2 = "0.1"
-tar = "0.4"

apps/gpservice/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

apps/gpservice/src/cli.rs

@@ -3,15 +3,13 @@ use std::{collections::HashMap, io::Write};
 
 use anyhow::bail;
 use clap::Parser;
-use gpapi::clap::InfoLevelVerbosity;
-use gpapi::logger;
 use gpapi::{
   process::gui_launcher::GuiLauncher,
   service::{request::WsRequest, vpn_state::VpnState},
-  utils::{crypto::generate_key, env_utils, lock_file::LockFile, redact::Redaction, shutdown_signal},
+  utils::{crypto::generate_key, env_file, lock_file::LockFile, redact::Redaction, shutdown_signal},
   GP_SERVICE_LOCK_FILE,
 };
-use log::{info, warn};
+use log::{info, warn, LevelFilter};
 use tokio::sync::{mpsc, watch};
 
 use crate::{vpn_task::VpnTask, ws_server::WsServer};
@@ -28,18 +26,11 @@ struct Cli {
   #[cfg(debug_assertions)]
   #[clap(long)]
   no_gui: bool,
-
-  #[command(flatten)]
-  verbose: InfoLevelVerbosity,
 }
 
 impl Cli {
-  async fn run(&mut self) -> anyhow::Result<()> {
+  async fn run(&mut self, redaction: Arc<Redaction>) -> anyhow::Result<()> {
-    let redaction = self.init_logger();
+    let lock_file = Arc::new(LockFile::new(GP_SERVICE_LOCK_FILE));
-    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 {
       bail!("Another instance of the service is already running");
@@ -57,17 +48,9 @@ impl Cli {
 
     let (shutdown_tx, mut shutdown_rx) = mpsc::channel::<()>(4);
     let shutdown_tx_clone = shutdown_tx.clone();
-    let vpn_task_cancel_token = vpn_task.cancel_token();
+    let vpn_task_token = vpn_task.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 ws_server_handle = tokio::spawn(async move { ws_server.start(shutdown_tx_clone).await });
 
@@ -80,7 +63,7 @@ impl Cli {
     if no_gui {
       info!("GUI is disabled");
     } else {
-      let envs = self.env_file.as_ref().map(env_utils::load_env_vars).transpose()?;
+      let envs = self.env_file.as_ref().map(env_file::load_env_vars).transpose()?;
 
       let minimized = self.minimized;
 
@@ -91,15 +74,15 @@ impl Cli {
     }
 
     tokio::select! {
-      _ = shutdown_signal() => {
+        _ = shutdown_signal() => {
-        info!("Shutdown signal received");
+            info!("Shutdown signal received");
-      }
+        }
-      _ = shutdown_rx.recv() => {
+        _ = shutdown_rx.recv() => {
-        info!("Shutdown request received, shutting down");
+            info!("Shutdown request received, shutting down");
-      }
+        }
     }
 
-    vpn_task_cancel_token.cancel();
+    vpn_task_token.cancel();
     let _ = tokio::join!(vpn_task_handle, ws_server_handle);
 
     lock_file.unlock()?;
@@ -109,33 +92,6 @@ impl Cli {
     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,
-          "[{} {}  {}] {}",
-          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> {
     #[cfg(debug_assertions)]
     if self.no_gui {
@@ -146,52 +102,27 @@ impl Cli {
   }
 }
 
-#[cfg(unix)]
+fn init_logger() -> Arc<Redaction> {
-mod signals {
+  let redaction = Arc::new(Redaction::new());
-  use std::sync::Arc;
+  let redaction_clone = Arc::clone(&redaction);
+  // 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();
 
-  use log::{info, warn};
+  redaction
-
-  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) {
@@ -222,7 +153,10 @@ async fn launch_gui(envs: Option<HashMap<String, String>>, api_key: Vec<u8>, mut
 pub async fn run() {
   let mut cli = Cli::parse();
 
-  if let Err(e) = cli.run().await {
+  let redaction = init_logger();
+  info!("gpservice started: {}", VERSION);
+
+  if let Err(e) = cli.run(redaction).await {
     eprintln!("Error: {}", e);
     std::process::exit(1);
   }

apps/gpservice/src/handlers.rs

@@ -1,17 +1,10 @@
-use std::{
+use std::{borrow::Cow, fs::Permissions, ops::ControlFlow, os::unix::fs::PermissionsExt, path::PathBuf, sync::Arc};
-  fs::{File, Permissions},
-  io::BufReader,
-  ops::ControlFlow,
-  os::unix::fs::PermissionsExt,
-  path::PathBuf,
-  sync::Arc,
-};
 
 use anyhow::bail;
 use axum::{
   body::Bytes,
   extract::{
-    ws::{self, CloseFrame, Message, Utf8Bytes, WebSocket},
+    ws::{self, CloseFrame, Message, WebSocket},
     State, WebSocketUpgrade,
   },
   http::StatusCode,
@@ -24,9 +17,7 @@ use gpapi::{
   GP_GUI_BINARY,
 };
 use log::{info, warn};
-use tar::Archive;
 use tokio::fs;
-use xz2::read::XzDecoder;
 
 use crate::ws_server::WsServerContext;
 
@@ -38,6 +29,10 @@ pub(crate) async fn active_gui(State(ctx): State<Arc<WsServerContext>>) -> impl
   ctx.send_event(WsEvent::ActiveGui).await;
 }
 
+pub(crate) async fn auth_data(State(ctx): State<Arc<WsServerContext>>, body: String) -> impl IntoResponse {
+  ctx.send_event(WsEvent::AuthData(body)).await;
+}
+
 pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) -> Result<(), StatusCode> {
   let payload = match ctx.decrypt::<UpdateGuiRequest>(body.to_vec()) {
     Ok(payload) => payload,
@@ -65,7 +60,6 @@ pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) ->
   Ok(())
 }
 
-// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
 async fn install_gui(src: &str) -> anyhow::Result<()> {
   let path = PathBuf::from(GP_GUI_BINARY);
   let Some(dir) = path.parent() else {
@@ -74,27 +68,8 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {
 
   fs::create_dir_all(dir).await?;
 
-  // Unpack the archive
+  // Copy the file to the final location and make it executable
-  info!("Unpacking GUI archive");
+  fs::copy(src, GP_GUI_BINARY).await?;
-  let tar = XzDecoder::new(BufReader::new(File::open(src)?));
-  let mut ar = Archive::new(tar);
-
-  for entry in ar.entries()? {
-    let mut entry = entry?;
-    let path = entry.path()?;
-
-    if let Some(name) = path.file_name() {
-      let name = name.to_string_lossy();
-
-      if name == "gpgui" {
-        let mut file = File::create(GP_GUI_BINARY)?;
-        std::io::copy(&mut entry, &mut file)?;
-        break;
-      }
-    }
-  }
-
-  // Make the binary executable
   fs::set_permissions(GP_GUI_BINARY, Permissions::from_mode(0o755)).await?;
 
   Ok(())
@@ -132,7 +107,7 @@ async fn handle_socket(mut socket: WebSocket, ctx: Arc<WsServerContext>) {
 
     let close_msg = Message::Close(Some(CloseFrame {
       code: ws::close_code::NORMAL,
-      reason: Utf8Bytes::from("Goodbye"),
+      reason: Cow::from("Goodbye"),
     }));
 
     if let Err(err) = sender.send(close_msg).await {

apps/gpservice/src/routes.rs

@@ -11,6 +11,7 @@ pub(crate) fn routes(ctx: Arc<WsServerContext>) -> Router {
   Router::new()
     .route("/health", get(handlers::health))
     .route("/active-gui", post(handlers::active_gui))
+    .route("/auth-data", post(handlers::auth_data))
     .route("/update-gui", post(handlers::update_gui))
     .route("/ws", get(handlers::ws_handler))
     .with_state(ctx)

apps/gpservice/src/vpn_task.rs

@@ -1,13 +1,10 @@
 use std::{sync::Arc, thread};
 
-use gpapi::{
+use gpapi::service::{
-  logger,
+  request::{ConnectRequest, WsRequest},
-  service::{
+  vpn_state::VpnState,
-    request::{ConnectRequest, UpdateLogLevelRequest, WsRequest},
-    vpn_state::VpnState,
-  },
 };
-use log::{info, warn};
+use log::info;
 use openconnect::Vpn;
 use tokio::sync::{mpsc, oneshot, watch, RwLock};
 use tokio_util::sync::CancellationToken;
@@ -34,35 +31,22 @@ impl VpnTaskContext {
       return;
     }
 
-    let vpn_state_tx = self.vpn_state_tx.clone();
     let info = req.info().clone();
     let vpn_handle = Arc::clone(&self.vpn_handle);
     let args = req.args();
-    let vpn = match Vpn::builder(req.gateway().server(), args.cookie())
+    let vpn = Vpn::builder(req.gateway().server(), args.cookie())
-      .script(args.vpnc_script())
       .user_agent(args.user_agent())
-      .os(args.openconnect_os())
+      .script(args.vpnc_script())
-      .certificate(args.certificate())
-      .sslkey(args.sslkey())
-      .key_password(args.key_password())
       .csd_uid(args.csd_uid())
       .csd_wrapper(args.csd_wrapper())
-      .reconnect_timeout(args.reconnect_timeout())
       .mtu(args.mtu())
-      .disable_ipv6(args.disable_ipv6())
+      .os(args.openconnect_os())
-      .no_dtls(args.no_dtls())
+      .build();
-      .build()
-    {
-      Ok(vpn) => vpn,
-      Err(err) => {
-        warn!("Failed to create VPN: {}", err);
-        vpn_state_tx.send(VpnState::Disconnected).ok();
-        return;
-      }
-    };
 
     // Save the VPN handle
     vpn_handle.write().await.replace(vpn);
+
+    let vpn_state_tx = self.vpn_state_tx.clone();
     let connect_info = Box::new(info.clone());
     vpn_state_tx.send(VpnState::Connecting(connect_info)).ok();
 
@@ -90,7 +74,7 @@ impl VpnTaskContext {
     });
   }
 
-  pub async fn disconnect(&self) -> bool {
+  pub async fn disconnect(&self) {
     if let Some(disconnect_rx) = self.disconnect_rx.write().await.take() {
       info!("Disconnecting VPN...");
       if let Some(vpn) = self.vpn_handle.read().await.as_ref() {
@@ -101,13 +85,9 @@ impl VpnTaskContext {
       // Wait for the VPN to be disconnected
       disconnect_rx.await.ok();
       info!("VPN disconnected");
-
-      true
     } else {
       info!("VPN is not connected, skip disconnect");
       self.vpn_state_tx.send(VpnState::Disconnected).ok();
-
-      false
     }
   }
 }
@@ -150,10 +130,6 @@ impl VpnTask {
     server_cancel_token.cancel();
   }
 
-  pub fn context(&self) -> Arc<VpnTaskContext> {
-    return Arc::clone(&self.ctx);
-  }
-
   async fn recv(&mut self) {
     while let Some(req) = self.ws_req_rx.recv().await {
       tokio::spawn(process_ws_req(req, self.ctx.clone()));
@@ -169,12 +145,5 @@ async fn process_ws_req(req: WsRequest, ctx: Arc<VpnTaskContext>) {
     WsRequest::Disconnect(_) => {
       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);
-      }
-    }
   }
 }

apps/gpservice/src/ws_connection.rs

@@ -20,7 +20,7 @@ impl WsConnection {
 
   pub async fn send_event(&self, event: &WsEvent) -> anyhow::Result<()> {
     let encrypted = self.crypto.encrypt(event)?;
-    let msg = Message::Binary(encrypted.into());
+    let msg = Message::Binary(encrypted);
 
     self.tx.send(msg).await?;
 
@@ -29,7 +29,7 @@ impl WsConnection {
 
   pub fn recv_msg(&self, msg: Message) -> ControlFlow<(), WsRequest> {
     match msg {
-      Message::Binary(data) => match self.crypto.decrypt(data.into()) {
+      Message::Binary(data) => match self.crypto.decrypt(data) {
         Ok(ws_req) => ControlFlow::Continue(ws_req),
         Err(err) => {
           info!("Failed to decrypt message: {}", err);

apps/gpservice/src/ws_server.rs

@@ -113,50 +113,33 @@ impl WsServer {
     }
   }
 
-  pub fn context(&self) -> Arc<WsServerContext> {
-    Arc::clone(&self.ctx)
-  }
-
   pub fn cancel_token(&self) -> CancellationToken {
     self.cancel_token.clone()
   }
 
   pub async fn start(&self, shutdown_tx: mpsc::Sender<()>) {
-    let listener = match self.start_tcp_server().await {
+    if let Ok(listener) = TcpListener::bind("127.0.0.1:0").await {
-      Ok(listener) => listener,
+      let local_addr = listener.local_addr().unwrap();
-      Err(err) => {
-        warn!("Failed to start WS server: {}", err);
-        let _ = shutdown_tx.send(()).await;
-        return;
-      }
-    };
 
-    tokio::select! {
+      self.lock_file.lock(local_addr.port().to_string()).unwrap();
-      _ = watch_vpn_state(self.ctx.vpn_state_rx(), Arc::clone(&self.ctx)) => {
+
-        info!("VPN state watch task completed");
+      info!("WS server listening on port: {}", local_addr.port());
-      }
+
-      _ = start_server(listener, self.ctx.clone()) => {
+      tokio::select! {
-          info!("WS server stopped");
+        _ = watch_vpn_state(self.ctx.vpn_state_rx(), Arc::clone(&self.ctx)) => {
-      }
+          info!("VPN state watch task completed");
-      _ = self.cancel_token.cancelled() => {
+        }
-        info!("WS server cancelled");
+        _ = start_server(listener, self.ctx.clone()) => {
+            info!("WS server stopped");
+        }
+        _ = self.cancel_token.cancelled() => {
+          info!("WS server cancelled");
+        }
       }
     }
 
     let _ = shutdown_tx.send(()).await;
   }
-
-  async fn start_tcp_server(&self) -> anyhow::Result<TcpListener> {
-    let listener = TcpListener::bind("127.0.0.1:0").await?;
-    let local_addr = listener.local_addr()?;
-    let port = local_addr.port();
-
-    info!("WS server listening on port: {}", port);
-
-    self.lock_file.lock(&port.to_string())?;
-
-    Ok(listener)
-  }
 }
 
 async fn watch_vpn_state(mut vpn_state_rx: watch::Receiver<VpnState>, ctx: Arc<WsServerContext>) {

changelog.md

@@ -1,124 +1,5 @@
 # Changelog
 
-## 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
-
-- Upgrade to Tauri 2.0
-- Support Ubuntu 22.04 and later
-
-## 2.3.9 - 2024-11-02
-
-- Enhance the OpenSSL compatibility mode (fix [#437](https://github.com/yuezk/GlobalProtect-openconnect/issues/437))
-
-## 2.3.8 - 2024-10-31
-
-- GUI: support configure the external browser to use for authentication (fix [#423](https://github.com/yuezk/GlobalProtect-openconnect/issues/423))
-- GUI: add option to remember the credential (fix [#420](https://github.com/yuezk/GlobalProtect-openconnect/issues/420))
-- GUI: fix the credential not saved issue (fix [#420](https://github.com/yuezk/GlobalProtect-openconnect/issues/420))
-- CLI: fix the default browser detection issue (fix [#416](https://github.com/yuezk/GlobalProtect-openconnect/issues/416))
-
-## 2.3.7 - 2024-08-16
-
-- Fix the Rust type inference regression [issue in 1.80](https://github.com/rust-lang/rust/issues/125319).
-
-## 2.3.6 - 2024-08-15
-
-- CLI: enhance the `gpauth` command to support external browser authentication
-- CLI: add the `--cookie-on-stdin` option to support read the cookie from stdin
-- CLI: support usage: `gpauth <portal> --browser <browser> 2>/dev/null | sudo gpclient connect <portal> --cookie-on-stdin`
-- CLI: fix the `--browser <browser>` option not working
-
-## 2.3.5 - 2024-08-14
-
-- Support configure `no-dtls` option
-- GUI: fix the tray icon disk usage issue (#398)
-- CLI: support specify the browser with `--browser <browser>` option (#405, #407, #397)
-- CLI: fix the `--os` option not working
-
-## 2.3.4 - 2024-07-08
-
-- Support the Internal Host Detection (fix [#377](https://github.com/yuezk/GlobalProtect-openconnect/issues/377))
-- CLI: support pass the password from stdin (fix [#381](https://github.com/yuezk/GlobalProtect-openconnect/issues/381))
-
-## 2.3.3 - 2024-06-23
-
-- GUI: add the remark field for the license activation
-- GUI: check the saved secret key length
-
-## 2.3.2 - 2024-06-17
-
-- Fix the CAS callback parsing issue (fix [#372](https://github.com/yuezk/GlobalProtect-openconnect/issues/372))
-- CLI: fix the `/tmp/gpauth.html` deletion issue (fix [#366](https://github.com/yuezk/GlobalProtect-openconnect/issues/366))
-- GUI: fix the license not working after reboot (fix [#376](https://github.com/yuezk/GlobalProtect-openconnect/issues/376))
-- GUI: add the license activation management link
-
-## 2.3.1 - 2024-05-21
-
-- Fix the `--sslkey` option not working
-
-## 2.3.0 - 2024-05-20
-
-- Support client certificate authentication (fix [#363](https://github.com/yuezk/GlobalProtect-openconnect/issues/363))
-- Support `--disable-ipv6`, `--reconnect-timeout` parameters (related: [#364](https://github.com/yuezk/GlobalProtect-openconnect/issues/364))
-- Use default labels if label fields are missing in prelogin response (fix [#357](https://github.com/yuezk/GlobalProtect-openconnect/issues/357))
-
-## 2.2.1 - 2024-05-07
-
-- GUI: Restore the default browser auth implementation (fix [#360](https://github.com/yuezk/GlobalProtect-openconnect/issues/360))
-
-## 2.2.0 - 2024-04-30
-
-- CLI: support authentication with external browser (fix [#298](https://github.com/yuezk/GlobalProtect-openconnect/issues/298))
-- GUI: support using file-based storage when the system keyring is not available.
-
-## 2.1.4 - 2024-04-10
-
-- Support MFA authentication (fix [#343](https://github.com/yuezk/GlobalProtect-openconnect/issues/343))
-- Improve the Gateway switcher UI
-
-## 2.1.3 - 2024-04-07
-
-- Support CAS authentication (fix [#339](https://github.com/yuezk/GlobalProtect-openconnect/issues/339))
-- CLI: Add `--as-gateway` option to connect as gateway directly (fix [#318](https://github.com/yuezk/GlobalProtect-openconnect/issues/318))
-- GUI: Support connect the gateway directly (fix [#318](https://github.com/yuezk/GlobalProtect-openconnect/issues/318))
-- GUI: Add an option to use symbolic tray icon (fix [#341](https://github.com/yuezk/GlobalProtect-openconnect/issues/341))
-
-## 2.1.2 - 2024-03-29
-
-- Treat portal as gateway when the gateway login is failed (fix #338)
-
-## 2.1.1 - 2024-03-25
-
-- Add the `--hip` option to enable HIP report
-- Fix not working in OpenSuse 15.5 (fix #336, #322)
-- Treat portal as gateway when the gateway login is failed (fix #338)
-- Improve the error message (fix #327)
-
-## 2.1.0 - 2024-02-27
-
-- Update distribution channel for `gpgui` to complaint with the GPL-3 license.
-- Add `mtu` option.
-- Retry auth if failed to obtain the auth cookie
-
 ## 2.0.0 - 2024-02-05
 
 - Refactor using Tauri

crates/auth/Cargo.toml

@@ -1,59 +0,0 @@
-[package]
-name = "auth"
-rust-version.workspace = true
-version.workspace = true
-authors.workspace = true
-homepage.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-gpapi = { path = "../gpapi" }
-
-# Shared dependencies
-anyhow.workspace = true
-log.workspace = true
-tokio.workspace = true
-
-# Browser auth dependencies
-webbrowser = { version = "1", optional = true }
-open = { version = "5", optional = true }
-which = { workspace = true, optional = true }
-tiny_http = { version = "0.12", optional = true }
-uuid = { version = "1", optional = true, features = ["v4"] }
-
-# Webview auth dependencies
-tauri = { workspace = true, optional = true }
-regex = { workspace = true, optional = true }
-tokio-util = { workspace = true, optional = true }
-html-escape = { version = "0.2.13", optional = true }
-
-[target.'cfg(not(target_os = "macos"))'.dependencies]
-webkit2gtk = { version = "2", optional = true }
-
-[target.'cfg(target_os = "macos")'.dependencies]
-block2 = { version = "0.5", optional = true }
-objc2 = { version = "0.5", optional = true }
-objc2-foundation = { version = "0.2", optional = true }
-objc2-web-kit = { version = "0.2", optional = true }
-
-[features]
-browser-auth = [
-  "dep:webbrowser",
-  "dep:open",
-  "dep:which",
-  "dep:tiny_http",
-  "dep:uuid",
-]
-webview-auth = [
-  "gpapi/tauri",
-  "dep:tauri",
-  "dep:regex",
-  "dep:tokio-util",
-  "dep:html-escape",
-  "dep:webkit2gtk",
-  "dep:block2",
-  "dep:objc2",
-  "dep:objc2-foundation",
-  "dep:objc2-web-kit",
-]

crates/auth/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

crates/auth/src/browser.rs

@@ -1,4 +0,0 @@
-mod auth_server;
-mod browser_auth;
-
-pub use browser_auth::BrowserAuthenticator;

crates/auth/src/browser/auth_server.rs

@@ -1,57 +0,0 @@
-use std::io::Cursor;
-
-use log::info;
-use tiny_http::{Header, Response, Server};
-use uuid::Uuid;
-
-pub(super) struct AuthServer {
-  server: Server,
-  auth_id: String,
-}
-
-impl AuthServer {
-  pub fn new() -> anyhow::Result<Self> {
-    let server = Server::http("127.0.0.1:0").map_err(|err| anyhow::anyhow!(err))?;
-    let auth_id = Uuid::new_v4().to_string();
-
-    Ok(Self { server, auth_id })
-  }
-
-  pub fn auth_url(&self) -> String {
-    format!("http://{}/{}", self.server.server_addr(), self.auth_id)
-  }
-
-  pub fn serve_request(&self, auth_request: &str) {
-    info!("auth server started at: {}", self.auth_url());
-
-    for req in self.server.incoming_requests() {
-      info!("received request, method: {}, url: {}", req.method(), req.url());
-
-      if req.url() != format!("/{}", self.auth_id) {
-        let forbidden = Response::from_string("forbidden").with_status_code(403);
-        let _ = req.respond(forbidden);
-      } else {
-        let auth_response = build_auth_response(auth_request);
-        if let Err(err) = req.respond(auth_response) {
-          info!("failed to respond to request: {}", err);
-        } else {
-          info!("stop the auth server");
-          break;
-        }
-      }
-    }
-  }
-}
-
-fn build_auth_response(auth_request: &str) -> Response<Cursor<Vec<u8>>> {
-  if auth_request.starts_with("http") {
-    let header = format!("location: {}", auth_request);
-    let header: Header = header.parse().unwrap();
-    Response::from_string("redirect")
-      .with_status_code(302)
-      .with_header(header)
-  } else {
-    let content_type: Header = "content-type: text/html".parse().unwrap();
-    Response::from_string(auth_request).with_header(content_type)
-  }
-}

crates/auth/src/browser/browser_auth.rs

@@ -1,121 +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 crate::browser::auth_server::AuthServer;
-
-pub enum Browser<'a> {
-  Default,
-  Chrome,
-  Firefox,
-  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,
-      _ => Browser::Other(browser),
-    }
-  }
-
-  fn as_str(&self) -> &str {
-    match self {
-      Browser::Default => "default",
-      Browser::Chrome => "chrome",
-      Browser::Firefox => "firefox",
-      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 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);
-    });
-
-    match self.browser {
-      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
-  }
-}
-
-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)
-}

crates/auth/src/lib.rs

@@ -1,23 +0,0 @@
-use anyhow::bail;
-use gpapi::{
-  gp_params::GpParams,
-  portal::{prelogin, Prelogin},
-};
-
-#[cfg(feature = "browser-auth")]
-mod browser;
-
-#[cfg(feature = "browser-auth")]
-pub use browser::*;
-
-#[cfg(feature = "webview-auth")]
-mod webview;
-#[cfg(feature = "webview-auth")]
-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"),
-  }
-}

crates/auth/src/webview.rs

@@ -1,8 +0,0 @@
-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;

crates/auth/src/webview/auth_messenger.rs

@@ -1,229 +0,0 @@
-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;un=xyz@email.com&amp;token=very_long_string">
-    "#;
-
-    assert_eq!(
-      extract_gpcallback(html).as_deref(),
-      Some("globalprotectcallback:cas-as=1&un=xyz@email.com&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);
-  }
-}

crates/auth/src/webview/macos.rs

@@ -1,58 +0,0 @@
-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),
-      );
-    }
-  }
-}

crates/auth/src/webview/unix.rs

@@ -1,105 +0,0 @@
-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
-    });
-  }
-}

crates/auth/src/webview/webview_auth.rs

@@ -1,277 +0,0 @@
-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)
-      .visible(false)
-      .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);
-    }
-  }
-}

crates/common/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "common"
-rust-version.workspace = true
-version.workspace = true
-authors.workspace = true
-homepage.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-is_executable.workspace = true

crates/common/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

crates/common/src/lib.rs

@@ -1 +0,0 @@
-pub mod vpn_utils;

crates/common/src/vpn_utils.rs

@@ -1,58 +0,0 @@
-use std::{io, path::Path};
-
-use is_executable::IsExecutable;
-
-const VPNC_SCRIPT_LOCATIONS: &[&str] = &[
-  "/usr/local/share/vpnc-scripts/vpnc-script",
-  "/usr/local/sbin/vpnc-script",
-  "/usr/share/vpnc-scripts/vpnc-script",
-  "/usr/sbin/vpnc-script",
-  "/etc/vpnc/vpnc-script",
-  "/etc/openconnect/vpnc-script",
-  #[cfg(target_os = "macos")]
-  "/opt/homebrew/etc/vpnc/vpnc-script",
-];
-
-const CSD_WRAPPER_LOCATIONS: &[&str] = &[
-  #[cfg(target_arch = "x86_64")]
-  "/usr/lib/x86_64-linux-gnu/openconnect/hipreport.sh",
-  #[cfg(target_arch = "aarch64")]
-  "/usr/lib/aarch64-linux-gnu/openconnect/hipreport.sh",
-  "/usr/lib/openconnect/hipreport.sh",
-  "/usr/libexec/openconnect/hipreport.sh",
-  #[cfg(target_os = "macos")]
-  "/opt/homebrew/opt/openconnect/libexec/openconnect/hipreport.sh",
-];
-
-fn find_executable(locations: &[&str]) -> Option<String> {
-  for location in locations.iter() {
-    let path = Path::new(location);
-    if path.is_executable() {
-      return Some(location.to_string());
-    }
-  }
-
-  None
-}
-
-pub fn find_vpnc_script() -> Option<String> {
-  find_executable(&VPNC_SCRIPT_LOCATIONS)
-}
-
-pub fn find_csd_wrapper() -> Option<String> {
-  find_executable(&CSD_WRAPPER_LOCATIONS)
-}
-
-/// If file exists, check if it is executable
-pub fn check_executable(file: &str) -> Result<(), io::Error> {
-  let path = Path::new(file);
-
-  if path.exists() && !path.is_executable() {
-    return Err(io::Error::new(
-      io::ErrorKind::PermissionDenied,
-      format!("{} is not executable", file),
-    ));
-  }
-
-  Ok(())
-}

crates/gpapi/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "gpapi"
-rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 license = "MIT"
@@ -8,17 +7,14 @@ license = "MIT"
 [dependencies]
 anyhow.workspace = true
 base64.workspace = true
-dns-lookup.workspace = true
 log.workspace = true
 reqwest.workspace = true
-openssl.workspace = true
-version-compare = "0.2"
-pem.workspace = true
 roxmltree.workspace = true
 serde.workspace = true
-specta = { workspace = true, features = ["derive"] }
+specta.workspace = true
+specta-macros.workspace = true
 urlencoding.workspace = true
-tokio = { workspace = true, features = ["process", "signal", "macros"] }
+tokio.workspace = true
 serde_json.workspace = true
 whoami.workspace = true
 tempfile.workspace = true
@@ -27,6 +23,7 @@ chacha20poly1305 = { version = "0.10", features = ["std"] }
 redact-engine.workspace = true
 url.workspace = true
 regex.workspace = true
+dotenvy_macro.workspace = true
 uzers.workspace = true
 serde_urlencoded.workspace = true
 md5.workspace = true
@@ -34,16 +31,9 @@ sha256.workspace = true
 
 tauri = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
-clap-verbosity-flag = { workspace = true, optional = true }
+open = { version = "5", optional = true }
-
-env_logger = { workspace = true, optional = true }
-log-reload = { version = "0.1", optional = true }
-
-[target.'cfg(not(any(target_os="macos", target_os="windows")))'.dependencies]
-gtk = "0.18"
 
 [features]
 tauri = ["dep:tauri"]
-clap = ["dep:clap", "dep:clap-verbosity-flag"]
+clap = ["dep:clap"]
-webview-auth = []
+browser-auth = ["dep:open"]
-logger = ["dep:env_logger", "dep:log-reload"]

crates/gpapi/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) [2024] [Kevin Yue]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

crates/gpapi/build.rs

@@ -1,19 +0,0 @@
-use std::path::Path;
-
-fn main() {
-  let manifest_dir = env!("CARGO_MANIFEST_DIR");
-  let workspace_dir = Path::new(manifest_dir).ancestors().nth(2).unwrap();
-  let gpgui_dir = workspace_dir.parent().unwrap().join("gpgui");
-
-  let gp_service_binary = workspace_dir.join("target/debug/gpservice");
-  let gp_client_binary = workspace_dir.join("target/debug/gpclient");
-  let gp_auth_binary = workspace_dir.join("target/debug/gpauth");
-  let gp_gui_helper_binary = workspace_dir.join("target/debug/gpgui-helper");
-  let gp_gui_binary = gpgui_dir.join("target/debug/gpgui");
-
-  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_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_BINARY={}", gp_gui_binary.display());
-}

crates/gpapi/src/auth.rs

@@ -1,22 +1,13 @@
-use std::borrow::{Borrow, Cow};
-
 use anyhow::bail;
-use log::{info, warn};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 
-use crate::{error::AuthDataParseError, utils::base64::decode_to_string};
-
-pub type AuthDataParseResult = anyhow::Result<SamlAuthData, AuthDataParseError>;
-
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SamlAuthData {
-  #[serde(alias = "un")]
   username: String,
   prelogin_cookie: Option<String>,
   portal_userauthcookie: Option<String>,
-  token: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -36,82 +27,40 @@ impl SamlAuthResult {
 }
 
 impl SamlAuthData {
-  pub fn new(
+  pub fn new(username: String, prelogin_cookie: Option<String>, portal_userauthcookie: Option<String>) -> Self {
-    username: Option<String>,
+    Self {
-    prelogin_cookie: Option<String>,
-    portal_userauthcookie: Option<String>,
-  ) -> anyhow::Result<Self> {
-    let username = username.unwrap_or_default();
-    if username.is_empty() {
-      bail!("Invalid username: <empty>");
-    }
-
-    let prelogin_cookie = prelogin_cookie.unwrap_or_default();
-    let portal_userauthcookie = portal_userauthcookie.unwrap_or_default();
-
-    if prelogin_cookie.len() <= 5 && portal_userauthcookie.len() <= 5 {
-      bail!(
-        "Invalid prelogin-cookie: {}, portal-userauthcookie: {}",
-        prelogin_cookie,
-        portal_userauthcookie
-      );
-    }
-
-    Ok(Self {
       username,
-      prelogin_cookie: Some(prelogin_cookie),
+      prelogin_cookie,
-      portal_userauthcookie: Some(portal_userauthcookie),
+      portal_userauthcookie,
-      token: None,
+    }
-    })
   }
 
-  pub fn from_html(html: &str) -> AuthDataParseResult {
+  pub fn parse_html(html: &str) -> anyhow::Result<SamlAuthData> {
     match parse_xml_tag(html, "saml-auth-status") {
-      Some(status) if status == "1" => {
+      Some(saml_status) if saml_status == "1" => {
         let username = parse_xml_tag(html, "saml-username");
         let prelogin_cookie = parse_xml_tag(html, "prelogin-cookie");
         let portal_userauthcookie = parse_xml_tag(html, "portal-userauthcookie");
 
-        SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie).map_err(AuthDataParseError::Invalid)
+        if SamlAuthData::check(&username, &prelogin_cookie, &portal_userauthcookie) {
+          return Ok(SamlAuthData::new(
+            username.unwrap(),
+            prelogin_cookie,
+            portal_userauthcookie,
+          ));
+        }
+
+        bail!("Found invalid auth data in HTML");
+      }
+      Some(status) => {
+        bail!("Found invalid SAML status {} in HTML", status);
+      }
+      None => {
+        bail!("No auth data found in HTML");
       }
-      Some(status) => Err(AuthDataParseError::Invalid(anyhow::anyhow!(
-        "SAML auth status: {}",
-        status
-      ))),
-      None => Err(AuthDataParseError::NotFound),
     }
   }
 
-  pub fn from_gpcallback(data: &str) -> anyhow::Result<SamlAuthData, AuthDataParseError> {
-    let auth_data = data.trim_start_matches("globalprotectcallback:");
-
-    if auth_data.starts_with("cas-as") {
-      info!("Got CAS auth data from globalprotectcallback");
-
-      // Decode the auth data and use the original value if decoding fails
-      let auth_data = urlencoding::decode(auth_data).unwrap_or_else(|err| {
-        warn!("Failed to decode token auth data: {}", err);
-        Cow::Borrowed(auth_data)
-      });
-
-      let auth_data: SamlAuthData = serde_urlencoded::from_str(auth_data.borrow()).map_err(|e| {
-        warn!("Failed to parse token auth data: {}", e);
-        warn!("Auth data: {}", auth_data);
-        AuthDataParseError::Invalid(anyhow::anyhow!(e))
-      })?;
-
-      return Ok(auth_data);
-    }
-
-    let auth_data = decode_to_string(auth_data).map_err(|e| {
-      warn!("Failed to decode SAML auth data: {}", e);
-      AuthDataParseError::Invalid(anyhow::anyhow!(e))
-    })?;
-    let auth_data = Self::from_html(&auth_data)?;
-
-    Ok(auth_data)
-  }
-
   pub fn username(&self) -> &str {
     &self.username
   }
@@ -120,49 +69,22 @@ impl SamlAuthData {
     self.prelogin_cookie.as_deref()
   }
 
-  pub fn token(&self) -> Option<&str> {
+  pub fn check(
-    self.token.as_deref()
+    username: &Option<String>,
+    prelogin_cookie: &Option<String>,
+    portal_userauthcookie: &Option<String>,
+  ) -> bool {
+    let username_valid = username.as_ref().is_some_and(|username| !username.is_empty());
+    let prelogin_cookie_valid = prelogin_cookie.as_ref().is_some_and(|val| val.len() > 5);
+    let portal_userauthcookie_valid = portal_userauthcookie.as_ref().is_some_and(|val| val.len() > 5);
+
+    username_valid && (prelogin_cookie_valid || portal_userauthcookie_valid)
   }
 }
 
-fn parse_xml_tag(html: &str, tag: &str) -> Option<String> {
+pub fn parse_xml_tag(html: &str, tag: &str) -> Option<String> {
   let re = Regex::new(&format!("<{}>(.*)</{}>", tag, tag)).unwrap();
   re.captures(html)
     .and_then(|captures| captures.get(1))
     .map(|m| m.as_str().to_string())
 }
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn auth_data_from_gpcallback_cas() {
-    let auth_data = "globalprotectcallback:cas-as=1&un=xyz@email.com&token=very_long_string";
-
-    let auth_data = SamlAuthData::from_gpcallback(auth_data).unwrap();
-
-    assert_eq!(auth_data.username(), "xyz@email.com");
-    assert_eq!(auth_data.token(), Some("very_long_string"));
-  }
-
-  #[test]
-  fn auth_data_from_gpcallback_cas_urlencoded() {
-    let auth_data = "globalprotectcallback:cas-as%3D1%26un%3Dxyz%40email.com%26token%3Dvery_long_string";
-
-    let auth_data = SamlAuthData::from_gpcallback(auth_data).unwrap();
-
-    assert_eq!(auth_data.username(), "xyz@email.com");
-    assert_eq!(auth_data.token(), Some("very_long_string"));
-  }
-
-  #[test]
-  fn auth_data_from_gpcallback_non_cas() {
-    let auth_data = "PGh0bWw+PCEtLSA8c2FtbC1hdXRoLXN0YXR1cz4xPC9zYW1sLWF1dGgtc3RhdHVzPjxwcmVsb2dpbi1jb29raWU+cHJlbG9naW4tY29va2llPC9wcmVsb2dpbi1jb29raWU+PHNhbWwtdXNlcm5hbWU+eHl6QGVtYWlsLmNvbTwvc2FtbC11c2VybmFtZT48c2FtbC1zbG8+bm88L3NhbWwtc2xvPjxzYW1sLVNlc3Npb25Ob3RPbk9yQWZ0ZXI+PC9zYW1sLVNlc3Npb25Ob3RPbk9yQWZ0ZXI+IC0tPjwvaHRtbD4=";
-
-    let auth_data = SamlAuthData::from_gpcallback(auth_data).unwrap();
-
-    assert_eq!(auth_data.username(), "xyz@email.com");
-    assert_eq!(auth_data.prelogin_cookie(), Some("prelogin-cookie"));
-  }
-}

crates/gpapi/src/clap/mod.rs

@@ -1,81 +1 @@
-use clap_verbosity_flag::{LogLevel, Verbosity, VerbosityFilter};
-use log::Level;
-
-use crate::error::PortalError;
-
 pub mod args;
-
-pub trait Args {
-  fn fix_openssl(&self) -> bool;
-  fn ignore_tls_errors(&self) -> bool;
-}
-
-pub fn handle_error(err: anyhow::Error, args: &impl Args) {
-  eprintln!("\nError: {:?}", err);
-
-  let Some(err) = err.downcast_ref::<PortalError>() else {
-    return;
-  };
-
-  if err.is_legacy_openssl_error() && !args.fix_openssl() {
-    eprintln!("\nRe-run it with the `--fix-openssl` option to work around this issue, e.g.:\n");
-    let args = std::env::args().collect::<Vec<_>>();
-    eprintln!("{} --fix-openssl {}\n", args[0], args[1..].join(" "));
-  }
-
-  if err.is_tls_error() && !args.ignore_tls_errors() {
-    eprintln!("\nRe-run it with the `--ignore-tls-errors` option to ignore the certificate error, e.g.:\n");
-    let args = std::env::args().collect::<Vec<_>>();
-    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"),
-    }
-  }
-}

crates/gpapi/src/credential.rs

@@ -1,10 +1,9 @@
 use std::collections::HashMap;
 
-use anyhow::bail;
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
-use crate::auth::{SamlAuthData, SamlAuthResult};
+use crate::{auth::SamlAuthData, utils::base64::decode_to_string};
 
 #[derive(Debug, Serialize, Deserialize, Type, Clone)]
 #[serde(rename_all = "camelCase")]
@@ -38,18 +37,16 @@ impl From<&CachedCredential> for PasswordCredential {
 
 #[derive(Debug, Serialize, Deserialize, Type, Clone)]
 #[serde(rename_all = "camelCase")]
-pub struct PreloginCredential {
+pub struct PreloginCookieCredential {
   username: String,
-  prelogin_cookie: Option<String>,
+  prelogin_cookie: String,
-  token: Option<String>,
 }
 
-impl PreloginCredential {
+impl PreloginCookieCredential {
-  pub fn new(username: &str, prelogin_cookie: Option<&str>, token: Option<&str>) -> Self {
+  pub fn new(username: &str, prelogin_cookie: &str) -> Self {
     Self {
       username: username.to_string(),
-      prelogin_cookie: prelogin_cookie.map(|s| s.to_string()),
+      prelogin_cookie: prelogin_cookie.to_string(),
-      token: token.map(|s| s.to_string()),
     }
   }
 
@@ -57,22 +54,22 @@ impl PreloginCredential {
     &self.username
   }
 
-  pub fn prelogin_cookie(&self) -> Option<&str> {
+  pub fn prelogin_cookie(&self) -> &str {
-    self.prelogin_cookie.as_deref()
+    &self.prelogin_cookie
-  }
-
-  pub fn token(&self) -> Option<&str> {
-    self.token.as_deref()
   }
 }
 
-impl From<SamlAuthData> for PreloginCredential {
+impl TryFrom<SamlAuthData> for PreloginCookieCredential {
-  fn from(value: SamlAuthData) -> Self {
+  type Error = anyhow::Error;
-    let username = value.username().to_string();
-    let prelogin_cookie = value.prelogin_cookie();
-    let token = value.token();
 
-    Self::new(&username, prelogin_cookie, token)
+  fn try_from(value: SamlAuthData) -> Result<Self, Self::Error> {
+    let username = value.username().to_string();
+    let prelogin_cookie = value
+      .prelogin_cookie()
+      .ok_or_else(|| anyhow::anyhow!("Missing prelogin cookie"))?
+      .to_string();
+
+    Ok(Self::new(&username, &prelogin_cookie))
   }
 }
 
@@ -111,11 +108,11 @@ impl AuthCookieCredential {
 pub struct CachedCredential {
   username: String,
   password: Option<String>,
-  auth_cookie: Option<AuthCookieCredential>,
+  auth_cookie: AuthCookieCredential,
 }
 
 impl CachedCredential {
-  pub fn new(username: String, password: Option<String>, auth_cookie: Option<AuthCookieCredential>) -> Self {
+  pub fn new(username: String, password: Option<String>, auth_cookie: AuthCookieCredential) -> Self {
     Self {
       username,
       password,
@@ -131,12 +128,12 @@ impl CachedCredential {
     self.password.as_deref()
   }
 
-  pub fn auth_cookie(&self) -> Option<&AuthCookieCredential> {
+  pub fn auth_cookie(&self) -> &AuthCookieCredential {
-    self.auth_cookie.as_ref()
+    &self.auth_cookie
   }
 
   pub fn set_auth_cookie(&mut self, auth_cookie: AuthCookieCredential) {
-    self.auth_cookie = Some(auth_cookie);
+    self.auth_cookie = auth_cookie;
   }
 
   pub fn set_username(&mut self, username: String) {
@@ -150,33 +147,41 @@ impl CachedCredential {
 
 impl From<PasswordCredential> for CachedCredential {
   fn from(value: PasswordCredential) -> Self {
-    Self::new(value.username().to_owned(), Some(value.password().to_owned()), None)
+    Self::new(
+      value.username().to_owned(),
+      Some(value.password().to_owned()),
+      AuthCookieCredential::new("", "", ""),
+    )
   }
 }
+
 #[derive(Debug, Serialize, Deserialize, Type, Clone)]
 #[serde(tag = "type", rename_all = "camelCase")]
 pub enum Credential {
   Password(PasswordCredential),
-  Prelogin(PreloginCredential),
+  PreloginCookie(PreloginCookieCredential),
   AuthCookie(AuthCookieCredential),
-  Cached(CachedCredential),
+  CachedCredential(CachedCredential),
 }
 
 impl Credential {
-  /// Create a credential from a globalprotectcallback:<base64 encoded string>,
+  /// Create a credential from a globalprotectcallback:<base64 encoded string>
-  /// or globalprotectcallback:cas-as=1&un=user@xyz.com&token=very_long_string
+  pub fn parse_gpcallback(auth_data: &str) -> anyhow::Result<Self> {
-  pub fn from_gpcallback(auth_data: &str) -> anyhow::Result<Self> {
+    // Remove the surrounding quotes
-    let auth_data = SamlAuthData::from_gpcallback(auth_data)?;
+    let auth_data = auth_data.trim_matches('"');
+    let auth_data = auth_data.trim_start_matches("globalprotectcallback:");
+    let auth_data = decode_to_string(auth_data)?;
+    let auth_data = SamlAuthData::parse_html(&auth_data)?;
 
-    Ok(Self::from(auth_data))
+    Self::try_from(auth_data)
   }
 
   pub fn username(&self) -> &str {
     match self {
       Credential::Password(cred) => cred.username(),
-      Credential::Prelogin(cred) => cred.username(),
+      Credential::PreloginCookie(cred) => cred.username(),
       Credential::AuthCookie(cred) => cred.username(),
-      Credential::Cached(cred) => cred.username(),
+      Credential::CachedCredential(cred) => cred.username(),
     }
   }
 
@@ -184,22 +189,20 @@ impl Credential {
     let mut params = HashMap::new();
     params.insert("user", self.username());
 
-    let (passwd, prelogin_cookie, portal_userauthcookie, portal_prelogonuserauthcookie, token) = match self {
+    let (passwd, prelogin_cookie, portal_userauthcookie, portal_prelogonuserauthcookie) = match self {
-      Credential::Password(cred) => (Some(cred.password()), None, None, None, None),
+      Credential::Password(cred) => (Some(cred.password()), None, None, None),
-      Credential::Prelogin(cred) => (None, cred.prelogin_cookie(), None, None, cred.token()),
+      Credential::PreloginCookie(cred) => (None, Some(cred.prelogin_cookie()), None, None),
       Credential::AuthCookie(cred) => (
         None,
         None,
         Some(cred.user_auth_cookie()),
         Some(cred.prelogon_user_auth_cookie()),
-        None,
       ),
-      Credential::Cached(cred) => (
+      Credential::CachedCredential(cred) => (
         cred.password(),
         None,
-        cred.auth_cookie.as_ref().map(|c| c.user_auth_cookie()),
+        Some(cred.auth_cookie.user_auth_cookie()),
-        cred.auth_cookie.as_ref().map(|c| c.prelogon_user_auth_cookie()),
+        Some(cred.auth_cookie.prelogon_user_auth_cookie()),
-        None,
       ),
     };
 
@@ -211,30 +214,17 @@ impl Credential {
       portal_prelogonuserauthcookie.unwrap_or_default(),
     );
 
-    if let Some(token) = token {
-      params.insert("token", token);
-    }
-
     params
   }
 }
 
-impl From<SamlAuthData> for Credential {
+impl TryFrom<SamlAuthData> for Credential {
-  fn from(value: SamlAuthData) -> Self {
-    let cred = PreloginCredential::from(value);
-
-    Self::Prelogin(cred)
-  }
-}
-
-impl TryFrom<SamlAuthResult> for Credential {
   type Error = anyhow::Error;
 
-  fn try_from(value: SamlAuthResult) -> anyhow::Result<Self> {
+  fn try_from(value: SamlAuthData) -> Result<Self, Self::Error> {
-    match value {
+    let prelogin_cookie = PreloginCookieCredential::try_from(value)?;
-      SamlAuthResult::Success(auth_data) => Ok(Self::from(auth_data)),
+
-      SamlAuthResult::Failure(err) => bail!(err),
+    Ok(Self::PreloginCookie(prelogin_cookie))
-    }
   }
 }
 
@@ -252,6 +242,6 @@ impl From<&AuthCookieCredential> for Credential {
 
 impl From<&CachedCredential> for Credential {
   fn from(value: &CachedCredential) -> Self {
-    Self::Cached(value.clone())
+    Self::CachedCredential(value.clone())
   }
 }

crates/gpapi/src/error.rs

@@ -1,40 +0,0 @@
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum PortalError {
-  #[error("Prelogin error: {0}")]
-  PreloginError(String),
-
-  #[error("Portal config error: {0}")]
-  ConfigError(String),
-
-  #[error(transparent)]
-  NetworkError(#[from] reqwest::Error),
-
-  #[error("TLS error")]
-  TlsError,
-}
-
-impl PortalError {
-  pub fn is_legacy_openssl_error(&self) -> bool {
-    format!("{:?}", self).contains("unsafe legacy renegotiation")
-  }
-
-  pub fn is_tls_error(&self) -> bool {
-    matches!(self, PortalError::TlsError) || format!("{:?}", self).contains("certificate verify failed")
-  }
-}
-
-#[derive(Error, Debug)]
-pub enum AuthDataParseError {
-  #[error("No auth data found")]
-  NotFound,
-  #[error(transparent)]
-  Invalid(#[from] anyhow::Error),
-}
-
-impl AuthDataParseError {
-  pub fn is_invalid(&self) -> bool {
-    matches!(self, AuthDataParseError::Invalid(_))
-  }
-}

crates/gpapi/src/gateway/hip.rs

@@ -156,7 +156,11 @@ fn build_csd_token(cookie: &str) -> anyhow::Result<String> {
 }
 
 pub async fn hip_report(gateway: &str, cookie: &str, csd_wrapper: &str, gp_params: &GpParams) -> anyhow::Result<()> {
-  let client = Client::try_from(gp_params)?;
+  let client = Client::builder()
+    .danger_accept_invalid_certs(gp_params.ignore_tls_errors())
+    .user_agent(gp_params.user_agent())
+    .build()?;
+
   let md5 = build_csd_token(cookie)?;
 
   info!("Submit HIP report md5: {}", md5);

crates/gpapi/src/gateway/login.rs

@@ -1,27 +1,24 @@
 use anyhow::bail;
-use log::{info, warn};
+use log::info;
 use reqwest::Client;
 use roxmltree::Document;
 use urlencoding::encode;
 
 use crate::{
   credential::Credential,
-  error::PortalError,
   gp_params::GpParams,
-  utils::{normalize_server, parse_gp_response, remove_url_scheme},
+  utils::{normalize_server, remove_url_scheme},
 };
 
-pub enum GatewayLogin {
+pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParams) -> anyhow::Result<String> {
-  Cookie(String),
-  Mfa(String, String),
-}
-
-pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParams) -> anyhow::Result<GatewayLogin> {
   let url = normalize_server(gateway)?;
   let gateway = remove_url_scheme(&url);
 
   let login_url = format!("{}/ssl-vpn/login.esp", url);
-  let client = Client::try_from(gp_params)?;
+  let client = Client::builder()
+    .danger_accept_invalid_certs(gp_params.ignore_tls_errors())
+    .user_agent(gp_params.user_agent())
+    .build()?;
 
   let mut params = cred.to_params();
   let extra_params = gp_params.to_params();
@@ -29,32 +26,19 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam
   params.extend(extra_params);
   params.insert("server", &gateway);
 
-  info!("Perform gateway login, user_agent: {}", gp_params.user_agent());
+  info!("Gateway login, user_agent: {}", gp_params.user_agent());
 
-  let res = client.post(&login_url).form(&params).send().await.map_err(|e| {
+  let res = client.post(&login_url).form(&params).send().await?;
-    warn!("Network error: {:?}", e);
+  let status = res.status();
-    anyhow::anyhow!(PortalError::NetworkError(e))
-  })?;
 
-  let res = parse_gp_response(res).await.map_err(|err| {
+  if status.is_client_error() || status.is_server_error() {
-    warn!("{err}");
+    bail!("Gateway login error: {}", status)
-    anyhow::anyhow!("Gateway login error: {}", err.reason)
-  })?;
-
-  // MFA detected
-  if res.contains("Challenge") {
-    let Some((message, input_str)) = parse_mfa(&res) else {
-      bail!("Failed to parse MFA challenge: {res}");
-    };
-
-    return Ok(GatewayLogin::Mfa(message, input_str));
   }
 
-  let doc = Document::parse(&res)?;
+  let res_xml = res.text().await?;
+  let doc = Document::parse(&res_xml)?;
 
-  let cookie = build_gateway_token(&doc, gp_params.computer())?;
+  build_gateway_token(&doc, gp_params.computer())
-
-  Ok(GatewayLogin::Cookie(cookie))
 }
 
 fn build_gateway_token(doc: &Document, computer: &str) -> anyhow::Result<String> {
@@ -88,33 +72,3 @@ fn read_args<'a>(args: &'a [String], index: usize, key: &'a str) -> anyhow::Resu
     .ok_or_else(|| anyhow::anyhow!("Failed to read {key} from args"))
     .map(|s| (key, s.as_ref()))
 }
-
-fn parse_mfa(res: &str) -> Option<(String, String)> {
-  let message = res
-    .lines()
-    .find(|l| l.contains("respMsg"))
-    .and_then(|l| l.split('"').nth(1).map(|s| s.to_string()))?;
-
-  let input_str = res
-    .lines()
-    .find(|l| l.contains("inputStr"))
-    .and_then(|l| l.split('"').nth(1).map(|s| s.to_string()))?;
-
-  Some((message, input_str))
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn mfa() {
-    let res = r#"var respStatus = "Challenge";
-var respMsg = "MFA message";
-thisForm.inputStr.value = "5ef64e83000119ed";"#;
-
-    let (message, input_str) = parse_mfa(res).unwrap();
-    assert_eq!(message, "MFA message");
-    assert_eq!(input_str, "5ef64e83000119ed");
-  }
-}

crates/gpapi/src/gateway/parse_gateways.rs

@@ -1,47 +1,44 @@
-use log::info;
+use roxmltree::Document;
-use roxmltree::Node;
-
-use crate::utils::xml::NodeExt;
 
 use super::{Gateway, PriorityRule};
 
-pub(crate) fn parse_gateways(node: &Node, prefer_internal: bool) -> Option<Vec<Gateway>> {
+pub(crate) fn parse_gateways(doc: &Document) -> Option<Vec<Gateway>> {
-  let node_gateways = node.find_descendant("gateways")?;
+  let node_gateways = doc.descendants().find(|n| n.has_tag_name("gateways"))?;
-  let internal_gateway_list = if prefer_internal {
+  let list_gateway = node_gateways.descendants().find(|n| n.has_tag_name("list"))?;
-    info!("Try to parse the internal gateways...");
-    node_gateways.find_descendant("internal").and_then(|n| n.find_child("list"))
-  } else {
-    None
-  };
 
-  let gateway_list = internal_gateway_list.or_else(|| {
+  let gateways = list_gateway
-    info!("Try to parse the external gateways...");
-    node_gateways.find_descendant("external").and_then(|n| n.find_child("list"))
-  })?;
-
-  let gateways = gateway_list
     .children()
     .filter_map(|gateway_item| {
       if !gateway_item.has_tag_name("entry") {
         return None;
       }
-      let address = gateway_item.attribute("name").unwrap_or_default().to_string();
+      let address = gateway_item.attribute("name").unwrap_or("").to_string();
-      let name = gateway_item.child_text("description").unwrap_or_default().to_string();
+      let name = gateway_item
+        .children()
+        .find(|n| n.has_tag_name("description"))
+        .and_then(|n| n.text())
+        .unwrap_or("")
+        .to_string();
       let priority = gateway_item
-        .child_text("priority")
+        .children()
+        .find(|n| n.has_tag_name("priority"))
+        .and_then(|n| n.text())
         .and_then(|s| s.parse().ok())
         .unwrap_or(u32::MAX);
       let priority_rules = gateway_item
-        .find_child("priority-rule")
+        .children()
+        .find(|n| n.has_tag_name("priority-rule"))
         .map(|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 name = n.attribute("name").unwrap_or("").to_string();
               let priority: u32 = n
-                .child_text("priority")
+                .children()
+                .find(|n| n.has_tag_name("priority"))
+                .and_then(|n| n.text())
                 .and_then(|s| s.parse().ok())
                 .unwrap_or(u32::MAX);
 

crates/gpapi/src/gp_params.rs

@@ -1,18 +1,15 @@
 use std::collections::HashMap;
 
-use log::info;
-use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
-use crate::{utils::request::create_identity, GP_USER_AGENT};
+use crate::GP_USER_AGENT;
 
 #[derive(Debug, Serialize, Deserialize, Clone, Type, Default)]
 pub enum ClientOs {
-  #[cfg_attr(not(target_os = "macos"), default)]
+  #[default]
   Linux,
   Windows,
-  #[cfg_attr(target_os = "macos", default)]
   Mac,
 }
 
@@ -45,7 +42,7 @@ impl ClientOs {
   }
 }
 
-#[derive(Debug, Serialize, Deserialize, Type, Default, Clone)]
+#[derive(Debug, Serialize, Deserialize, Type, Default)]
 pub struct GpParams {
   is_gateway: bool,
   user_agent: String,
@@ -54,12 +51,7 @@ pub struct GpParams {
   client_version: Option<String>,
   computer: String,
   ignore_tls_errors: bool,
-  certificate: Option<String>,
+  prefer_default_browser: bool,
-  sslkey: Option<String>,
-  key_password: Option<String>,
-  // Used for MFA
-  input_str: Option<String>,
-  otp: Option<String>,
 }
 
 impl GpParams {
@@ -87,6 +79,10 @@ impl GpParams {
     self.ignore_tls_errors
   }
 
+  pub fn prefer_default_browser(&self) -> bool {
+    self.prefer_default_browser
+  }
+
   pub fn client_os(&self) -> &str {
     self.client_os.as_str()
   }
@@ -99,14 +95,6 @@ impl GpParams {
     self.client_version.as_deref()
   }
 
-  pub fn set_input_str(&mut self, input_str: &str) {
-    self.input_str = Some(input_str.to_string());
-  }
-
-  pub fn set_otp(&mut self, otp: &str) {
-    self.otp = Some(otp.to_string());
-  }
-
   pub(crate) fn to_params(&self) -> HashMap<&str, &str> {
     let mut params: HashMap<&str, &str> = HashMap::new();
     let client_os = self.client_os.as_str();
@@ -117,16 +105,11 @@ impl GpParams {
     params.insert("ok", "Login");
     params.insert("direct", "yes");
     params.insert("ipv6-support", "yes");
+    params.insert("inputStr", "");
     params.insert("clientVer", "4100");
     params.insert("clientos", client_os);
     params.insert("computer", &self.computer);
 
-    // MFA
-    params.insert("inputStr", self.input_str.as_deref().unwrap_or_default());
-    if let Some(otp) = &self.otp {
-      params.insert("passwd", otp);
-    }
-
     if let Some(os_version) = &self.os_version {
       params.insert("os-version", os_version);
     }
@@ -148,26 +131,20 @@ pub struct GpParamsBuilder {
   client_version: Option<String>,
   computer: String,
   ignore_tls_errors: bool,
-  certificate: Option<String>,
+  prefer_default_browser: bool,
-  sslkey: Option<String>,
-  key_password: Option<String>,
 }
 
 impl GpParamsBuilder {
   pub fn new() -> Self {
-    let computer = whoami::fallible::hostname().unwrap_or_else(|_| String::from("localhost"));
-
     Self {
       is_gateway: false,
       user_agent: GP_USER_AGENT.to_string(),
       client_os: ClientOs::Linux,
       os_version: Default::default(),
       client_version: Default::default(),
-      computer,
+      computer: whoami::hostname(),
       ignore_tls_errors: false,
-      certificate: Default::default(),
+      prefer_default_browser: false,
-      sslkey: Default::default(),
-      key_password: Default::default(),
     }
   }
 
@@ -206,18 +183,8 @@ impl GpParamsBuilder {
     self
   }
 
-  pub fn certificate<T: Into<Option<String>>>(&mut self, certificate: T) -> &mut Self {
+  pub fn prefer_default_browser(&mut self, prefer_default_browser: bool) -> &mut Self {
-    self.certificate = certificate.into();
+    self.prefer_default_browser = prefer_default_browser;
-    self
-  }
-
-  pub fn sslkey<T: Into<Option<String>>>(&mut self, sslkey: T) -> &mut Self {
-    self.sslkey = sslkey.into();
-    self
-  }
-
-  pub fn key_password<T: Into<Option<String>>>(&mut self, password: T) -> &mut Self {
-    self.key_password = password.into();
     self
   }
 
@@ -230,11 +197,7 @@ impl GpParamsBuilder {
       client_version: self.client_version.clone(),
       computer: self.computer.clone(),
       ignore_tls_errors: self.ignore_tls_errors,
-      certificate: self.certificate.clone(),
+      prefer_default_browser: self.prefer_default_browser,
-      sslkey: self.sslkey.clone(),
-      key_password: self.key_password.clone(),
-      input_str: Default::default(),
-      otp: Default::default(),
     }
   }
 }
@@ -244,22 +207,3 @@ impl Default for GpParamsBuilder {
     Self::new()
   }
 }
-
-impl TryFrom<&GpParams> for Client {
-  type Error = anyhow::Error;
-
-  fn try_from(value: &GpParams) -> Result<Self, Self::Error> {
-    let mut builder = Client::builder()
-      .danger_accept_invalid_certs(value.ignore_tls_errors)
-      .user_agent(&value.user_agent);
-
-    if let Some(cert) = value.certificate.as_deref() {
-      info!("Using client certificate authentication...");
-      let identity = create_identity(cert, value.sslkey.as_deref(), value.key_password.as_deref())?;
-      builder = builder.identity(identity);
-    }
-
-    let client = builder.build()?;
-    Ok(client)
-  }
-}

crates/gpapi/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod auth;
 pub mod credential;
-pub mod error;
 pub mod gateway;
 pub mod gp_params;
 pub mod portal;
@@ -8,9 +7,6 @@ pub mod process;
 pub mod service;
 pub mod utils;
 
-#[cfg(feature = "logger")]
-pub mod logger;
-
 #[cfg(feature = "clap")]
 pub mod clap;
 
@@ -19,7 +15,6 @@ 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";
@@ -33,12 +28,12 @@ pub const GP_GUI_HELPER_BINARY: &str = "/usr/bin/gpgui-helper";
 pub(crate) const GP_AUTH_BINARY: &str = "/usr/bin/gpauth";
 
 #[cfg(debug_assertions)]
-pub const GP_CLIENT_BINARY: &str = env!("GP_CLIENT_BINARY");
+pub const GP_CLIENT_BINARY: &str = dotenvy_macro::dotenv!("GP_CLIENT_BINARY");
 #[cfg(debug_assertions)]
-pub const GP_SERVICE_BINARY: &str = env!("GP_SERVICE_BINARY");
+pub const GP_SERVICE_BINARY: &str = dotenvy_macro::dotenv!("GP_SERVICE_BINARY");
 #[cfg(debug_assertions)]
-pub const GP_GUI_BINARY: &str = env!("GP_GUI_BINARY");
+pub const GP_GUI_BINARY: &str = dotenvy_macro::dotenv!("GP_GUI_BINARY");
 #[cfg(debug_assertions)]
-pub const GP_GUI_HELPER_BINARY: &str = env!("GP_GUI_HELPER_BINARY");
+pub const GP_GUI_HELPER_BINARY: &str = dotenvy_macro::dotenv!("GP_GUI_HELPER_BINARY");
 #[cfg(debug_assertions)]
-pub(crate) const GP_AUTH_BINARY: &str = env!("GP_AUTH_BINARY");
+pub(crate) const GP_AUTH_BINARY: &str = dotenvy_macro::dotenv!("GP_AUTH_BINARY");

crates/gpapi/src/logger.rs

@@ -1,44 +0,0 @@
-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))
-}

crates/gpapi/src/portal/config.rs

@@ -1,17 +1,16 @@
 use anyhow::bail;
-use dns_lookup::lookup_addr;
+use log::info;
-use log::{info, warn};
 use reqwest::{Client, StatusCode};
-use roxmltree::{Document, Node};
+use roxmltree::Document;
 use serde::Serialize;
 use specta::Type;
 
 use crate::{
   credential::{AuthCookieCredential, Credential},
-  error::PortalError,
   gateway::{parse_gateways, Gateway},
   gp_params::GpParams,
-  utils::{normalize_server, parse_gp_response, remove_url_scheme, xml::NodeExt},
+  portal::PortalError,
+  utils::{normalize_server, remove_url_scheme, xml},
 };
 
 #[derive(Debug, Serialize, Type)]
@@ -22,13 +21,6 @@ pub struct PortalConfig {
   config_cred: Credential,
   gateways: Vec<Gateway>,
   config_digest: Option<String>,
-  /**
-   * Variants:
-   * - None: Internal host detection is not supported
-   * - Some(false): Internal host detection is supported but the user is not 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>,
 }
 
 impl PortalConfig {
@@ -48,10 +40,6 @@ impl PortalConfig {
     &self.config_cred
   }
 
-  pub fn internal_host_detection(&self) -> Option<bool> {
-    self.internal_host_detection
-  }
-
   /// In-place sort the gateways by region
   pub fn sort_gateways(&mut self, region: &str) {
     let preferred_gateway = self.find_preferred_gateway(region);
@@ -100,7 +88,10 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
   let server = remove_url_scheme(&portal);
 
   let url = format!("{}/global-protect/getconfig.esp", portal);
-  let client = Client::try_from(gp_params)?;
+  let client = Client::builder()
+    .danger_accept_invalid_certs(gp_params.ignore_tls_errors())
+    .user_agent(gp_params.user_agent())
+    .build()?;
 
   let mut params = cred.to_params();
   let extra_params = gp_params.to_params();
@@ -109,50 +100,35 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
   params.insert("server", &server);
   params.insert("host", &server);
 
-  info!("Retrieve the portal config, user_agent: {}", gp_params.user_agent());
+  info!("Portal config, user_agent: {}", gp_params.user_agent());
 
-  let res = client.post(&url).form(&params).send().await.map_err(|e| {
+  let res = client.post(&url).form(&params).send().await?;
-    warn!("Network error: {:?}", e);
+  let status = res.status();
-    anyhow::anyhow!(PortalError::NetworkError(e))
-  })?;
 
-  let res_xml = parse_gp_response(res).await.or_else(|err| {
+  if status == StatusCode::NOT_FOUND {
-    if err.status == StatusCode::NOT_FOUND {
+    bail!(PortalError::ConfigError("Config endpoint not found".to_string()))
-      bail!(PortalError::ConfigError("Config endpoint not found".to_string()));
+  }
-    }
 
-    if err.is_status_error() {
+  if status.is_client_error() || status.is_server_error() {
-      warn!("{err}");
+    bail!("Portal config error: {}", status)
-      bail!("Portal config error: {}", err.reason);
+  }
-    }
 
-    Err(anyhow::anyhow!(PortalError::ConfigError(err.reason)))
+  let res_xml = res.text().await.map_err(|e| PortalError::ConfigError(e.to_string()))?;
-  })?;
 
   if res_xml.is_empty() {
     bail!(PortalError::ConfigError("Empty portal config response".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 gateways = parse_gateways(&doc).unwrap_or_else(|| {
-  let mut prefer_internal = false;
-  if let Some(ihd_node) = root.find_descendant("internal-host-detection") {
-    ihd_enabled = true;
-    prefer_internal = internal_host_detect(&ihd_node)
-  }
-
-  let mut gateways = parse_gateways(&root, prefer_internal).unwrap_or_else(|| {
     info!("No gateways found in portal config");
     vec![]
   });
 
-  let user_auth_cookie = root.descendant_text("portal-userauthcookie").unwrap_or_default();
+  let user_auth_cookie = xml::get_child_text(&doc, "portal-userauthcookie").unwrap_or_default();
-  let prelogon_user_auth_cookie = root
+  let prelogon_user_auth_cookie = xml::get_child_text(&doc, "portal-prelogonuserauthcookie").unwrap_or_default();
-    .descendant_text("portal-prelogonuserauthcookie")
+  let config_digest = xml::get_child_text(&doc, "config-digest");
-    .unwrap_or_default();
-  let config_digest = root.descendant_text("config-digest");
 
   if gateways.is_empty() {
     gateways.push(Gateway::new(server.to_string(), server.to_string()));
@@ -160,44 +136,9 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
 
   Ok(PortalConfig {
     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(),
     gateways,
-    config_digest: config_digest.map(|s| s.to_string()),
+    config_digest,
-    internal_host_detection: if ihd_enabled { Some(prefer_internal) } else { None },
   })
 }
-
-// Perform DNS lookup and compare the result with the expected hostname
-fn internal_host_detect(node: &Node) -> bool {
-  let ip_info = [
-    (node.child_text("ip-address"), node.child_text("host")),
-    (node.child_text("ipv6-address"), node.child_text("ipv6-host")),
-  ];
-
-  info!("Found internal-host-detection, performing DNS lookup");
-
-  for (ip_address, host) in ip_info.iter() {
-    if let (Some(ip_address), Some(host)) = (ip_address.as_deref(), host.as_deref()) {
-      if !ip_address.is_empty() && !host.is_empty() {
-        match ip_address.parse::<std::net::IpAddr>() {
-          Ok(ip) => match lookup_addr(&ip) {
-            Ok(host_lookup) if host_lookup.to_lowercase() == host.to_lowercase() => {
-              return true;
-            }
-            Ok(host_lookup) => {
-              info!(
-                "rDNS lookup for {} returned {}, expected {}",
-                ip_address, host_lookup, host
-              );
-            }
-            Err(err) => warn!("rDNS lookup failed for {}: {}", ip_address, err),
-          },
-          Err(err) => warn!("Invalid IP address {}: {}", ip_address, err),
-        }
-      }
-    }
-  }
-
-  false
-}

crates/gpapi/src/portal/mod.rs

@@ -3,3 +3,13 @@ mod prelogin;
 
 pub use config::*;
 pub use prelogin::*;
+
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum PortalError {
+  #[error("Portal prelogin error: {0}")]
+  PreloginError(String),
+  #[error("Portal config error: {0}")]
+  ConfigError(String),
+}

crates/gpapi/src/portal/prelogin.rs

@@ -1,14 +1,14 @@
-use anyhow::{anyhow, bail};
+use anyhow::bail;
-use log::{info, warn};
+use log::info;
 use reqwest::{Client, StatusCode};
 use roxmltree::Document;
 use serde::Serialize;
 use specta::Type;
 
 use crate::{
-  error::PortalError,
   gp_params::GpParams,
-  utils::{base64, normalize_server, parse_gp_response, xml::NodeExt},
+  portal::PortalError,
+  utils::{base64, normalize_server, xml},
 };
 
 const REQUIRED_PARAMS: [&str; 8] = [
@@ -98,77 +98,69 @@ impl Prelogin {
 
 pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prelogin> {
   let user_agent = gp_params.user_agent();
-  let is_gateway = gp_params.is_gateway();
+  info!("Prelogin with user_agent: {}", user_agent);
-  let prelogin_type = if is_gateway { "Gateway" } else { "Portal" };
-
-  info!("{} prelogin with user_agent: {}", prelogin_type, user_agent);
 
   let portal = normalize_server(portal)?;
+  let is_gateway = gp_params.is_gateway();
   let path = if is_gateway { "ssl-vpn" } else { "global-protect" };
   let prelogin_url = format!("{portal}/{}/prelogin.esp", path);
   let mut params = gp_params.to_params();
 
   params.insert("tmp", "tmp");
-  params.insert("default-browser", "1");
+  if gp_params.prefer_default_browser() {
-  params.insert("cas-support", "yes");
+    params.insert("default-browser", "1");
+  }
 
   params.retain(|k, _| REQUIRED_PARAMS.iter().any(|required_param| required_param == k));
 
-  let client = Client::try_from(gp_params)?;
+  let client = Client::builder()
+    .danger_accept_invalid_certs(gp_params.ignore_tls_errors())
+    .user_agent(user_agent)
+    .build()?;
 
-  let res = client.post(&prelogin_url).form(&params).send().await.map_err(|e| {
+  let res = client.post(&prelogin_url).form(&params).send().await?;
-    warn!("Network error: {:?}", e);
+  let status = res.status();
-    anyhow::anyhow!(PortalError::NetworkError(e))
-  })?;
 
-  let res_xml = parse_gp_response(res).await.or_else(|err| {
+  if status == StatusCode::NOT_FOUND {
-    if err.status == StatusCode::NOT_FOUND {
+    bail!(PortalError::PreloginError("Prelogin endpoint not found".to_string()))
-      bail!(PortalError::PreloginError("Prelogin endpoint not found".to_string()))
+  }
-    }
 
-    if err.is_status_error() {
+  if status.is_client_error() || status.is_server_error() {
-      warn!("{err}");
+    bail!("Prelogin error: {}", status)
-      bail!("Prelogin error: {}", err.reason)
+  }
-    }
 
-    Err(anyhow!(PortalError::PreloginError(err.reason)))
+  let res_xml = res
-  })?;
+    .text()
+    .await
+    .map_err(|e| PortalError::PreloginError(e.to_string()))?;
 
-  let prelogin = parse_res_xml(&res_xml, is_gateway).map_err(|err| {
+  let prelogin = parse_res_xml(res_xml, is_gateway).map_err(|e| PortalError::PreloginError(e.to_string()))?;
-    warn!("Parse response error, response: {}", res_xml);
-    PortalError::PreloginError(err.to_string())
-  })?;
 
   Ok(prelogin)
 }
 
-fn parse_res_xml(res_xml: &str, is_gateway: bool) -> anyhow::Result<Prelogin> {
+fn parse_res_xml(res_xml: String, is_gateway: bool) -> anyhow::Result<Prelogin> {
-  let doc = Document::parse(res_xml)?;
+  let doc = Document::parse(&res_xml)?;
-  let root = doc.root();
 
-  let status = root
+  let status = xml::get_child_text(&doc, "status")
-    .descendant_text("status")
     .ok_or_else(|| anyhow::anyhow!("Prelogin response does not contain status element"))?;
   // Check the status of the prelogin response
   if status.to_uppercase() != "SUCCESS" {
-    let msg = root.descendant_text("msg").unwrap_or("Unknown error");
+    let msg = xml::get_child_text(&doc, "msg").unwrap_or(String::from("Unknown error"));
-    bail!("{}", msg)
+    bail!("Prelogin failed: {}", msg)
   }
 
-  let region = root
+  let region = xml::get_child_text(&doc, "region").unwrap_or_else(|| {
-    .descendant_text("region")
+    info!("Prelogin response does not contain region element");
-    .unwrap_or_else(|| {
+    String::from("Unknown")
-      info!("Prelogin response does not contain region element");
+  });
-      "Unknown"
-    })
-    .to_string();
 
-  let saml_method = root.descendant_text("saml-auth-method");
+  let saml_method = xml::get_child_text(&doc, "saml-auth-method");
-  let saml_request = root.descendant_text("saml-request");
+  let saml_request = xml::get_child_text(&doc, "saml-request");
-  let saml_default_browser = root.descendant_text("saml-default-browser");
+  let saml_default_browser = xml::get_child_text(&doc, "saml-default-browser");
   // Check if the prelogin response is SAML
   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 saml_prelogin = SamlPrelogin {
@@ -181,32 +173,22 @@ fn parse_res_xml(res_xml: &str, is_gateway: bool) -> anyhow::Result<Prelogin> {
     return Ok(Prelogin::Saml(saml_prelogin));
   }
 
-  let label_username = root
+  let label_username = xml::get_child_text(&doc, "username-label");
-    .descendant_text("username-label")
+  let label_password = xml::get_child_text(&doc, "password-label");
-    .unwrap_or_else(|| {
+  // Check if the prelogin response is standard login
-      info!("Username label has no value, using default");
+  if label_username.is_some() && label_password.is_some() {
-      "Username"
+    let auth_message =
-    })
+      xml::get_child_text(&doc, "authentication-message").unwrap_or(String::from("Please enter the login credentials"));
-    .to_string();
+    let standard_prelogin = StandardPrelogin {
-  let label_password = root
+      region,
-    .descendant_text("password-label")
+      is_gateway,
-    .unwrap_or_else(|| {
+      auth_message,
-      info!("Password label has no value, using default");
+      label_username: label_username.unwrap(),
-      "Password"
+      label_password: label_password.unwrap(),
-    })
+    };
-    .to_string();
 
-  let auth_message = root
+    return Ok(Prelogin::Standard(standard_prelogin));
-    .descendant_text("authentication-message")
+  }
-    .unwrap_or("Please enter the login credentials")
-    .to_string();
-  let standard_prelogin = StandardPrelogin {
-    region,
-    is_gateway,
-    auth_message,
-    label_username,
-    label_password,
-  };
 
-  Ok(Prelogin::Standard(standard_prelogin))
+  bail!("Invalid prelogin response");
 }

crates/gpapi/src/process/auth_launcher.rs

@@ -14,16 +14,10 @@ pub struct SamlAuthLauncher<'a> {
   user_agent: Option<&'a str>,
   os: Option<&'a str>,
   os_version: Option<&'a str>,
+  hidpi: bool,
   fix_openssl: bool,
   ignore_tls_errors: bool,
-  #[cfg(feature = "webview-auth")]
-  hidpi: bool,
-  #[cfg(feature = "webview-auth")]
   clean: bool,
-  #[cfg(feature = "webview-auth")]
-  default_browser: bool,
-  browser: Option<&'a str>,
-  verbose: Option<&'a str>,
 }
 
 impl<'a> SamlAuthLauncher<'a> {
@@ -35,16 +29,10 @@ impl<'a> SamlAuthLauncher<'a> {
       user_agent: None,
       os: None,
       os_version: None,
+      hidpi: false,
       fix_openssl: false,
       ignore_tls_errors: false,
-      #[cfg(feature = "webview-auth")]
-      hidpi: false,
-      #[cfg(feature = "webview-auth")]
       clean: false,
-      #[cfg(feature = "webview-auth")]
-      default_browser: false,
-      browser: None,
-      verbose: None,
     }
   }
 
@@ -73,6 +61,11 @@ impl<'a> SamlAuthLauncher<'a> {
     self
   }
 
+  pub fn hidpi(mut self, hidpi: bool) -> Self {
+    self.hidpi = hidpi;
+    self
+  }
+
   pub fn fix_openssl(mut self, fix_openssl: bool) -> Self {
     self.fix_openssl = fix_openssl;
     self
@@ -83,34 +76,11 @@ impl<'a> SamlAuthLauncher<'a> {
     self
   }
 
-  #[cfg(feature = "webview-auth")]
-  pub fn hidpi(mut self, hidpi: bool) -> Self {
-    self.hidpi = hidpi;
-    self
-  }
-
-  #[cfg(feature = "webview-auth")]
   pub fn clean(mut self, clean: bool) -> Self {
     self.clean = clean;
     self
   }
 
-  #[cfg(feature = "webview-auth")]
-  pub fn default_browser(mut self, default_browser: bool) -> Self {
-    self.default_browser = default_browser;
-    self
-  }
-
-  pub fn browser(mut self, browser: Option<&'a str>) -> Self {
-    self.browser = browser;
-    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.
   pub async fn launch(self) -> anyhow::Result<Credential> {
     let mut auth_cmd = Command::new(GP_AUTH_BINARY);
@@ -136,6 +106,10 @@ impl<'a> SamlAuthLauncher<'a> {
       auth_cmd.arg("--os-version").arg(os_version);
     }
 
+    if self.hidpi {
+      auth_cmd.arg("--hidpi");
+    }
+
     if self.fix_openssl {
       auth_cmd.arg("--fix-openssl");
     }
@@ -144,27 +118,8 @@ impl<'a> SamlAuthLauncher<'a> {
       auth_cmd.arg("--ignore-tls-errors");
     }
 
-    #[cfg(feature = "webview-auth")]
+    if self.clean {
-    {
+      auth_cmd.arg("--clean");
-      if self.hidpi {
-        auth_cmd.arg("--hidpi");
-      }
-
-      if self.clean {
-        auth_cmd.arg("--clean");
-      }
-
-      if self.default_browser {
-        auth_cmd.arg("--default-browser");
-      }
-    }
-
-    if let Some(browser) = self.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()?;
@@ -179,6 +134,9 @@ impl<'a> SamlAuthLauncher<'a> {
       bail!("Failed to parse auth data")
     };
 
-    Credential::try_from(auth_result)
+    match auth_result {
+      SamlAuthResult::Success(auth_data) => Credential::try_from(auth_data),
+      SamlAuthResult::Failure(msg) => bail!(msg),
+    }
   }
 }

crates/gpapi/src/process/browser_authenticator.rs

@@ -0,0 +1,34 @@
+use std::{env::temp_dir, io::Write};
+
+pub struct BrowserAuthenticator<'a> {
+  auth_request: &'a str,
+}
+
+impl BrowserAuthenticator<'_> {
+  pub fn new(auth_request: &str) -> BrowserAuthenticator {
+    BrowserAuthenticator { auth_request }
+  }
+
+  pub fn authenticate(&self) -> anyhow::Result<()> {
+    if self.auth_request.starts_with("http") {
+      open::that_detached(self.auth_request)?;
+    } else {
+      let html_file = temp_dir().join("gpauth.html");
+      let mut file = std::fs::File::create(&html_file)?;
+
+      file.write_all(self.auth_request.as_bytes())?;
+
+      open::that_detached(html_file)?;
+    }
+
+    Ok(())
+  }
+}
+
+impl Drop for BrowserAuthenticator<'_> {
+  fn drop(&mut self) {
+    // Cleanup the temporary file
+    let html_file = temp_dir().join("gpauth.html");
+    let _ = std::fs::remove_file(html_file);
+  }
+}

crates/gpapi/src/process/mod.rs

@@ -2,6 +2,8 @@ pub(crate) mod command_traits;
 pub(crate) mod gui_helper_launcher;
 
 pub mod auth_launcher;
+#[cfg(feature = "browser-auth")]
+pub mod browser_authenticator;
 pub mod gui_launcher;
 pub mod hip_launcher;
 pub mod service_launcher;

crates/gpapi/src/process/service_launcher.rs

@@ -10,28 +10,26 @@ use crate::GP_SERVICE_BINARY;
 
 use super::command_traits::CommandExt;
 
-pub struct ServiceLauncher<'a> {
+pub struct ServiceLauncher {
   program: PathBuf,
   minimized: bool,
   env_file: Option<String>,
   log_file: Option<String>,
-  verbose: Option<&'a str>
 }
 
-impl Default for ServiceLauncher<'_> {
+impl Default for ServiceLauncher {
   fn default() -> Self {
     Self::new()
   }
 }
 
-impl<'a> ServiceLauncher<'a> {
+impl ServiceLauncher {
   pub fn new() -> Self {
     Self {
       program: GP_SERVICE_BINARY.into(),
       minimized: false,
       env_file: None,
       log_file: None,
-      verbose: None
     }
   }
 
@@ -50,11 +48,6 @@ impl<'a> ServiceLauncher<'a> {
     self
   }
 
-  pub fn verbose(mut self, verbose: Option<&'a str>) -> Self {
-    self.verbose = verbose;
-    self
-  }
-
   pub async fn launch(&self) -> anyhow::Result<ExitStatus> {
     let mut cmd = Command::new_pkexec(&self.program);
 
@@ -66,10 +59,6 @@ impl<'a> ServiceLauncher<'a> {
       cmd.arg("--env-file").arg(env_file);
     }
 
-    if let Some(verbose) = self.verbose {
-      cmd.arg(verbose);
-    }
-
     if let Some(log_file) = &self.log_file {
       let log_file = File::create(log_file)?;
       let stdio = Stdio::from(log_file);

crates/gpapi/src/service/event.rs

@@ -7,5 +7,6 @@ use super::vpn_state::VpnState;
 pub enum WsEvent {
   VpnState(VpnState),
   ActiveGui,
-  ResumeConnection,
+  /// External authentication data
+  AuthData(String),
 }

crates/gpapi/src/service/request.rs

@@ -32,16 +32,10 @@ pub struct ConnectArgs {
   cookie: String,
   vpnc_script: Option<String>,
   user_agent: Option<String>,
-  os: Option<ClientOs>,
-  certificate: Option<String>,
-  sslkey: Option<String>,
-  key_password: Option<String>,
   csd_uid: u32,
   csd_wrapper: Option<String>,
-  reconnect_timeout: u32,
   mtu: u32,
-  disable_ipv6: bool,
+  os: Option<ClientOs>,
-  no_dtls: bool,
 }
 
 impl ConnectArgs {
@@ -51,15 +45,9 @@ impl ConnectArgs {
       vpnc_script: None,
       user_agent: None,
       os: None,
-      certificate: None,
-      sslkey: None,
-      key_password: None,
       csd_uid: 0,
       csd_wrapper: None,
-      reconnect_timeout: 300,
       mtu: 0,
-      disable_ipv6: false,
-      no_dtls: false,
     }
   }
 
@@ -79,18 +67,6 @@ impl ConnectArgs {
     self.os.as_ref().map(|os| os.to_openconnect_os().to_string())
   }
 
-  pub fn certificate(&self) -> Option<String> {
-    self.certificate.clone()
-  }
-
-  pub fn sslkey(&self) -> Option<String> {
-    self.sslkey.clone()
-  }
-
-  pub fn key_password(&self) -> Option<String> {
-    self.key_password.clone()
-  }
-
   pub fn csd_uid(&self) -> u32 {
     self.csd_uid
   }
@@ -99,21 +75,9 @@ impl ConnectArgs {
     self.csd_wrapper.clone()
   }
 
-  pub fn reconnect_timeout(&self) -> u32 {
-    self.reconnect_timeout
-  }
-
   pub fn mtu(&self) -> u32 {
     self.mtu
   }
-
-  pub fn disable_ipv6(&self) -> bool {
-    self.disable_ipv6
-  }
-
-  pub fn no_dtls(&self) -> bool {
-    self.no_dtls
-  }
 }
 
 #[derive(Debug, Deserialize, Serialize, Type)]
@@ -145,6 +109,11 @@ impl ConnectRequest {
     self
   }
 
+  pub fn with_mtu(mut self, mtu: u32) -> Self {
+    self.args.mtu = mtu;
+    self
+  }
+
   pub fn with_user_agent<T: Into<Option<String>>>(mut self, user_agent: T) -> Self {
     self.args.user_agent = user_agent.into();
     self
@@ -155,41 +124,6 @@ impl ConnectRequest {
     self
   }
 
-  pub fn with_certificate<T: Into<Option<String>>>(mut self, certificate: T) -> Self {
-    self.args.certificate = certificate.into();
-    self
-  }
-
-  pub fn with_sslkey<T: Into<Option<String>>>(mut self, sslkey: T) -> Self {
-    self.args.sslkey = sslkey.into();
-    self
-  }
-
-  pub fn with_key_password<T: Into<Option<String>>>(mut self, key_password: T) -> Self {
-    self.args.key_password = key_password.into();
-    self
-  }
-
-  pub fn with_reconnect_timeout(mut self, reconnect_timeout: u32) -> Self {
-    self.args.reconnect_timeout = reconnect_timeout;
-    self
-  }
-
-  pub fn with_mtu(mut self, mtu: u32) -> Self {
-    self.args.mtu = mtu;
-    self
-  }
-
-  pub fn with_disable_ipv6(mut self, disable_ipv6: bool) -> Self {
-    self.args.disable_ipv6 = disable_ipv6;
-    self
-  }
-
-  pub fn with_no_dtls(mut self, no_dtls: bool) -> Self {
-    self.args.no_dtls = no_dtls;
-    self
-  }
-
   pub fn gateway(&self) -> &Gateway {
     self.info.gateway()
   }
@@ -206,15 +140,11 @@ impl ConnectRequest {
 #[derive(Debug, Deserialize, Serialize, Type)]
 pub struct DisconnectRequest;
 
-#[derive(Debug, Deserialize, Serialize)]
-pub struct UpdateLogLevelRequest(pub String);
-
 /// Requests that can be sent to the service
 #[derive(Debug, Deserialize, Serialize)]
 pub enum WsRequest {
   Connect(Box<ConnectRequest>),
   Disconnect(DisconnectRequest),
-  UpdateLogLevel(UpdateLogLevelRequest),
 }
 
 #[derive(Debug, Deserialize, Serialize)]

crates/gpapi/src/utils/endpoint.rs

@@ -1,9 +1,10 @@
-use super::lock_file::gpservice_lock_info;
+use tokio::fs;
+
+use crate::GP_SERVICE_LOCK_FILE;
 
 async fn read_port() -> anyhow::Result<String> {
-  let lock_info = gpservice_lock_info().await?;
+  let port = fs::read_to_string(GP_SERVICE_LOCK_FILE).await?;
-
+  Ok(port.trim().to_string())
-  Ok(lock_info.port.to_string())
 }
 
 pub async fn http_endpoint() -> anyhow::Result<String> {

crates/gpapi/src/utils/env_file.rs

@@ -3,7 +3,6 @@ use std::env;
 use std::io::Write;
 use std::path::Path;
 
-use log::info;
 use tempfile::NamedTempFile;
 
 pub fn persist_env_vars(extra: Option<HashMap<String, String>>) -> anyhow::Result<NamedTempFile> {
@@ -36,14 +35,3 @@ pub fn load_env_vars<T: AsRef<Path>>(env_file: T) -> anyhow::Result<HashMap<Stri
 
   Ok(env_vars)
 }
-
-pub fn patch_gui_runtime_env(hidpi: bool) {
-  // This is to avoid blank screen on some systems
-  std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
-
-  if hidpi {
-    info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
-    std::env::set_var("GDK_SCALE", "2");
-    std::env::set_var("GDK_DPI_SCALE", "0.5");
-  }
-}

crates/gpapi/src/utils/lock_file.rs

@@ -1,24 +1,19 @@
 use std::path::PathBuf;
 
-use thiserror::Error;
-use tokio::fs;
-
 pub struct LockFile {
   path: PathBuf,
-  pid: u32,
 }
 
 impl LockFile {
-  pub fn new<P: Into<PathBuf>>(path: P, pid: u32) -> Self {
+  pub fn new<P: Into<PathBuf>>(path: P) -> Self {
-    Self { path: path.into(), pid }
+    Self { path: path.into() }
   }
 
   pub fn exists(&self) -> bool {
     self.path.exists()
   }
 
-  pub fn lock(&self, content: &str) -> anyhow::Result<()> {
+  pub fn lock(&self, content: impl AsRef<[u8]>) -> anyhow::Result<()> {
-    let content = format!("{}:{}", self.pid, content);
     std::fs::write(&self.path, content)?;
     Ok(())
   }
@@ -42,87 +37,3 @@ 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(crate::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(_))
-    ));
-  }
-}

crates/gpapi/src/utils/mod.rs

@@ -1,25 +1,22 @@
+use reqwest::Url;
+
 pub(crate) mod xml;
 
 pub mod base64;
 pub mod checksum;
 pub mod crypto;
 pub mod endpoint;
-pub mod env_utils;
+pub mod env_file;
 pub mod lock_file;
 pub mod openssl;
 pub mod redact;
-pub mod request;
 #[cfg(feature = "tauri")]
 pub mod window;
 
 mod shutdown_signal;
 
-use log::warn;
 pub use shutdown_signal::shutdown_signal;
 
-use reqwest::{Response, StatusCode, Url};
-use thiserror::Error;
-
 /// Normalize the server URL to the format `https://<host>:<port>`
 pub fn normalize_server(server: &str) -> anyhow::Result<String> {
   let server = if server.starts_with("https://") || server.starts_with("http://") {
@@ -44,52 +41,3 @@ pub fn normalize_server(server: &str) -> anyhow::Result<String> {
 pub fn remove_url_scheme(s: &str) -> String {
   s.replace("http://", "").replace("https://", "")
 }
-
-#[derive(Error, Debug)]
-#[error("GP response error: reason={reason}, status={status}, body={body}")]
-pub(crate) struct GpError {
-  pub status: StatusCode,
-  pub reason: String,
-  body: String,
-}
-
-impl GpError {
-  pub fn is_status_error(&self) -> bool {
-    self.status.is_client_error() || self.status.is_server_error()
-  }
-}
-
-pub(crate) async fn parse_gp_response(res: Response) -> anyhow::Result<String, GpError> {
-  let status = res.status();
-
-  if status.is_client_error() || status.is_server_error() {
-    let (reason, body) = parse_gp_error(res).await;
-
-    return Err(GpError { status, reason, body });
-  }
-
-  res.text().await.map_err(|err| {
-    warn!("Failed to read response: {}", err);
-
-    GpError {
-      status,
-      reason: "failed to read response".to_string(),
-      body: "<failed to read response>".to_string(),
-    }
-  })
-}
-
-async fn parse_gp_error(res: Response) -> (String, String) {
-  let reason = res
-    .headers()
-    .get("x-private-pan-globalprotect")
-    .map_or_else(|| "<none>", |v| v.to_str().unwrap_or("<invalid header>"))
-    .to_string();
-
-  let res = res.text().await.map_or_else(
-    |_| "<failed to read response>".to_string(),
-    |v| if v.is_empty() { "<empty>".to_string() } else { v },
-  );
-
-  (reason, res)
-}

crates/gpapi/src/utils/openssl.rs

@@ -1,36 +1,21 @@
 use std::path::Path;
 
-use log::{info, warn};
-use regex::Regex;
 use tempfile::NamedTempFile;
-use version_compare::{compare_to, Cmp};
 
 pub fn openssl_conf() -> String {
-  let option = get_openssl_option();
+  let option = "UnsafeLegacyServerConnect";
 
   format!(
     "openssl_conf = openssl_init
 
 [openssl_init]
 ssl_conf = ssl_sect
-providers = provider_sect
 
 [ssl_sect]
 system_default = system_default_sect
 
 [system_default_sect]
-Options = {}
+Options = {}",
-
-[provider_sect]
-default = default_sect
-legacy = legacy_sect
-
-[default_sect]
-activate = 1
-
-[legacy_sect]
-activate = 1
-",
     option
   )
 }
@@ -50,58 +35,3 @@ pub fn fix_openssl_env() -> anyhow::Result<NamedTempFile> {
 
   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);
-  }
-}

crates/gpapi/src/utils/request.rs

@@ -1,140 +0,0 @@
-use std::{borrow::Cow, fs};
-
-use anyhow::bail;
-use log::warn;
-use openssl::pkey::PKey;
-use pem::parse_many;
-use reqwest::Identity;
-
-#[derive(Debug, thiserror::Error)]
-pub enum RequestIdentityError {
-  #[error("Failed to find the private key")]
-  NoKey,
-  #[error("No passphrase provided")]
-  NoPassphrase(&'static str),
-  #[error("Failed to decrypt private key")]
-  DecryptError(&'static str),
-}
-
-/// Create an identity object from a certificate and key
-/// The file is expected to be the PKCS#8 PEM or PKCS#12 format
-/// When using a PKCS#12 file, the key is NOT required, but a passphrase is required
-pub fn create_identity(cert: &str, key: Option<&str>, passphrase: Option<&str>) -> anyhow::Result<Identity> {
-  if cert.ends_with(".p12") || cert.ends_with(".pfx") {
-    create_identity_from_pkcs12(cert, passphrase)
-  } else {
-    create_identity_from_pem(cert, key, passphrase)
-  }
-}
-
-fn create_identity_from_pem(cert: &str, key: Option<&str>, passphrase: Option<&str>) -> anyhow::Result<Identity> {
-  let cert_pem = fs::read(cert).map_err(|err| anyhow::anyhow!("Failed to read certificate file: {}", err))?;
-
-  // Use the certificate as the key if no key is provided
-  let key_pem_file = match key {
-    Some(key) => Cow::Owned(fs::read(key).map_err(|err| anyhow::anyhow!("Failed to read key file: {}", err))?),
-    None => Cow::Borrowed(&cert_pem),
-  };
-
-  // Find the private key in the pem file
-  let key_pem = parse_many(key_pem_file.as_ref())?
-    .into_iter()
-    .find(|pem| pem.tag().ends_with("PRIVATE KEY"))
-    .ok_or(RequestIdentityError::NoKey)?;
-
-  // The key pem could be encrypted, so we need to decrypt it
-  let decrypted_key_pem = if key_pem.tag().ends_with("ENCRYPTED PRIVATE KEY") {
-    let passphrase = passphrase.ok_or_else(|| {
-      warn!("Key is encrypted but no passphrase provided");
-      RequestIdentityError::NoPassphrase("PEM")
-    })?;
-    let pem_content = pem::encode(&key_pem);
-    let key = PKey::private_key_from_pem_passphrase(pem_content.as_bytes(), passphrase.as_bytes()).map_err(|err| {
-      warn!("Failed to decrypt key: {}", err);
-      RequestIdentityError::DecryptError("PEM")
-    })?;
-
-    key.private_key_to_pem_pkcs8()?
-  } else {
-    pem::encode(&key_pem).into()
-  };
-
-  let identity = Identity::from_pkcs8_pem(&cert_pem, &decrypted_key_pem)?;
-  Ok(identity)
-}
-
-fn create_identity_from_pkcs12(pkcs12: &str, passphrase: Option<&str>) -> anyhow::Result<Identity> {
-  let pkcs12 = fs::read(pkcs12)?;
-
-  let Some(passphrase) = passphrase else {
-    bail!(RequestIdentityError::NoPassphrase("PKCS#12"));
-  };
-
-  let identity = Identity::from_pkcs12_der(&pkcs12, passphrase)?;
-  Ok(identity)
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn create_identity_from_pem_requires_passphrase() {
-    let cert = "tests/files/badssl.com-client.pem";
-    let identity = create_identity_from_pem(cert, None, None);
-
-    assert!(identity.is_err());
-    assert!(identity.unwrap_err().to_string().contains("No passphrase provided"));
-  }
-
-  #[test]
-  fn create_identity_from_pem_with_passphrase() {
-    let cert = "tests/files/badssl.com-client.pem";
-    let passphrase = "badssl.com";
-
-    let identity = create_identity_from_pem(cert, None, Some(passphrase));
-
-    assert!(identity.is_ok());
-  }
-
-  #[test]
-  fn create_identity_from_pem_unencrypted_key() {
-    let cert = "tests/files/badssl.com-client-unencrypted.pem";
-    let identity = create_identity_from_pem(cert, None, None);
-    println!("{:?}", identity);
-
-    assert!(identity.is_ok());
-  }
-
-  #[test]
-  fn create_identity_from_pem_cert_and_encrypted_key() {
-    let cert = "tests/files/badssl.com-client.pem";
-    let key = "tests/files/badssl.com-client.pem";
-    let passphrase = "badssl.com";
-
-    let identity = create_identity_from_pem(cert, Some(key), Some(passphrase));
-
-    assert!(identity.is_ok());
-  }
-
-  #[test]
-  fn create_identity_from_pem_cert_and_encrypted_key_no_passphrase() {
-    let cert = "tests/files/badssl.com-client.pem";
-    let key = "tests/files/badssl.com-client.pem";
-
-    let identity = create_identity_from_pem(cert, Some(key), None);
-
-    assert!(identity.is_err());
-    assert!(identity.unwrap_err().to_string().contains("No passphrase provided"));
-  }
-
-  #[test]
-  fn create_identity_from_pem_cert_and_unencrypted_key() {
-    let cert = "tests/files/badssl.com-client.pem";
-    let key = "tests/files/badssl.com-client-unencrypted.pem";
-
-    let identity = create_identity_from_pem(cert, Some(key), None);
-
-    assert!(identity.is_ok());
-  }
-}

crates/gpapi/src/utils/window.rs

@@ -1,97 +1,97 @@
-use tauri::WebviewWindow;
+use std::{process::ExitStatus, time::Duration};
+
+use anyhow::bail;
+use log::{info, warn};
+use tauri::Window;
+use tokio::process::Command;
 
 pub trait WindowExt {
   fn raise(&self) -> anyhow::Result<()>;
+  fn hide_menu(&self);
 }
 
-impl WindowExt for WebviewWindow {
+impl WindowExt for Window {
-  #[cfg(any(target_os = "macos", target_os = "windows"))]
   fn raise(&self) -> anyhow::Result<()> {
-    self.show()?;
+    raise_window(self)
-    Ok(())
   }
 
-  #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+  fn hide_menu(&self) {
-  fn raise(&self) -> anyhow::Result<()> {
+    hide_menu(self);
-    unix::raise_window(self)
   }
 }
 
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+pub fn raise_window(win: &Window) -> anyhow::Result<()> {
-mod unix {
+  let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
-  use std::{process::ExitStatus, time::Duration};
 
-  use anyhow::bail;
+  if is_wayland {
-  use gtk::{
+    win.hide()?;
-    glib::Cast,
+    win.show()?;
-    traits::{EventBoxExt, GtkWindowExt, WidgetExt},
+  } else {
-    EventBox,
+    if !win.is_visible()? {
-  };
+      win.show()?;
-  use log::info;
+    }
-  use tauri::WebviewWindow;
+    let title = win.title()?;
-  use tokio::process::Command;
+    tokio::spawn(async move {
-
+      if let Err(err) = wmctrl_raise_window(&title).await {
-  pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
+        warn!("Failed to raise window: {}", err);
-    let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
-
-    if is_wayland {
-      let gtk_win = win.gtk_window()?;
-      if let Some(header) = gtk_win.titlebar() {
-        let _ = header.downcast::<EventBox>().map(|event_box| {
-          event_box.set_above_child(false);
-        });
       }
+    });
+  }
 
-      gtk_win.hide();
+  // Calling window.show() on Windows will cause the menu to be shown.
-      gtk_win.show_all();
+  // We need to hide it again.
-    } else {
+  hide_menu(win);
-      if !win.is_visible()? {
+
-        win.show()?;
+  Ok(())
+}
+
+async fn wmctrl_raise_window(title: &str) -> anyhow::Result<()> {
+  let mut counter = 0;
+
+  loop {
+    if let Ok(exit_status) = wmctrl_try_raise_window(title).await {
+      if exit_status.success() {
+        info!("Window raised after {} attempts", counter + 1);
+        return Ok(());
       }
-      let title = win.title()?;
-      tokio::spawn(async move {
-        if let Err(err) = wmctrl_raise_window(&title).await {
-          info!("Window not raised: {}", err);
-        }
-      });
     }
 
-    // Calling window.show() on window object will cause the menu to be shown.
+    if counter >= 10 {
-    // We need to hide it again.
+      bail!("Failed to raise window: {}", title)
-    win.hide_menu()?;
+    }
 
-    Ok(())
+    counter += 1;
+    tokio::time::sleep(Duration::from_millis(100)).await;
   }
+}
 
-  async fn wmctrl_raise_window(title: &str) -> anyhow::Result<()> {
+async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
-    let mut counter = 0;
+  let exit_status = Command::new("wmctrl")
+    .arg("-F")
+    .arg("-a")
+    .arg(title)
+    .spawn()?
+    .wait()
+    .await?;
 
+  Ok(exit_status)
+}
+
+fn hide_menu(win: &Window) {
+  let menu_handle = win.menu_handle();
+
+  tokio::spawn(async move {
     loop {
-      if let Ok(exit_status) = wmctrl_try_raise_window(title).await {
+      let menu_visible = menu_handle.is_visible().unwrap_or(false);
-        if exit_status.success() {
+
-          info!("Window raised after {} attempts", counter + 1);
+      if !menu_visible {
-          return Ok(());
+        break;
-        }
       }
 
-      if counter >= 10 {
+      if menu_visible {
-        bail!("Failed to raise window: {}", title)
+        let _ = menu_handle.hide();
+        tokio::time::sleep(Duration::from_millis(10)).await;
       }
-
-      counter += 1;
-      tokio::time::sleep(Duration::from_millis(100)).await;
     }
-  }
+  });
-
-  async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
-    let exit_status = Command::new("wmctrl")
-      .arg("-F")
-      .arg("-a")
-      .arg(title)
-      .spawn()?
-      .wait()
-      .await?;
-
-    Ok(exit_status)
-  }
 }

crates/gpapi/src/utils/xml.rs

@@ -1,27 +1,6 @@
-use roxmltree::Node;
+use roxmltree::Document;
 
-pub(crate) trait NodeExt<'a> {
+pub(crate) fn get_child_text(doc: &Document, name: &str) -> Option<String> {
-  fn find_descendant(&self, name: &str) -> Option<Node<'a, 'a>>;
+  let node = doc.descendants().find(|n| n.has_tag_name(name))?;
-  fn descendant_text(&self, name: &str) -> Option<&'a str>;
+  node.text().map(|s| s.to_string())
-
-  fn find_child(&self, name: &str) -> Option<Node<'a, 'a>>;
-  fn child_text(&self, name: &str) -> Option<&'a str>;
-}
-
-impl<'a> NodeExt<'a> for Node<'a, 'a> {
-  fn find_descendant(&self, name: &str) -> Option<Node<'a, 'a>> {
-    self.descendants().find(|n| n.has_tag_name(name))
-  }
-
-  fn descendant_text(&self, name: &str) -> Option<&'a str> {
-    self.find_descendant(name).and_then(|node| node.text())
-  }
-
-  fn find_child(&self, name: &str) -> Option<Node<'a, 'a>> {
-    self.children().find(|n| n.has_tag_name(name))
-  }
-
-  fn child_text(&self, name: &str) -> Option<&'a str> {
-    self.find_child(name).and_then(|node| node.text())
-  }
 }

crates/gpapi/tests/files/badssl.com-client-unencrypted.pem

@@ -1,62 +0,0 @@
-Bag Attributes
-    localKeyID: AE DC 75 2E 97 28 71 D8 1E 9A 7F 1E 5A AA F4 2E D3 6D 2C 8B
-subject=/C=US/ST=California/L=San Francisco/O=BadSSL/CN=BadSSL Client Certificate
-issuer=/C=US/ST=California/L=San Francisco/O=BadSSL/CN=BadSSL Client Root Certificate Authority
------BEGIN CERTIFICATE-----
-MIIEnTCCAoWgAwIBAgIJAPfJjkenM2ooMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ8wDQYDVQQKDAZCYWRTU0wxMTAvBgNVBAMMKEJhZFNTTCBDbGllbnQgUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjQwNTE3MTc1OTMyWhcNMjYwNTE3
-MTc1OTMyWjBvMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQG
-A1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGQmFkU1NMMSIwIAYDVQQDDBlC
-YWRTU0wgQ2xpZW50IENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxzdfEeseTs/rukjly6MSLHM+Rh0enA3Ai4Mj2sdl31x3SbPoen08
-utVhjPmlxIUdkiMG4+ffe7N+JtDLG75CaxZp9CxytX7kywooRBJsRnQhmQPca8MR
-WAJBIz+w/L+3AFkTIqWBfyT+1VO8TVKPkEpGdLDovZOmzZAASi9/sj+j6gM7AaCi
-DeZTf2ES66abA5pOp60Q6OEdwg/vCUJfarhKDpi9tj3P6qToy9Y4DiBUhOct4MG8
-w5XwmKAC+Vfm8tb7tMiUoU0yvKKOcL6YXBXxB2kPcOYxYNobXavfVBEdwSrjQ7i/
-s3o6hkGQlm9F7JPEuVgbl/Jdwa64OYIqjQIDAQABoy0wKzAJBgNVHRMEAjAAMBEG
-CWCGSAGG+EIBAQQEAwIHgDALBgNVHQ8EBAMCBeAwDQYJKoZIhvcNAQELBQADggIB
-AE6iDW5Lv5I0bJY6TGxJUoB4rcsbbtEP4O4MT14GP7j7I48V09VBG9yjskYze0Ls
-Xb9mQpEpPyQLTDJIWu/ic/y5SMnelCjUxmfl37cfNLJajQZxc4FDEUSemrPKpEkB
-UzHNkxw9LSzqsyxnQmMIGoN+ZNCFoV7s5pekzPfgZj5+s7a+oiF/AzhOWZzF7vaM
-aclX7KCeENQV+q0giDjsGIHI6BevUHYkglocEqff+rIDHjjLxHLPooflV50M+ifc
-4uJdHgG8hwKxd1uf3LImUsquiBrW5CO6KCgwLrtQNe11pQHpY0urZxK/tnAj7QtD
-v/O1ryd/3+b0Gx14TyulMtcaLHsE94ppwjcxpYGNcyH+M39OMihuR2aqmkrqcZd/
-VWop1cNwZgPtCNVvfivRpX52NLI5I0eMfs6jeTMr719hdAby3akoiNLN3YNKrdrp
-pyRz/sUFGO8AHHECXA15KTeMBNfZnO32ZAZ4jHyyDBO1A5f9iDbErhXfIpeRCrCO
-gM9MLuO4YEMG1Skp+qaw7SIaG+oi2t4lbVRr3LOv0Hfkjjb7bVjfWSwLBPH/gv0E
-ZL6G0p7PjeoCh4obS3Y1yxfNlPR6RQwWl1wve+Nkmf5sDCmgr3P0512ZuvqkbKkB
-/syiAWDsYzFuq2Ntv2ljTYPEPwXEIQcpsagDRL6WzoLR
------END CERTIFICATE-----
-Bag Attributes
-    localKeyID: AE DC 75 2E 97 28 71 D8 1E 9A 7F 1E 5A AA F4 2E D3 6D 2C 8B
-Key Attributes: <No Attributes>
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHN18R6x5Oz+u6
-SOXLoxIscz5GHR6cDcCLgyPax2XfXHdJs+h6fTy61WGM+aXEhR2SIwbj5997s34m
-0MsbvkJrFmn0LHK1fuTLCihEEmxGdCGZA9xrwxFYAkEjP7D8v7cAWRMipYF/JP7V
-U7xNUo+QSkZ0sOi9k6bNkABKL3+yP6PqAzsBoKIN5lN/YRLrppsDmk6nrRDo4R3C
-D+8JQl9quEoOmL22Pc/qpOjL1jgOIFSE5y3gwbzDlfCYoAL5V+by1vu0yJShTTK8
-oo5wvphcFfEHaQ9w5jFg2htdq99UER3BKuNDuL+zejqGQZCWb0Xsk8S5WBuX8l3B
-rrg5giqNAgMBAAECggEAVRB/t9b9igmeTlzyQpHPIMvUu3uTpm742JmWpcSe61FA
-XmhDzInNdLnIfbnb3p44kj4Coy5PbzKlm01sbNxA4BkiBPE1yen1J/2eU/LJ6QuN
-jRjo9drFfR75UWPQ3xu9uJhQY2rocLILXmvy69FlG+ebThh8SPbTMtNaTFMb47An
-pk2FrW9+rzPswbklOxls/SDt78usRvfAjslm73IdBTOrbceF+GmYs3/SXz1gu05p
-LxY2rhC8piBlqnD/QbXBahZbhjb9SkDFn2typMFZKkJIIKDJaOI2E9tIlZ97/0nZ
-txqchMty8IuU9YYAfLXCmj2IEfnvLtL7thLfKLuWAQKBgQDyXBpEgKFzfy2a1AI0
-+1qL/u5UN14l7S6/wmyDTgVMXwoxhwPRXWD5PutQ8D6tMfC/y4AYt3OXg1blCvLD
-XysNj5SK+dpmQR0SyeWjd9zwxJAXvx0McJefCYd86YGcGhJsuX5bkHIeQlEc6df7
-yoqr1480VQx/+Fk1i6Zr0EIUFQKBgQDSbalUOfXZh2EVRQEgf3VoPlxAiwGGQcVT
-i+pbjMG3pOwmkVyJZusGtN5HN4Oi7n1oiyfMYGsszKQ5j4TDBGS70pNUzhTv3Vn8
-0Vsfz0arJRqJxviiv4FfDmsYXwObNKwOjR+LEn1NUPkOYOLdz1lDuWOu11LE90Dy
-Q6hg8WwCmQKBgQDTy5lI9AAjpqh7/XpQQrhGT2qHPjuQeU25Vnbt6GjI7OVDkvHL
-LQdpyYprGQgs4s+5TGWNNARYC/cMAh1Ujv5Yw3jUWrR5V73IhZeg20bBQYWKuwDv
-thVKblFw377cZAxl51R9QCX6O4oW8mRFLiMxORd0bD6YNrf/CyNMZJraYQKBgAE7
-o0JbFJWxtV/qh5cpKAb0VpYKOngO6pkSuMzQhlINJVUUhPZJJBdl9+dy69KIkzOJ
-nTIVXotkp5GuxZhe7jgrg7F7g6PkKCLTFzWYgVF/ZihoggxyEs/7xaTe6aZ/KILt
-UMH/2bwaPVtYNfwWuu8qpurfWBzPVhIVU2c+AuQBAoGAXMbw10vyiznlhyMFw5kx
-SzlBMqJBLJkzQBtpvXuT0lqqxTSNC3N4WxgVOLCHa6HqXiB0790YL8/RWunsXTk2
-c7ugThP6iMPNVAycWkIF4vvHTwZ9RCSmEQabRaqGGLz/bhLL3fi3lPGCR+iW2Dxq
-GTH3fhaM/pZZGdIC75x/69Y=
------END PRIVATE KEY-----

crates/gpapi/tests/files/badssl.com-client.pem

@@ -1,64 +0,0 @@
-Bag Attributes
-    localKeyID: AE DC 75 2E 97 28 71 D8 1E 9A 7F 1E 5A AA F4 2E D3 6D 2C 8B 
-subject=/C=US/ST=California/L=San Francisco/O=BadSSL/CN=BadSSL Client Certificate
-issuer=/C=US/ST=California/L=San Francisco/O=BadSSL/CN=BadSSL Client Root Certificate Authority
------BEGIN CERTIFICATE-----
-MIIEnTCCAoWgAwIBAgIJAPfJjkenM2ooMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ8wDQYDVQQKDAZCYWRTU0wxMTAvBgNVBAMMKEJhZFNTTCBDbGllbnQgUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjQwNTE3MTc1OTMyWhcNMjYwNTE3
-MTc1OTMyWjBvMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQG
-A1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGQmFkU1NMMSIwIAYDVQQDDBlC
-YWRTU0wgQ2xpZW50IENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxzdfEeseTs/rukjly6MSLHM+Rh0enA3Ai4Mj2sdl31x3SbPoen08
-utVhjPmlxIUdkiMG4+ffe7N+JtDLG75CaxZp9CxytX7kywooRBJsRnQhmQPca8MR
-WAJBIz+w/L+3AFkTIqWBfyT+1VO8TVKPkEpGdLDovZOmzZAASi9/sj+j6gM7AaCi
-DeZTf2ES66abA5pOp60Q6OEdwg/vCUJfarhKDpi9tj3P6qToy9Y4DiBUhOct4MG8
-w5XwmKAC+Vfm8tb7tMiUoU0yvKKOcL6YXBXxB2kPcOYxYNobXavfVBEdwSrjQ7i/
-s3o6hkGQlm9F7JPEuVgbl/Jdwa64OYIqjQIDAQABoy0wKzAJBgNVHRMEAjAAMBEG
-CWCGSAGG+EIBAQQEAwIHgDALBgNVHQ8EBAMCBeAwDQYJKoZIhvcNAQELBQADggIB
-AE6iDW5Lv5I0bJY6TGxJUoB4rcsbbtEP4O4MT14GP7j7I48V09VBG9yjskYze0Ls
-Xb9mQpEpPyQLTDJIWu/ic/y5SMnelCjUxmfl37cfNLJajQZxc4FDEUSemrPKpEkB
-UzHNkxw9LSzqsyxnQmMIGoN+ZNCFoV7s5pekzPfgZj5+s7a+oiF/AzhOWZzF7vaM
-aclX7KCeENQV+q0giDjsGIHI6BevUHYkglocEqff+rIDHjjLxHLPooflV50M+ifc
-4uJdHgG8hwKxd1uf3LImUsquiBrW5CO6KCgwLrtQNe11pQHpY0urZxK/tnAj7QtD
-v/O1ryd/3+b0Gx14TyulMtcaLHsE94ppwjcxpYGNcyH+M39OMihuR2aqmkrqcZd/
-VWop1cNwZgPtCNVvfivRpX52NLI5I0eMfs6jeTMr719hdAby3akoiNLN3YNKrdrp
-pyRz/sUFGO8AHHECXA15KTeMBNfZnO32ZAZ4jHyyDBO1A5f9iDbErhXfIpeRCrCO
-gM9MLuO4YEMG1Skp+qaw7SIaG+oi2t4lbVRr3LOv0Hfkjjb7bVjfWSwLBPH/gv0E
-ZL6G0p7PjeoCh4obS3Y1yxfNlPR6RQwWl1wve+Nkmf5sDCmgr3P0512ZuvqkbKkB
-/syiAWDsYzFuq2Ntv2ljTYPEPwXEIQcpsagDRL6WzoLR
------END CERTIFICATE-----
-Bag Attributes
-    localKeyID: AE DC 75 2E 97 28 71 D8 1E 9A 7F 1E 5A AA F4 2E D3 6D 2C 8B 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIET6L0Ht/lYgCAggA
-MBQGCCqGSIb3DQMHBAi1Xo+JdQ6XvwSCBMgX20Fk3/GzptJ0zjl7ZqX2G3J4LIkM
-E5qJ4yv2WUkCCOWqz5DjlSrRz4kdCYHqnM1/qyrLa1UWWJlNQ9lBHTE+yp0vtAC/
-ajQfKt3RFyGxblp6nEKJI7kvhmQHDbITilmVEpcZPbci3gi7asQI3bRSLaHwGtbH
-DY+8hJ8lZQMRjYGDyGb99qEdYnMMRMW+b44lIRASe6W3EUfrvJlp+OUqRA7hJzn2
-yha9Zo8KWo9fA9UZDFFKNlXakg76+1HymB+uqvZl14xHHfwhlKPaqzmCb8MUtt7e
-YJDB9I3y8aHKExXPbRk04bbY5G9o6WdWslDUY4axOZuhUXyn0h6cTZn//qmsjcBH
-499+j55vW6W7vkMfurt/pmLIBWC9kDWPZVLizbfXxWiWvRmQvKPfzO5TU8oObYyJ
-qUVjb3Vpa/WPrF5APUVd/DDofurgzdOkmDGomONPvSHxahHSyEZsxpnl52GD6uU/
-i3oa5qLE9uA1QjyX6wyN9SU5wE2FZKTJwwRJwW4+s4T/2eJjhuJez5q1xhSCes4A
-A2pufAAY/ctQSmCCKCTW+EkrXtcezx66fkgPpNK/m6bz5KGJkA4QXjl8A05PDAFE
-Z68VOX/T0IGfXc2BbPgP0u+WpCvvO2cW/pU4sjcwOMxFuT1Bn3TwmDLTZ+zba1rE
-zFRMMCz/8SKq3I+VkzQ66ureEz0RLwk07JVzE9AJUEm+zCFUdoIaz09OMGVqtf4a
-V+UgupH0QlffmRNJKQtXPuj6Wjfa43GLaCnN/cpXXq8+2o81dLTsCbEsYu+8DRjC
-B0iyjzdqgjBBYurIEwEc4iGtPt4Y+4rgAJcpEUgwvWii37xyutOC9V7ansvd6zg3
-WXiX5Ktj/qS0EzM33WtZfx7jygJIf1MvxrJU+D+HgGii1mHaZ6bHxMX3QGpRsEvh
-IzBx16XvoHcXARZJG91bC+K1sJ6e05L1PevS7gj4heJTEhtmvABUrn9O1n5fZWPj
-Q81zRDgplMO7r8aBW/pE+sj4VSTMg0Xu0nlqqvQoWxr9YFcJm0+I9fHQPxewnRus
-sBZoiTqnWqbTr+uRATRUAp+hU03S4jGZwbzH4ylL2hr/TshGVJk/olBsULAfIiHa
-dA5H258IEwAoFO6zgI9AvqmTFo3Mnpqb/AS/HuDmmS/3Ud1EF8hFsMLPcV0JdSTY
-Dl4xgZ6j6jOUlTN5Yt6To2Zg3Q9Bm6qytFaffEP66Jl5aWhksI31Fz/ihzn5wfx9
-xh91U8+kGVNrpYHlo5y3FR/ywSXynLkJffCbfUciEaTDv9i0JppoIVXyFqcMofHe
-GUsWTCozAW3O8MwpLaJxcNcfRq0DWziIdiDgbF2tPoCqnNxXtLYSPpdt3jNDcPcx
-U0Z6ep6FnAXiujtQRSRSP3Ssq23098BxDSM9+eashFOmSbSClAEEn/THRxTp/gMh
-zmD8kpX1zN1Cm/lerTGjrGjnkXcQ7LY76/+C1uT+tQbw5LjmCfFEYTFtnFyYFlF1
-GiXFokh9SdLaCzW4vmZok85Fe+7VZ7BAchBTfTIMKlXKmeouf3YVYJ8glPsinrjb
-cB2pKv3tVrdQwo3moYDwSsDgkd7BNKKHDVdY2O6NgX4/Fyd6pZt7ZAphyC1giEqg
-pPo=
------END ENCRYPTED PRIVATE KEY-----

crates/gpapi/tests/files/portal_config.xml

@@ -46,26 +46,7 @@
     <use-sso>yes</use-sso>
     <ip-address></ip-address>
     <host></host>
-    <internal-host-detection>
-      <ip-address></ip-address>
-      <host></host>
-      <ipv6-address/>
-      <ipv6-host/>
-    </internal-host-detection>
     <gateways>
-        <internal>
-          <list>
-                <entry name="xxx.xxx.xxx.xxx">
-                    <priority-rule>
-                        <entry name="Any">
-                            <priority>1</priority>
-                        </entry>
-                    </priority-rule>
-                    <priority>1</priority>
-                    <description>vpn_gateway</description>
-                </entry>
-            </list>
-        </internal>
         <cutoff-time>5</cutoff-time>
         <external>
             <list>
@@ -82,19 +63,6 @@
         </external>
     </gateways>
     <gateways-v6>
-        <internal>
-            <list>
-                <entry name="vpn_gateway">
-                    <ipv4>xxx.xxx.xxx.xxx</ipv4>
-                    <priority-rule>
-                        <entry name="Any">
-                            <priority>1</priority>
-                        </entry>
-                    </priority-rule>
-                    <priority>1</priority>
-                </entry>
-            </list>
-        </internal>
         <cutoff-time>5</cutoff-time>
         <external>
             <list>