mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2025-05-20 07:26:58 -04:00
Compare commits
3 Commits
v2.1.0
...
426989350e
| Author | SHA1 | Date | |
|---|---|---|---|
|
426989350e | ||
|
|
935993e8da | ||
|
f9c0eb43a6 |
@@ -7,6 +7,3 @@ indent_size = 2
|
|||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
[Makefile]
|
|
||||||
indent_style = tab
|
|
||||||
|
|||||||
30
.github/ISSUE_TEMPLATE/bug_report.md
vendored
30
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -1,30 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is.
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
**Screenshots**
|
|
||||||
If applicable, add screenshots to help explain your problem.
|
|
||||||
|
|
||||||
**Logs**
|
|
||||||
- For the GUI version, you can find the logs at `~/.local/share/gpclient/gpclient.log`
|
|
||||||
- For the CLI version, copy the output of the `gpclient` command.
|
|
||||||
|
|
||||||
**Environment:**
|
|
||||||
- OS: [e.g. Ubuntu 22.04]
|
|
||||||
- Desktop Environment: [e.g. GNOME or KDE]
|
|
||||||
- Output of `ps aux | grep 'gnome-keyring\|kwalletd5' | grep -v grep`: [Required for secure store error]
|
|
||||||
- Is remote SSH? [Yes/No]
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
||||||
482
.github/workflows/build.yaml
vendored
482
.github/workflows/build.yaml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: Build
|
name: Build GPGUI
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -8,7 +8,6 @@ on:
|
|||||||
- .devcontainer
|
- .devcontainer
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- dev
|
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- v*.*.*
|
- v*.*.*
|
||||||
@@ -23,244 +22,287 @@ jobs:
|
|||||||
id: set-matrix
|
id: set-matrix
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
|
if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
|
||||||
echo "matrix=[\"ubuntu-latest\", \"arm64\"]" >> $GITHUB_OUTPUT
|
echo "matrix=[\"amd64\", \"arm64\"]" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
echo "matrix=[\"ubuntu-latest\"]" >> $GITHUB_OUTPUT
|
echo "matrix=[\"amd64\"]" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tarball:
|
build-fe:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [setup-matrix]
|
|
||||||
steps:
|
steps:
|
||||||
- uses: pnpm/action-setup@v2
|
- name: Checkout gpgui repo
|
||||||
with:
|
uses: actions/checkout@v3
|
||||||
version: 8
|
with:
|
||||||
- name: Prepare workspace
|
token: ${{ secrets.GH_PAT }}
|
||||||
run: rm -rf source && mkdir source
|
repository: yuezk/gpgui
|
||||||
- name: Checkout GlobalProtect-openconnect
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
|
||||||
path: source/gp
|
|
||||||
- name: Create tarball
|
|
||||||
run: |
|
|
||||||
cd source/gp
|
|
||||||
make tarball
|
|
||||||
- name: Upload tarball
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-source
|
|
||||||
if-no-files-found: error
|
|
||||||
path: |
|
|
||||||
source/gp/.build/tarball/*.tar.gz
|
|
||||||
|
|
||||||
build-deb:
|
- name: Install Node.js
|
||||||
needs:
|
uses: actions/setup-node@v4
|
||||||
- setup-matrix
|
with:
|
||||||
- tarball
|
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:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare workspace
|
- name: Checkout gpgui repo
|
||||||
run: rm -rf build-deb && mkdir build-deb
|
uses: actions/checkout@v3
|
||||||
- name: Download tarball
|
with:
|
||||||
uses: actions/download-artifact@v3
|
token: ${{ secrets.GH_PAT }}
|
||||||
with:
|
repository: yuezk/gpgui
|
||||||
name: artifact-source
|
path: gpgui
|
||||||
path: build-deb
|
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build DEB package in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-deb:/deb yuezk/gpdev:deb-builder
|
|
||||||
- name: Install DEB package in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-deb:/deb yuezk/gpdev:deb-builder \
|
|
||||||
bash -c "sudo dpkg -i /deb/*.deb; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
|
|
||||||
- name: Upload DEB package
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-deb-${{ matrix.os }}
|
|
||||||
if-no-files-found: error
|
|
||||||
path: |
|
|
||||||
build-deb/*.deb
|
|
||||||
|
|
||||||
build-rpm:
|
- name: Download package tarball
|
||||||
needs:
|
uses: actions/download-artifact@v3
|
||||||
- setup-matrix
|
with:
|
||||||
- tarball
|
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:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
arch: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare workspace
|
- name: Checkout gpgui repo
|
||||||
run: rm -rf build-rpm && mkdir build-rpm
|
uses: actions/checkout@v3
|
||||||
- name: Download tarball
|
with:
|
||||||
uses: actions/download-artifact@v3
|
token: ${{ secrets.GH_PAT }}
|
||||||
with:
|
repository: yuezk/gpgui
|
||||||
name: artifact-source
|
path: gpgui
|
||||||
path: build-rpm
|
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build RPM package in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-rpm:/rpm yuezk/gpdev:rpm-builder
|
|
||||||
- name: Install RPM package in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-rpm:/rpm yuezk/gpdev:rpm-builder \
|
|
||||||
bash -c "sudo rpm -i /rpm/*.$(uname -m).rpm; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
|
|
||||||
- name: Upload RPM package
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-rpm-${{ matrix.os }}
|
|
||||||
if-no-files-found: error
|
|
||||||
path: |
|
|
||||||
build-rpm/*.rpm
|
|
||||||
|
|
||||||
build-pkgbuild:
|
- name: Download artifact-${{ matrix.arch }}
|
||||||
needs:
|
uses: actions/download-artifact@v3
|
||||||
- setup-matrix
|
with:
|
||||||
- tarball
|
name: artifact-${{ matrix.arch }}-tauri
|
||||||
strategy:
|
path: gpgui/.tmp/artifact
|
||||||
matrix:
|
|
||||||
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
|
||||||
- name: Prepare workspace
|
|
||||||
run: rm -rf build-pkgbuild && mkdir build-pkgbuild
|
|
||||||
- name: Download tarball
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-source
|
|
||||||
path: build-pkgbuild
|
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build PKGBUILD package in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild
|
|
||||||
- name: Install PKGBUILD package in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-pkgbuild:/pkgbuild yuezk/gpdev:pkgbuild \
|
|
||||||
bash -c "sudo pacman -U --noconfirm /pkgbuild/*.pkg.tar.zst; gpclient --version; gpservice --version; gpauth --version; gpgui-helper --version;"
|
|
||||||
- name: Upload PKGBUILD package
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-pkgbuild-${{ matrix.os }}
|
|
||||||
if-no-files-found: error
|
|
||||||
path: |
|
|
||||||
build-pkgbuild/*.pkg.tar.zst
|
|
||||||
|
|
||||||
build-binary:
|
- name: Set up QEMU
|
||||||
needs:
|
uses: docker/setup-qemu-action@v3
|
||||||
- setup-matrix
|
with:
|
||||||
- tarball
|
platforms: ${{ matrix.arch }}
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
|
||||||
- name: Prepare workspace
|
|
||||||
run: rm -rf build-binary && mkdir build-binary
|
|
||||||
- name: Download tarball
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-source
|
|
||||||
path: build-binary
|
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build binary in Docker
|
|
||||||
run: |
|
|
||||||
docker run --rm -v $(pwd)/build-binary:/binary yuezk/gpdev:binary-builder
|
|
||||||
- name: Install binary in Docker
|
|
||||||
run: |
|
|
||||||
cd build-binary
|
|
||||||
tar -xJf ./*.bin.tar.xz
|
|
||||||
docker run --rm -v $(pwd):/binary yuezk/gpdev:binary-builder \
|
|
||||||
bash -c "cd /binary/globalprotect-openconnect*/ && sudo make install && gpclient --version && gpservice --version && gpauth --version && gpgui-helper --version;"
|
|
||||||
- name: Upload binary
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-binary-${{ matrix.os }}
|
|
||||||
if-no-files-found: error
|
|
||||||
path: |
|
|
||||||
build-binary/*.bin.tar.xz
|
|
||||||
build-binary/*.bin.tar.xz.sha256
|
|
||||||
|
|
||||||
build-gpgui:
|
- name: Login to Docker Hub
|
||||||
needs:
|
uses: docker/login-action@v3
|
||||||
- setup-matrix
|
with:
|
||||||
strategy:
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
matrix:
|
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||||
os: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
|
|
||||||
runs-on: ${{ matrix.os }}
|
- name: Generate PKGBUILD
|
||||||
steps:
|
run: |
|
||||||
- uses: pnpm/action-setup@v2
|
export CI_ARCH=${{ matrix.arch }}
|
||||||
with:
|
./gpgui/scripts/generate-pkgbuild.sh
|
||||||
version: 8
|
|
||||||
- name: Prepare workspace
|
- name: Build PKGBUILD package
|
||||||
run: rm -rf gpgui-source && mkdir gpgui-source
|
run: |
|
||||||
- name: Checkout GlobalProtect-openconnect
|
# Build package
|
||||||
uses: actions/checkout@v3
|
docker run \
|
||||||
with:
|
--rm \
|
||||||
token: ${{ secrets.GH_PAT }}
|
-v $(pwd)/gpgui/.tmp/pkgbuild:/pkgbuild \
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
--platform linux/${{ matrix.arch }} \
|
||||||
path: gpgui-source/gp
|
yuezk/gpdev:pkgbuild
|
||||||
- name: Checkout gpgui
|
|
||||||
uses: actions/checkout@v3
|
- name: Upload pkgbuild artifacts
|
||||||
with:
|
uses: actions/upload-artifact@v3
|
||||||
token: ${{ secrets.GH_PAT }}
|
with:
|
||||||
repository: yuezk/gpgui
|
name: artifact-${{ matrix.arch }}-pkgbuild
|
||||||
path: gpgui-source/gpgui
|
path: |
|
||||||
- name: Tarball
|
gpgui/.tmp/pkgbuild/*.pkg.tar.zst
|
||||||
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 --rm -v $(pwd)/gpgui-source:/gpgui yuezk/gpdev:gpgui-builder
|
|
||||||
- name: Install gpgui in Docker
|
|
||||||
run: |
|
|
||||||
cd gpgui-source
|
|
||||||
tar -xJf *.bin.tar.xz
|
|
||||||
docker run --rm -v $(pwd):/gpgui yuezk/gpdev:gpgui-builder \
|
|
||||||
bash -c "cd /gpgui/gpgui_*/ && ./gpgui --version"
|
|
||||||
- name: Upload gpgui
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: artifact-gpgui-${{ matrix.os }}
|
|
||||||
if-no-files-found: error
|
|
||||||
path: |
|
|
||||||
gpgui-source/*.bin.tar.xz
|
|
||||||
gpgui-source/*.bin.tar.xz.sha256
|
|
||||||
|
|
||||||
gh-release:
|
gh-release:
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- build-deb
|
- package-rpm
|
||||||
- build-rpm
|
- package-pkgbuild
|
||||||
- build-pkgbuild
|
|
||||||
- build-binary
|
|
||||||
- build-gpgui
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare workspace
|
- name: Download artifact
|
||||||
run: rm -rf build-artifact && mkdir build-artifact
|
uses: actions/download-artifact@v3
|
||||||
- name: Download all artifacts
|
with:
|
||||||
uses: actions/download-artifact@v3
|
path: artifact
|
||||||
with:
|
# pattern: artifact-*
|
||||||
path: build-artifact
|
# merge-multiple: true
|
||||||
- name: Create GH release
|
|
||||||
uses: softprops/action-gh-release@v1
|
# - name: Generate checksum
|
||||||
with:
|
# uses: jmgilman/actions-generate-checksum@v1
|
||||||
token: ${{ secrets.GH_PAT }}
|
# with:
|
||||||
prerelease: ${{ contains(github.ref, 'latest') }}
|
# output: checksums.txt
|
||||||
fail_on_unmatched_files: true
|
# patterns: |
|
||||||
files: |
|
# artifact/*
|
||||||
build-artifact/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-*/*
|
||||||
|
|||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -2,8 +2,3 @@
|
|||||||
/target
|
/target
|
||||||
.pnpm-store
|
.pnpm-store
|
||||||
.env
|
.env
|
||||||
.vendor
|
|
||||||
*.tar.xz
|
|
||||||
|
|
||||||
.cargo
|
|
||||||
.build
|
|
||||||
|
|||||||
88
Cargo.lock
generated
88
Cargo.lock
generated
@@ -126,6 +126,28 @@ version = "1.0.79"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
|
checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "async-stream"
|
||||||
|
version = "0.3.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
|
||||||
|
dependencies = [
|
||||||
|
"async-stream-impl",
|
||||||
|
"futures-core",
|
||||||
|
"pin-project-lite",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "async-stream-impl"
|
||||||
|
version = "0.3.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.48",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-trait"
|
name = "async-trait"
|
||||||
version = "0.1.77"
|
version = "0.1.77"
|
||||||
@@ -903,6 +925,19 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "downloader"
|
||||||
|
version = "0.2.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d05213e96f184578b5f70105d4d0a644a168e99e12d7bea0b200c15d67b5c182"
|
||||||
|
dependencies = [
|
||||||
|
"futures",
|
||||||
|
"rand 0.8.5",
|
||||||
|
"reqwest",
|
||||||
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dtoa"
|
name = "dtoa"
|
||||||
version = "1.0.9"
|
version = "1.0.9"
|
||||||
@@ -1423,7 +1458,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpapi"
|
name = "gpapi"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.21.5",
|
"base64 0.21.5",
|
||||||
@@ -1440,7 +1475,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_urlencoded",
|
"serde_urlencoded",
|
||||||
"sha256",
|
|
||||||
"specta",
|
"specta",
|
||||||
"specta-macros",
|
"specta-macros",
|
||||||
"tauri",
|
"tauri",
|
||||||
@@ -1455,7 +1489,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpauth"
|
name = "gpauth"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -1475,7 +1509,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpclient"
|
name = "gpclient"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -1496,14 +1530,16 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpgui-helper"
|
name = "gpgui-helper"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
"async-stream",
|
||||||
|
"base64 0.21.5",
|
||||||
"clap",
|
"clap",
|
||||||
"compile-time",
|
"compile-time",
|
||||||
|
"downloader",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"gpapi",
|
|
||||||
"log",
|
"log",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"tauri",
|
"tauri",
|
||||||
@@ -1514,7 +1550,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpservice"
|
name = "gpservice"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -1525,12 +1561,9 @@ dependencies = [
|
|||||||
"gpapi",
|
"gpapi",
|
||||||
"log",
|
"log",
|
||||||
"openconnect",
|
"openconnect",
|
||||||
"serde",
|
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"tar",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"xz2",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2200,17 +2233,6 @@ dependencies = [
|
|||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lzma-sys"
|
|
||||||
version = "0.1.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
"pkg-config",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mac"
|
name = "mac"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@@ -2519,7 +2541,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openconnect"
|
name = "openconnect"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"is_executable",
|
"is_executable",
|
||||||
@@ -3481,19 +3503,6 @@ dependencies = [
|
|||||||
"digest",
|
"digest",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sha256"
|
|
||||||
version = "1.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "18278f6a914fa3070aa316493f7d2ddfb9ac86ebc06fa3b83bffda487e9065b0"
|
|
||||||
dependencies = [
|
|
||||||
"async-trait",
|
|
||||||
"bytes",
|
|
||||||
"hex",
|
|
||||||
"sha2",
|
|
||||||
"tokio",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sharded-slab"
|
name = "sharded-slab"
|
||||||
version = "0.1.7"
|
version = "0.1.7"
|
||||||
@@ -5137,15 +5146,6 @@ version = "0.13.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
|
checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "xz2"
|
|
||||||
version = "0.1.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
|
|
||||||
dependencies = [
|
|
||||||
"lzma-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zeroize"
|
name = "zeroize"
|
||||||
version = "1.7.0"
|
version = "1.7.0"
|
||||||
|
|||||||
@@ -4,8 +4,7 @@ resolver = "2"
|
|||||||
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"]
|
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
rust-version = "1.70"
|
version = "2.0.0"
|
||||||
version = "2.1.0"
|
|
||||||
authors = ["Kevin Yue <k3vinyue@gmail.com>"]
|
authors = ["Kevin Yue <k3vinyue@gmail.com>"]
|
||||||
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
@@ -43,7 +42,6 @@ dotenvy_macro = "0.15"
|
|||||||
compile-time = "0.2"
|
compile-time = "0.2"
|
||||||
serde_urlencoded = "0.7"
|
serde_urlencoded = "0.7"
|
||||||
md5="0.7"
|
md5="0.7"
|
||||||
sha256="1"
|
|
||||||
|
|
||||||
# Tauri dependencies
|
# Tauri dependencies
|
||||||
tauri = { version = "1.5" }
|
tauri = { version = "1.5" }
|
||||||
|
|||||||
234
Makefile
234
Makefile
@@ -1,234 +0,0 @@
|
|||||||
OFFLINE ?= 0
|
|
||||||
BUILD_FE ?= 1
|
|
||||||
CARGO ?= cargo
|
|
||||||
|
|
||||||
VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
|
|
||||||
REVISION ?= 1
|
|
||||||
PPA_REVISION ?= 1
|
|
||||||
PKG_NAME = globalprotect-openconnect
|
|
||||||
PKG = $(PKG_NAME)-$(VERSION)
|
|
||||||
SERIES ?= $(shell lsb_release -cs)
|
|
||||||
PUBLISH ?= 0
|
|
||||||
|
|
||||||
export DEBEMAIL = k3vinyue@gmail.com
|
|
||||||
export DEBFULLNAME = Kevin Yue
|
|
||||||
|
|
||||||
CARGO_BUILD_ARGS = --release
|
|
||||||
|
|
||||||
ifeq ($(OFFLINE), 1)
|
|
||||||
CARGO_BUILD_ARGS += --frozen
|
|
||||||
endif
|
|
||||||
|
|
||||||
default: build
|
|
||||||
|
|
||||||
version:
|
|
||||||
@echo $(VERSION)
|
|
||||||
|
|
||||||
clean-tarball:
|
|
||||||
rm -rf .build/tarball
|
|
||||||
rm -rf .vendor
|
|
||||||
rm -rf vendor.tar.xz
|
|
||||||
rm -rf .cargo
|
|
||||||
|
|
||||||
# Create a tarball, include the cargo dependencies if OFFLINE is set to 1
|
|
||||||
tarball: clean-tarball
|
|
||||||
if [ $(BUILD_FE) -eq 1 ]; then \
|
|
||||||
cd apps/gpgui-helper && pnpm install && pnpm build; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove node_modules to reduce the tarball size
|
|
||||||
rm -rf apps/gpgui-helper/node_modules
|
|
||||||
|
|
||||||
mkdir -p .cargo
|
|
||||||
mkdir -p .build/tarball
|
|
||||||
|
|
||||||
# If OFFLINE is set to 1, vendor all cargo dependencies
|
|
||||||
if [ $(OFFLINE) -eq 1 ]; then \
|
|
||||||
$(CARGO) vendor .vendor > .cargo/config.toml; \
|
|
||||||
tar -cJf vendor.tar.xz .vendor; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
tar --exclude .vendor --exclude target --transform 's,^,${PKG}/,' -czf .build/tarball/${PKG}.tar.gz * .cargo
|
|
||||||
|
|
||||||
build: build-fe build-rs
|
|
||||||
|
|
||||||
# Install and build the frontend
|
|
||||||
# If OFFLINE is set to 1, skip it
|
|
||||||
build-fe:
|
|
||||||
if [ $(OFFLINE) -eq 1 ] || [ $(BUILD_FE) -eq 0 ]; then \
|
|
||||||
echo "Skipping frontend build (OFFLINE=1 or BUILD_FE=0)"; \
|
|
||||||
else \
|
|
||||||
cd apps/gpgui-helper && pnpm install && pnpm build; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d apps/gpgui-helper/dist ]; then \
|
|
||||||
echo "Error: frontend build failed"; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
build-rs:
|
|
||||||
if [ $(OFFLINE) -eq 1 ]; then \
|
|
||||||
tar -xJf vendor.tar.xz; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice -p gpauth
|
|
||||||
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"
|
|
||||||
|
|
||||||
clean:
|
|
||||||
$(CARGO) clean
|
|
||||||
rm -rf .build
|
|
||||||
rm -rf .vendor
|
|
||||||
rm -rf apps/gpgui-helper/node_modules
|
|
||||||
|
|
||||||
install:
|
|
||||||
@echo "Installing $(PKG_NAME)..."
|
|
||||||
|
|
||||||
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 -Dm644 packaging/files/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
|
|
||||||
install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
|
||||||
install -Dm644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
|
||||||
install -Dm644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
|
||||||
install -Dm644 packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
|
||||||
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/share/applications/gpgui.desktop
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
|
||||||
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:
|
|
||||||
rm -rf .build/deb
|
|
||||||
|
|
||||||
# Generate the debian package structure, without the changelog
|
|
||||||
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
|
|
||||||
cd .build/deb/${PKG} && debmake
|
|
||||||
|
|
||||||
cp -f packaging/deb/control.in .build/deb/$(PKG)/debian/control
|
|
||||||
cp -f packaging/deb/rules .build/deb/$(PKG)/debian/rules
|
|
||||||
|
|
||||||
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules
|
|
||||||
|
|
||||||
rm -f .build/deb/$(PKG)/debian/changelog
|
|
||||||
|
|
||||||
deb: init-debian
|
|
||||||
# Remove the rust build depdency from the control file
|
|
||||||
sed -i "s/@RUST@//g" .build/deb/$(PKG)/debian/control
|
|
||||||
|
|
||||||
cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
|
|
||||||
|
|
||||||
cd .build/deb/$(PKG) && 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
|
|
||||||
cd .build/deb/${PKG}
|
|
||||||
|
|
||||||
sed -i "s/@RUST@/rust-all(>=1.70)/g" debian/control
|
|
||||||
|
|
||||||
$(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1))
|
|
||||||
@echo "Building for $(SERIES) $(SERIES_VER)"
|
|
||||||
|
|
||||||
dch --create --distribution $(SERIES) --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION)ppa$(PPA_REVISION)~ubuntu$(SERIES_VER) "Bugfix and improvements."
|
|
||||||
|
|
||||||
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 \
|
|
||||||
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
|
|
||||||
mkdir -p .build/rpm
|
|
||||||
|
|
||||||
cp packaging/rpm/globalprotect-openconnect.spec.in .build/rpm/globalprotect-openconnect.spec
|
|
||||||
cp packaging/rpm/globalprotect-openconnect.changes.in .build/rpm/globalprotect-openconnect.changes
|
|
||||||
|
|
||||||
sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
|
|
||||||
sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
|
|
||||||
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/rpm/globalprotect-openconnect.spec
|
|
||||||
sed -i "s/@DATE@/$(shell 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/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .build/rpm/globalprotect-openconnect.changes
|
|
||||||
|
|
||||||
rpm: init-rpm tarball
|
|
||||||
rm -rf $(HOME)/rpmbuild
|
|
||||||
rpmdev-setuptree
|
|
||||||
|
|
||||||
cp .build/tarball/${PKG}.tar.gz $(HOME)/rpmbuild/SOURCES/${PKG_NAME}.tar.gz
|
|
||||||
rpmbuild -ba .build/rpm/globalprotect-openconnect.spec
|
|
||||||
|
|
||||||
# Copy RPM package from build directory
|
|
||||||
cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .build/rpm
|
|
||||||
|
|
||||||
# Copy the SRPM only for x86_64.
|
|
||||||
if [ "$(shell uname -m)" = "x86_64" ]; then \
|
|
||||||
cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .build/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
|
|
||||||
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
|
|
||||||
20
README.md
20
README.md
@@ -59,7 +59,7 @@ The GUI version is also available after you installed it. You can launch it from
|
|||||||
|
|
||||||
> [!Warning]
|
> [!Warning]
|
||||||
>
|
>
|
||||||
> The client requires `openconnect >= 8.20, pkexec, and gnome-keyring`, please make sure you have them installed.
|
> The client requires `openconnect >= 8.20`, please make sure you have it installed, you can check it with `openconnect --version`.
|
||||||
> Installing the client from PPA will automatically install the required version of `openconnect`.
|
> Installing the client from PPA will automatically install the required version of `openconnect`.
|
||||||
|
|
||||||
### Debian/Ubuntu based distributions
|
### Debian/Ubuntu based distributions
|
||||||
@@ -67,7 +67,6 @@ The GUI version is also available after you installed it. You can launch it from
|
|||||||
#### Install from PPA
|
#### 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 add-apt-repository ppa:yuezk/globalprotect-openconnect
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install globalprotect-openconnect
|
sudo apt-get install globalprotect-openconnect
|
||||||
@@ -114,7 +113,7 @@ sudo dnf copr enable yuezk/globalprotect-openconnect
|
|||||||
sudo dnf install globalprotect-openconnect
|
sudo dnf install globalprotect-openconnect
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Install from OBS (OpenSUSE Build Service)
|
#### Install from OBS
|
||||||
|
|
||||||
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.
|
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.
|
||||||
|
|
||||||
@@ -124,20 +123,7 @@ Download the latest RPM package from [releases](https://github.com/yuezk/GlobalP
|
|||||||
|
|
||||||
### Other distributions
|
### Other distributions
|
||||||
|
|
||||||
- Install `openconnect >= 8.20`, `webkit2gtk`, `libsecret`, `libayatana-appindicator` or `libappindicator-gtk3`.
|
The project depends on `openconnect >= 8.20`, `webkit2gtk`, `libsecret`, `libayatana-appindicator` or `libappindicator-gtk3`. You can install them first and then download the latest binary release (i.e., `*.bin.tar.gz`) 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 and run `make build` to build the client.
|
|
||||||
- Run `make install` to install the client.
|
|
||||||
|
|
||||||
## FAQ
|
|
||||||
|
|
||||||
1. How to deal with error `Secure Storage not ready`
|
|
||||||
|
|
||||||
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
|
## About Trial
|
||||||
|
|
||||||
|
|||||||
@@ -413,19 +413,7 @@ fn read_auth_data(main_resource: &WebResource, auth_result_tx: mpsc::UnboundedSe
|
|||||||
}
|
}
|
||||||
Err(AuthDataError::NotFound) => {
|
Err(AuthDataError::NotFound) => {
|
||||||
info!("No auth data found in headers, trying to read from body...");
|
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| {
|
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)
|
send_auth_result(&auth_result_tx, auth_result)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,9 +37,6 @@ pub(crate) struct ConnectArgs {
|
|||||||
#[arg(long, help = "Same as the '--csd-wrapper' option in the openconnect command")]
|
#[arg(long, help = "Same as the '--csd-wrapper' option in the openconnect command")]
|
||||||
csd_wrapper: Option<String>,
|
csd_wrapper: Option<String>,
|
||||||
|
|
||||||
#[arg(short, long, help = "Request MTU from server (legacy servers only)")]
|
|
||||||
mtu: Option<u32>,
|
|
||||||
|
|
||||||
#[arg(long, default_value = GP_USER_AGENT, help = "The user agent to use")]
|
#[arg(long, default_value = GP_USER_AGENT, help = "The user agent to use")]
|
||||||
user_agent: String,
|
user_agent: String,
|
||||||
#[arg(long, default_value = "Linux")]
|
#[arg(long, default_value = "Linux")]
|
||||||
@@ -155,14 +152,12 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
|
|
||||||
async fn connect_gateway(&self, gateway: &str, cookie: &str) -> anyhow::Result<()> {
|
async fn connect_gateway(&self, gateway: &str, cookie: &str) -> anyhow::Result<()> {
|
||||||
let csd_uid = get_csd_uid(&self.args.csd_user)?;
|
let csd_uid = get_csd_uid(&self.args.csd_user)?;
|
||||||
let mtu = self.args.mtu.unwrap_or(0);
|
|
||||||
|
|
||||||
let vpn = Vpn::builder(gateway, cookie)
|
let vpn = Vpn::builder(gateway, cookie)
|
||||||
.user_agent(self.args.user_agent.clone())
|
.user_agent(self.args.user_agent.clone())
|
||||||
.script(self.args.script.clone())
|
.script(self.args.script.clone())
|
||||||
.csd_uid(csd_uid)
|
.csd_uid(csd_uid)
|
||||||
.csd_wrapper(self.args.csd_wrapper.clone())
|
.csd_wrapper(self.args.csd_wrapper.clone())
|
||||||
.mtu(mtu)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
let vpn = Arc::new(vpn);
|
let vpn = Arc::new(vpn);
|
||||||
|
|||||||
1
apps/gpgui-helper/.gitignore
vendored
1
apps/gpgui-helper/.gitignore
vendored
@@ -22,4 +22,3 @@ dist-ssr
|
|||||||
*.njsproj
|
*.njsproj
|
||||||
*.sln
|
*.sln
|
||||||
*.sw?
|
*.sw?
|
||||||
.vite
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ license.workspace = true
|
|||||||
tauri-build = { version = "1.5", features = [] }
|
tauri-build = { version = "1.5", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
gpapi = { path = "../../../crates/gpapi", features = ["tauri"] }
|
|
||||||
tauri = { workspace = true, features = ["window-start-dragging"] }
|
tauri = { workspace = true, features = ["window-start-dragging"] }
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
@@ -17,9 +16,9 @@ log.workspace = true
|
|||||||
clap.workspace = true
|
clap.workspace = true
|
||||||
compile-time.workspace = true
|
compile-time.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
|
base64.workspace = true
|
||||||
|
async-stream = "0.3"
|
||||||
futures-util.workspace = true
|
futures-util.workspace = true
|
||||||
|
downloader = "0.2"
|
||||||
tempfile.workspace = true
|
tempfile.workspace = true
|
||||||
reqwest = { workspace = true, features = ["stream"] }
|
reqwest = { workspace = true, features = ["stream"] }
|
||||||
|
|
||||||
[features]
|
|
||||||
custom-protocol = ["tauri/custom-protocol"]
|
|
||||||
|
|||||||
@@ -1,52 +1,34 @@
|
|||||||
use std::sync::Arc;
|
use std::{io::Write, time::Duration};
|
||||||
|
|
||||||
use gpapi::utils::window::WindowExt;
|
use futures_util::StreamExt;
|
||||||
use log::info;
|
use log::info;
|
||||||
use tauri::Manager;
|
use tauri::{window::MenuHandle, Manager, Window};
|
||||||
|
use tempfile::NamedTempFile;
|
||||||
use crate::updater::{GuiUpdater, Installer, ProgressNotifier};
|
|
||||||
|
|
||||||
pub struct App {
|
pub struct App {
|
||||||
api_key: Vec<u8>,
|
api_key: Vec<u8>,
|
||||||
gui_version: String,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl App {
|
impl App {
|
||||||
pub fn new(api_key: Vec<u8>, gui_version: &str) -> Self {
|
pub fn new(api_key: Vec<u8>) -> Self {
|
||||||
Self {
|
Self { api_key }
|
||||||
api_key,
|
|
||||||
gui_version: gui_version.to_string(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(&self) -> anyhow::Result<()> {
|
pub fn run(&self) -> anyhow::Result<()> {
|
||||||
let gui_version = self.gui_version.clone();
|
|
||||||
let api_key = self.api_key.clone();
|
|
||||||
|
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.setup(move |app| {
|
.setup(|app| {
|
||||||
let win = app.get_window("main").expect("no main window");
|
let win = app.get_window("main").unwrap();
|
||||||
win.hide_menu();
|
hide_menu(win.menu_handle());
|
||||||
|
|
||||||
let notifier = ProgressNotifier::new(win.clone());
|
tauri::async_runtime::spawn(async move {
|
||||||
let installer = Installer::new(api_key);
|
let win_clone = win.clone();
|
||||||
let updater = Arc::new(GuiUpdater::new(gui_version, notifier, installer));
|
download_gui(win.clone()).await;
|
||||||
|
|
||||||
let win_clone = win.clone();
|
win.listen("app://download", move |_event| {
|
||||||
app.listen_global("app://update-done", move |_event| {
|
tokio::spawn(download_gui(win_clone.clone()));
|
||||||
info!("Update done");
|
});
|
||||||
let _ = win_clone.close();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Listen for the update event
|
|
||||||
win.listen("app://update", move |_event| {
|
|
||||||
let updater = Arc::clone(&updater);
|
|
||||||
tokio::spawn(async move { updater.update().await });
|
|
||||||
});
|
|
||||||
|
|
||||||
// Update the GUI on startup
|
|
||||||
win.trigger("app://update", None);
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
.run(tauri::generate_context!())?;
|
.run(tauri::generate_context!())?;
|
||||||
@@ -54,3 +36,80 @@ impl App {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fix the bug that the menu bar is visible on Ubuntu 18.04
|
||||||
|
fn hide_menu(menu_handle: MenuHandle) {
|
||||||
|
tokio::spawn(async move {
|
||||||
|
loop {
|
||||||
|
let menu_visible = menu_handle.is_visible().unwrap_or(false);
|
||||||
|
|
||||||
|
if !menu_visible {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if menu_visible {
|
||||||
|
let _ = menu_handle.hide();
|
||||||
|
tokio::time::sleep(Duration::from_millis(10)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn download_gui(win: Window) {
|
||||||
|
let url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v2.0.0/globalprotect-openconnect_2.0.0_x86_64.bin.tar.gz";
|
||||||
|
// let url = "https://free.nchc.org.tw/opensuse/distribution/leap/15.5/iso/openSUSE-Leap-15.5-DVD-x86_64-Build491.1-Media.iso";
|
||||||
|
|
||||||
|
let win_clone = win.clone();
|
||||||
|
|
||||||
|
match download(url, move |p| {
|
||||||
|
let _ = win.emit_all("app://download-progress", p);
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Err(err) => {
|
||||||
|
info!("download error: {}", err);
|
||||||
|
let _ = win_clone.emit_all("app://download-error", ());
|
||||||
|
}
|
||||||
|
Ok(file) => {
|
||||||
|
let path = file.into_temp_path();
|
||||||
|
info!("download completed: {:?}", path);
|
||||||
|
// Close window after 300ms
|
||||||
|
tokio::time::sleep(Duration::from_millis(300 * 1000)).await;
|
||||||
|
info!("file: {:?}", path);
|
||||||
|
let _ = win_clone.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn download<T>(url: &str, on_progress: T) -> anyhow::Result<NamedTempFile>
|
||||||
|
where
|
||||||
|
T: Fn(Option<f64>) + Send + 'static,
|
||||||
|
{
|
||||||
|
let res = reqwest::get(url).await?.error_for_status()?;
|
||||||
|
let content_length = res.content_length().unwrap_or(0);
|
||||||
|
|
||||||
|
info!("content_length: {}", content_length);
|
||||||
|
|
||||||
|
let mut current_length = 0;
|
||||||
|
let mut stream = res.bytes_stream();
|
||||||
|
|
||||||
|
let mut file = NamedTempFile::new()?;
|
||||||
|
|
||||||
|
while let Some(item) = stream.next().await {
|
||||||
|
let chunk = item?;
|
||||||
|
let chunk_size = chunk.len() as u64;
|
||||||
|
|
||||||
|
file.write_all(&chunk)?;
|
||||||
|
|
||||||
|
current_length += chunk_size;
|
||||||
|
let progress = current_length as f64 / content_length as f64 * 100.0;
|
||||||
|
|
||||||
|
if content_length > 0 {
|
||||||
|
on_progress(Some(progress));
|
||||||
|
} else {
|
||||||
|
on_progress(None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(file)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
use base64::prelude::*;
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use gpapi::utils::base64;
|
|
||||||
use log::{info, LevelFilter};
|
use log::{info, LevelFilter};
|
||||||
|
|
||||||
use crate::app::App;
|
use crate::app::App;
|
||||||
@@ -9,33 +9,27 @@ const GP_API_KEY: &[u8; 32] = &[0; 32];
|
|||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
#[command(version = VERSION)]
|
#[command(version = VERSION)]
|
||||||
struct Cli {
|
struct Cli {}
|
||||||
#[arg(long, help = "Read the API key from stdin")]
|
|
||||||
api_key_on_stdin: bool,
|
|
||||||
|
|
||||||
#[arg(long, default_value = env!("CARGO_PKG_VERSION"), help = "The version of the GUI")]
|
|
||||||
gui_version: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Cli {
|
impl Cli {
|
||||||
fn run(&self) -> anyhow::Result<()> {
|
fn run(&self) -> anyhow::Result<()> {
|
||||||
|
#[cfg(debug_assertions)]
|
||||||
|
let api_key = GP_API_KEY.to_vec();
|
||||||
|
#[cfg(not(debug_assertions))]
|
||||||
let api_key = self.read_api_key()?;
|
let api_key = self.read_api_key()?;
|
||||||
let app = App::new(api_key, &self.gui_version);
|
|
||||||
|
let app = App::new(api_key);
|
||||||
|
|
||||||
app.run()
|
app.run()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_api_key(&self) -> anyhow::Result<Vec<u8>> {
|
fn read_api_key(&self) -> anyhow::Result<Vec<u8>> {
|
||||||
if self.api_key_on_stdin {
|
let mut api_key = String::new();
|
||||||
let mut api_key = String::new();
|
std::io::stdin().read_line(&mut api_key)?;
|
||||||
std::io::stdin().read_line(&mut api_key)?;
|
|
||||||
|
|
||||||
let api_key = base64::decode_to_vec(api_key.trim())?;
|
let api_key = BASE64_STANDARD.decode(api_key.trim())?;
|
||||||
|
|
||||||
Ok(api_key)
|
Ok(api_key)
|
||||||
} else {
|
|
||||||
Ok(GP_API_KEY.to_vec())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,87 +0,0 @@
|
|||||||
use std::io::Write;
|
|
||||||
|
|
||||||
use anyhow::bail;
|
|
||||||
use futures_util::StreamExt;
|
|
||||||
use log::info;
|
|
||||||
use tempfile::NamedTempFile;
|
|
||||||
use tokio::sync::RwLock;
|
|
||||||
|
|
||||||
type OnProgress = Box<dyn Fn(Option<f64>) + Send + Sync + 'static>;
|
|
||||||
|
|
||||||
pub struct FileDownloader<'a> {
|
|
||||||
url: &'a str,
|
|
||||||
on_progress: RwLock<Option<OnProgress>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> FileDownloader<'a> {
|
|
||||||
pub fn new(url: &'a str) -> Self {
|
|
||||||
Self {
|
|
||||||
url,
|
|
||||||
on_progress: Default::default(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn on_progress<T>(&self, on_progress: T)
|
|
||||||
where
|
|
||||||
T: Fn(Option<f64>) + Send + Sync + 'static,
|
|
||||||
{
|
|
||||||
if let Ok(mut guard) = self.on_progress.try_write() {
|
|
||||||
*guard = Some(Box::new(on_progress));
|
|
||||||
} else {
|
|
||||||
info!("Failed to acquire on_progress lock");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn download(&self) -> anyhow::Result<NamedTempFile> {
|
|
||||||
let res = reqwest::get(self.url).await?.error_for_status()?;
|
|
||||||
let content_length = res.content_length().unwrap_or(0);
|
|
||||||
|
|
||||||
info!("Content length: {}", content_length);
|
|
||||||
|
|
||||||
let mut current_length = 0;
|
|
||||||
let mut stream = res.bytes_stream();
|
|
||||||
|
|
||||||
let mut file = NamedTempFile::new()?;
|
|
||||||
|
|
||||||
while let Some(item) = stream.next().await {
|
|
||||||
let chunk = item?;
|
|
||||||
let chunk_size = chunk.len() as u64;
|
|
||||||
|
|
||||||
file.write_all(&chunk)?;
|
|
||||||
|
|
||||||
current_length += chunk_size;
|
|
||||||
let progress = current_length as f64 / content_length as f64 * 100.0;
|
|
||||||
|
|
||||||
if let Some(on_progress) = &*self.on_progress.read().await {
|
|
||||||
let progress = if content_length > 0 { Some(progress) } else { None };
|
|
||||||
|
|
||||||
on_progress(progress);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if content_length > 0 && current_length != content_length {
|
|
||||||
bail!("Download incomplete");
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Downloaded to: {:?}", file.path());
|
|
||||||
|
|
||||||
Ok(file)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct ChecksumFetcher<'a> {
|
|
||||||
url: &'a str,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> ChecksumFetcher<'a> {
|
|
||||||
pub fn new(url: &'a str) -> Self {
|
|
||||||
Self { url }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn fetch(&self) -> anyhow::Result<String> {
|
|
||||||
let res = reqwest::get(self.url).await?.error_for_status()?;
|
|
||||||
let checksum = res.text().await?.trim().to_string();
|
|
||||||
|
|
||||||
Ok(checksum)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
pub(crate) mod app;
|
pub(crate) mod app;
|
||||||
pub(crate) mod downloader;
|
|
||||||
pub(crate) mod updater;
|
|
||||||
|
|
||||||
pub mod cli;
|
pub mod cli;
|
||||||
|
|||||||
@@ -1,137 +0,0 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use gpapi::{
|
|
||||||
service::request::UpdateGuiRequest,
|
|
||||||
utils::{checksum::verify_checksum, crypto::Crypto, endpoint::http_endpoint},
|
|
||||||
};
|
|
||||||
use log::{info, warn};
|
|
||||||
use tauri::{Manager, Window};
|
|
||||||
|
|
||||||
use crate::downloader::{ChecksumFetcher, FileDownloader};
|
|
||||||
|
|
||||||
pub struct ProgressNotifier {
|
|
||||||
win: Window,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ProgressNotifier {
|
|
||||||
pub fn new(win: Window) -> Self {
|
|
||||||
Self { win }
|
|
||||||
}
|
|
||||||
|
|
||||||
fn notify(&self, progress: Option<f64>) {
|
|
||||||
let _ = self.win.emit_all("app://update-progress", progress);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn notify_error(&self) {
|
|
||||||
let _ = self.win.emit_all("app://update-error", ());
|
|
||||||
}
|
|
||||||
|
|
||||||
fn notify_done(&self) {
|
|
||||||
let _ = self.win.emit_and_trigger("app://update-done", ());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Installer {
|
|
||||||
crypto: Crypto,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Installer {
|
|
||||||
pub fn new(api_key: Vec<u8>) -> Self {
|
|
||||||
Self {
|
|
||||||
crypto: Crypto::new(api_key),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn install(&self, path: &str, checksum: &str) -> anyhow::Result<()> {
|
|
||||||
let service_endpoint = http_endpoint().await?;
|
|
||||||
|
|
||||||
let request = UpdateGuiRequest {
|
|
||||||
path: path.to_string(),
|
|
||||||
checksum: checksum.to_string(),
|
|
||||||
};
|
|
||||||
let payload = self.crypto.encrypt(&request)?;
|
|
||||||
|
|
||||||
reqwest::Client::default()
|
|
||||||
.post(format!("{}/update-gui", service_endpoint))
|
|
||||||
.body(payload)
|
|
||||||
.send()
|
|
||||||
.await?
|
|
||||||
.error_for_status()?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct GuiUpdater {
|
|
||||||
version: String,
|
|
||||||
notifier: Arc<ProgressNotifier>,
|
|
||||||
installer: Installer,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl GuiUpdater {
|
|
||||||
pub fn new(version: String, notifier: ProgressNotifier, installer: Installer) -> Self {
|
|
||||||
Self {
|
|
||||||
version,
|
|
||||||
notifier: Arc::new(notifier),
|
|
||||||
installer,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn update(&self) {
|
|
||||||
info!("Update GUI, version: {}", self.version);
|
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
|
||||||
let release_tag = "latest";
|
|
||||||
#[cfg(not(debug_assertions))]
|
|
||||||
let release_tag = format!("v{}", self.version);
|
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
let arch = "x86_64";
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
|
||||||
let arch = "aarch64";
|
|
||||||
|
|
||||||
let file_url = format!(
|
|
||||||
"https://github.com/yuezk/GlobalProtect-openconnect/releases/download/{}/gpgui_{}_{}.bin.tar.xz",
|
|
||||||
release_tag, self.version, arch
|
|
||||||
);
|
|
||||||
let checksum_url = format!("{}.sha256", file_url);
|
|
||||||
|
|
||||||
info!("Downloading file: {}", file_url);
|
|
||||||
|
|
||||||
let dl = FileDownloader::new(&file_url);
|
|
||||||
let cf = ChecksumFetcher::new(&checksum_url);
|
|
||||||
let notifier = Arc::clone(&self.notifier);
|
|
||||||
|
|
||||||
dl.on_progress(move |progress| notifier.notify(progress));
|
|
||||||
|
|
||||||
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.notifier.notify_error();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let path = file.into_temp_path();
|
|
||||||
let file_path = path.to_string_lossy();
|
|
||||||
|
|
||||||
if let Err(err) = verify_checksum(&file_path, &checksum) {
|
|
||||||
warn!("Checksum error: {}", err);
|
|
||||||
self.notifier.notify_error();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Checksum success");
|
|
||||||
|
|
||||||
if let Err(err) = self.installer.install(&file_path, &checksum).await {
|
|
||||||
warn!("Install error: {}", err);
|
|
||||||
self.notifier.notify_error();
|
|
||||||
} else {
|
|
||||||
info!("Install success");
|
|
||||||
self.notifier.notify_done();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "pnpm dev",
|
"beforeDevCommand": "pnpm dev",
|
||||||
"beforeBuildCommand": "pnpm build",
|
"beforeBuildCommand": "echo 'Skipping Vite build command...'",
|
||||||
"devPath": "http://localhost:1421",
|
"devPath": "http://localhost:1420",
|
||||||
"distDir": "../dist",
|
"distDir": "../dist",
|
||||||
"withGlobalTauri": false
|
"withGlobalTauri": false
|
||||||
},
|
},
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
"active": false,
|
"active": true,
|
||||||
"targets": "deb",
|
"targets": "deb",
|
||||||
"identifier": "com.yuezk.gpgui-helper",
|
"identifier": "com.yuezk.gpgui-helper",
|
||||||
"icon": [
|
"icon": [
|
||||||
@@ -40,10 +40,6 @@
|
|||||||
"resizable": true,
|
"resizable": true,
|
||||||
"width": 500,
|
"width": 500,
|
||||||
"height": 100,
|
"height": 100,
|
||||||
"minWidth": 500,
|
|
||||||
"minHeight": 100,
|
|
||||||
"maxWidth": 500,
|
|
||||||
"maxHeight": 100,
|
|
||||||
"label": "main",
|
"label": "main",
|
||||||
"decorations": false
|
"decorations": false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +1,39 @@
|
|||||||
import { Box, Button, CssBaseline, LinearProgress, Typography } from "@mui/material";
|
import {
|
||||||
|
Box,
|
||||||
|
Button,
|
||||||
|
CssBaseline,
|
||||||
|
LinearProgress,
|
||||||
|
Typography,
|
||||||
|
} from "@mui/material";
|
||||||
import { appWindow } 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";
|
import "./styles.css";
|
||||||
|
|
||||||
function useUpdateProgress() {
|
import logo from "../../assets/icon.svg";
|
||||||
const [progress, setProgress] = useState<number | null>(null);
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const unlisten = appWindow.listen("app://update-progress", (event) => {
|
|
||||||
setProgress(event.payload as number);
|
|
||||||
});
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
unlisten.then((unlisten) => unlisten());
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return progress;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const unlisten = appWindow.listen("app://update-error", () => {
|
const unlisten = appWindow.listen("app://download-error", () => {
|
||||||
setError(true);
|
setError(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
unlisten.then((unlisten) => unlisten());
|
unlisten.then((unlisten) => unlisten());
|
||||||
};
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleRetry = () => {
|
useEffect(() => {
|
||||||
setError(false);
|
const unlisten = appWindow.listen("app://download", () => {
|
||||||
appWindow.emit("app://update");
|
setError(false);
|
||||||
};
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
unlisten.then((unlisten) => unlisten());
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -58,7 +54,7 @@ export default function App() {
|
|||||||
data-tauri-drag-region
|
data-tauri-drag-region
|
||||||
/>
|
/>
|
||||||
<Box flex={1} ml={2}>
|
<Box flex={1} ml={2}>
|
||||||
{error ? <DownloadFailed onRetry={handleRetry} /> : <DownloadIndicator />}
|
{error ? <DownloadFailed /> : <DownloadIndicator />}
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
@@ -67,7 +63,17 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function DownloadIndicator() {
|
function DownloadIndicator() {
|
||||||
const progress = useUpdateProgress();
|
const [progress, setProgress] = useState<number | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const unlisten = appWindow.listen("app://download-progress", (event) => {
|
||||||
|
setProgress(event.payload as number);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
unlisten.then((unlisten) => unlisten());
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -81,7 +87,7 @@ function DownloadIndicator() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function DownloadFailed({ onRetry }: { onRetry: () => void }) {
|
function DownloadFailed() {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Typography variant="h1" fontSize="1rem" data-tauri-drag-region>
|
<Typography variant="h1" fontSize="1rem" data-tauri-drag-region>
|
||||||
@@ -92,7 +98,7 @@ function DownloadFailed({ onRetry }: { onRetry: () => void }) {
|
|||||||
variant="contained"
|
variant="contained"
|
||||||
color="primary"
|
color="primary"
|
||||||
size="small"
|
size="small"
|
||||||
onClick={onRetry}
|
onClick={() => appWindow.emit("app://download")}
|
||||||
sx={{
|
sx={{
|
||||||
textTransform: "none",
|
textTransform: "none",
|
||||||
}}
|
}}
|
||||||
@@ -115,11 +121,10 @@ function LinearProgressWithLabel(props: { value: number | null }) {
|
|||||||
value={value ?? 0}
|
value={value ?? 0}
|
||||||
sx={{
|
sx={{
|
||||||
py: 1.2,
|
py: 1.2,
|
||||||
".MuiLinearProgress-bar": {
|
'.MuiLinearProgress-bar': {
|
||||||
transition: "none",
|
transition: "none"
|
||||||
},
|
}
|
||||||
}}
|
}} />
|
||||||
/>
|
|
||||||
</Box>
|
</Box>
|
||||||
{value !== null && (
|
{value !== null && (
|
||||||
<Box sx={{ minWidth: 35, textAlign: "right", ml: 1 }}>
|
<Box sx={{ minWidth: 35, textAlign: "right", ml: 1 }}>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export default defineConfig(async () => {
|
|||||||
clearScreen: false,
|
clearScreen: false,
|
||||||
// 2. tauri expects a fixed port, fail if that port is not available
|
// 2. tauri expects a fixed port, fail if that port is not available
|
||||||
server: {
|
server: {
|
||||||
port: 1421,
|
port: 1420,
|
||||||
strictPort: true,
|
strictPort: true,
|
||||||
},
|
},
|
||||||
// 3. to make use of `TAURI_DEBUG` and other env variables
|
// 3. to make use of `TAURI_DEBUG` and other env variables
|
||||||
|
|||||||
@@ -13,10 +13,7 @@ tokio.workspace = true
|
|||||||
tokio-util.workspace = true
|
tokio-util.workspace = true
|
||||||
axum = { workspace = true, features = ["ws"] }
|
axum = { workspace = true, features = ["ws"] }
|
||||||
futures.workspace = true
|
futures.workspace = true
|
||||||
serde.workspace = true
|
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
compile-time.workspace = true
|
compile-time.workspace = true
|
||||||
xz2 = "0.1"
|
|
||||||
tar = "0.4"
|
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ fn init_logger() -> Arc<Redaction> {
|
|||||||
let timestamp = buf.timestamp();
|
let timestamp = buf.timestamp();
|
||||||
writeln!(
|
writeln!(
|
||||||
buf,
|
buf,
|
||||||
"[{} {} {}] {}",
|
"[{} {} {}] {}",
|
||||||
timestamp,
|
timestamp,
|
||||||
record.level(),
|
record.level(),
|
||||||
record.module_path().unwrap_or_default(),
|
record.module_path().unwrap_or_default(),
|
||||||
@@ -127,8 +127,10 @@ fn init_logger() -> Arc<Redaction> {
|
|||||||
|
|
||||||
async fn launch_gui(envs: Option<HashMap<String, String>>, api_key: Vec<u8>, mut minimized: bool) {
|
async fn launch_gui(envs: Option<HashMap<String, String>>, api_key: Vec<u8>, mut minimized: bool) {
|
||||||
loop {
|
loop {
|
||||||
let gui_launcher = GuiLauncher::new(env!("CARGO_PKG_VERSION"), &api_key)
|
let api_key_clone = api_key.clone();
|
||||||
|
let gui_launcher = GuiLauncher::new()
|
||||||
.envs(envs.clone())
|
.envs(envs.clone())
|
||||||
|
.api_key(api_key_clone)
|
||||||
.minimized(minimized);
|
.minimized(minimized);
|
||||||
|
|
||||||
match gui_launcher.launch().await {
|
match gui_launcher.launch().await {
|
||||||
|
|||||||
@@ -1,33 +1,16 @@
|
|||||||
use std::{
|
use std::{borrow::Cow, ops::ControlFlow, sync::Arc};
|
||||||
borrow::Cow,
|
|
||||||
fs::{File, Permissions},
|
|
||||||
io::BufReader,
|
|
||||||
ops::ControlFlow,
|
|
||||||
os::unix::fs::PermissionsExt,
|
|
||||||
path::PathBuf,
|
|
||||||
sync::Arc,
|
|
||||||
};
|
|
||||||
|
|
||||||
use anyhow::bail;
|
|
||||||
use axum::{
|
use axum::{
|
||||||
body::Bytes,
|
body::Bytes,
|
||||||
extract::{
|
extract::{
|
||||||
ws::{self, CloseFrame, Message, WebSocket},
|
ws::{self, CloseFrame, Message, WebSocket},
|
||||||
State, WebSocketUpgrade,
|
State, WebSocketUpgrade,
|
||||||
},
|
},
|
||||||
http::StatusCode,
|
|
||||||
response::IntoResponse,
|
response::IntoResponse,
|
||||||
};
|
};
|
||||||
use futures::{SinkExt, StreamExt};
|
use futures::{SinkExt, StreamExt};
|
||||||
use gpapi::{
|
use gpapi::service::event::WsEvent;
|
||||||
service::{event::WsEvent, request::UpdateGuiRequest},
|
|
||||||
utils::checksum::verify_checksum,
|
|
||||||
GP_GUI_BINARY,
|
|
||||||
};
|
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
use tar::Archive;
|
|
||||||
use tokio::fs;
|
|
||||||
use xz2::read::XzDecoder;
|
|
||||||
|
|
||||||
use crate::ws_server::WsServerContext;
|
use crate::ws_server::WsServerContext;
|
||||||
|
|
||||||
@@ -43,67 +26,12 @@ pub(crate) async fn auth_data(State(ctx): State<Arc<WsServerContext>>, body: Str
|
|||||||
ctx.send_event(WsEvent::AuthData(body)).await;
|
ctx.send_event(WsEvent::AuthData(body)).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) -> Result<(), StatusCode> {
|
pub(crate) struct UpdateGuiPayload {
|
||||||
let payload = match ctx.decrypt::<UpdateGuiRequest>(body.to_vec()) {
|
pub(crate) file: String,
|
||||||
Ok(payload) => payload,
|
pub(crate) checksum: String,
|
||||||
Err(err) => {
|
|
||||||
warn!("Failed to decrypt update payload: {}", err);
|
|
||||||
return Err(StatusCode::BAD_REQUEST);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
info!("Update GUI: {:?}", payload);
|
|
||||||
let UpdateGuiRequest { path, checksum } = payload;
|
|
||||||
|
|
||||||
info!("Verifying checksum");
|
|
||||||
verify_checksum(&path, &checksum).map_err(|err| {
|
|
||||||
warn!("Failed to verify checksum: {}", err);
|
|
||||||
StatusCode::BAD_REQUEST
|
|
||||||
})?;
|
|
||||||
|
|
||||||
info!("Installing GUI");
|
|
||||||
install_gui(&path).await.map_err(|err| {
|
|
||||||
warn!("Failed to install GUI: {}", err);
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR
|
|
||||||
})?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
|
pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) -> impl IntoResponse {}
|
||||||
async fn install_gui(src: &str) -> anyhow::Result<()> {
|
|
||||||
let path = PathBuf::from(GP_GUI_BINARY);
|
|
||||||
let Some(dir) = path.parent() else {
|
|
||||||
bail!("Failed to get parent directory of GUI binary");
|
|
||||||
};
|
|
||||||
|
|
||||||
fs::create_dir_all(dir).await?;
|
|
||||||
|
|
||||||
// Unpack the archive
|
|
||||||
info!("Unpacking GUI archive");
|
|
||||||
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(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) async fn ws_handler(ws: WebSocketUpgrade, State(ctx): State<Arc<WsServerContext>>) -> impl IntoResponse {
|
pub(crate) async fn ws_handler(ws: WebSocketUpgrade, State(ctx): State<Arc<WsServerContext>>) -> impl IntoResponse {
|
||||||
ws.on_upgrade(move |socket| handle_socket(socket, ctx))
|
ws.on_upgrade(move |socket| handle_socket(socket, ctx))
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ impl VpnTaskContext {
|
|||||||
.script(args.vpnc_script())
|
.script(args.vpnc_script())
|
||||||
.csd_uid(args.csd_uid())
|
.csd_uid(args.csd_uid())
|
||||||
.csd_wrapper(args.csd_wrapper())
|
.csd_wrapper(args.csd_wrapper())
|
||||||
.mtu(args.mtu())
|
|
||||||
.os(args.openconnect_os())
|
.os(args.openconnect_os())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ use gpapi::{
|
|||||||
utils::{crypto::Crypto, lock_file::LockFile, redact::Redaction},
|
utils::{crypto::Crypto, lock_file::LockFile, redact::Redaction},
|
||||||
};
|
};
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
use serde::de::DeserializeOwned;
|
|
||||||
use tokio::{
|
use tokio::{
|
||||||
net::TcpListener,
|
net::TcpListener,
|
||||||
sync::{mpsc, watch, RwLock},
|
sync::{mpsc, watch, RwLock},
|
||||||
@@ -39,10 +38,6 @@ impl WsServerContext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn decrypt<T: DeserializeOwned>(&self, encrypted: Vec<u8>) -> anyhow::Result<T> {
|
|
||||||
self.crypto.decrypt(encrypted)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn send_event(&self, event: WsEvent) {
|
pub async fn send_event(&self, event: WsEvent) {
|
||||||
let connections = self.connections.read().await;
|
let connections = self.connections.read().await;
|
||||||
|
|
||||||
|
|||||||
15
changelog.md
15
changelog.md
@@ -1,15 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
## 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
|
|
||||||
- Support HIP report
|
|
||||||
- Support pass vpn-slice command
|
|
||||||
- Do not error when the region field is empty
|
|
||||||
- Update the auth window icon
|
|
||||||
@@ -27,7 +27,6 @@ dotenvy_macro.workspace = true
|
|||||||
uzers.workspace = true
|
uzers.workspace = true
|
||||||
serde_urlencoded.workspace = true
|
serde_urlencoded.workspace = true
|
||||||
md5.workspace = true
|
md5.workspace = true
|
||||||
sha256.workspace = true
|
|
||||||
|
|
||||||
tauri = { workspace = true, optional = true }
|
tauri = { workspace = true, optional = true }
|
||||||
clap = { workspace = true, optional = true }
|
clap = { workspace = true, optional = true }
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ pub const GP_SERVICE_BINARY: &str = "/usr/bin/gpservice";
|
|||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(debug_assertions))]
|
||||||
pub const GP_GUI_BINARY: &str = "/usr/bin/gpgui";
|
pub const GP_GUI_BINARY: &str = "/usr/bin/gpgui";
|
||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(debug_assertions))]
|
||||||
pub const GP_GUI_HELPER_BINARY: &str = "/usr/bin/gpgui-helper";
|
|
||||||
#[cfg(not(debug_assertions))]
|
|
||||||
pub(crate) const GP_AUTH_BINARY: &str = "/usr/bin/gpauth";
|
pub(crate) const GP_AUTH_BINARY: &str = "/usr/bin/gpauth";
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
@@ -34,6 +32,4 @@ pub const GP_SERVICE_BINARY: &str = dotenvy_macro::dotenv!("GP_SERVICE_BINARY");
|
|||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
pub const GP_GUI_BINARY: &str = dotenvy_macro::dotenv!("GP_GUI_BINARY");
|
pub const GP_GUI_BINARY: &str = dotenvy_macro::dotenv!("GP_GUI_BINARY");
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
pub const GP_GUI_HELPER_BINARY: &str = dotenvy_macro::dotenv!("GP_GUI_HELPER_BINARY");
|
|
||||||
#[cfg(debug_assertions)]
|
|
||||||
pub(crate) const GP_AUTH_BINARY: &str = dotenvy_macro::dotenv!("GP_AUTH_BINARY");
|
pub(crate) const GP_AUTH_BINARY: &str = dotenvy_macro::dotenv!("GP_AUTH_BINARY");
|
||||||
|
|||||||
@@ -12,7 +12,11 @@ pub trait CommandExt {
|
|||||||
impl CommandExt for Command {
|
impl CommandExt for Command {
|
||||||
fn new_pkexec<S: AsRef<OsStr>>(program: S) -> Command {
|
fn new_pkexec<S: AsRef<OsStr>>(program: S) -> Command {
|
||||||
let mut cmd = Command::new("pkexec");
|
let mut cmd = Command::new("pkexec");
|
||||||
cmd.arg("--user").arg("root").arg(program);
|
cmd
|
||||||
|
.arg("--disable-internal-agent")
|
||||||
|
.arg("--user")
|
||||||
|
.arg("root")
|
||||||
|
.arg(program);
|
||||||
|
|
||||||
cmd
|
cmd
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
use std::{collections::HashMap, path::PathBuf, process::Stdio};
|
|
||||||
|
|
||||||
use anyhow::bail;
|
|
||||||
use log::info;
|
|
||||||
use tokio::{io::AsyncWriteExt, process::Command};
|
|
||||||
|
|
||||||
use crate::{process::command_traits::CommandExt, utils, GP_GUI_HELPER_BINARY};
|
|
||||||
|
|
||||||
pub struct GuiHelperLauncher<'a> {
|
|
||||||
program: PathBuf,
|
|
||||||
envs: Option<&'a HashMap<String, String>>,
|
|
||||||
api_key: &'a [u8],
|
|
||||||
gui_version: Option<&'a str>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> GuiHelperLauncher<'a> {
|
|
||||||
pub fn new(api_key: &'a [u8]) -> Self {
|
|
||||||
Self {
|
|
||||||
program: GP_GUI_HELPER_BINARY.into(),
|
|
||||||
envs: None,
|
|
||||||
api_key,
|
|
||||||
gui_version: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn envs(mut self, envs: Option<&'a HashMap<String, String>>) -> Self {
|
|
||||||
self.envs = envs;
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn gui_version(mut self, version: Option<&'a str>) -> Self {
|
|
||||||
self.gui_version = version;
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn launch(&self) -> anyhow::Result<()> {
|
|
||||||
let mut cmd = Command::new(&self.program);
|
|
||||||
|
|
||||||
if let Some(envs) = self.envs {
|
|
||||||
cmd.env_clear();
|
|
||||||
cmd.envs(envs);
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd.arg("--api-key-on-stdin");
|
|
||||||
|
|
||||||
if let Some(gui_version) = self.gui_version {
|
|
||||||
cmd.arg("--gui-version").arg(gui_version);
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Launching gpgui-helper");
|
|
||||||
let mut non_root_cmd = cmd.into_non_root()?;
|
|
||||||
let mut child = non_root_cmd.kill_on_drop(true).stdin(Stdio::piped()).spawn()?;
|
|
||||||
let Some(mut stdin) = child.stdin.take() else {
|
|
||||||
bail!("Failed to open stdin");
|
|
||||||
};
|
|
||||||
|
|
||||||
let api_key = utils::base64::encode(self.api_key);
|
|
||||||
tokio::spawn(async move {
|
|
||||||
stdin.write_all(api_key.as_bytes()).await.unwrap();
|
|
||||||
drop(stdin);
|
|
||||||
});
|
|
||||||
|
|
||||||
let exit_status = child.wait().await?;
|
|
||||||
info!("gpgui-helper exited with: {}", exit_status);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,28 +4,30 @@ use std::{
|
|||||||
process::{ExitStatus, Stdio},
|
process::{ExitStatus, Stdio},
|
||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::bail;
|
|
||||||
use log::info;
|
|
||||||
use tokio::{io::AsyncWriteExt, process::Command};
|
use tokio::{io::AsyncWriteExt, process::Command};
|
||||||
|
|
||||||
use crate::{process::gui_helper_launcher::GuiHelperLauncher, utils::base64, GP_GUI_BINARY};
|
use crate::{utils::base64, GP_GUI_BINARY};
|
||||||
|
|
||||||
use super::command_traits::CommandExt;
|
use super::command_traits::CommandExt;
|
||||||
|
|
||||||
pub struct GuiLauncher<'a> {
|
pub struct GuiLauncher {
|
||||||
version: &'a str,
|
|
||||||
program: PathBuf,
|
program: PathBuf,
|
||||||
api_key: &'a [u8],
|
api_key: Option<Vec<u8>>,
|
||||||
minimized: bool,
|
minimized: bool,
|
||||||
envs: Option<HashMap<String, String>>,
|
envs: Option<HashMap<String, String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> GuiLauncher<'a> {
|
impl Default for GuiLauncher {
|
||||||
pub fn new(version: &'a str, api_key: &'a [u8]) -> Self {
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GuiLauncher {
|
||||||
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
version,
|
|
||||||
program: GP_GUI_BINARY.into(),
|
program: GP_GUI_BINARY.into(),
|
||||||
api_key,
|
api_key: None,
|
||||||
minimized: false,
|
minimized: false,
|
||||||
envs: None,
|
envs: None,
|
||||||
}
|
}
|
||||||
@@ -36,23 +38,17 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn api_key(mut self, api_key: Vec<u8>) -> Self {
|
||||||
|
self.api_key = Some(api_key);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
pub fn minimized(mut self, minimized: bool) -> Self {
|
pub fn minimized(mut self, minimized: bool) -> Self {
|
||||||
self.minimized = minimized;
|
self.minimized = minimized;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn launch(&self) -> anyhow::Result<ExitStatus> {
|
pub async fn launch(&self) -> anyhow::Result<ExitStatus> {
|
||||||
// Check if the program's version
|
|
||||||
if let Err(err) = self.check_version().await {
|
|
||||||
info!("Check version failed: {}", err);
|
|
||||||
// Download the program and replace the current one
|
|
||||||
self.download_program().await?;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.launch_program().await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn launch_program(&self) -> anyhow::Result<ExitStatus> {
|
|
||||||
let mut cmd = Command::new(&self.program);
|
let mut cmd = Command::new(&self.program);
|
||||||
|
|
||||||
if let Some(envs) = &self.envs {
|
if let Some(envs) = &self.envs {
|
||||||
@@ -60,60 +56,33 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
cmd.envs(envs);
|
cmd.envs(envs);
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd.arg("--api-key-on-stdin");
|
if self.api_key.is_some() {
|
||||||
|
cmd.arg("--api-key-on-stdin");
|
||||||
|
}
|
||||||
|
|
||||||
if self.minimized {
|
if self.minimized {
|
||||||
cmd.arg("--minimized");
|
cmd.arg("--minimized");
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("Launching gpgui");
|
|
||||||
let mut non_root_cmd = cmd.into_non_root()?;
|
let mut non_root_cmd = cmd.into_non_root()?;
|
||||||
let mut child = non_root_cmd.kill_on_drop(true).stdin(Stdio::piped()).spawn()?;
|
|
||||||
let Some(mut stdin) = child.stdin.take() else {
|
|
||||||
bail!("Failed to open stdin");
|
|
||||||
};
|
|
||||||
|
|
||||||
let api_key = base64::encode(self.api_key);
|
let mut child = non_root_cmd.kill_on_drop(true).stdin(Stdio::piped()).spawn()?;
|
||||||
tokio::spawn(async move {
|
|
||||||
stdin.write_all(api_key.as_bytes()).await.unwrap();
|
let mut stdin = child
|
||||||
drop(stdin);
|
.stdin
|
||||||
});
|
.take()
|
||||||
|
.ok_or_else(|| anyhow::anyhow!("Failed to open stdin"))?;
|
||||||
|
|
||||||
|
if let Some(api_key) = &self.api_key {
|
||||||
|
let api_key = base64::encode(api_key);
|
||||||
|
tokio::spawn(async move {
|
||||||
|
stdin.write_all(api_key.as_bytes()).await.unwrap();
|
||||||
|
drop(stdin);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
let exit_status = child.wait().await?;
|
let exit_status = child.wait().await?;
|
||||||
|
|
||||||
Ok(exit_status)
|
Ok(exit_status)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn check_version(&self) -> anyhow::Result<()> {
|
|
||||||
let cmd = Command::new(&self.program).arg("--version").output().await?;
|
|
||||||
let output = String::from_utf8_lossy(&cmd.stdout);
|
|
||||||
|
|
||||||
// Version string: "gpgui 2.0.0 (2024-02-05)"
|
|
||||||
let Some(version) = output.split_whitespace().nth(1) else {
|
|
||||||
bail!("Failed to parse version: {}", output);
|
|
||||||
};
|
|
||||||
|
|
||||||
if version != self.version {
|
|
||||||
bail!("Version mismatch: expected {}, got {}", self.version, version);
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Version check passed: {}", version);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn download_program(&self) -> anyhow::Result<()> {
|
|
||||||
let gui_helper = GuiHelperLauncher::new(self.api_key);
|
|
||||||
|
|
||||||
gui_helper
|
|
||||||
.envs(self.envs.as_ref())
|
|
||||||
.gui_version(Some(self.version))
|
|
||||||
.launch()
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
// Check the version again
|
|
||||||
self.check_version().await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
pub(crate) mod command_traits;
|
pub(crate) mod command_traits;
|
||||||
pub(crate) mod gui_helper_launcher;
|
|
||||||
|
|
||||||
pub mod auth_launcher;
|
pub mod auth_launcher;
|
||||||
#[cfg(feature = "browser-auth")]
|
#[cfg(feature = "browser-auth")]
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ pub struct ConnectArgs {
|
|||||||
user_agent: Option<String>,
|
user_agent: Option<String>,
|
||||||
csd_uid: u32,
|
csd_uid: u32,
|
||||||
csd_wrapper: Option<String>,
|
csd_wrapper: Option<String>,
|
||||||
mtu: u32,
|
|
||||||
os: Option<ClientOs>,
|
os: Option<ClientOs>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,7 +46,6 @@ impl ConnectArgs {
|
|||||||
os: None,
|
os: None,
|
||||||
csd_uid: 0,
|
csd_uid: 0,
|
||||||
csd_wrapper: None,
|
csd_wrapper: None,
|
||||||
mtu: 0,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,10 +72,6 @@ impl ConnectArgs {
|
|||||||
pub fn csd_wrapper(&self) -> Option<String> {
|
pub fn csd_wrapper(&self) -> Option<String> {
|
||||||
self.csd_wrapper.clone()
|
self.csd_wrapper.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn mtu(&self) -> u32 {
|
|
||||||
self.mtu
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize, Type)]
|
#[derive(Debug, Deserialize, Serialize, Type)]
|
||||||
@@ -109,11 +103,6 @@ impl ConnectRequest {
|
|||||||
self
|
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 {
|
pub fn with_user_agent<T: Into<Option<String>>>(mut self, user_agent: T) -> Self {
|
||||||
self.args.user_agent = user_agent.into();
|
self.args.user_agent = user_agent.into();
|
||||||
self
|
self
|
||||||
@@ -146,9 +135,3 @@ pub enum WsRequest {
|
|||||||
Connect(Box<ConnectRequest>),
|
Connect(Box<ConnectRequest>),
|
||||||
Disconnect(DisconnectRequest),
|
Disconnect(DisconnectRequest),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
pub struct UpdateGuiRequest {
|
|
||||||
pub path: String,
|
|
||||||
pub checksum: String,
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use anyhow::bail;
|
|
||||||
|
|
||||||
pub fn verify_checksum(path: &str, expected: &str) -> anyhow::Result<()> {
|
|
||||||
let file = Path::new(&path);
|
|
||||||
let checksum = sha256::try_digest(&file)?;
|
|
||||||
|
|
||||||
if checksum != expected {
|
|
||||||
bail!("Checksum mismatch, expected: {}, actual: {}", expected, checksum);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,6 @@ use reqwest::Url;
|
|||||||
pub(crate) mod xml;
|
pub(crate) mod xml;
|
||||||
|
|
||||||
pub mod base64;
|
pub mod base64;
|
||||||
pub mod checksum;
|
|
||||||
pub mod crypto;
|
pub mod crypto;
|
||||||
pub mod endpoint;
|
pub mod endpoint;
|
||||||
pub mod env_file;
|
pub mod env_file;
|
||||||
|
|||||||
@@ -2,22 +2,17 @@ use std::{process::ExitStatus, time::Duration};
|
|||||||
|
|
||||||
use anyhow::bail;
|
use anyhow::bail;
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
use tauri::Window;
|
use tauri::{window::MenuHandle, Window};
|
||||||
use tokio::process::Command;
|
use tokio::process::Command;
|
||||||
|
|
||||||
pub trait WindowExt {
|
pub trait WindowExt {
|
||||||
fn raise(&self) -> anyhow::Result<()>;
|
fn raise(&self) -> anyhow::Result<()>;
|
||||||
fn hide_menu(&self);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WindowExt for Window {
|
impl WindowExt for Window {
|
||||||
fn raise(&self) -> anyhow::Result<()> {
|
fn raise(&self) -> anyhow::Result<()> {
|
||||||
raise_window(self)
|
raise_window(self)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn hide_menu(&self) {
|
|
||||||
hide_menu(self);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn raise_window(win: &Window) -> anyhow::Result<()> {
|
pub fn raise_window(win: &Window) -> anyhow::Result<()> {
|
||||||
@@ -39,8 +34,7 @@ pub fn raise_window(win: &Window) -> anyhow::Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Calling window.show() on Windows will cause the menu to be shown.
|
// Calling window.show() on Windows will cause the menu to be shown.
|
||||||
// We need to hide it again.
|
hide_menu(win.menu_handle());
|
||||||
hide_menu(win);
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -77,9 +71,7 @@ async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
|
|||||||
Ok(exit_status)
|
Ok(exit_status)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn hide_menu(win: &Window) {
|
fn hide_menu(menu_handle: MenuHandle) {
|
||||||
let menu_handle = win.menu_handle();
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
let menu_visible = menu_handle.is_visible().unwrap_or(false);
|
let menu_visible = menu_handle.is_visible().unwrap_or(false);
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ pub(crate) struct ConnectOptions {
|
|||||||
|
|
||||||
pub csd_uid: u32,
|
pub csd_uid: u32,
|
||||||
pub csd_wrapper: *const c_char,
|
pub csd_wrapper: *const c_char,
|
||||||
|
|
||||||
pub mtu: u32,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[link(name = "vpn")]
|
#[link(name = "vpn")]
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ int vpn_connect(const vpn_options *options, vpn_connected_callback callback)
|
|||||||
INFO("OS: %s", options->os);
|
INFO("OS: %s", options->os);
|
||||||
INFO("CSD_USER: %d", options->csd_uid);
|
INFO("CSD_USER: %d", options->csd_uid);
|
||||||
INFO("CSD_WRAPPER: %s", options->csd_wrapper);
|
INFO("CSD_WRAPPER: %s", options->csd_wrapper);
|
||||||
INFO("MTU: %d", options->mtu);
|
|
||||||
|
|
||||||
vpninfo = openconnect_vpninfo_new(options->user_agent, validate_peer_cert, NULL, NULL, print_progress, NULL);
|
vpninfo = openconnect_vpninfo_new(options->user_agent, validate_peer_cert, NULL, NULL, print_progress, NULL);
|
||||||
|
|
||||||
@@ -98,11 +97,6 @@ int vpn_connect(const vpn_options *options, vpn_connected_callback callback)
|
|||||||
openconnect_setup_csd(vpninfo, options->csd_uid, 1, options->csd_wrapper);
|
openconnect_setup_csd(vpninfo, options->csd_uid, 1, options->csd_wrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options->mtu > 0) {
|
|
||||||
int mtu = options->mtu < 576 ? 576 : options->mtu;
|
|
||||||
openconnect_set_reqmtu(vpninfo, mtu);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_cmd_pipe_fd = openconnect_setup_cmd_pipe(vpninfo);
|
g_cmd_pipe_fd = openconnect_setup_cmd_pipe(vpninfo);
|
||||||
if (g_cmd_pipe_fd < 0)
|
if (g_cmd_pipe_fd < 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ typedef struct vpn_options
|
|||||||
|
|
||||||
const uid_t csd_uid;
|
const uid_t csd_uid;
|
||||||
const char *csd_wrapper;
|
const char *csd_wrapper;
|
||||||
|
|
||||||
const int mtu;
|
|
||||||
} vpn_options;
|
} vpn_options;
|
||||||
|
|
||||||
int vpn_connect(const vpn_options *options, vpn_connected_callback callback);
|
int vpn_connect(const vpn_options *options, vpn_connected_callback callback);
|
||||||
|
|||||||
@@ -21,8 +21,6 @@ pub struct Vpn {
|
|||||||
csd_uid: u32,
|
csd_uid: u32,
|
||||||
csd_wrapper: Option<CString>,
|
csd_wrapper: Option<CString>,
|
||||||
|
|
||||||
mtu: u32,
|
|
||||||
|
|
||||||
callback: OnConnectedCallback,
|
callback: OnConnectedCallback,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,8 +62,6 @@ impl Vpn {
|
|||||||
|
|
||||||
csd_uid: self.csd_uid,
|
csd_uid: self.csd_uid,
|
||||||
csd_wrapper: Self::option_to_ptr(&self.csd_wrapper),
|
csd_wrapper: Self::option_to_ptr(&self.csd_wrapper),
|
||||||
|
|
||||||
mtu: self.mtu,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,8 +82,6 @@ pub struct VpnBuilder {
|
|||||||
|
|
||||||
csd_uid: u32,
|
csd_uid: u32,
|
||||||
csd_wrapper: Option<String>,
|
csd_wrapper: Option<String>,
|
||||||
|
|
||||||
mtu: u32,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl VpnBuilder {
|
impl VpnBuilder {
|
||||||
@@ -100,7 +94,6 @@ impl VpnBuilder {
|
|||||||
os: None,
|
os: None,
|
||||||
csd_uid: 0,
|
csd_uid: 0,
|
||||||
csd_wrapper: None,
|
csd_wrapper: None,
|
||||||
mtu: 0,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,11 +122,6 @@ impl VpnBuilder {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn mtu(mut self, mtu: u32) -> Self {
|
|
||||||
self.mtu = mtu;
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn build(self) -> Vpn {
|
pub fn build(self) -> Vpn {
|
||||||
let user_agent = self.user_agent.unwrap_or_default();
|
let user_agent = self.user_agent.unwrap_or_default();
|
||||||
let script = self.script.or_else(find_default_vpnc_script).unwrap_or_default();
|
let script = self.script.or_else(find_default_vpnc_script).unwrap_or_default();
|
||||||
@@ -151,8 +139,6 @@ impl VpnBuilder {
|
|||||||
csd_uid: self.csd_uid,
|
csd_uid: self.csd_uid,
|
||||||
csd_wrapper: self.csd_wrapper.as_deref().map(Self::to_cstring),
|
csd_wrapper: self.csd_wrapper.as_deref().map(Self::to_cstring),
|
||||||
|
|
||||||
mtu: self.mtu,
|
|
||||||
|
|
||||||
callback: Default::default(),
|
callback: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
install:
|
|
||||||
@echo "===> Installing..."
|
|
||||||
|
|
||||||
install -Dm755 artifacts/usr/bin/gpclient $(DESTDIR)/usr/bin/gpclient
|
|
||||||
install -Dm755 artifacts/usr/bin/gpservice $(DESTDIR)/usr/bin/gpservice
|
|
||||||
install -Dm755 artifacts/usr/bin/gpauth $(DESTDIR)/usr/bin/gpauth
|
|
||||||
install -Dm755 artifacts/usr/bin/gpgui-helper $(DESTDIR)/usr/bin/gpgui-helper
|
|
||||||
|
|
||||||
install -Dm644 artifacts/usr/share/applications/gpgui.desktop $(DESTDIR)/usr/share/applications/gpgui.desktop
|
|
||||||
install -Dm644 artifacts/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
|
||||||
install -Dm644 artifacts/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
|
||||||
install -Dm644 artifacts/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
|
||||||
install -Dm644 artifacts/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
|
||||||
install -Dm644 artifacts/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
@echo "===> Uninstalling from $(DESTDIR)..."
|
|
||||||
|
|
||||||
rm -f $(DESTDIR)/usr/bin/gpclient
|
|
||||||
rm -f $(DESTDIR)/usr/bin/gpservice
|
|
||||||
rm -f $(DESTDIR)/usr/bin/gpauth
|
|
||||||
rm -f $(DESTDIR)/usr/bin/gpgui-helper
|
|
||||||
rm -f $(DESTDIR)/usr/bin/gpgui
|
|
||||||
|
|
||||||
rm -f $(DESTDIR)/usr/share/applications/gpgui.desktop
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
|
|
||||||
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
|
|
||||||
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
Source: globalprotect-openconnect
|
|
||||||
Section: net
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: Kevin Yue <k3vinyue@gmail.com>
|
|
||||||
Standards-Version: 4.1.4
|
|
||||||
Build-Depends: debhelper (>= 9), pkg-config, jq (>= 1), make (>= 4), openconnect (>= 8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, libwebkit2gtk-4.0-37, libgtk-3-0, gnome-keyring, @RUST@
|
|
||||||
Homepage: https://github.com/yuezk/GlobalProtect-openconnect
|
|
||||||
|
|
||||||
Package: globalprotect-openconnect
|
|
||||||
Architecture: any
|
|
||||||
Multi-Arch: foreign
|
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring
|
|
||||||
Description: A GUI for GlobalProtect VPN
|
|
||||||
A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
#!/usr/bin/make -f
|
|
||||||
|
|
||||||
export OFFLINE = @OFFLINE@ BUILD_FE=0
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
|
|
||||||
Type=Application
|
|
||||||
Name=GlobalProtect Openconnect VPN Client
|
|
||||||
Comment=A GUI for GlobalProtect VPN
|
|
||||||
GenericName=GlobalProtect VPN Client
|
|
||||||
Categories=Network;Dialup;
|
|
||||||
Exec=/usr/bin/gpclient launch-gui %u
|
|
||||||
MimeType=x-scheme-handler/globalprotectcallback;
|
|
||||||
Icon=gpgui
|
|
||||||
Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
@@ -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>
|
|
||||||
|
Before Width: | Height: | Size: 6.7 KiB |
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
|
|
||||||
<policyconfig>
|
|
||||||
<vendor>The GlobalProtect-openconnect Project</vendor>
|
|
||||||
<vendor_url>https://github.com/yuezk/GlobalProtect-openconnect</vendor_url>
|
|
||||||
<icon_name>gpgui</icon_name>
|
|
||||||
<action id="com.yuezk.gpgui.service">
|
|
||||||
<description>Run GPService as root</description>
|
|
||||||
<message>Authentication is required to run the GPService as root</message>
|
|
||||||
<defaults>
|
|
||||||
<allow_any>auth_admin</allow_any>
|
|
||||||
<allow_inactive>auth_admin</allow_inactive>
|
|
||||||
<allow_active>yes</allow_active>
|
|
||||||
</defaults>
|
|
||||||
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gpservice</annotate>
|
|
||||||
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
|
||||||
</action>
|
|
||||||
</policyconfig>
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
# Maintainer: Keinv Yue <k3vinyue@gmail.com>
|
|
||||||
|
|
||||||
_pkgname=@PKG_NAME@
|
|
||||||
pkgname=${_pkgname}
|
|
||||||
pkgver="@VERSION@"
|
|
||||||
pkgrel=@REVISION@
|
|
||||||
pkgdesc="A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method."
|
|
||||||
arch=('x86_64' 'aarch64')
|
|
||||||
url="https://github.com/yuezk/GlobalProtect-openconnect"
|
|
||||||
license=('GPL3')
|
|
||||||
makedepends=('make' 'pkg-config' 'rust' 'cargo' 'jq' 'webkit2gtk' 'curl' 'wget' 'file' 'openssl' 'appmenu-gtk-module' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips' 'libayatana-appindicator' 'openconnect' 'libsecret')
|
|
||||||
depends=('openconnect>=8.20' webkit2gtk libappindicator-gtk3 libayatana-appindicator libsecret libxml2)
|
|
||||||
optdepends=('wmctrl: for window management')
|
|
||||||
|
|
||||||
provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui')
|
|
||||||
|
|
||||||
source=("${_pkgname}-${pkgver}.tar.gz")
|
|
||||||
sha256sums=('SKIP')
|
|
||||||
|
|
||||||
options=('!strip')
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd "$pkgname-$pkgver"
|
|
||||||
|
|
||||||
# Must unset the CFLAGS, otherwise the build fails
|
|
||||||
unset CFLAGS
|
|
||||||
|
|
||||||
make build OFFLINE=@OFFLINE@ BUILD_FE=0
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd "$pkgname-$pkgver"
|
|
||||||
|
|
||||||
make install DESTDIR="$pkgdir"
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
@DATE@ - k3vinyue@gmail.com - @VERSION@
|
|
||||||
|
|
||||||
- Update to @VERSION@
|
|
||||||
* Bugfix and improvements.
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
Name: globalprotect-openconnect
|
|
||||||
Version: @VERSION@
|
|
||||||
Release: @REVISION@
|
|
||||||
Summary: A GlobalProtect VPN client powered by OpenConnect
|
|
||||||
Group: Productivity/Networking/PPP
|
|
||||||
|
|
||||||
License: GPL-3.0
|
|
||||||
URL: https://github.com/yuezk/GlobalProtect-openconnect
|
|
||||||
Source: %{name}.tar.gz
|
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: rust
|
|
||||||
BuildRequires: cargo
|
|
||||||
BuildRequires: jq
|
|
||||||
BuildRequires: pkg-config
|
|
||||||
BuildRequires: openconnect-devel
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
BuildRequires: curl
|
|
||||||
BuildRequires: wget
|
|
||||||
BuildRequires: file
|
|
||||||
|
|
||||||
BuildRequires: (webkit2gtk4.0-devel or webkit2gtk3-soup2-devel)
|
|
||||||
BuildRequires: (libappindicator-gtk3-devel or libappindicator3-1)
|
|
||||||
BuildRequires: (librsvg2-devel or librsvg-devel)
|
|
||||||
|
|
||||||
Requires: openconnect >= 8.20, (libayatana-appindicator or libappindicator-gtk3)
|
|
||||||
Conflicts: globalprotect-openconnect-snapshot
|
|
||||||
|
|
||||||
%global debug_package %{nil}
|
|
||||||
|
|
||||||
%description
|
|
||||||
A GUI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup
|
|
||||||
|
|
||||||
%build
|
|
||||||
# The injected RUSTFLAGS could fail the build
|
|
||||||
unset RUSTFLAGS
|
|
||||||
make build OFFLINE=@OFFLINE@ BUILD_FE=0
|
|
||||||
|
|
||||||
%install
|
|
||||||
%make_install
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_bindir}/gpclient
|
|
||||||
%{_bindir}/gpservice
|
|
||||||
%{_bindir}/gpauth
|
|
||||||
%{_bindir}/gpgui-helper
|
|
||||||
%{_datadir}/applications/gpgui.desktop
|
|
||||||
%{_datadir}/icons/hicolor/32x32/apps/gpgui.png
|
|
||||||
%{_datadir}/icons/hicolor/128x128/apps/gpgui.png
|
|
||||||
%{_datadir}/icons/hicolor/256x256@2/apps/gpgui.png
|
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/gpgui.svg
|
|
||||||
%{_datadir}/polkit-1/actions/com.yuezk.gpgui.policy
|
|
||||||
|
|
||||||
%dir %{_datadir}/icons/hicolor
|
|
||||||
%dir %{_datadir}/icons/hicolor/32x32
|
|
||||||
%dir %{_datadir}/icons/hicolor/32x32/apps
|
|
||||||
%dir %{_datadir}/icons/hicolor/128x128
|
|
||||||
%dir %{_datadir}/icons/hicolor/128x128/apps
|
|
||||||
%dir %{_datadir}/icons/hicolor/256x256@2
|
|
||||||
%dir %{_datadir}/icons/hicolor/256x256@2/apps
|
|
||||||
%dir %{_datadir}/icons/hicolor/scalable
|
|
||||||
%dir %{_datadir}/icons/hicolor/scalable/apps
|
|
||||||
%dir %{_datadir}/polkit-1
|
|
||||||
%dir %{_datadir}/polkit-1/actions
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* @DATE@ Kevin Yue <k3vinyue@gmail.com> - @VERSION@
|
|
||||||
- Bugfix and improvements
|
|
||||||
Reference in New Issue
Block a user