Release 1.4.1

Fix #107

.editorconfig

@@ -0,0 +1,16 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = false
+trim_trailing_whitespace=true
+indent_style = space
+indent_size = 4
+
+[{VERSION,VERSION_SUFFIX}]
+insert_final_newline = false
+
+[*.sh]
+indent_style = tab

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+ko_fi: yuezk
+custom: ["https://buymeacoffee.com/yuezk", "https://paypal.me/zongkun"]

.github/workflows/build.yml

@@ -0,0 +1,267 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - develop
+    tags:
+      - "v*.*.*"
+    paths-ignore:
+      - LICENSE
+      - "*.md"
+      - .vscode
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04]
+    
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      # Checkout repository and submodules
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Build
+        run: |
+          ./scripts/install-ubuntu.sh
+
+  snapshot-archive-all:
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install git-archive-all
+      
+      - name: Archive all
+        run: |
+          ./scripts/snapshot-archive-all.sh
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: snapshot-source-code
+          path: ./artifacts/*
+
+  snapshot-ppa:
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+    needs: snapshot-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: snapshot-source-code
+          path: artifacts
+      
+      - name: Extract source code
+        run: |
+          cd $GITHUB_WORKSPACE/artifacts
+          mkdir deb-build && cp *.tar.gz deb-build && cd deb-build
+          tar xf *.tar.gz
+
+      - name: Publish PPA
+        uses: yuezk/publish-ppa-package@develop
+        with:
+          repository: 'ppa:yuezk/globalprotect-openconnect-snapshot'
+          gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+          gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
+          pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/'
+      
+  snapshot-aur:
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+    needs: snapshot-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: snapshot-source-code
+          path: artifacts
+
+      - name: Publish AUR package
+        env:
+          VERSION: $(cat ./artifacts/VERSION)
+        uses: yuezk/github-actions-deploy-aur@update-pkgver
+        with:
+          pkgname: globalprotect-openconnect-git
+          pkgbuild: ./artifacts/aur/PKGBUILD
+          assets: ./artifacts/aur/*.tar.gz
+          update_pkgver: true
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          commit_email: ${{ secrets.AUR_EMAIL }}
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message: 'Snapshot release: git#${{ github.sha }}'
+
+  snapshot-obs:
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+    needs: snapshot-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: snapshot-source-code
+          path: artifacts
+
+      - uses: yuezk/publish-obs-package@main
+        with:
+          project: home:yuezk
+          package: globalprotect-openconnect-snapshot
+          username: yuezk
+          password: ${{ secrets.OBS_PASSWORD }}
+          files: ./artifacts/obs/*
+
+  snapshot-snap:
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+    needs: snapshot-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: snapshot-source-code
+          path: artifacts
+      
+      - name: Extract source code
+        run: |
+          mkdir snap-source
+          tar xvf ./artifacts/globalprotect-openconnect-*tar.gz \
+            --directory snap-source \
+            --strip 1
+          
+      - uses: snapcore/action-build@v1
+        id: build
+        with:
+          path: ./snap-source
+
+      - uses: snapcore/action-publish@v1
+        with:
+          store_login: ${{ secrets.SNAPSTORE_LOGIN }}
+          snap: ${{ steps.build.outputs.snap }}
+          release: edge
+
+  release-archive-all:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install git-archive-all
+      
+      - name: Archive all
+        run: |
+          ./scripts/release-archive-all.sh
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: release-source-code
+          path: ./artifacts/*
+
+  release-ppa:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: release-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: release-source-code
+          path: artifacts
+
+      - name: Extract source code
+        run: |
+          cd $GITHUB_WORKSPACE/artifacts
+          mkdir deb-build && cp *.tar.gz deb-build && cd deb-build
+          tar xf *.tar.gz
+
+      - name: Publish PPA
+        uses: yuezk/publish-ppa-package@develop
+        with:
+          repository: 'ppa:yuezk/globalprotect-openconnect'
+          gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+          gpg_passphrase: ${{ secrets.PPA_GPG_PASSPHRASE }}
+          pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/'
+  
+  release-aur:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: release-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: release-source-code
+          path: artifacts
+
+      - name: Publish AUR package
+        env:
+          VERSION: $(cat ./artifacts/VERSION)
+        uses: yuezk/github-actions-deploy-aur@update-pkgver
+        with:
+          pkgname: globalprotect-openconnect-git
+          pkgbuild: ./artifacts/aur/PKGBUILD
+          assets: ./artifacts/aur/*.tar.gz
+          update_pkgver: true
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          commit_email: ${{ secrets.AUR_EMAIL }}
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message: 'Release ${{ github.ref }}'
+  
+  release-obs:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: release-archive-all
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: release-source-code
+          path: artifacts
+
+      - uses: yuezk/publish-obs-package@main
+        with:
+          project: home:yuezk
+          package: globalprotect-openconnect
+          username: yuezk
+          password: ${{ secrets.OBS_PASSWORD }}
+          files: ./artifacts/obs/*
+  
+  release-github:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs:
+      - release-ppa
+      - release-aur
+      - release-obs
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: release-source-code
+          path: artifacts
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            ./artifacts/*.tar.gz

.github/workflows/pr.yml

@@ -1,24 +1,26 @@
-name: CI
+name: PR Build
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - develop
+    paths-ignore:
+      - LICENSE
+      - "*.md"
+      - .vscode
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04]
+    
+    runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        with:
-          version: '5.15.2'
-          modules: 'qtwebengine qtwebsockets'
-      
       # Checkout repository and submodules
       - uses: actions/checkout@v2
         with:
@@ -26,5 +28,4 @@ jobs:
 
       - name: Build
         run: |
-          qmake CONFIG+=release
-          make
+          ./scripts/install-ubuntu.sh

.github/workflows/publish.yml

@@ -1,61 +0,0 @@
-name: Publish
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        with:
-          version: 5.15.2
-          modules: 'qtwebengine qtwebsockets'
-
-      # Checkout repository and submodules
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Build
-        run: |
-          qmake CONFIG+=release
-          make
-
-  aur-publish:
-    needs:
-      - build
-  
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      
-      - name: Get latest version
-        id: get-version
-        run: |
-          echo ::set-output name=VERSION::$(git tag --sort=-v:refname --list "v[0-9]*" | head -n 1 | cut -c 2-)
-          
-      - name: Get the sha256sum
-        id: get-sha256sum
-        run: |
-          echo ::set-output name=SHA::$(curl -L https://github.com/yuezk/GlobalProtect-openconnect/archive/refs/tags/v${{ steps.get-version.outputs.VERSION }}.tar.gz | sha256sum | cut -f1 -d" ")
-      
-      - name: Generate PKGBUILD
-        run: |
-          sed "s/{PKG_VERSION}/${{ steps.get-version.outputs.VERSION }}/g;s/{SOURCE_SHA}/${{ steps.get-sha256sum.outputs.SHA }}/g" PKGBUILD.template > PKGBUILD
-      
-      - name: Publish AUR package
-        uses: KSXGitHub/github-actions-deploy-aur@v2.2.4
-        with:
-          pkgname: globalprotect-openconnect
-          pkgbuild: ./PKGBUILD
-          commit_username: ${{ secrets.AUR_USERNAME }}
-          commit_email: ${{ secrets.AUR_EMAIL }}
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: 'Release v${{ steps.get-version.outputs.VERSION }}'
-          force_push: true

.gitignore

@@ -1,6 +1,13 @@
 # Binaries
-gpclient
-gpservice
+*.rpm
+*.gz
+*.snap
+.DS_Store
+build-debian
+build
+artifacts
+
+.cmake
 
 # Auto generated DBus files
 *_adaptor.cpp

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "singleapplication"]
-	path = singleapplication
+	path = 3rdparty/SingleApplication
 	url = https://github.com/itay-grudev/SingleApplication.git
 
 [submodule "plog"]
-	path = plog
+	path = 3rdparty/plog
 	url = https://github.com/SergiusTheBest/plog.git

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+    "files.watcherExclude": {
+        "**/artifacts/**": true,
+    },
+    "files.associations": {
+        "qregularexpression": "cpp",
+        "qfileinfo": "cpp",
+        "qregularexpressionmatch": "cpp",
+        "qdatetime": "cpp",
+        "qprocess": "cpp",
+        "qobject": "cpp",
+        "qstandardpaths": "cpp",
+        "qmainwindow": "cpp",
+        "qsystemtrayicon": "cpp",
+        "qpushbutton": "cpp",
+        "qmenu": "cpp",
+        "qjsondocument": "cpp",
+        "qnetworkaccessmanager": "cpp",
+        "qwebengineview": "cpp",
+        "qprocessenvironment": "cpp",
+        "qnetworkreply": "cpp",
+        "qicon": "cpp",
+        "qsslsocket": "cpp",
+        "qapplication": "cpp"
+    }
+}

3rdparty/qt-unix-signals/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1.0)
+
+project(QtSignals LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5 REQUIRED COMPONENTS Core)
+
+add_library(QtSignals STATIC sigwatch.cpp)
+target_include_directories(QtSignals INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(QtSignals Qt5::Core)

3rdparty/qt-unix-signals/LICENCE

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

CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.10.0)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+file(STRINGS "VERSION" ver)
+file(STRINGS "VERSION_SUFFIX" VERSION_SUFFIX)
+project(GlobalProtect-openconnect VERSION ${ver} LANGUAGES CXX)
+
+# Set the CMAKE_INSTALL_PREFIX to /usr if not specified
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "The default install prefix" FORCE)
+endif()
+
+message(STATUS "CMAKE_INSTALL_PREFIX was set to: ${CMAKE_INSTALL_PREFIX}")
+
+configure_file(version.h.in version.h)
+
+find_package(Qt5 REQUIRED COMPONENTS
+    Core
+    Widgets
+    Network
+    WebSockets
+    WebEngine
+    WebEngineWidgets
+    DBus
+)
+
+add_subdirectory(3rdparty/qt-unix-signals)
+add_subdirectory(GPService)
+add_subdirectory(GPClient)
+add_dependencies(gpclient gpservice)

GPClient/CMakeLists.txt

@@ -0,0 +1,104 @@
+include("${CMAKE_SOURCE_DIR}/cmake/Add3rdParty.cmake")
+
+project(GPClient)
+
+set(gpclient_GENERATED_SOURCES)
+
+configure_file(com.yuezk.qt.gpclient.desktop.in com.yuezk.qt.gpclient.desktop)
+configure_file(com.yuezk.qt.gpclient.metainfo.xml.in com.yuezk.qt.gpclient.metainfo.xml)
+
+qt5_add_dbus_interface(
+    gpclient_GENERATED_SOURCES
+    ${CMAKE_BINARY_DIR}/com.yuezk.qt.GPService.xml
+    gpserviceinterface
+)
+
+add_executable(gpclient
+    cdpcommand.cpp
+    cdpcommandmanager.cpp
+    enhancedwebview.cpp
+    gatewayauthenticator.cpp
+    gatewayauthenticatorparams.cpp
+    gpgateway.cpp
+    gphelper.cpp
+    loginparams.cpp
+    main.cpp
+    normalloginwindow.cpp
+    portalauthenticator.cpp
+    portalconfigresponse.cpp
+    preloginresponse.cpp
+    samlloginwindow.cpp
+    gpclient.cpp
+    settingsdialog.cpp
+    gpclient.ui
+    normalloginwindow.ui
+    settingsdialog.ui
+    challengedialog.h
+    challengedialog.cpp
+    challengedialog.ui
+    vpn_dbus.cpp
+    vpn_json.cpp
+    resources.qrc
+    ${gpclient_GENERATED_SOURCES}
+)
+
+add_3rdparty(
+    SingleApplication
+    GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
+    GIT_TAG v3.3.0
+    CMAKE_ARGS
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+        -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
+        -DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
+        -DQAPPLICATION_CLASS=QApplication
+)
+
+add_3rdparty(
+    plog
+    GIT_REPOSITORY https://github.com/SergiusTheBest/plog.git
+    GIT_TAG master
+    CMAKE_ARGS
+        -DPLOG_BUILD_SAMPLES=OFF
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+)
+
+ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
+set(SingleApplication_INCLUDE_DIR ${SOURCE_DIR})
+set(SingleApplication_LIBRARY ${BINARY_DIR}/libSingleApplication.a)
+
+ExternalProject_Get_Property(plog-${PROJECT_NAME} SOURCE_DIR)
+set(plog_INCLUDE_DIR "${SOURCE_DIR}/include")
+
+add_dependencies(gpclient SingleApplication-${PROJECT_NAME} plog-${PROJECT_NAME})
+
+target_include_directories(gpclient PRIVATE
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${SingleApplication_INCLUDE_DIR}
+    ${plog_INCLUDE_DIR}
+)
+
+target_link_libraries(gpclient
+    ${SingleApplication_LIBRARY}
+    Qt5::Widgets
+    Qt5::Network
+    Qt5::WebSockets
+    Qt5::WebEngine
+    Qt5::WebEngineWidgets
+    Qt5::DBus
+    QtSignals
+)
+
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
+    target_compile_options(gpclient PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+endif()
+
+target_compile_definitions(gpclient PUBLIC QAPPLICATION_CLASS=QApplication)
+
+install(TARGETS gpclient DESTINATION bin)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.yuezk.qt.gpclient.metainfo.xml" DESTINATION share/metainfo)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.yuezk.qt.gpclient.desktop" DESTINATION share/applications)
+install(FILES "com.yuezk.qt.gpclient.svg" DESTINATION share/icons/hicolor/scalable/apps)

GPClient/GPClient.pro

@@ -1,81 +0,0 @@
-TARGET = gpclient
-
-QT       += core gui network websockets dbus webenginewidgets
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++11
-
-include(../singleapplication/singleapplication.pri)
-DEFINES += QAPPLICATION_CLASS=QApplication
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-INCLUDEPATH += ../plog/include
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-SOURCES += \
-    cdpcommand.cpp \
-    cdpcommandmanager.cpp \
-    enhancedwebview.cpp \
-    gatewayauthenticator.cpp \
-    gpgateway.cpp \
-    gphelper.cpp \
-    loginparams.cpp \
-    main.cpp \
-    normalloginwindow.cpp \
-    portalauthenticator.cpp \
-    portalconfigresponse.cpp \
-    preloginresponse.cpp \
-    samlloginwindow.cpp \
-    gpclient.cpp \
-    settingsdialog.cpp
-
-HEADERS += \
-    cdpcommand.h \
-    cdpcommandmanager.h \
-    enhancedwebview.h \
-    gatewayauthenticator.h \
-    gpgateway.h \
-    gphelper.h \
-    loginparams.h \
-    normalloginwindow.h \
-    portalauthenticator.h \
-    portalconfigresponse.h \
-    preloginresponse.h \
-    samlloginwindow.h \
-    gpclient.h \
-    settingsdialog.h
-
-FORMS += \
-    gpclient.ui \
-    normalloginwindow.ui \
-    settingsdialog.ui
-
-DBUS_INTERFACES += ../GPService/gpservice.xml
-
-# Default rules for deployment.
-target.path = /usr/bin
-INSTALLS += target
-
-DISTFILES += \
-    com.yuezk.qt.GPClient.svg \
-    com.yuezk.qt.gpclient.desktop
-
-desktop_entry.path = /usr/share/applications/
-desktop_entry.files = com.yuezk.qt.gpclient.desktop
-
-desktop_icon.path = /usr/share/pixmaps/
-desktop_icon.files = com.yuezk.qt.GPClient.svg
-
-INSTALLS += desktop_entry desktop_icon
-
-RESOURCES += \
-    resources.qrc

GPClient/cdpcommand.cpp

@@ -1,8 +1,8 @@
-#include "cdpcommand.h"
+#include <QtCore/QVariantMap>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
-#include <QVariantMap>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include "cdpcommand.h"
 
 CDPCommand::CDPCommand(QObject *parent) : QObject(parent)
 {

GPClient/cdpcommand.h

@@ -1,7 +1,7 @@
 #ifndef CDPCOMMAND_H
 #define CDPCOMMAND_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class CDPCommand : public QObject
 {

GPClient/cdpcommandmanager.cpp

@@ -1,7 +1,8 @@
-#include "cdpcommandmanager.h"
-#include <QVariantMap>
+#include <QtCore/QVariantMap>
 #include <plog/Log.h>
 
+#include "cdpcommandmanager.h"
+
 CDPCommandManager::CDPCommandManager(QObject *parent)
     : QObject(parent)
     , networkManager(new QNetworkAccessManager)

GPClient/cdpcommandmanager.h

@@ -1,11 +1,12 @@
 #ifndef CDPCOMMANDMANAGER_H
 #define CDPCOMMANDMANAGER_H
 
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtWebSockets/QtWebSockets>
+#include <QtNetwork/QNetworkAccessManager>
+
 #include "cdpcommand.h"
-#include <QObject>
-#include <QHash>
-#include <QtWebSockets>
-#include <QNetworkAccessManager>
 
 class CDPCommandManager : public QObject
 {

GPClient/challengedialog.cpp

@@ -0,0 +1,38 @@
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QPushButton>
+
+#include "challengedialog.h"
+#include "ui_challengedialog.h"
+
+ChallengeDialog::ChallengeDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::ChallengeDialog)
+{
+    ui->setupUi(this);
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+}
+
+ChallengeDialog::~ChallengeDialog()
+{
+    delete ui;
+}
+
+void ChallengeDialog::setMessage(const QString &message)
+{
+    ui->challengeMessage->setText(message);
+}
+
+const QString ChallengeDialog::getChallenge()
+{
+    return ui->challengeInput->text();
+}
+
+void ChallengeDialog::on_challengeInput_textChanged(const QString &value)
+{
+    QPushButton *okBtn = ui->buttonBox->button(QDialogButtonBox::Ok);
+    if (value.isEmpty()) {
+        okBtn->setDisabled(true);
+    } else {
+        okBtn->setEnabled(true);
+    }
+}

GPClient/challengedialog.h

@@ -0,0 +1,28 @@
+#ifndef CHALLENGEDIALOG_H
+#define CHALLENGEDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class ChallengeDialog;
+}
+
+class ChallengeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit ChallengeDialog(QWidget *parent = nullptr);
+    ~ChallengeDialog();
+
+    void setMessage(const QString &message);
+    const QString getChallenge();
+
+private slots:
+    void on_challengeInput_textChanged(const QString &arg1);
+
+private:
+    Ui::ChallengeDialog *ui;
+};
+
+#endif // CHALLENGEDIALOG_H

GPClient/challengedialog.ui

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ChallengeDialog</class>
+ <widget class="QDialog" name="ChallengeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>405</width>
+    <height>200</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>GlobalProtect Challenge</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,1">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Sign In</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="challengeMessage">
+       <property name="text">
+        <string>Duo two-factor login for [redacted]  Enter a passcode or select one of the following options:   1. Duo Push to XXX-XXX-[redacted]  2. SMS passcodes to XXX-XXX-[redacted]  Passcode or option (1-2): </string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="challengeInput">
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ChallengeDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ChallengeDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

GPClient/com.yuezk.qt.gpclient.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-
-Type=Application
-Version=1.0.0
-Name=GlobalProtect VPN
-Comment=GlobalProtect VPN client, supports SAML auth mode
-Exec=/usr/bin/gpclient
-Icon=com.yuezk.qt.GPClient
-Categories=Network;VPN;Utility;Qt;
-Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
-StartupWMClass=gpclient

GPClient/com.yuezk.qt.gpclient.desktop.in

@@ -0,0 +1,12 @@
+[Desktop Entry]
+
+Type=Application
+Version=1.0
+Name=GlobalProtect VPN
+Comment=A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Qt5, supports SAML auth mode.
+GenericName=GlobalProtect VPN client, supports SAML auth mode
+Categories=Network;Dialup;
+Exec=@CMAKE_INSTALL_PREFIX@/bin/gpclient
+Icon=com.yuezk.qt.gpclient
+Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
+StartupWMClass=gpclient

GPClient/com.yuezk.qt.gpclient.metainfo.xml.in

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>com.yuezk.qt.gpclient</id>
+
+    <name>globalprotect-openconnect</name>
+    <summary>A GlobalProtect VPN client powered by OpenConnect</summary>
+
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>AGPL-3.0-or-later</project_license>
+
+    <description>
+        <p>A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Qt5, supports the SAML auth mode.</p>
+    </description>
+
+    <categories>
+        <category>Network</category>
+    </categories>
+
+    <update_contact>k3vinyue_AT_gmail.com</update_contact>
+    <developer_name>Kevin Yue</developer_name>
+
+    <url type="homepage">https://github.com/yuezk/GlobalProtect-openconnect</url>
+    <url type="bugtracker">https://github.com/yuezk/GlobalProtect-openconnect/issues</url>
+    <url type="help">https://github.com/yuezk/GlobalProtect-openconnect/issues</url>
+
+    <keywords>
+        <keyword>globalprotect</keyword>
+        <keyword>openconnect</keyword>
+        <keyword>vpn</keyword>
+        <keyword>saml</keyword>
+    </keywords>
+
+    <launchable type="desktop-id">com.yuezk.qt.gpclient.desktop</launchable>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://user-images.githubusercontent.com/3297602/133869036-5c02b0d9-c2d9-4f87-8c81-e44f68cfd6ac.png</image>
+        </screenshot>
+    </screenshots>
+    <provides>
+        <binary>@CMAKE_INSTALL_PREFIX@/bin/gpclient</binary>
+        <dbus type="system">com.yuezk.qt.GPService</dbus>
+    </provides>
+</component>

GPClient/com.yuezk.qt.gpclient.svg

@@ -16,7 +16,7 @@
    viewBox="0 0 96 96"
    style="enable-background:new 0 0 96 96;"
    xml:space="preserve"
-   sodipodi:docname="com.yuezk.qt.GPClient.svg"
+   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

GPClient/enhancedwebview.cpp

@@ -1,9 +1,9 @@
+#include <QtCore/QProcessEnvironment>
+#include <QtWebEngineWidgets/QWebEngineView>
+
 #include "enhancedwebview.h"
 #include "cdpcommandmanager.h"
 
-#include <QtWebEngineWidgets/QWebEngineView>
-#include <QProcessEnvironment>
-
 EnhancedWebView::EnhancedWebView(QWidget *parent)
     : QWebEngineView(parent)
     , cdp(new CDPCommandManager)

GPClient/enhancedwebview.h

@@ -1,9 +1,10 @@
 #ifndef ENHANCEDWEBVIEW_H
 #define ENHANCEDWEBVIEW_H
 
-#include "cdpcommandmanager.h"
 #include <QtWebEngineWidgets/QWebEngineView>
 
+#include "cdpcommandmanager.h"
+
 #define ENV_CDP_PORT "QTWEBENGINE_REMOTE_DEBUGGING"
 
 class EnhancedWebView : public QWebEngineView

GPClient/gatewayauthenticator.cpp

@@ -1,19 +1,26 @@
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QRegularExpressionMatch>
+#include <plog/Log.h>
+
 #include "gatewayauthenticator.h"
 #include "gphelper.h"
 #include "loginparams.h"
 #include "preloginresponse.h"
-
-#include <QNetworkReply>
-#include <plog/Log.h>
+#include "challengedialog.h"
 
 using namespace gpclient::helper;
 
-GatewayAuthenticator::GatewayAuthenticator(const QString& gateway, const PortalConfigResponse& portalConfig)
+GatewayAuthenticator::GatewayAuthenticator(const QString& gateway, GatewayAuthenticatorParams params)
     : QObject()
-    , preloginUrl("https://" + gateway + "/ssl-vpn/prelogin.esp?tmp=tmp&kerberos-support=yes&ipv6-support=yes&clientVer=4100&clientos=Linux")
+    , gateway(gateway)
+    , params(params)
+    , preloginUrl("https://" + gateway + "/ssl-vpn/prelogin.esp?tmp=tmp&kerberos-support=yes&ipv6-support=yes&clientVer=4100")
     , loginUrl("https://" + gateway + "/ssl-vpn/login.esp")
-    , portalConfig(portalConfig)
 {
+    if (!params.clientos().isEmpty()) {
+        preloginUrl = preloginUrl + "&clientos=" + params.clientos();
+    }
 }
 
 GatewayAuthenticator::~GatewayAuthenticator()
@@ -25,29 +32,30 @@ void GatewayAuthenticator::authenticate()
 {
     PLOGI << "Start gateway authentication...";
 
-    LoginParams params;
-    params.setUser(portalConfig.username());
-    params.setPassword(portalConfig.password());
-    params.setUserAuthCookie(portalConfig.userAuthCookie());
+    LoginParams loginParams { params.clientos() };
+    loginParams.setUser(params.username());
+    loginParams.setPassword(params.password());
+    loginParams.setUserAuthCookie(params.userAuthCookie());
+    loginParams.setInputStr(params.inputStr());
 
-    login(params);
+    login(loginParams);
 }
 
-void GatewayAuthenticator::login(const LoginParams &params)
+void GatewayAuthenticator::login(const LoginParams &loginParams)
 {
-    PLOGI << "Trying to login the gateway at " << loginUrl << " with " << params.toUtf8();
+    PLOGI << "Trying to login the gateway at " << loginUrl << " with " << loginParams.toUtf8();
 
-    QNetworkReply *reply = createRequest(loginUrl, params.toUtf8());
+    QNetworkReply *reply = createRequest(loginUrl, loginParams.toUtf8());
     connect(reply, &QNetworkReply::finished, this, &GatewayAuthenticator::onLoginFinished);
 }
 
 void GatewayAuthenticator::onLoginFinished()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
-    QByteArray response;
+    QByteArray response = reply->readAll();
 
-    if (reply->error() || (response = reply->readAll()).contains("Authentication failure")) {
-        PLOGE << QString("Failed to login the gateway at %1, %2").arg(loginUrl).arg(reply->errorString());
+    if (reply->error() || response.contains("Authentication failure")) {
+        PLOGE << QString("Failed to login the gateway at %1, %2").arg(loginUrl, reply->errorString());
 
         if (normalLoginWindow) {
             normalLoginWindow->setProcessing(false);
@@ -58,6 +66,13 @@ void GatewayAuthenticator::onLoginFinished()
         return;
     }
 
+    // 2FA
+    if (response.contains("Challenge")) {
+        PLOGI << "The server need input the challenge...";
+        showChallenge(response);
+        return;
+    }
+
     if (normalLoginWindow) {
         normalLoginWindow->close();
     }
@@ -79,7 +94,7 @@ void GatewayAuthenticator::onPreloginFinished()
     QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
 
     if (reply->error()) {
-        PLOGE << QString("Failed to prelogin the gateway at %1, %2").arg(preloginUrl).arg(reply->errorString());
+        PLOGE << QString("Failed to prelogin the gateway at %1, %2").arg(preloginUrl, reply->errorString());
 
         emit fail("Error occurred on the gateway prelogin interface.");
         return;
@@ -94,7 +109,7 @@ void GatewayAuthenticator::onPreloginFinished()
     } else if (response.hasNormalAuthFields()) {
         normalAuth(response.labelUsername(), response.labelPassword(), response.authMessage());
     } else {
-        PLOGE << QString("Unknown prelogin response for %1, got %2").arg(preloginUrl).arg(QString::fromUtf8(response.rawResponse()));
+        PLOGE << QString("Unknown prelogin response for %1, got %2").arg(preloginUrl, QString::fromUtf8(response.rawResponse()));
         emit fail("Unknown response for gateway prelogin interface.");
     }
 
@@ -103,7 +118,7 @@ void GatewayAuthenticator::onPreloginFinished()
 
 void GatewayAuthenticator::normalAuth(QString labelUsername, QString labelPassword, QString authMessage)
 {
-    PLOGI << QString("Trying to perform the normal login with %1 / %2 credentials").arg(labelUsername).arg(labelPassword);
+    PLOGI << QString("Trying to perform the normal login with %1 / %2 credentials").arg(labelUsername, labelPassword);
 
     normalLoginWindow = new NormalLoginWindow;
     normalLoginWindow->setPortalAddress(gateway);
@@ -124,10 +139,10 @@ void GatewayAuthenticator::onPerformNormalLogin(const QString &username, const Q
     PLOGI << "Start to perform normal login...";
 
     normalLoginWindow->setProcessing(true);
-    LoginParams params;
-    params.setUser(username);
+    params.setUsername(username);
     params.setPassword(password);
-    login(params);
+    
+    authenticate();
 }
 
 void GatewayAuthenticator::onLoginWindowRejected()
@@ -162,15 +177,50 @@ void GatewayAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> &saml
         PLOGI << "SAML login succeeded, got the portal-userauthcookie " << samlResult.value("userAuthCookie");
     }
 
-    LoginParams params;
-    params.setUser(samlResult.value("username"));
-    params.setPreloginCookie(samlResult.value("preloginCookie"));
-    params.setUserAuthCookie(samlResult.value("userAuthCookie"));
+    LoginParams loginParams { params.clientos() };
+    loginParams.setUser(samlResult.value("username"));
+    loginParams.setPreloginCookie(samlResult.value("preloginCookie"));
+    loginParams.setUserAuthCookie(samlResult.value("userAuthCookie"));
 
-    login(params);
+    login(loginParams);
 }
 
 void GatewayAuthenticator::onSAMLLoginFail(const QString msg)
 {
     emit fail(msg);
 }
+
+void GatewayAuthenticator::showChallenge(const QString &responseText)
+{
+    QRegularExpression re("\"(.*?)\";");
+    QRegularExpressionMatchIterator i = re.globalMatch(responseText);
+
+    i.next(); // Skip the status value
+    QString message = i.next().captured(1);
+    QString inputStr = i.next().captured(1);
+    // update the inputSrc field
+    params.setInputStr(inputStr);
+
+    challengeDialog = new ChallengeDialog;
+    challengeDialog->setMessage(message);
+
+    connect(challengeDialog, &ChallengeDialog::accepted, this, [this] {
+        params.setPassword(challengeDialog->getChallenge());
+        PLOGI << "Challenge submitted, try to re-authenticate...";
+        authenticate();
+    });
+
+    connect(challengeDialog, &ChallengeDialog::rejected, this, [this] {
+        if (normalLoginWindow) {
+            normalLoginWindow->close();
+        }
+        emit fail();
+    });
+
+    connect(challengeDialog, &ChallengeDialog::finished, this, [this] {
+        delete challengeDialog;
+        challengeDialog = nullptr;
+    });
+
+    challengeDialog->show();
+}

GPClient/gatewayauthenticator.h

@@ -1,16 +1,18 @@
 #ifndef GATEWAYAUTHENTICATOR_H
 #define GATEWAYAUTHENTICATOR_H
 
-#include "portalconfigresponse.h"
+#include <QtCore/QObject>
+
 #include "normalloginwindow.h"
+#include "challengedialog.h"
 #include "loginparams.h"
-#include <QObject>
+#include "gatewayauthenticatorparams.h"
 
 class GatewayAuthenticator : public QObject
 {
     Q_OBJECT
 public:
-    explicit GatewayAuthenticator(const QString& gateway, const PortalConfigResponse& portalConfig);
+    explicit GatewayAuthenticator(const QString& gateway, GatewayAuthenticatorParams params);
     ~GatewayAuthenticator();
 
     void authenticate();
@@ -30,17 +32,18 @@ private slots:
 
 private:
     QString gateway;
+    GatewayAuthenticatorParams params;
     QString preloginUrl;
     QString loginUrl;
 
-    const PortalConfigResponse& portalConfig;
-
     NormalLoginWindow *normalLoginWindow{ nullptr };
+    ChallengeDialog *challengeDialog{ nullptr };
 
-    void login(const LoginParams& params);
+    void login(const LoginParams& loginParams);
     void doAuth();
     void normalAuth(QString labelUsername, QString labelPassword, QString authMessage);
     void samlAuth(QString samlMethod, QString samlRequest, QString preloginUrl = "");
+    void showChallenge(const QString &responseText);
 };
 
 #endif // GATEWAYAUTHENTICATOR_H

GPClient/gatewayauthenticatorparams.cpp

@@ -0,0 +1,67 @@
+#include "gatewayauthenticatorparams.h"
+
+GatewayAuthenticatorParams::GatewayAuthenticatorParams()
+{
+
+}
+
+GatewayAuthenticatorParams GatewayAuthenticatorParams::fromPortalConfigResponse(const PortalConfigResponse &portalConfig)
+{
+    GatewayAuthenticatorParams params;
+    params.setUsername(portalConfig.username());
+    params.setPassword(portalConfig.password());
+    params.setUserAuthCookie(portalConfig.userAuthCookie());
+
+    return params;
+}
+
+const QString &GatewayAuthenticatorParams::username() const
+{
+    return m_username;
+}
+
+void GatewayAuthenticatorParams::setUsername(const QString &newUsername)
+{
+    m_username = newUsername;
+}
+
+const QString &GatewayAuthenticatorParams::password() const
+{
+    return m_password;
+}
+
+void GatewayAuthenticatorParams::setPassword(const QString &newPassword)
+{
+    m_password = newPassword;
+}
+
+const QString &GatewayAuthenticatorParams::userAuthCookie() const
+{
+    return m_userAuthCookie;
+}
+
+void GatewayAuthenticatorParams::setUserAuthCookie(const QString &newUserAuthCookie)
+{
+    m_userAuthCookie = newUserAuthCookie;
+}
+
+const QString &GatewayAuthenticatorParams::clientos() const
+{
+    return m_clientos;
+}
+
+void GatewayAuthenticatorParams::setClientos(const QString &newClientos)
+{
+    m_clientos = newClientos;
+}
+
+const QString &GatewayAuthenticatorParams::inputStr() const
+{
+    return m_inputStr;
+}
+
+void GatewayAuthenticatorParams::setInputStr(const QString &inputStr)
+{
+    m_inputStr = inputStr;
+}
+

GPClient/gatewayauthenticatorparams.h

@@ -0,0 +1,38 @@
+#ifndef GATEWAYAUTHENTICATORPARAMS_H
+#define GATEWAYAUTHENTICATORPARAMS_H
+
+#include <QtCore/QString>
+
+#include "portalconfigresponse.h"
+
+class GatewayAuthenticatorParams
+{
+public:
+    GatewayAuthenticatorParams();
+
+    static GatewayAuthenticatorParams fromPortalConfigResponse(const PortalConfigResponse &portalConfig);
+
+    const QString &username() const;
+    void setUsername(const QString &newUsername);
+
+    const QString &password() const;
+    void setPassword(const QString &newPassword);
+
+    const QString &userAuthCookie() const;
+    void setUserAuthCookie(const QString &newUserAuthCookie);
+
+    const QString &clientos() const;
+    void setClientos(const QString &newClientos);
+
+    const QString &inputStr() const;
+    void setInputStr(const QString &inputStr);
+
+private:
+    QString m_username;
+    QString m_password;
+    QString m_userAuthCookie;
+    QString m_clientos;
+    QString m_inputStr;
+};
+
+#endif // GATEWAYAUTHENTICATORPARAMS_H

GPClient/gpclient.cpp

@@ -1,18 +1,20 @@
+#include <QtGui/QIcon>
+#include <plog/Log.h>
+
 #include "gpclient.h"
 #include "gphelper.h"
 #include "ui_gpclient.h"
 #include "portalauthenticator.h"
 #include "gatewayauthenticator.h"
 #include "settingsdialog.h"
-
-#include <plog/Log.h>
-#include <QIcon>
+#include "gatewayauthenticatorparams.h"
 
 using namespace gpclient::helper;
 
-GPClient::GPClient(QWidget *parent)
+GPClient::GPClient(QWidget *parent, IVpn *vpn)
     : QMainWindow(parent)
     , ui(new Ui::GPClient)
+    , vpn(vpn)
     , settingsDialog(new SettingsDialog(this))
 {
     ui->setupUi(this);
@@ -24,13 +26,14 @@ GPClient::GPClient(QWidget *parent)
     setupSettings();
 
     // Restore portal from the previous settings
-    ui->portalInput->setText(settings::get("portal", "").toString());
+    this->portal(settings::get("portal", "").toString());
 
     // DBus service setup
-    vpn = new com::yuezk::qt::GPService("com.yuezk.qt.GPService", "/", QDBusConnection::systemBus(), this);
-    connect(vpn, &com::yuezk::qt::GPService::connected, this, &GPClient::onVPNConnected);
-    connect(vpn, &com::yuezk::qt::GPService::disconnected, this, &GPClient::onVPNDisconnected);
-    connect(vpn, &com::yuezk::qt::GPService::logAvailable, this, &GPClient::onVPNLogAvailable);
+    QObject *ov = dynamic_cast<QObject*>(vpn);
+    connect(ov, SIGNAL(connected()), this, SLOT(onVPNConnected()));
+    connect(ov, SIGNAL(disconnected()), this, SLOT(onVPNDisconnected()));
+    connect(ov, SIGNAL(error(QString)), this, SLOT(onVPNError(QString)));
+    connect(ov, SIGNAL(logAvailable(QString)), this, SLOT(onVPNLogAvailable(QString)));
 
     // Initiallize the context menu of system tray.
     initSystemTrayIcon();
@@ -48,7 +51,7 @@ GPClient::~GPClient()
 void GPClient::setupSettings()
 {
     settingsButton = new QPushButton(this);
-    settingsButton->setIcon(QIcon(":/images/settings_icon.svg"));
+    settingsButton->setIcon(QIcon(":/images/settings_icon.png"));
     settingsButton->setFixedSize(QSize(28, 28));
 
     QRect rect = this->geometry();
@@ -66,12 +69,14 @@ void GPClient::setupSettings()
 void GPClient::onSettingsButtonClicked()
 {
     settingsDialog->setExtraArgs(settings::get("extraArgs", "").toString());
+    settingsDialog->setClientos(settings::get("clientos", "Linux").toString());
     settingsDialog->show();
 }
 
 void GPClient::onSettingsAccepted()
 {
     settings::save("extraArgs", settingsDialog->extraArgs());
+    settings::save("clientos", settingsDialog->clientos());
 }
 
 void GPClient::on_connectButton_clicked()
@@ -274,7 +279,7 @@ void GPClient::doConnect()
 // Login to the portal interface to get the portal config and preferred gateway
 void GPClient::portalLogin()
 {
-    PortalAuthenticator *portalAuth = new PortalAuthenticator(portal());
+    PortalAuthenticator *portalAuth = new PortalAuthenticator(portal(), settings::get("clientos", "Linux").toString());
 
     connect(portalAuth, &PortalAuthenticator::success, this, &GPClient::onPortalSuccess);
     // Prelogin failed on the portal interface, try to treat the portal as a gateway interface
@@ -351,7 +356,10 @@ void GPClient::gatewayLogin()
 {
     PLOGI << "Performing gateway login...";
 
-    GatewayAuthenticator *gatewayAuth = new GatewayAuthenticator(currentGateway().address(), portalConfig);
+    GatewayAuthenticatorParams params = GatewayAuthenticatorParams::fromPortalConfigResponse(portalConfig);
+    params.setClientos(settings::get("clientos", "Linux").toString());
+
+    GatewayAuthenticator *gatewayAuth = new GatewayAuthenticator(currentGateway().address(), params);
 
     connect(gatewayAuth, &GatewayAuthenticator::success, this, &GPClient::onGatewaySuccess);
     connect(gatewayAuth, &GatewayAuthenticator::fail, this, &GPClient::onGatewayFail);
@@ -366,7 +374,11 @@ void GPClient::onGatewaySuccess(const QString &authCookie)
     PLOGI << "Gateway login succeeded, got the cookie " << authCookie;
 
     isQuickConnect = false;
-    vpn->connect(currentGateway().address(), portalConfig.username(), authCookie, settings::get("extraArgs", "").toString());
+    QList<QString> gatewayAddresses;
+    for (GPGateway &gw : allGateways()) {
+      gatewayAddresses.push_back(gw.address());
+    }
+    vpn->connect(currentGateway().address(), gatewayAddresses, portalConfig.username(), authCookie, settings::get("extraArgs", "").toString());
     ui->statusLabel->setText("Connecting...");
     updateConnectionStatus(VpnStatus::pending);
 }
@@ -403,6 +415,11 @@ QString GPClient::portal() const
     return input;
 }
 
+void GPClient::portal(QString p)
+{
+    ui->portalInput->setText(p);
+}
+
 bool GPClient::connected() const
 {
     const QString statusText = ui->statusLabel->text();
@@ -471,6 +488,12 @@ void GPClient::onVPNDisconnected()
     }
 }
 
+void GPClient::onVPNError(QString errorMessage)
+{
+    updateConnectionStatus(VpnStatus::disconnected);
+    openMessageBox("Failed to connect", errorMessage);
+}
+
 void GPClient::onVPNLogAvailable(QString log)
 {
     PLOGI << log;

GPClient/gpclient.h

@@ -1,14 +1,14 @@
 #ifndef GPCLIENT_H
 #define GPCLIENT_H
 
-#include "gpservice_interface.h"
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QSystemTrayIcon>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QPushButton>
+
 #include "portalconfigresponse.h"
 #include "settingsdialog.h"
-
-#include <QMainWindow>
-#include <QSystemTrayIcon>
-#include <QMenu>
-#include <QPushButton>
+#include "vpn.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class GPClient; }
@@ -19,10 +19,19 @@ class GPClient : public QMainWindow
     Q_OBJECT
 
 public:
-    GPClient(QWidget *parent = nullptr);
+    GPClient(QWidget *parent, IVpn *vpn);
     ~GPClient();
 
     void activate();
+    void quit();
+
+    QString portal() const;
+    void portal(QString);
+
+    GPGateway currentGateway() const;
+    void setCurrentGateway(const GPGateway gateway);
+
+    void doConnect();
 
 private slots:
     void onSettingsButtonClicked();
@@ -45,6 +54,7 @@ private slots:
 
     void onVPNConnected();
     void onVPNDisconnected();
+    void onVPNError(QString errorMessage);
     void onVPNLogAvailable(QString log);
 
 private:
@@ -56,7 +66,7 @@ private:
     };
 
     Ui::GPClient *ui;
-    com::yuezk::qt::GPService *vpn;
+    IVpn *vpn;
 
     QSystemTrayIcon *systemTrayIcon;
     QMenu *contextMenu;
@@ -81,21 +91,15 @@ private:
     void populateGatewayMenu();
     void updateConnectionStatus(const VpnStatus &status);
 
-    void doConnect();
     void portalLogin();
     void tryGatewayLogin();
     void gatewayLogin();
 
-    QString portal() const;
     bool connected() const;
 
     QList<GPGateway> allGateways() const;
     void setAllGateways(QList<GPGateway> gateways);
 
-    GPGateway currentGateway() const;
-    void setCurrentGateway(const GPGateway gateway);
-
     void clearSettings();
-    void quit();
 };
 #endif // GPCLIENT_H

GPClient/gpgateway.cpp

@@ -1,8 +1,8 @@
-#include "gpgateway.h"
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include "gpgateway.h"
 
 GPGateway::GPGateway()
 {

GPClient/gpgateway.h

@@ -1,9 +1,9 @@
 #ifndef GPGATEWAY_H
 #define GPGATEWAY_H
 
-#include <QString>
-#include <QMap>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QJsonObject>
 
 class GPGateway
 {

GPClient/gphelper.cpp

@@ -1,14 +1,15 @@
-#include "gphelper.h"
-#include <QNetworkRequest>
-#include <QXmlStreamReader>
-#include <QMessageBox>
-#include <QDesktopWidget>
-#include <QApplication>
-#include <QWidget>
-#include <QSslConfiguration>
-#include <QSslSocket>
+#include <QtCore/QXmlStreamReader>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QSslConfiguration>
+#include <QtNetwork/QSslSocket>
 #include <plog/Log.h>
 
+#include "gphelper.h"
+
 QNetworkAccessManager* gpclient::helper::networkManager = new QNetworkAccessManager;
 
 QNetworkReply* gpclient::helper::createRequest(QString url, QByteArray params)
@@ -116,7 +117,13 @@ void gpclient::helper::settings::save(const QString &key, const QVariant &value)
     _settings->setValue(key, value);
 }
 
+
 void gpclient::helper::settings::clear()
 {
-    _settings->clear();
+    QStringList keys = _settings->allKeys();
+    for (const auto &key : qAsConst(keys)) {
+        if (!reservedKeys.contains(key)) {
+            _settings->remove(key);
+        }
+    }
 }

GPClient/gphelper.h

@@ -1,16 +1,16 @@
 #ifndef GPHELPER_H
 #define GPHELPER_H
 
+#include <QtCore/QObject>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QSettings>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+
 #include "samlloginwindow.h"
 #include "gpgateway.h"
 
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrlQuery>
-#include <QSettings>
-
 
 const QString UA = "PAN GlobalProtect";
 
@@ -31,6 +31,7 @@ namespace gpclient {
         namespace settings {
 
             extern QSettings *_settings;
+            static const QStringList reservedKeys {"extraArgs", "clientos"};
 
             QVariant get(const QString &key, const QVariant &defaultValue = QVariant());
             void save(const QString &key, const QVariant &value);

GPClient/loginparams.cpp

@@ -1,12 +1,12 @@
+#include <QtCore/QUrlQuery>
+
 #include "loginparams.h"
 
-#include <QUrlQuery>
-
-LoginParams::LoginParams()
+LoginParams::LoginParams(const QString clientos)
 {
     params.addQueryItem("prot", QUrl::toPercentEncoding("https:"));
     params.addQueryItem("server", "");
-    params.addQueryItem("inputSrc", "");
+    params.addQueryItem("inputStr", "");
     params.addQueryItem("jnlpReady", "jnlpReady");
     params.addQueryItem("user", "");
     params.addQueryItem("passwd", "");
@@ -15,7 +15,12 @@ LoginParams::LoginParams()
     params.addQueryItem("direct", "yes");
     params.addQueryItem("clientVer", "4100");
     params.addQueryItem("os-version", QUrl::toPercentEncoding(QSysInfo::prettyProductName()));
-    params.addQueryItem("clientos", "Linux");
+
+    // add the clientos parameter if not empty
+    if (!clientos.isEmpty()) {
+        params.addQueryItem("clientos", clientos);
+    }
+
     params.addQueryItem("portal-userauthcookie", "");
     params.addQueryItem("portal-prelogonuserauthcookie", "");
     params.addQueryItem("prelogin-cookie", "");
@@ -56,6 +61,11 @@ void LoginParams::setPreloginCookie(const QString cookie)
     updateQueryItem("prelogin-cookie", cookie);
 }
 
+void LoginParams::setInputStr(const QString inputStr)
+{
+    updateQueryItem("inputStr", inputStr);
+}
+
 QByteArray LoginParams::toUtf8() const
 {
     return params.toString().toUtf8();

GPClient/loginparams.h

@@ -1,12 +1,12 @@
 #ifndef LOGINPARAMS_H
 #define LOGINPARAMS_H
 
-#include <QUrlQuery>
+#include <QtCore/QUrlQuery>
 
 class LoginParams
 {
 public:
-    LoginParams();
+    LoginParams(const QString clientos);
     ~LoginParams();
 
     void setUser(const QString user);
@@ -15,6 +15,7 @@ public:
     void setUserAuthCookie(const QString cookie);
     void setPrelogonAuthCookie(const QString cookie);
     void setPreloginCookie(const QString cookie);
+    void setInputStr(const QString inputStr);
 
     QByteArray toUtf8() const;
 

GPClient/main.cpp

@@ -1,25 +1,26 @@
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QDir>
+#include <QtCore/QStandardPaths>
+#include <plog/Log.h>
+#include <plog/Init.h>
+#include <plog/Appenders/ColorConsoleAppender.h>
+#include <plog/Formatters/TxtFormatter.h>
+
 #include "singleapplication.h"
 #include "gpclient.h"
+#include "vpn_dbus.h"
+#include "vpn_json.h"
 #include "enhancedwebview.h"
-
-#include <QStandardPaths>
-#include <plog/Log.h>
-#include <plog/Appenders/ColorConsoleAppender.h>
-
-static const QString version = "v1.3.0";
+#include "sigwatch.h"
+#include "version.h"
 
 int main(int argc, char *argv[])
 {
-    const QDir path = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/GlobalProtect-openconnect";
-    const QString logFile = path.path() + "/gpclient.log";
-    if (!path.exists()) {
-        path.mkpath(".");
-    }
+    plog::ColorConsoleAppender<plog::TxtFormatter> consoleAppender(plog::streamStdErr);
+    plog::init(plog::debug, &consoleAppender);
 
-    static plog::ColorConsoleAppender<plog::TxtFormatter> consoleAppender;
-    plog::init(plog::debug, logFile.toUtf8()).addAppender(&consoleAppender);
-
-    PLOGI << "GlobalProtect started, version: " << version;
+    PLOGI << "GlobalProtect started, version: " << VERSION;
 
     QString port = QString::fromLocal8Bit(qgetenv(ENV_CDP_PORT));
 
@@ -30,10 +31,50 @@ int main(int argc, char *argv[])
     SingleApplication app(argc, argv);
     app.setQuitOnLastWindowClosed(false);
 
-    GPClient w;
+    QCommandLineParser parser;
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.addPositionalArgument("server", "The URL of the VPN server. Optional.");
+    parser.addPositionalArgument("gateway", "The URL of the specific VPN gateway. Optional.");
+    parser.addOptions({
+      {"json", "Write the result of the handshake with the GlobalConnect server to stdout as JSON and terminate. Useful for scripting."},
+      {"now", "Do not show the dialog with the connect button; connect immediately instead."},
+    });
+    parser.process(app);
+
+    const QStringList positional = parser.positionalArguments();
+
+    IVpn *vpn = parser.isSet("json") // yes it leaks, but this is cleared on exit anyway
+      ? static_cast<IVpn*>(new VpnJson(nullptr)) // Print to stdout and exit
+      : static_cast<IVpn*>(new VpnDbus(nullptr)); // Contact GPService daemon via dbus
+    GPClient w(nullptr, vpn);
     w.show();
 
+    if (positional.size() > 0) {
+      w.portal(positional.at(0));
+    }
+    if (positional.size() > 1) {
+      GPGateway gw;
+      gw.setName(positional.at(1));
+      gw.setAddress(positional.at(1));
+      w.setCurrentGateway(gw);
+    }
+
     QObject::connect(&app, &SingleApplication::instanceStarted, &w, &GPClient::activate);
 
+    UnixSignalWatcher sigwatch;
+    sigwatch.watchForSignal(SIGINT);
+    sigwatch.watchForSignal(SIGTERM);
+    sigwatch.watchForSignal(SIGQUIT);
+    sigwatch.watchForSignal(SIGHUP);
+    QObject::connect(&sigwatch, &UnixSignalWatcher::unixSignal, &w, &GPClient::quit);
+
+    if (parser.isSet("now")) {
+      w.doConnect();
+    }
+    if (parser.isSet("json")) {
+      QObject::connect(static_cast<VpnJson*>(vpn), &VpnJson::connected, &w, &GPClient::quit);
+    }
+
     return app.exec();
 }

GPClient/normalloginwindow.cpp

@@ -1,8 +1,8 @@
+#include <QtGui/QCloseEvent>
+
 #include "normalloginwindow.h"
 #include "ui_normalloginwindow.h"
 
-#include <QCloseEvent>
-
 NormalLoginWindow::NormalLoginWindow(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::NormalLoginWindow)

GPClient/normalloginwindow.h

@@ -1,7 +1,7 @@
 #ifndef PORTALAUTHWINDOW_H
 #define PORTALAUTHWINDOW_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui {
 class NormalLoginWindow;

GPClient/portalauthenticator.cpp

@@ -1,3 +1,6 @@
+#include <QtNetwork/QNetworkReply>
+#include <plog/Log.h>
+
 #include "portalauthenticator.h"
 #include "gphelper.h"
 #include "normalloginwindow.h"
@@ -7,16 +10,17 @@
 #include "portalconfigresponse.h"
 #include "gpgateway.h"
 
-#include <plog/Log.h>
-#include <QNetworkReply>
-
 using namespace gpclient::helper;
 
-PortalAuthenticator::PortalAuthenticator(const QString& portal) : QObject()
+PortalAuthenticator::PortalAuthenticator(const QString& portal, const QString& clientos) : QObject()
   , portal(portal)
-  , preloginUrl("https://" + portal + "/global-protect/prelogin.esp?tmp=tmp&kerberos-support=yes&ipv6-support=yes&clientVer=4100&clientos=Linux")
+  , clientos(clientos)
+  , preloginUrl("https://" + portal + "/global-protect/prelogin.esp?tmp=tmp&kerberos-support=yes&ipv6-support=yes&clientVer=4100")
   , configUrl("https://" + portal + "/global-protect/getconfig.esp")
 {
+    if (!clientos.isEmpty()) {
+        preloginUrl = preloginUrl + "&clientos=" + clientos;
+    }
 }
 
 PortalAuthenticator::~PortalAuthenticator()
@@ -37,7 +41,7 @@ void PortalAuthenticator::onPreloginFinished()
     QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
 
     if (reply->error()) {
-        PLOGE << QString("Error occurred while accessing %1, %2").arg(preloginUrl).arg(reply->errorString());
+        PLOGE << QString("Error occurred while accessing %1, %2").arg(preloginUrl, reply->errorString());
         emit preloginFailed("Error occurred on the portal prelogin interface.");
         delete reply;
         return;
@@ -143,12 +147,12 @@ void PortalAuthenticator::onSAMLLoginFail(const QString msg)
 
 void PortalAuthenticator::fetchConfig(QString username, QString password, QString preloginCookie, QString userAuthCookie)
 {
-    LoginParams params;
-    params.setServer(portal);
-    params.setUser(username);
-    params.setPassword(password);
-    params.setPreloginCookie(preloginCookie);
-    params.setUserAuthCookie(userAuthCookie);
+    LoginParams loginParams { clientos };
+    loginParams.setServer(portal);
+    loginParams.setUser(username);
+    loginParams.setPassword(password);
+    loginParams.setPreloginCookie(preloginCookie);
+    loginParams.setUserAuthCookie(userAuthCookie);
 
     // Save the username and password for future use.
     this->username = username;
@@ -156,7 +160,7 @@ void PortalAuthenticator::fetchConfig(QString username, QString password, QStrin
 
     PLOGI << "Fetching the portal config from " << configUrl << " for user: " << username;
 
-    QNetworkReply *reply = createRequest(configUrl, params.toUtf8());
+    QNetworkReply *reply = createRequest(configUrl, loginParams.toUtf8());
     connect(reply, &QNetworkReply::finished, this, &PortalAuthenticator::onFetchConfigFinished);
 }
 
@@ -191,9 +195,6 @@ void PortalAuthenticator::onFetchConfigFinished()
     if (normalLoginWindow) {
         PLOGI << "Closing the NormalLoginWindow...";
 
-        // Save the credentials for reuse
-        settings::save("username", username);
-        settings::save("password", password);
         normalLoginWindow->close();
     }
 

GPClient/portalauthenticator.h

@@ -1,18 +1,19 @@
 #ifndef PORTALAUTHENTICATOR_H
 #define PORTALAUTHENTICATOR_H
 
+#include <QtCore/QObject>
+
 #include "portalconfigresponse.h"
 #include "normalloginwindow.h"
 #include "samlloginwindow.h"
 #include "preloginresponse.h"
 
-#include <QObject>
 
 class PortalAuthenticator : public QObject
 {
     Q_OBJECT
 public:
-    explicit PortalAuthenticator(const QString& portal);
+    explicit PortalAuthenticator(const QString& portal, const QString& clientos);
     ~PortalAuthenticator();
 
     void authenticate();
@@ -34,6 +35,7 @@ private slots:
 
 private:
     QString portal;
+    QString clientos;
     QString preloginUrl;
     QString configUrl;
     QString username;

GPClient/portalconfigresponse.cpp

@@ -1,8 +1,8 @@
-#include "portalconfigresponse.h"
-
-#include <QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 #include <plog/Log.h>
 
+#include "portalconfigresponse.h"
+
 QString PortalConfigResponse::xmlUserAuthCookie = "portal-userauthcookie";
 QString PortalConfigResponse::xmlPrelogonUserAuthCookie = "portal-prelogonuserauthcookie";
 QString PortalConfigResponse::xmlGateways = "gateways";
@@ -46,17 +46,17 @@ PortalConfigResponse PortalConfigResponse::parse(const QByteArray xml)
 
 const QByteArray PortalConfigResponse::rawResponse() const
 {
-    return _rawResponse;
+    return m_rawResponse;
 }
 
-QString PortalConfigResponse::username() const
+const QString &PortalConfigResponse::username() const
 {
-    return _username;
+    return m_username;
 }
 
 QString PortalConfigResponse::password() const
 {
-    return _password;
+    return m_password;
 }
 
 QList<GPGateway> PortalConfigResponse::parseGateways(QXmlStreamReader &xmlReader)
@@ -134,45 +134,45 @@ QString PortalConfigResponse::parseGatewayName(QXmlStreamReader &xmlReader)
 
 QString PortalConfigResponse::userAuthCookie() const
 {
-    return _userAuthCookie;
+    return m_userAuthCookie;
 }
 
 QString PortalConfigResponse::prelogonUserAuthCookie() const
 {
-    return _prelogonAuthCookie;
+    return m_prelogonAuthCookie;
 }
 
 QList<GPGateway> PortalConfigResponse::allGateways() const
 {
-    return _gateways;
+    return m_gateways;
 }
 
 void PortalConfigResponse::setAllGateways(QList<GPGateway> gateways)
 {
-    _gateways = gateways;
+    m_gateways = gateways;
 }
 
 void PortalConfigResponse::setRawResponse(const QByteArray response)
 {
-    _rawResponse = response;
+    m_rawResponse = response;
 }
 
 void PortalConfigResponse::setUsername(const QString username)
 {
-    _username = username;
+    m_username = username;
 }
 
 void PortalConfigResponse::setPassword(const QString password)
 {
-    _password = password;
+    m_password = password;
 }
 
 void PortalConfigResponse::setUserAuthCookie(const QString cookie)
 {
-    _userAuthCookie = cookie;
+    m_userAuthCookie = cookie;
 }
 
 void PortalConfigResponse::setPrelogonUserAuthCookie(const QString cookie)
 {
-    _prelogonAuthCookie = cookie;
+    m_prelogonAuthCookie = cookie;
 }

GPClient/portalconfigresponse.h

@@ -1,11 +1,11 @@
 #ifndef PORTALCONFIGRESPONSE_H
 #define PORTALCONFIGRESPONSE_H
 
-#include "gpgateway.h"
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QtCore/QXmlStreamReader>
 
-#include <QString>
-#include <QList>
-#include <QXmlStreamReader>
+#include "gpgateway.h"
 
 class PortalConfigResponse
 {
@@ -16,7 +16,7 @@ public:
     static PortalConfigResponse parse(const QByteArray xml);
 
     const QByteArray rawResponse() const;
-    QString username() const;
+    const QString &username() const;
     QString password() const;
     QString userAuthCookie() const;
     QString prelogonUserAuthCookie() const;
@@ -31,13 +31,13 @@ private:
     static QString xmlPrelogonUserAuthCookie;
     static QString xmlGateways;
 
-    QByteArray _rawResponse;
-    QString _username;
-    QString _password;
-    QString _userAuthCookie;
-    QString _prelogonAuthCookie;
+    QByteArray m_rawResponse;
+    QString m_username;
+    QString m_password;
+    QString m_userAuthCookie;
+    QString m_prelogonAuthCookie;
 
-    QList<GPGateway> _gateways;
+    QList<GPGateway> m_gateways;
 
     void setRawResponse(const QByteArray response);
     void setUserAuthCookie(const QString cookie);

GPClient/preloginresponse.cpp

@@ -1,9 +1,9 @@
-#include "preloginresponse.h"
-
-#include <QXmlStreamReader>
-#include <QMap>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QMap>
 #include <plog/Log.h>
 
+#include "preloginresponse.h"
+
 QString PreloginResponse::xmlAuthMessage = "authentication-message";
 QString PreloginResponse::xmlLabelUsername = "username-label";
 QString PreloginResponse::xmlLabelPassword = "password-label";

GPClient/preloginresponse.h

@@ -1,8 +1,8 @@
 #ifndef PRELOGINRESPONSE_H
 #define PRELOGINRESPONSE_H
 
-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 
 class PreloginResponse
 {

GPClient/resources.qrc

@@ -1,11 +1,11 @@
 <RCC>
     <qresource prefix="/images">
-        <file alias="logo.svg">com.yuezk.qt.GPClient.svg</file>
+        <file alias="logo.svg">com.yuezk.qt.gpclient.svg</file>
         <file>connected.png</file>
         <file>pending.png</file>
         <file>not_connected.png</file>
         <file>radio_unselected.png</file>
         <file>radio_selected.png</file>
-        <file>settings_icon.svg</file>
+        <file>settings_icon.png</file>
     </qresource>
 </RCC>

GPClient/samlloginwindow.cpp

@@ -1,15 +1,15 @@
-#include "samlloginwindow.h"
-
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWebEngineWidgets/QWebEngineProfile>
+#include <QtWebEngineWidgets/QWebEngineView>
 #include <plog/Log.h>
-#include <QWebEngineProfile>
-#include <QWebEngineView>
+
+#include "samlloginwindow.h"
 
 SAMLLoginWindow::SAMLLoginWindow(QWidget *parent)
     : QDialog(parent)
     , webView(new EnhancedWebView(this))
 {
-    setWindowTitle("GlobalProtect SAML Login");
+    setWindowTitle("GlobalProtect Login");
     setModal(true);
     resize(700, 550);
 

GPClient/samlloginwindow.h

@@ -1,11 +1,11 @@
 #ifndef SAMLLOGINWINDOW_H
 #define SAMLLOGINWINDOW_H
 
-#include "enhancedwebview.h"
+#include <QtCore/QMap>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QDialog>
 
-#include <QDialog>
-#include <QMap>
-#include <QCloseEvent>
+#include "enhancedwebview.h"
 
 class SAMLLoginWindow : public QDialog
 {

GPClient/settings_icon.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
-<g>
-	<path d="M16.5,19.9C16.5,19.9,16.5,19.9,16.5,19.9l3.1-3.1c0,0,0,0,0,0l2.3-2.3c2.2,0.6,4.5,0,6.2-1.6c1.8-1.8,2.3-4.4,1.4-6.8
-		c-0.1-0.3-0.4-0.5-0.7-0.6c-0.3-0.1-0.7,0-0.9,0.3L25.6,8l-1.3-0.3L24,6.4l2.2-2.2c0.2-0.2,0.3-0.6,0.3-0.9
-		c-0.1-0.3-0.3-0.6-0.6-0.7c-2.3-0.9-5-0.4-6.8,1.4c-1.6,1.6-2.2,4-1.6,6.2l-1.6,1.6l-2.6-2.6L11,5.3c-0.1-0.1-0.2-0.3-0.3-0.3
-		L6.8,2.7C6.4,2.4,5.9,2.5,5.5,2.8L2.5,5.9C2.1,6.2,2.1,6.7,2.3,7.1L4.6,11c0.1,0.1,0.2,0.3,0.3,0.3l3.7,2.2l2.6,2.6l-1.2,1.2
-		c-2.2-0.6-4.5,0-6.2,1.6c-1.8,1.8-2.3,4.4-1.4,6.8c0.1,0.3,0.4,0.5,0.7,0.6c0.3,0.1,0.7,0,0.9-0.3L6.4,24l1.3,0.3L8,25.6l-2.2,2.2
-		c-0.2,0.2-0.3,0.6-0.3,0.9c0.1,0.3,0.3,0.6,0.6,0.7c0.8,0.3,1.5,0.4,2.3,0.4c1.6,0,3.3-0.6,4.5-1.9c1.6-1.6,2.2-4,1.6-6.2
-		L16.5,19.9z"/>
-	<path d="M22.5,16.8l-6,6l6.1,6.1c0.8,0.8,1.9,1.3,3,1.3s2.2-0.4,3-1.3c0.8-0.8,1.3-1.9,1.3-3c0-1.1-0.4-2.2-1.3-3L22.5,16.8z"/>
-</g>
-</svg>

GPClient/settingsdialog.cpp

@@ -6,8 +6,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     ui(new Ui::SettingsDialog)
 {
     ui->setupUi(this);
-
-    ui->extraArgsInput->setPlaceholderText("e.g. --name=value");
 }
 
 SettingsDialog::~SettingsDialog()
@@ -15,12 +13,22 @@ SettingsDialog::~SettingsDialog()
     delete ui;
 }
 
-void SettingsDialog::setExtraArgs(QString args)
+void SettingsDialog::setExtraArgs(QString extraArgs)
 {
-    ui->extraArgsInput->setPlainText(args);
+    ui->extraArgsInput->setPlainText(extraArgs);
 }
 
 QString SettingsDialog::extraArgs()
 {
     return ui->extraArgsInput->toPlainText().trimmed();
 }
+
+void SettingsDialog::setClientos(QString clientos)
+{
+    ui->clientosInput->setText(clientos);
+}
+
+QString SettingsDialog::clientos()
+{
+    return ui->clientosInput->text();
+}

GPClient/settingsdialog.h

@@ -1,7 +1,7 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui {
 class SettingsDialog;
@@ -15,9 +15,12 @@ public:
     explicit SettingsDialog(QWidget *parent = nullptr);
     ~SettingsDialog();
 
-    void setExtraArgs(QString);
+    void setExtraArgs(QString extraArgs);
     QString extraArgs();
 
+    void setClientos(QString clientos);
+    QString clientos();
+
 private:
     Ui::SettingsDialog *ui;
 };

GPClient/settingsdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>470</width>
-    <height>183</height>
+    <width>488</width>
+    <height>177</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,18 +23,36 @@
    <iconset resource="resources.qrc">
     <normaloff>:/images/connected.png</normaloff>:/images/connected.png</iconset>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QFormLayout" name="formLayout_3">
+   <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Custom Parameters:</string>
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QPlainTextEdit" name="extraArgsInput"/>
+   <item row="0" column="1">
+    <widget class="QPlainTextEdit" name="extraArgsInput">
+     <property name="placeholderText">
+      <string extracomment="Tokens with spaces can be surrounded by double quotes">e.g. --name=value --script=&quot;vpn-slice xxx&quot;</string>
+     </property>
+    </widget>
    </item>
-   <item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Value of &quot;clientos&quot;:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="clientosInput">
+     <property name="placeholderText">
+      <string>e.g., Windows</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

GPClient/vpn.h

@@ -0,0 +1,24 @@
+#ifndef VPN_H
+#define VPN_H
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+class IVpn
+{
+public:
+    virtual ~IVpn() = default;
+
+    virtual void connect(const QString &preferredServer, const QList<QString> &servers, const QString &username, const QString &passwd, const QString &extraArgs) = 0;
+    virtual void disconnect() = 0;
+    virtual int status() = 0;
+
+// signals: // SIGNALS
+//     virtual void connected();
+//     virtual void disconnected();
+//     virtual void error(const QString &errorMessage);
+//     virtual void logAvailable(const QString &log);
+};
+
+Q_DECLARE_INTERFACE(IVpn, "IVpn") // define this out of namespace scope
+
+#endif

GPClient/vpn_dbus.cpp

@@ -0,0 +1,13 @@
+#include "vpn_dbus.h"
+
+void VpnDbus::connect(const QString &preferredServer, const QList<QString> &servers, const QString &username, const QString &passwd, const QString &extraArgs) {
+    inner->connect(preferredServer, username, passwd, extraArgs);
+}
+
+void VpnDbus::disconnect() {
+    inner->disconnect();
+}
+
+int VpnDbus::status() {
+    return inner->status();
+}

GPClient/vpn_dbus.h

@@ -0,0 +1,33 @@
+#ifndef VPN_DBUS_H
+#define VPN_DBUS_H
+#include "vpn.h"
+#include "gpserviceinterface.h"
+
+class VpnDbus : public QObject, public IVpn
+{
+  Q_OBJECT
+  Q_INTERFACES(IVpn)
+
+private:
+  com::yuezk::qt::GPService *inner;
+
+public:
+  VpnDbus(QObject *parent) : QObject(parent) {
+    inner = new com::yuezk::qt::GPService("com.yuezk.qt.GPService", "/", QDBusConnection::systemBus(), this);
+    QObject::connect(inner, &com::yuezk::qt::GPService::connected, this, &VpnDbus::connected);
+    QObject::connect(inner, &com::yuezk::qt::GPService::disconnected, this, &VpnDbus::disconnected);
+    QObject::connect(inner, &com::yuezk::qt::GPService::error, this, &VpnDbus::error);
+    QObject::connect(inner, &com::yuezk::qt::GPService::logAvailable, this, &VpnDbus::logAvailable);
+  }
+
+  void connect(const QString &preferredServer, const QList<QString> &servers, const QString &username, const QString &passwd, const QString &extraArgs);
+  void disconnect();
+  int status();
+
+signals: // SIGNALS
+  void connected();
+  void disconnected();
+  void error(QString errorMessage);
+  void logAvailable(QString log);
+};
+#endif

GPClient/vpn_json.cpp

@@ -0,0 +1,24 @@
+#include "vpn_json.h"
+#include <QTextStream> 
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+
+void VpnJson::connect(const QString &preferredServer, const QList<QString> &servers, const QString &username, const QString &passwd, const QString &extraArgs) {
+    QJsonArray sl;
+    for (const QString &srv : servers) {
+      sl.push_back(QJsonValue(srv));
+    }
+    QJsonObject j;
+    j["server"] = preferredServer;
+    j["availableServers"] = sl;
+    j["cookie"] = passwd;
+    QTextStream(stdout) << QJsonDocument(j).toJson(QJsonDocument::Compact) << "\n";
+    emit connected();
+}
+
+void VpnJson::disconnect() { /* nop */ }
+
+int VpnJson::status() {
+    return 4; // disconnected
+}

GPClient/vpn_json.h

@@ -0,0 +1,23 @@
+#ifndef VPN_JSON_H
+#define VPN_JSON_H
+#include "vpn.h"
+
+class VpnJson : public QObject, public IVpn
+{
+  Q_OBJECT
+  Q_INTERFACES(IVpn)
+
+public:
+  VpnJson(QObject *parent) : QObject(parent) {}
+
+  void connect(const QString &preferredServer, const QList<QString> &servers, const QString &username, const QString &passwd, const QString &extraArgs);
+  void disconnect();
+  int status();
+
+signals: // SIGNALS
+  void connected();
+  void disconnected();
+  void error(const QString &errorMessage);
+  void logAvailable(const QString &log);
+};
+#endif

GPService/CMakeLists.txt

@@ -0,0 +1,74 @@
+include("${CMAKE_SOURCE_DIR}/cmake/Add3rdParty.cmake")
+
+project(GPService)
+
+set(gpservice_GENERATED_SOURCES)
+
+configure_file(dbus/com.yuezk.qt.GPService.service.in dbus/com.yuezk.qt.GPService.service)
+configure_file(systemd/gpservice.service.in systemd/gpservice.service)
+
+# generate the dbus xml definition
+qt5_generate_dbus_interface(
+    gpservice.h
+    ${CMAKE_BINARY_DIR}/com.yuezk.qt.GPService.xml
+)
+
+# generate dbus adaptor
+qt5_add_dbus_adaptor(
+    gpservice_GENERATED_SOURCES
+    ${CMAKE_BINARY_DIR}/com.yuezk.qt.GPService.xml
+    gpservice.h
+    GPService
+)
+
+add_executable(gpservice
+    gpservice.cpp
+    main.cpp
+    ${gpservice_GENERATED_SOURCES}
+)
+
+add_3rdparty(
+    SingleApplication
+    GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
+    GIT_TAG v3.3.0
+    CMAKE_ARGS
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+        -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
+        -DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
+        -DQAPPLICATION_CLASS=QCoreApplication
+)
+
+ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
+
+set(SingleApplication_INCLUDE_DIR ${SOURCE_DIR})
+set(SingleApplication_LIBRARY ${BINARY_DIR}/libSingleApplication.a)
+
+add_dependencies(gpservice SingleApplication-${PROJECT_NAME})
+
+target_include_directories(gpservice PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${SingleApplication_INCLUDE_DIR}
+)
+
+target_link_libraries(gpservice
+    ${SingleApplication_LIBRARY}
+    Qt5::Core
+    Qt5::Network
+    Qt5::DBus
+    QtSignals
+)
+
+target_compile_definitions(gpservice PUBLIC QAPPLICATION_CLASS=QCoreApplication)
+
+install(TARGETS gpservice DESTINATION bin)
+install(FILES "dbus/com.yuezk.qt.GPService.conf" DESTINATION share/dbus-1/system.d )
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus/com.yuezk.qt.GPService.service" DESTINATION share/dbus-1/system-services)
+
+if("$ENV{DEBIAN_PACKAGE}")
+    # Install the systemd unit files to /lib/systemd/system for debian package
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/systemd/gpservice.service" DESTINATION /lib/systemd/system)
+else()
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/systemd/gpservice.service" DESTINATION lib/systemd/system)
+endif()

GPService/GPService.pro

@@ -1,52 +0,0 @@
-TARGET = gpservice
-
-QT += dbus
-QT -= gui
-
-CONFIG += c++11 console
-CONFIG -= app_bundle
-
-include(../singleapplication/singleapplication.pri)
-DEFINES += QAPPLICATION_CLASS=QCoreApplication
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-HEADERS += \
-    gpservice.h \
-    sigwatch.h
-
-SOURCES += \
-        gpservice.cpp \
-        main.cpp \
-        sigwatch.cpp
-
-DBUS_ADAPTORS += gpservice.xml
-
-# Default rules for deployment.
-target.path = /usr/bin
-INSTALLS += target
-
-DISTFILES += \
-    dbus/com.yuezk.qt.GPService.conf \
-    dbus/com.yuezk.qt.GPService.service \
-    systemd/gpservice.service
-
-dbus_config.path = /usr/share/dbus-1/system.d/
-dbus_config.files = dbus/com.yuezk.qt.GPService.conf
-
-dbus_service.path = /usr/share/dbus-1/system-services/
-dbus_service.files = dbus/com.yuezk.qt.GPService.service
-
-systemd_service.path = /etc/systemd/system/
-systemd_service.files = systemd/gpservice.service
-
-INSTALLS += dbus_config dbus_service systemd_service

GPService/dbus/com.yuezk.qt.GPService.service.in

@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=com.yuezk.qt.GPService
-Exec=/usr/bin/gpservice
+Exec=@CMAKE_INSTALL_PREFIX@/bin/gpservice
 User=root
 SystemdService=gpservice.service

GPService/gpservice.cpp

@@ -1,10 +1,12 @@
-#include "gpservice.h"
-#include "gpservice_adaptor.h"
+#include <QtCore/QFileInfo>
+#include <QtCore/QDateTime>
+#include <QtCore/QVariant>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QRegularExpressionMatch>
+#include <QtDBus/QtDBus>
 
-#include <QFileInfo>
-#include <QtDBus>
-#include <QDateTime>
-#include <QVariant>
+#include "gpservice.h"
+#include "gpserviceadaptor.h"
 
 GPService::GPService(QObject *parent)
     : QObject(parent)
@@ -39,6 +41,47 @@ QString GPService::findBinary()
     return nullptr;
 }
 
+/* Port from https://github.com/qt/qtbase/blob/11d1dcc6e263c5059f34b44d531c9ccdf7c0b1d6/src/corelib/io/qprocess.cpp#L2115 */
+QStringList GPService::splitCommand(QString command)
+{
+    QStringList args;
+    QString tmp;
+    int quoteCount = 0;
+    bool inQuote = false;
+
+    // handle quoting. tokens can be surrounded by double quotes
+    // "hello world". three consecutive double quotes represent
+    // the quote character itself.
+    for (int i = 0; i < command.size(); ++i) {
+        if (command.at(i) == QLatin1Char('"')) {
+            ++quoteCount;
+            if (quoteCount == 3) {
+                // third consecutive quote
+                quoteCount = 0;
+                tmp += command.at(i);
+            }
+            continue;
+        }
+        if (quoteCount) {
+            if (quoteCount == 1)
+                inQuote = !inQuote;
+            quoteCount = 0;
+        }
+        if (!inQuote && command.at(i).isSpace()) {
+            if (!tmp.isEmpty()) {
+                args += tmp;
+                tmp.clear();
+            }
+        } else {
+            tmp += command.at(i);
+        }
+    }
+    if (!tmp.isEmpty())
+        args += tmp;
+
+    return args;
+}
+
 void GPService::quit()
 {
     if (openconnect->state() == QProcess::NotRunning) {
@@ -58,21 +101,53 @@ void GPService::connect(QString server, QString username, QString passwd, QStrin
 
     QString bin = findBinary();
     if (bin == nullptr) {
-        log("Could not found openconnect binary, make sure openconnect is installed, exiting.");
+        log("Could not find openconnect binary, make sure openconnect is installed, exiting.");
+        emit error("The OpenConect CLI was not found, make sure it has been installed!");
+        return;
+    }
+
+    if (!isValidVersion(bin)) {
         return;
     }
 
     QStringList args;
     args << QCoreApplication::arguments().mid(1)
-     << "--protocol=gp"
-     << QProcess::splitCommand(extraArgs)
-     << "-u" << username
-     << "-C" << passwd
-     << server;
+         << "--protocol=gp"
+         << splitCommand(extraArgs)
+         << "-u" << username
+         << "--cookie-on-stdin"
+         << server;
 
     log("Start process with arugments: " + args.join(" "));
 
     openconnect->start(bin, args);
+    openconnect->write((passwd + "\n").toUtf8());
+}
+
+bool GPService::isValidVersion(QString &bin) {
+    QProcess p;
+    p.start(bin, QStringList("--version"));
+    p.waitForFinished();
+    QString output = p.readAllStandardError() + p.readAllStandardOutput();
+
+    QRegularExpression re("v(\\d+).*?(\\s|\\n)");
+    QRegularExpressionMatch match = re.match(output);
+
+    if (match.hasMatch()) {
+        log("Output of `openconnect --version`: " + output);
+
+        QString fullVersion = match.captured(0);
+        QString majorVersion = match.captured(1);
+
+        if (majorVersion.toInt() < 8) {
+            emit error("The OpenConnect version must greater than v8.0.0, got " + fullVersion);
+            return false;
+        }
+    } else {
+        log("Failed to parse the OpenConnect version from " + output);
+    }
+
+    return true;
 }
 
 void GPService::disconnect()
@@ -106,7 +181,7 @@ void GPService::onProcessStdout()
     QString output = openconnect->readAllStandardOutput();
 
     log(output);
-    if (output.indexOf("Connected as") >= 0) {
+    if (output.indexOf("Connected as") >= 0 || output.indexOf("Configured as") >= 0) {
         vpnStatus = GPService::VpnConnected;
         emit connected();
     }

GPService/gpservice.h

@@ -1,8 +1,8 @@
 #ifndef GLOBALPROTECTSERVICE_H
 #define GLOBALPROTECTSERVICE_H
 
-#include <QObject>
-#include <QProcess>
+#include <QtCore/QObject>
+#include <QtCore/QProcess>
 
 static const QString binaryPaths[] {
     "/usr/local/bin/openconnect",
@@ -21,6 +21,8 @@ public:
     explicit GPService(QObject *parent = nullptr);
     ~GPService();
 
+    void quit();
+
     enum VpnStatus {
         VpnNotConnected,
         VpnConnecting,
@@ -31,13 +33,13 @@ public:
 signals:
     void connected();
     void disconnected();
+    void error(QString errorMessage);
     void logAvailable(QString log);
 
 public slots:
     void connect(QString server, QString username, QString passwd, QString extraArgs);
     void disconnect();
     int status();
-    void quit();
 
 private slots:
     void onProcessStarted();
@@ -52,7 +54,9 @@ private:
     int vpnStatus = GPService::VpnNotConnected;
 
     void log(QString msg);
+    bool isValidVersion(QString &bin);
     static QString findBinary();
+    static QStringList splitCommand(QString command);
 };
 
 #endif // GLOBALPROTECTSERVICE_H

GPService/gpservice.xml

@@ -1,23 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="com.yuezk.qt.GPService">
-    <signal name="connected">
-    </signal>
-    <signal name="disconnected">
-    </signal>
-    <signal name="logAvailable">
-      <arg name="log" type="s" />
-    </signal>
-    <method name="connect">
-      <arg name="server" type="s" direction="in"/>
-      <arg name="username" type="s" direction="in"/>
-      <arg name="passwd" type="s" direction="in"/>
-      <arg name="extraArgs" type="s" direction="in"/>
-    </method>
-    <method name="disconnect">
-    </method>
-    <method name="status">
-      <arg type="i" direction="out"/>
-    </method>
-  </interface>
-</node>

GPService/main.cpp

@@ -1,4 +1,5 @@
-#include <QtDBus>
+#include <QtDBus/QtDBus>
+
 #include "gpservice.h"
 #include "singleapplication.h"
 #include "sigwatch.h"

GPService/systemd/gpservice.service.in

@@ -5,7 +5,7 @@ Description=GlobalProtect openconnect DBus service
 Environment="LANG=en_US.utf8"
 Type=dbus
 BusName=com.yuezk.qt.GPService
-ExecStart=/usr/bin/gpservice
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/gpservice
 
 [Install]
 WantedBy=multi-user.target

GlobalProtect-openconnect.pro

@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    GPClient \
-    GPService

PKGBUILD.template

@@ -1,39 +0,0 @@
-# Maintainer: Keinv Yue <yuezk001@gmail.com>
-
-pkgname=globalprotect-openconnect
-_gitname=GlobalProtect-openconnect
-pkgver={PKG_VERSION}
-pkgrel=1
-pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode."
-arch=(x86_64 aarch64)
-url="https://github.com/yuezk/${_gitname}"
-license=('GPL3')
-depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
-makedepends=()
-source=(
-    "${_gitname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
-    "https://github.com/itay-grudev/SingleApplication/archive/v3.0.19.tar.gz"
-    "https://github.com/SergiusTheBest/plog/archive/1.1.5.tar.gz"
-)
-
-sha256sums=(
-    '{SOURCE_SHA}'
-    '9405fd259288b2a862e91e5135bccee936f0438e1b32c13603277132309d15e0'
-    '6c80b4701183d2415bec927e1f5ca9b1761b3b5c65d3e09fb29c743e016d5609'
-);
-
-prepare() {
-    mv "$srcdir/SingleApplication-3.0.19" -T "$srcdir/${_gitname}-${pkgver}/singleapplication"
-    mv "$srcdir/plog-1.1.5" -T "$srcdir/${_gitname}-${pkgver}/plog"
-}
-
-build() {
-    cd "$srcdir/${_gitname}-${pkgver}"
-    qmake CONFIG+=release "${srcdir}/${_gitname}-${pkgver}/GlobalProtect-openconnect.pro"
-    make
-}
-
-package() {
-    cd "$srcdir/${_gitname}-${pkgver}"
-    make INSTALL_ROOT="$pkgdir/" install
-}

README.md

@@ -2,9 +2,14 @@
 A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode, inspired by [gp-saml-gui](https://github.com/dlenski/gp-saml-gui).
 
 <p align="center">
-  <img src="screenshot.png">
+  <img src="https://user-images.githubusercontent.com/3297602/133869036-5c02b0d9-c2d9-4f87-8c81-e44f68cfd6ac.png">
 </p>
 
+<a href="https://paypal.me/zongkun" target="_blank"><img src="https://cdn.jsdelivr.net/gh/everdrone/coolbadge@5ea5937cabca5ecbfc45d6b30592bd81f219bc8d/badges/Paypal/Coffee/Blue/Small.png" alt="Buy me a coffee via Paypal" style="height: 32px; width: 268px;" ></a>
+<a href="https://ko-fi.com/M4M75PYKZ" target="_blank"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Support me on Ko-fi" style="height: 32px; width: 238px;"></a>
+<a href="https://www.buymeacoffee.com/yuezk" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 32px; width: 114px;" ></a>
+
+
 ## Features
 
 - Similar user experience as the official client in macOS.
@@ -12,108 +17,134 @@ A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Q
 - Supports automatically selecting the preferred gateway from the multiple gateways.
 - Supports switching gateway from the system tray menu manually.
 
-## Passing the Custom Parameters to `OpenConnect` CLI
-
-Custom parameters can be appended to the `OpenConnect` CLI with the following settings.
-<p align="center">
- <img src="https://user-images.githubusercontent.com/3297602/129464304-94eb8a2b-1c4a-47e1-b931-4422fff6eb81.png" />
-<p>
-  
-## Prerequisites
-
-- Openconnect v8.x
-- Qt5, qt5-webengine, qt5-websockets
-
-### Ubuntu
-1. Install openconnect v8.x
-
-    ```sh
-    sudo apt install openconnect
-    openconnect --version
-    ```
-
-   For Ubuntu 18.04 you might need to [build the latest openconnect from source code](https://gist.github.com/yuezk/ab9a4b87a9fa0182bdb2df41fab5f613).
-   
-2. Install the Qt dependencies
-
-    For Ubuntu 20, this should work.
-    
-    ```sh
-    sudo apt install qtbase5-dev libqt5websockets5-dev qtwebengine5-dev qttools5-dev debhelper
-    ```
-    
-    For Ubuntu 21, you need to install the base pieces separately as QT5 is the default.
-    
-    ```sh
-    sudo apt install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5websockets5-dev qtwebengine5-dev qttools5-dev debhelper
-    ```
-    
-### OpenSUSE
-Install the Qt dependencies
-
-```sh
-sudo zypper install libqt5-qtbase-devel libqt5-qtwebsockets-devel libqt5-qtwebengine-devel
-```
-
-### Fedora
-Install the Qt dependencies:
-
-```sh
-sudo dnf install qt5-qtbase-devel qt5-qttools-devel qt5-qtwebengine qt5-qtwebsockets-devel qt5-qtwebengine-devel
-```
 
 ## Install
 
-### Install from AUR (Arch/Manjaro)
+|OS|Stable version | Development version|
+|---|--------------|--------------------|
+|Linux Mint, Ubuntu 18.04 or later|[ppa:yuezk/globalprotect-openconnect](https://launchpad.net/~yuezk/+archive/ubuntu/globalprotect-openconnect)|[ppa:yuezk/globalprotect-openconnect-snapshot](https://launchpad.net/~yuezk/+archive/ubuntu/globalprotect-openconnect-snapshot)|
+|Arch, Manjaro|[globalprotect-openconnect](https://archlinux.org/packages/community/x86_64/globalprotect-openconnect/)|[AUR: globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/)|
+|Fedora|[copr: yuezk/globalprotect-openconnect](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/)|[copr: yuezk/globalprotect-openconnect](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/)|
+|openSUSE, CentOS 8|[OBS: globalprotect-openconnect](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect)|[OBS: globalprotect-openconnect-snapshot](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect-snapshot)|
 
-Install [globalprotect-openconnect](https://aur.archlinux.org/packages/globalprotect-openconnect/).
+Add the repository in the above table and install it with your favorite package manager tool.
 
-### Build from source code
+[![Arch package](https://repology.org/badge/version-for-repo/arch/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+[![AUR package](https://repology.org/badge/version-for-repo/aur/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+[![Manjaro Stable package](https://repology.org/badge/version-for-repo/manjaro_stable/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+[![Manjaro Testing package](https://repology.org/badge/version-for-repo/manjaro_testing/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+[![Manjaro Unstable package](https://repology.org/badge/version-for-repo/manjaro_unstable/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+[![nixpkgs unstable package](https://repology.org/badge/version-for-repo/nix_unstable/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+[![Parabola package](https://repology.org/badge/version-for-repo/parabola/globalprotect-openconnect.svg)](https://repology.org/project/globalprotect-openconnect/versions)
+
+### Linux Mint, Ubuntu 18.04 or later
+
+```sh
+sudo add-apt-repository ppa:yuezk/globalprotect-openconnect
+sudo apt-get update
+sudo apt install globalprotect-openconnect
+```
+
+> For Linux Mint, you might need to import the GPG key with: `sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7937C393082992E5D6E4A60453FC26B43838D761` if you encountered an error `gpg: keyserver receive failed: General error`.
+
+### Arch Linux / Manjaro
+
+```sh
+sudo pacman -S globalprotect-openconnect
+```
+
+### AUR snapshot version
+
+```sh
+yay -S globalprotect-openconnect-git
+```
+
+### Fedora
+
+```sh
+sudo dnf copr enable yuezk/globalprotect-openconnect
+sudo dnf install globalprotect-openconnect
+```
+
+### openSUSE
+
+- openSUSE Tumbleweed
+  ```sh
+  sudo zypper ar https://download.opensuse.org/repositories/home:/yuezk/openSUSE_Tumbleweed/home:yuezk.repo
+  sudo zypper ref
+  sudo zypper install globalprotect-openconnect
+  ```
+
+- openSUSE Leap
+
+  ```sh
+  sudo zypper ar https://download.opensuse.org/repositories/home:/yuezk/openSUSE_Leap_15.2/home:yuezk.repo
+  sudo zypper ref
+  sudo zypper install globalprotect-openconnect
+  ```
+### CentOS 8
+
+1. Add the repository: `https://download.opensuse.org/repositories/home:/yuezk/CentOS_8/home:yuezk.repo`
+1. Install `globalprotect-openconnect`
+
+  
+## Build & Install from source code
+
+Clone this repo with:
 
 ```sh
 git clone https://github.com/yuezk/GlobalProtect-openconnect.git
 cd GlobalProtect-openconnect
-git submodule update --init
-
-# qmake or qmake-qt5
-qmake CONFIG+=release
-make
-sudo make install
 ```
-Open `GlobalProtect VPN` in the application dashboard.
 
-### Debian package
+### Ubuntu/Mint
 
-Relatively manual process for now:
+> **⚠️ REQUIRED for Ubuntu 18.04 ⚠️**
+> 
+> Add this [dwmw2/openconnect](https://launchpad.net/~dwmw2/+archive/ubuntu/openconnect) PPA first to install the latest openconnect.
+> 
+> ```sh
+> sudo add-apt-repository ppa:dwmw2/openconnect
+> sudo apt update
+> ```
+  
+Build and install with:
 
-* Clone the source tree
+```sh
+./scripts/install-ubuntu.sh
+```
+### openSUSE
 
-  ```
-  git clone https://github.com/yuezk/GlobalProtect-openconnect.git
-  cd GlobalProtect-openconnect
-  ```
+Build and install with:
 
-* Install git-archive-all using the pip. Remember to adjust the version numbers etc.
+```sh
+./scripts/install-opensuse.sh
+```
 
-  ```
-  pip install git-archive-all
-  ```
+### Fedora
 
-* Next create an upstream source tree using git archive.
+Build and install with:
 
-  ```
-  git-archive-all --force-submodules --prefix=globalprotect-openconnect-1.3.0/ ../globalprotect-openconnect_1.3.0.orig.tar.gz
-  ```
+```sh
+./scripts/install-fedora.sh
+```
 
-* Finally extract the source tree, build the debian package, and install it.
+### Other Linux
+
+Install the Qt5 dependencies and OpenConnect:
+
+- QtCore
+- QtWebEngine
+- QtWebSockets
+- QtDBus
+- openconnect v8.x
+
+...then build and install with:
+
+```sh
+./scripts/install.sh
+```
 
-  ```
-  cd ..
-  tar -xzvf globalprotect-openconnect_1.3.0.orig.tar.gz
-  cd globalprotect-openconnect-1.3.0
-  fakeroot dpkg-buildpackage -uc -us -sa 2>&1 | tee ../build.log
-  sudo dpkg -i globalprotect-openconnect_1.3.0-1ppa1_amd64.deb
-  ```
 
 ### NixOS
   In `configuration.nix`:
@@ -127,7 +158,42 @@ Relatively manual process for now:
   
   environment.systemPackages = [ globalprotect-openconnect ];
   ```
+
+## Run
+
+Once the software is installed, you can run `gpclient` to start the UI.
+
+## Passing the Custom Parameters to `OpenConnect` CLI
+
+Custom parameters can be appended to the `OpenConnect` CLI with the following settings.
+
+> Tokens with spaces can be surrounded by double quotes; three consecutive double quotes represent the quote character itself.
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/3297602/130319209-744be02b-d657-4f49-a76d-d2c81b5c46d5.png" />
+<p>
   
+## Display the system tray icon on Gnome 40
+
+Install the [AppIndicator and KStatusNotifierItem Support](https://extensions.gnome.org/extension/615/appindicator-support/) extension and you will see the system try icon (Restart the system after the installation).
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/3297602/130831022-b93492fd-46dd-4a8e-94a4-13b5747120b7.png" />
+<p>
+
+  
+
+## Future plan
+
+- [x] Improve the release process
+- [ ] Process bugs and feature requests
+- [ ] Support for bypassing the `gpclient` parameters
+- [ ] Support the CLI mode
+  
+  
+## Troubleshooting
+
+The application logs can be found at: `~/.cache/GlobalProtect-openconnect/gpclient.log`
 
 ## [License](./LICENSE)
 GPLv3

VERSION

@@ -0,0 +1 @@
+1.4.1

cmake/Add3rdParty.cmake

@@ -0,0 +1,27 @@
+include(ExternalProject)
+
+function(add_3rdparty NAME)
+    set(oneValueArgs GIT_REPOSITORY GIT_TAG)
+    cmake_parse_arguments(add_3rdparty_args "" "${oneValueArgs}" "" ${ARGN})
+
+    if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/${NAME}/CMakeLists.txt")
+        message(STATUS "Found third party locally for ${NAME}")
+
+        ExternalProject_Add(
+            ${NAME}-${PROJECT_NAME}
+            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
+            SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/${NAME}"
+            INSTALL_COMMAND ""
+            "${add_3rdparty_args_UNPARSED_ARGUMENTS}"
+        )
+        return()
+    endif()
+
+    message(STATUS "Using ExternalProject to download ${NAME}") 
+    ExternalProject_Add(
+        ${NAME}-${PROJECT_NAME}
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
+        INSTALL_COMMAND ""
+        "${ARGN}"
+    )
+endfunction()

cmakew

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+cmake_version="3.21.2"
+
+arr_cmake_v=(${cmake_version//./ })
+cmake_version_major=(${arr_cmake_v[0]})
+cmake_version_minor=(${arr_cmake_v[1]})
+cmake_version_patch=(${arr_cmake_v[2]})
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+
+case "`uname`" in
+    CYGWIN* )
+        cygwin=true
+        ;;
+    Darwin* )
+        darwin=true
+        ;;
+    MINGW* )
+        msys=true
+        ;;
+    NONSTOP* )
+        nonstop=true
+        ;;
+esac
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+    cd "$(dirname "$0")"
+fi
+
+cmake_base="./.cmake"
+cmake_bin="${cmake_base}/cmake-$cmake_version/bin/cmake"
+
+# download cmake if neccessary
+if [ ! -f "$cmake_bin" ]; then
+    download_link=""
+
+    if [ "$darwin" = true ]; then 
+        download_link="https://cmake.org/files/v$cmake_version_major.$cmake_version_minor/cmake-$cmake_version-Darwin-x86_64.tar.gz"        
+    else
+        download_link="https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cmake-${cmake_version}-linux-x86_64.tar.gz"
+    fi 
+
+    wget -nv --show-progress "$download_link" -O "/tmp/cmake-$cmake_version.tar.gz"  
+    mkdir -p "${cmake_base}/cmake-$cmake_version"      
+    tar -xzf "/tmp/cmake-$cmake_version.tar.gz" -C "${cmake_base}/cmake-$cmake_version" --strip-components=1
+    rm "/tmp/cmake-$cmake_version.tar.gz" 
+fi 
+
+# We build the pattern for arguments to be converted via cygpath
+if [ "$cygwin" = true ]; then
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+
+    OURCYGPATTERN="(^($ROOTDIRS))"
+
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+
+        i=$((i+1))
+    done
+
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# run cmake
+exec "$cmake_bin" "$@"

debian/changelog

@@ -1,47 +1,44 @@
-globalprotect-openconnect (1.3.0-1ppa1) bionic; urgency=medium
+globalprotect-openconnect (1.4.1-1) unstable; urgency=medium
+
+  * Updated VERSION, Bumped 1.4.0 –> 1.4.1
+  * print the gpservice logs
+  * update AUR packaging
+
+ -- Kevin Yue <k3vinyue@gmail.com>  Thu, 03 Mar 2022 21:58:59 +0800
+
+globalprotect-openconnect (1.4.0-1) unstable; urgency=medium
+
+  * Updated VERSION, Bumped 1.3.4 –> 1.4.0
+  * Fix gpservice after openconnect v8.20 (#124)
+  * Add 2FA support (#112)
+  * Add a scripting mode to GPClient (#110)
+  * Stop saving credentials (#111)
+  * update CI
+  * add editorconfig
+  * Update README.md
+  * Add a run entry (#108)
+  * update the installation instruction of Arch Linux
+
+ -- Kevin Yue <k3vinyue@gmail.com>  Wed, 02 Mar 2022 21:34:19 +0800
+
+globalprotect-openconnect (1.3.4-1) unstable; urgency=medium
+
+  * Updated VERSION, Bumped 1.3.3 –> 1.3.4
+  * update packaging (#100)
+  * shorten the sponsor links
+  * Update README.md
+  * add sponsor links
+  * Adding application logs location in the README (#95)
+  * improve the doc
+  * Add snap packaging (#93)
+  * update doc
+  * Migrate to cmake and refine the code structure (#92)
+  * QStringView -> QString
+
+ -- Kevin Yue <k3vinyue@gmail.com>  Sun, 24 Oct 2021 12:13:24 +0800
+
+globalprotect-openconnect (1.3.0-1) unstable; urgency=medium
 
   * Bump version to 1.3.0
 
  -- Kevin Yue <k3vinyue@gmail.com>  Thu, 09 Jul 2020 10:13:46 +0800
-
-globalprotect-openconnect (1.2.7-1ppa1) bionic; urgency=medium
-
-  * Update dependencies
-
- -- Kevin Yue <k3vinyue@gmail.com>  Tue, 09 Jun 2020 22:13:46 +0800
-
-globalprotect-openconnect (1.2.6-1ppa1) bionic; urgency=medium
-
-  * Add qt5-default dependency
-
- -- Kevin Yue <k3vinyue@gmail.com>  Tue, 09 Jun 2020 22:05:57 +0800
-
-globalprotect-openconnect (1.2.5-1ppa1) bionic; urgency=medium
-
-  * Update version
-
- -- Kevin Yue <k3vinyue@gmail.com>  Mon, 08 Jun 2020 23:24:06 +0800
-
-globalprotect-openconnect (1.2.4-1ppa5) bionic; urgency=medium
-
-  * Update dependencies
-
- -- Kevin Yue <k3vinyue@gmail.com>  Mon, 08 Jun 2020 23:13:44 +0800
-
-globalprotect-openconnect (1.2.4-1ppa2) bionic; urgency=medium
-
-  * Update dependencies
-
- -- Kevin Yue <k3vinyue@gmail.com>  Mon, 08 Jun 2020 22:39:07 +0800
-
-globalprotect-openconnect (1.2.4-1ppa1) bionic; urgency=medium
-
-  * Initial release.
-
- -- Kevin Yue <k3vinyue@gmail.com>  Sun, 07 Jun 2020 19:00:25 +0800
-
-globalprotect-openconnect (1.2.4-1) UNRELEASED; urgency=low
-
-  * Initial release of debian package
-
- -- Amit Joshi <>  Fri, 29 May 2020 21:52:59 -0400

debian/control

@@ -2,7 +2,7 @@ Source: globalprotect-openconnect
 Section: net
 Priority: optional
 Maintainer: Kevin Yue <k3vinyue@gmail.com>
-Build-Depends: debhelper (>=11~), qtbase5-dev, qttools5-dev (>=5.9), libqt5websockets5-dev (>=5.9), qtwebengine5-dev (>=5.9)
+Build-Depends: cmake (>=3.10), debhelper (>=11~), qtbase5-dev, libqt5websockets5-dev (>=5.9), qtwebengine5-dev (>=5.9)
 Standards-Version: 4.1.4
 Homepage: https://github.com/yuezk/GlobalProtect-openconnect
 

debian/copyright

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

debian/rules

@@ -5,11 +5,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+export DEBIAN_PACKAGE=1
+
 %:
-	dh $@  
-
-override_dh_auto_install:
-	dh_auto_install -- prefix=/usr
-
-#override_dh_install:
-#	dh_install --list-missing -X.pyc -X.pyo
+	dh $@
+override_dh_installsystemd:
+	dh_installsystemd gpservice.service

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

debian/watch

@@ -1,3 +1,3 @@
 version=4
-opts="mode=git" https://github.com/yuezk/GlobalProtect-openconnect.git \
-   refs/tags/v([\d\.]+) debian uupdate
+opts="mode=git,pgpmode=gittag" \
+https://github.com/yuezk/GlobalProtect-openconnect.git refs/tags/v([\d\.]+)

packaging/aur/PKGBUILD

@@ -0,0 +1,33 @@
+# Maintainer: Keinv Yue <yuezk001@gmail.com>
+
+pkgname=globalprotect-openconnect
+pkgver=0
+pkgrel=1
+pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode."
+arch=(x86_64 aarch64)
+url="https://github.com/yuezk/GlobalProtect-openconnect"
+license=('GPL3')
+depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
+makedepends=(cmake)
+provides=('gpclient' 'gpservice')
+
+source=("${pkgname}.tar.gz")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd $srcdir/$pkgname-*/
+    cat VERSION VERSION_SUFFIX
+}
+
+build() {
+    cd $srcdir/$pkgname-*/
+    cmake -B build \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_FLAGS_RELEASE=-s
+    make -j$(nproc) -C build
+}
+
+package() {
+    cd $srcdir/$pkgname-*/
+    make DESTDIR="$pkgdir/" install -C build
+}

packaging/aur/PKGBUILD-git

@@ -0,0 +1,35 @@
+# Maintainer: Keinv Yue <yuezk001@gmail.com>
+
+pkgname=globalprotect-openconnect-git
+_pkgname=globalprotect-openconnect
+pkgver=0
+pkgrel=1
+pkgdesc="A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Qt5, supports SAML auth mode. (development version)"
+arch=(x86_64 aarch64)
+url="https://github.com/yuezk/GlobalProtect-openconnect"
+license=('GPL3')
+depends=('openconnect>=8.0.0' qt5-base qt5-webengine qt5-websockets)
+makedepends=(cmake)
+conflicts=('globalprotect-openconnect')
+provides=('gpclient' 'gpservice')
+
+source=("${_pkgname}.tar.gz")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd $srcdir/$_pkgname-*/
+    cat VERSION VERSION_SUFFIX
+}
+
+build() {
+    cd $srcdir/${_pkgname}-*/
+    cmake -B build \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_FLAGS_RELEASE=-s
+    make -j$(nproc) -C build
+}
+
+package() {
+    cd $srcdir/${_pkgname}-*/
+    make DESTDIR="$pkgdir/" install -C build
+}

packaging/flatpak/com.yuezk.qt.gpclient.yml

@@ -0,0 +1,26 @@
+app-id: com.yuezk.qt.gpclient
+base: io.qt.qtwebengine.BaseApp
+base-version: '5.15'
+runtime: org.kde.Platform
+runtime-version: '5.15'
+sdk: org.kde.Sdk
+command: gpclient
+finish-args:
+  - --share=network
+  - --share=ipc
+  - --socket=x11
+  - --socket=wayland
+  - --filesystem=host
+  - --device=dri
+  - --talk-name=org.kde.StatusNotifierWatcher
+  - --own-name=org.kde.*
+  - --system-own-name=com.yuezk.qt.GPService
+modules:
+  - name: gpclient
+    buildsystem: cmake
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_CXX_FLAGS_RELEASE=-s
+    sources:
+      - type: archive
+        path: globalprotect-openconnect.tar.gz

packaging/obs/globalprotect-openconnect-rpmlintrc

@@ -0,0 +1 @@
+setBadness('suse-dbus-unauthorized-service', 0)

packaging/obs/globalprotect-openconnect.changes

@@ -0,0 +1,44 @@
+-------------------------------------------------------------------
+Thu Mar  3 13:58:59 UTC 2022 - k3vinyue@gmail.com - 1.4.1
+
+- Update to 1.4.1
+  * Updated VERSION, Bumped 1.4.0 –> 1.4.1
+  * print the gpservice logs
+  * update AUR packaging
+
+-------------------------------------------------------------------
+Wed Mar  2 13:34:19 UTC 2022 - k3vinyue@gmail.com - 1.4.0
+
+- Update to 1.4.0
+  * Updated VERSION, Bumped 1.3.4 –> 1.4.0
+  * Fix gpservice after openconnect v8.20 (#124)
+  * Add 2FA support (#112)
+  * Add a scripting mode to GPClient (#110)
+  * Stop saving credentials (#111)
+  * update CI
+  * add editorconfig
+  * Update README.md
+  * Add a run entry (#108)
+  * update the installation instruction of Arch Linux
+
+-------------------------------------------------------------------
+Sun Oct 24 04:13:24 UTC 2021 - k3vinyue@gmail.com - 1.3.4
+
+- Update to 1.3.4
+  * Updated VERSION, Bumped 1.3.3 –> 1.3.4
+  * update packaging (#100)
+  * shorten the sponsor links
+  * Update README.md
+  * add sponsor links
+  * Adding application logs location in the README (#95)
+  * improve the doc
+  * Add snap packaging (#93)
+  * update doc
+  * Migrate to cmake and refine the code structure (#92)
+  * QStringView -> QString
+
+-------------------------------------------------------------------
+Thu Jul  9 02:13:46 UTC 2020 - k3vinyue@gmail.com - 1.3.0
+
+- Update to 1.3.0
+  * Bump version to 1.3.0

packaging/obs/globalprotect-openconnect.spec

@@ -0,0 +1,96 @@
+Name:           globalprotect-openconnect
+Version:        1.4.1
+Release:        1
+Summary:        A GlobalProtect VPN client powered by OpenConnect
+Group:          Productivity/Networking/PPP
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+License:        GPL-3.0
+URL:            https://github.com/yuezk/GlobalProtect-openconnect
+Source0:        %{name}.tar.gz
+BuildRequires:  cmake cmake(Qt5) cmake(Qt5Gui) cmake(Qt5WebEngine) cmake(Qt5WebSockets) cmake(Qt5DBus)
+BuildRequires:  systemd-rpm-macros
+Requires:       openconnect >= 8.0
+Conflicts:      globalprotect-openconnect-snapshot
+
+
+%global debug_package %{nil}
+
+%description
+A GlobalProtect VPN client (GUI) for Linux based on OpenConnect and built with Qt5, supports SAML auth mode.
+
+
+%prep
+%autosetup -n "globalprotect-openconnect-%{version}"
+
+
+%pre
+
+%if 0%{?suse_version}
+    %service_add_pre gpservice.service
+%endif
+
+
+%post
+
+%if 0%{?suse_version}
+    %service_add_post gpservice.service
+%else
+    %systemd_post gpservice.service
+%endif
+
+
+%preun
+
+%if 0%{?suse_version}
+    %service_del_preun gpservice.service
+%else
+    %systemd_preun gpservice.service
+%endif
+
+
+%postun
+
+%if 0%{?suse_version}
+    %service_del_postun gpservice.service
+%else
+    %systemd_postun gpservice.service
+%endif
+
+
+%build
+
+%cmake -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_FLAGS_RELEASE=-s
+
+%if 0%{?fedora_version} && 0%{?fedora_version} <= 32
+    %make_build
+%else
+    %cmake_build
+%endif
+
+
+%install
+
+%if 0%{?fedora_version} && 0%{?fedora_version} <= 32
+    %make_install 
+%else
+    %cmake_install
+%endif
+
+%files
+%defattr(-,root,root)
+%{_unitdir}/gpservice.service
+%{_bindir}/gpclient
+%{_bindir}/gpservice
+%{_datadir}/applications/com.yuezk.qt.gpclient.desktop
+%{_datadir}/dbus-1/system-services/com.yuezk.qt.GPService.service
+%{_datadir}/dbus-1/system.d/com.yuezk.qt.GPService.conf
+%{_datadir}/icons/hicolor/scalable/apps/com.yuezk.qt.gpclient.svg
+%{_datadir}/metainfo/com.yuezk.qt.gpclient.metainfo.xml
+
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/scalable
+%dir %{_datadir}/icons/hicolor/scalable/apps
+
+%changelog

scripts/_archive-all.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+VERSION=$(cat VERSION VERSION_SUFFIX)
+
+rm -rf ./artifacts && mkdir -p ./artifacts/{obs,aur,flatpak}
+
+# Add the version file
+echo $VERSION > ./artifacts/VERSION
+
+# Archive the source code
+git-archive-all \
+    --force-submodules \
+    --prefix=globalprotect-openconnect-${VERSION}/ \
+    ./artifacts/globalprotect-openconnect-${VERSION}.tar.gz
+
+# Prepare the OBS package
+cp -r ./packaging/obs ./artifacts
+cp ./artifacts/*.tar.gz ./artifacts/obs/globalprotect-openconnect.tar.gz
+
+# Prepare the AUR package
+cp ./packaging/aur/PKGBUILD-git ./artifacts/aur/PKGBUILD
+cp ./artifacts/*.tar.gz ./artifacts/aur/globalprotect-openconnect.tar.gz
+
+# Prepare the flatpak package
+cp ./packaging/flatpak/com.yuezk.qt.gpclient.yml ./artifacts/flatpak
+cp ./artifacts/*.tar.gz ./artifacts/flatpak/globalprotect-openconnect.tar.gz

scripts/build.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+./cmakew -B build \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_FLAGS_RELEASE=-s
+
+MAKEFLAGS=-j$(nproc) ./cmakew --build build

scripts/bump-version.sh

@@ -0,0 +1,452 @@
+#!/bin/bash
+#
+# █▄▄ █░█ █▀▄▀█ █▀█ ▄▄ █░█ █▀▀ █▀█ █▀ █ █▀█ █▄░█
+# █▄█ █▄█ █░▀░█ █▀▀ ░░ ▀▄▀ ██▄ █▀▄ ▄█ █ █▄█ █░▀█
+#
+# Description:
+#   - This script automates bumping the git software project's version using automation.
+
+#   - It does several things that are typically required for releasing a Git repository, like git tagging, 
+#     automatic updating of CHANGELOG.md, and incrementing the version number in various JSON files.
+
+#     - Increments / suggests the current software project's version number
+#     - Adds a Git tag, named after the chosen version number
+#     - Updates CHANGELOG.md
+#     - Updates VERSION file
+#     - Commits files to a new branch  
+#     - Pushes to remote (optionally)
+#     - Updates "version" : "x.x.x" tag in JSON files if [-v file1 -v file2...] argument is supplied.
+#
+# Usage: 
+#   ./bump-version.sh [-v <version number>] [-m <release message>] [-j <file1>] [-j <file2>].. [-n] [-p] [-b] [-h]
+#
+# Options:
+#   -v <version number>	  Specify a manual version number
+#   -m <release message>	Custom release message.
+#   -f <filename.json>	  Update version number inside JSON files.
+# 			                  * For multiple files, add a separate -f option for each one,
+#	  		                  * For example: ./bump-version.sh -f src/plugin/package.json -f composer.json
+#   -p <repository alias> Push commits to remote repository, eg `-p origin`
+#   -n 	                  Don't perform a commit automatically.
+#	  		                  * You may want to do that yourself, for example.
+#   -b                    Don't create automatic `release-<version>` branch
+#   -h 	                  Show help message.
+
+#
+# Detailed notes:
+#   – The contents of the `VERSION` file which should be a semantic version number such as "1.2.3" 
+#     or even "1.2.3-beta+001.ab"
+#   
+#   – It pulls a list of changes from git history & prepends to a file called CHANGELOG.md 
+#     under the title of the new version # number, allows the user to review and update the changelist
+#
+#   – Creates a Git tag with the version number
+#
+#   - Creates automatic `release-<version>` branch
+#
+#   – Commits the new version to the current repository
+#
+#   – Optionally pushes the commit to remote repository
+#
+#   – Make sure to set execute permissions for the script, eg `$ chmod 755 bump-version.sh`
+#
+# Credits:
+#   – https://github.com/jv-k/bump-version
+#
+#   - Inspired by the scripts from @pete-otaqui and @mareksuscak
+#     https://gist.github.com/pete-otaqui/4188238
+#     https://gist.github.com/mareksuscak/1f206fbc3bb9d97dec9c
+#
+
+NOW="$(date +'%B %d, %Y')"
+
+# ANSI/VT100 colours
+YELLOW='\033[1;33m'
+LIGHTYELLOW='\033[0;33m'
+RED='\033[0;31m'
+LIGHTRED='\033[1;31m'
+GREEN='\033[0;32m'
+LIGHTGREEN='\033[1;32m'
+BLUE='\033[0;34m'
+LIGHTBLUE='\033[1;34m'
+PURPLE='\033[0;35m'
+LIGHTPURPLE='\033[1;35m'
+CYAN='\033[0;36m'
+LIGHTCYAN='\033[1;36m'
+WHITE='\033[1;37m'
+LIGHTGRAY='\033[0;37m'
+DARKGRAY='\033[1;30m'
+BOLD="\033[1m"
+INVERT="\033[7m"
+RESET='\033[0m'
+
+# Default options
+FLAG_JSON="false"
+FLAG_PUSH="false"
+
+I_OK="✅"; I_STOP="🚫"; I_ERROR="❌"; I_END="👋🏻"
+
+S_NORM="${WHITE}"
+S_LIGHT="${LIGHTGRAY}"
+S_NOTICE="${GREEN}"
+S_QUESTION="${YELLOW}"
+S_WARN="${LIGHTRED}"
+S_ERROR="${RED}"
+
+V_SUGGEST="0.1.0" # This is suggested in case VERSION file or user supplied version via -v is missing
+GIT_MSG=""
+REL_NOTE=""
+REL_PREFIX="release-"
+PUSH_DEST="origin"
+
+# Show credits & help
+usage() { 
+  echo -e "$GREEN"\
+          "\n █▄▄ █░█ █▀▄▀█ █▀█ ▄▄ █░█ █▀▀ █▀█ █▀ █ █▀█ █▄░█  "\
+          "\n █▄█ █▄█ █░▀░█ █▀▀ ░░ ▀▄▀ ██▄ █▀▄ ▄█ █ █▄█ █░▀█  "\
+          "\n\t\t\t\t\t$LIGHTGRAY v${SCRIPT_VER}"\
+
+  echo -e " ${S_NORM}${BOLD}Usage:${RESET}"\
+          "\n $0 [-v <version number>] [-m <release message>] [-j <file1>] [-j <file2>].. [-n] [-p] [-h]" 1>&2; 
+  
+  echo -e "\n ${S_NORM}${BOLD}Options:${RESET}"
+  echo -e " $S_WARN-v$S_NORM <version number>\tSpecify a manual version number"
+  echo -e " $S_WARN-m$S_NORM <release message>\tCustom release message."
+  echo -e " $S_WARN-f$S_NORM <filename.json>\tUpdate version number inside JSON files."\
+          "\n\t\t\t* For multiple files, add a separate -f option for each one,"\
+          "\n\t\t\t* For example: ./bump-version.sh -f src/plugin/package.json -f composer.json"
+  echo -e " $S_WARN-p$S_NORM \t\t\tPush commits to ORIGIN. "
+  echo -e " $S_WARN-n$S_NORM \t\t\tDon't perform a commit automatically. "\
+          "\n\t\t\t* You may want to do that manually after checking everything, for example."
+  echo -e " $S_WARN-b$S_NORM \t\t\tDon't create automatic \`release-<version>\` branch"
+  echo -e " $S_WARN-h$S_NORM \t\t\tShow this help message. "
+  echo -e "\n ${S_NORM}${BOLD}Author:$S_LIGHT https://github.com/jv-t/bump-version $RESET\n"
+
+}
+
+# If there are no commits in repo, quit, because you can't tag with zero commits.
+check-commits-exist() {
+  git rev-parse HEAD &> /dev/null
+  if [ ! "$?" -eq 0 ]; then
+    echo -e "\n${I_STOP} ${S_ERROR}Your current branch doesn't have any commits yet. Can't tag without at least one commit." >&2
+    echo    
+    exit 1
+  fi
+}
+
+get-commit-msg() {
+ echo Bumped $([ -n "${V_PREV}" ] && echo "${V_PREV} –>" || echo "to ") "$V_USR_INPUT"
+}
+
+exit_abnormal() {
+  echo -e " ${S_LIGHT}––––––"
+  usage # Show help
+  exit 1
+}
+
+# Process script options
+process-arguments() {
+  local OPTIONS OPTIND OPTARG
+    
+  # Get positional parameters
+  JSON_FILES=( )
+  while getopts ":v:p:m:f:hbn" OPTIONS; do # Note: Adding the first : before the flags takes control of flags and prevents default error msgs.
+    case "$OPTIONS" in
+      h )
+        # Show help
+        exit_abnormal
+      ;;
+      v )
+        # User has supplied a version number
+        V_USR_SUPPLIED=$OPTARG
+      ;;
+      m )
+        REL_NOTE=$OPTARG
+        # Custom release note
+        echo -e "\n${S_LIGHT}Option set: ${S_NOTICE}Release note:" ${S_NORM}"'"$REL_NOTE"'"
+      ;;
+      f )
+        FLAG_JSON=true
+        echo -e "\n${S_LIGHT}Option set: ${S_NOTICE}JSON file via [-f]: <${S_NORM}${OPTARG}${S_LIGHT}>"
+        # Store JSON filenames(s)
+        JSON_FILES+=($OPTARG)
+      ;;
+      p )
+        FLAG_PUSH=true
+        PUSH_DEST=${OPTARG} # Replace default with user input
+        echo -e "\n${S_LIGHT}Option set: ${S_NOTICE}Pushing to <${S_NORM}${PUSH_DEST}${S_LIGHT}>, as the last action in this script."
+      ;;
+      n )
+        FLAG_NOCOMMIT=true
+        echo -e "\n${S_LIGHT}Option set: ${S_NOTICE}Disable commit after tagging."
+      ;;
+      b )
+        FLAG_NOBRANCH=true
+        echo -e "\n${S_LIGHT}Option set: ${S_NOTICE}Disable committing to new branch."
+      ;;
+      \? )
+        echo -e "\n${I_ERROR}${S_ERROR} Invalid option: ${S_WARN}-$OPTARG" >&2
+        echo
+        exit_abnormal
+      ;;        
+      : )
+        echo -e "\n${I_ERROR}${S_ERROR} Option ${S_WARN}-$OPTARG ${S_ERROR}requires an argument." >&2
+        echo
+        exit_abnormal
+      ;;      
+    esac
+  done
+}
+
+# Suggests version from VERSION file, or grabs from user supplied -v <version>.
+# If none is set, suggest default from options.
+process-version() {
+  if [ -f VERSION ] && [ -s VERSION ]; then    
+    V_PREV=`cat VERSION`
+
+    echo -e "\n${S_NOTICE}Current version from <${S_NORM}VERSION${S_NOTICE}> file: ${S_NORM}$V_PREV"
+
+    # Suggest incremented value from VERSION file
+    V_PREV_LIST=(`echo $V_PREV | tr '.' ' '`)
+    V_MAJOR=${V_PREV_LIST[0]}; V_MINOR=${V_PREV_LIST[1]}; V_PATCH=${V_PREV_LIST[2]};
+    
+    # Test if V_PATCH is a number, then increment it. Otherwise, do nothing
+    if [ "$V_PATCH" -eq "$V_PATCH" ] 2>/dev/null; then # discard stderr (2) output to black hole (suppress it)
+      V_PATCH=$((V_PATCH + 1)) # Increment
+    fi
+
+    V_SUGGEST="$V_MAJOR.$V_MINOR.$V_PATCH"
+  else
+    echo -ne "\n${S_WARN}The [${S_NORM}VERSION${S_WARN}] "
+    if [ ! -f VERSION ]; then 
+      echo "file was not found.";     
+    elif [ ! -s VERSION ]; then 
+      echo "file is empty."; 
+    fi
+  fi
+
+  # If a version number is supplied by the user with [-v <version number>], then use it 
+  if [ -n "$V_USR_SUPPLIED" ]; then
+    echo -e "\n${S_NOTICE}You selected version using [-v]:" "${S_WARN}${V_USR_SUPPLIED}"      
+    V_USR_INPUT="${V_USR_SUPPLIED}"
+  else
+    echo -ne "\n${S_QUESTION}Enter a new version number [${S_NORM}$V_SUGGEST${S_QUESTION}]: "
+    echo -ne "$S_WARN"
+    read V_USR_INPUT
+
+    if [ "$V_USR_INPUT" = "" ]; then
+      V_USR_INPUT="${V_SUGGEST}"
+    fi
+  fi
+  
+  # echo -e "${S_NOTICE}Setting version to [${S_NORM}${V_USR_INPUT}${S_NOTICE}] ...."
+}
+
+# Only tag if tag doesn't already exist
+check-tag-exists() {
+  TAG_CHECK_EXISTS=`git tag -l v"$V_USR_INPUT"`
+  if [ -n "$TAG_CHECK_EXISTS" ]; then
+    echo -e "\n${I_STOP} ${S_ERROR}Error: A release with that tag version number already exists!\n"
+    exit 0
+  fi
+}
+
+# $1 : version
+# $2 : release note
+tag() {
+  if [ -z "$2" ]; then
+    # Default release note
+    git tag -a "v$1" -m "Tag version $1."
+  else
+    # Custom release note
+    git tag -a "v$1" -m "$2"
+  fi
+  echo -e "\n${I_OK} ${S_NOTICE}Added GIT tag"
+}
+
+# Change `version:` value in JSON files, like packager.json, composer.json, etc
+bump-json-files() {
+  if [ "$FLAG_JSON" != true ]; then return; fi
+  
+  JSON_PROCESSED=( ) # holds filenames after they've been changed
+
+  for FILE in "${JSON_FILES[@]}"; do
+    if [ -f $FILE ]; then
+      # Get the existing version number
+      V_OLD=$( sed -n 's/.*"version": "\(.*\)",/\1/p' $FILE )
+
+      if [ "$V_OLD" = "$V_USR_INPUT" ]; then
+        echo -e "\n${S_WARN}File <${S_NORM}$FILE${S_WARN}> already contains version: ${S_NORM}$V_OLD"
+      else
+        # Write to output file
+        FILE_MSG=`sed -i .temp "s/\"version\": \"$V_OLD\"/\"version\": \"$V_USR_INPUT\"/g" $FILE 2>&1`
+        if [ "$?" -eq 0 ]; then
+          echo -e "\n${I_OK} ${S_NOTICE}Updated file: <${S_NOTICE}$FILE${S_LIGHT}> from ${S_NORM}$V_OLD -> $V_USR_INPUT"
+          rm -f ${FILE}.temp          
+          # Add file change to commit message:
+          GIT_MSG+="${GIT_MSG}Updated $FILE, "
+        else
+          echo -e "\n${I_STOP} ${S_ERROR}Error\n$PUSH_MSG\n"
+        fi
+      fi
+
+      JSON_PROCESSED+=($FILE)
+    else
+      echo -e "\n${S_WARN}File <${S_NORM}$FILE${S_WARN}> not found."
+    fi
+  done
+  # Stage files that were changed:
+  [ -n "${JSON_PROCESSED}" ] && git add "${JSON_PROCESSED[@]}"
+}
+
+# Handle VERSION file
+do-versionfile() {
+  [ -f VERSION ] && ACTION_MSG="Updated" || ACTION_MSG="Created"
+
+  GIT_MSG+="${ACTION_MSG} VERSION, "
+  echo $V_USR_INPUT | tr -d "\n" > VERSION # Create file
+  echo -e "\n${I_OK} ${S_NOTICE}${ACTION_MSG} [${S_NORM}VERSION${S_NOTICE}] file"
+
+  # Stage file for commit
+  git add VERSION
+}
+
+# Dump git log history to CHANGELOG.md
+do-changelog() {  
+
+  # Log latest commits to CHANGELOG.md:
+  # Get latest commits
+  LOG_MSG=`git log --pretty=format:"- %s" $([ -n "$V_PREV" ] && echo "v${V_PREV}...HEAD") 2>&1`
+  if [ ! "$?" -eq 0 ]; then
+    echo -e "\n${I_STOP} ${S_ERROR}Error getting commit history for logging to CHANGELOG.\n$LOG_MSG\n"
+    exit 1
+  fi
+  
+  [ -f CHANGELOG.md ] && ACTION_MSG="Updated" || ACTION_MSG="Created"
+  # Add info to commit message for later:
+  GIT_MSG+="${ACTION_MSG} CHANGELOG.md, "
+ 
+  # Add heading
+  echo "## $V_USR_INPUT ($NOW)" > tmpfile
+
+  # Log the bumping commit:
+  # - The final commit is done after do-changelog(), so we need to create the log entry for it manually:
+  echo "- ${GIT_MSG}$(get-commit-msg)" >> tmpfile
+  # Add previous commits
+  [ -n "$LOG_MSG" ] && echo "$LOG_MSG" >> tmpfile
+  
+  echo -en "\n" >> tmpfile
+
+  if [ -f CHANGELOG.md ]; then
+    # Append existing log
+    cat CHANGELOG.md >> tmpfile
+  else
+    echo -e "\n${S_WARN}A [${S_NORM}CHANGELOG.md${S_WARN}] file was not found."  
+  fi
+
+  mv tmpfile CHANGELOG.md
+  
+  # User prompts
+  echo -e "\n${I_OK} ${S_NOTICE}${ACTION_MSG} [${S_NORM}CHANGELOG.md${S_NOTICE}] file"
+  # Pause & allow user to open and edit the file:
+  echo -en "\n${S_QUESTION}Make adjustments to [${S_NORM}CHANGELOG.md${S_QUESTION}] if required now. Press <enter> to continue."
+  read
+
+  # Stage log file, to commit later
+  git add CHANGELOG.md
+}
+
+#
+check-branch-exist() {
+  [ "$FLAG_NOBRANCH" = true ] && return
+
+  BRANCH_MSG=`git rev-parse --verify "${REL_PREFIX}${V_USR_INPUT}" 2>&1`
+  if [ "$?" -eq 0 ]; then
+    echo -e "\n${I_STOP} ${S_ERROR}Error: Branch <${S_NORM}${REL_PREFIX}${V_USR_INPUT}${S_ERROR}> already exists!\n"
+    exit 1
+  fi  
+}
+
+# 
+do-branch() {
+  [ "$FLAG_NOBRANCH" = true ] && return
+
+  echo -e "\n${S_NOTICE}Creating new release branch..."
+
+  BRANCH_MSG=`git branch "${REL_PREFIX}${V_USR_INPUT}" 2>&1`
+  if [ ! "$?" -eq 0 ]; then
+    echo -e "\n${I_STOP} ${S_ERROR}Error\n$BRANCH_MSG\n"
+    exit 1
+  else
+    BRANCH_MSG=`git checkout "${REL_PREFIX}${V_USR_INPUT}" 2>&1`
+    echo -e "\n${I_OK} ${S_NOTICE}${BRANCH_MSG}"
+  fi  
+  
+  # REL_PREFIX
+}
+
+# Stage & commit all files modified by this script
+do-commit() {
+  [ "$FLAG_NOCOMMIT" = true ] && return
+
+  GIT_MSG+="$(get-commit-msg)" 
+  echo -e "\n${S_NOTICE}Committing..."
+  COMMIT_MSG=`git commit -m "${GIT_MSG}" 2>&1`
+  if [ ! "$?" -eq 0 ]; then
+    echo -e "\n${I_STOP} ${S_ERROR}Error\n$COMMIT_MSG\n"
+    exit 1
+  else
+    echo -e "\n${I_OK} ${S_NOTICE}$COMMIT_MSG"
+  fi  
+}
+
+# Pushes files + tags to remote repo. Changes are staged by earlier functions
+do-push() {
+  [ "$FLAG_NOCOMMIT" = true ] && return
+  
+  if [ "$FLAG_PUSH" = true ]; then
+    CONFIRM="Y"
+  else
+    echo -ne "\n${S_QUESTION}Push tags to <${S_NORM}${PUSH_DEST}${S_QUESTION}>? [${S_NORM}N/y${S_QUESTION}]: "
+    read CONFIRM  
+  fi
+
+  case "$CONFIRM" in
+    [yY][eE][sS]|[yY] )
+      echo -e "\n${S_NOTICE}Pushing files + tags to <${S_NORM}${PUSH_DEST}${S_NOTICE}>..."
+      PUSH_MSG=`git push "${PUSH_DEST}" v"$V_USR_INPUT" 2>&1` # Push new tag
+      if [ ! "$?" -eq 0 ]; then
+        echo -e "\n${I_STOP} ${S_WARN}Warning\n$PUSH_MSG"
+        # exit 1
+      else
+        echo -e "\n${I_OK} ${S_NOTICE}$PUSH_MSG"
+      fi  
+    ;;
+  esac  
+}
+
+#### Initiate Script ###########################
+
+check-commits-exist
+
+# Process and prepare
+process-arguments "$@"
+process-version
+
+check-branch-exist
+check-tag-exists
+
+echo -e "\n${S_LIGHT}––––––"
+
+# Update files
+bump-json-files
+do-versionfile
+# do-changelog
+# do-branch
+do-commit
+# tag "${V_USR_INPUT}" "${REL_NOTE}"
+do-push
+
+echo -e "\n${S_LIGHT}––––––"
+echo -e "\n${I_OK} ${S_NOTICE}"Bumped $([ -n "${V_PREV}" ] && echo "${V_PREV} –>" || echo "to ") "$V_USR_INPUT"
+echo -e "\n${GREEN}Done ${I_END}\n"

scripts/install-fedora.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+sudo dnf install -y \
+    qt5-qtbase-devel \
+    qt5-qtwebengine-devel \
+    qt5-qtwebsockets-devel \
+    openconnect
+
+./scripts/install.sh

scripts/install-opensuse.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+sudo zypper install -y \
+    libqt5-qtbase-devel \
+    libqt5-qtwebsockets-devel \
+    libqt5-qtwebengine-devel \
+    openconnect
+
+./scripts/install.sh

scripts/install-ubuntu.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+sudo apt update
+sudo apt install -y \
+    build-essential \
+    qtbase5-dev \
+    libqt5websockets5-dev \
+    qtwebengine5-dev \
+    openconnect
+
+./scripts/install.sh

scripts/install.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+./scripts/build.sh
+
+sudo ./cmakew --install build
+
+sudo systemctl enable gpservice.service
+sudo systemctl daemon-reload
+sudo systemctl restart gpservice.service
+
+echo -e "\nSuccess. You can launch the GlobalProtect VPN client from the application dashboard.\n"