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

@@ -0,0 +1,31 @@
+name: PR Build
+
+on:
+  pull_request:
+    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:
+    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

.gitignore

@@ -1,6 +1,19 @@
 # Binaries
-gpclient
-gpservice
+*.rpm
+*.gz
+*.snap
+.DS_Store
+build-debian
+build
+artifacts
+
+.cmake
+
+# Auto generated DBus files
+*_adaptor.cpp
+*_adaptor.h
+
+gpservice_interface.*
 
 # C++ objects and libs
 *.slo

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "singleapplication"]
-	path = singleapplication
+	path = 3rdparty/SingleApplication
 	url = https://github.com/itay-grudev/SingleApplication.git
+
+[submodule "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,59 +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
-
-# 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 \
-    main.cpp \
-    samlloginwindow.cpp \
-    gpclient.cpp
-
-HEADERS += \
-    cdpcommand.h \
-    cdpcommandmanager.h \
-    enhancedwebview.h \
-    samlloginwindow.h \
-    gpclient.h
-
-FORMS += \
-    gpclient.ui
-
-DBUS_INTERFACES += ../GPService/gpservice.xml
-
-# Default rules for deployment.
-target.path = /usr/local/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,5 +1,7 @@
+#include <QtCore/QVariantMap>
+#include <plog/Log.h>
+
 #include "cdpcommandmanager.h"
-#include <QVariantMap>
 
 CDPCommandManager::CDPCommandManager(QObject *parent)
     : QObject(parent)
@@ -27,7 +29,7 @@ void CDPCommandManager::initialize(QString endpoint)
         reply, &QNetworkReply::finished,
         [reply, this]() {
             if (reply->error()) {
-                qDebug() << "CDP request error";
+                PLOGE << "CDP request error";
                 return;
             }
 
@@ -76,10 +78,10 @@ void CDPCommandManager::onTextMessageReceived(QString message)
 
 void CDPCommandManager::onSocketDisconnected()
 {
-    qDebug() << "WebSocket disconnected";
+    PLOGI << "WebSocket disconnected";
 }
 
 void CDPCommandManager::onSocketError(QAbstractSocket::SocketError error)
 {
-    qDebug() << "WebSocket error" << error;
+    PLOGE << "WebSocket error" << error;
 }

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,10 +0,0 @@
-[Desktop Entry]
-
-Type=Application
-Version=1.0.0
-Name=GlobalProtect VPN
-Comment=GlobalProtect VPN client, supports SAML auth mode
-Exec=/usr/local/bin/gpclient
-Icon=com.yuezk.qt.GPClient
-Categories=Network;VPN;Utility;Qt;
-Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;

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

@@ -0,0 +1,226 @@
+#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 "challengedialog.h"
+
+using namespace gpclient::helper;
+
+GatewayAuthenticator::GatewayAuthenticator(const QString& gateway, GatewayAuthenticatorParams params)
+    : QObject()
+    , 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")
+{
+    if (!params.clientos().isEmpty()) {
+        preloginUrl = preloginUrl + "&clientos=" + params.clientos();
+    }
+}
+
+GatewayAuthenticator::~GatewayAuthenticator()
+{
+    delete normalLoginWindow;
+}
+
+void GatewayAuthenticator::authenticate()
+{
+    PLOGI << "Start gateway authentication...";
+
+    LoginParams loginParams { params.clientos() };
+    loginParams.setUser(params.username());
+    loginParams.setPassword(params.password());
+    loginParams.setUserAuthCookie(params.userAuthCookie());
+    loginParams.setInputStr(params.inputStr());
+
+    login(loginParams);
+}
+
+void GatewayAuthenticator::login(const LoginParams &loginParams)
+{
+    PLOGI << "Trying to login the gateway at " << loginUrl << " with " << loginParams.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 = reply->readAll();
+
+    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);
+            openMessageBox("Gateway login failed.", "Please check your credentials and try again.");
+        } else {
+            doAuth();
+        }
+        return;
+    }
+
+    // 2FA
+    if (response.contains("Challenge")) {
+        PLOGI << "The server need input the challenge...";
+        showChallenge(response);
+        return;
+    }
+
+    if (normalLoginWindow) {
+        normalLoginWindow->close();
+    }
+
+    const QUrlQuery params = gpclient::helper::parseGatewayResponse(response);
+    emit success(params.toString());
+}
+
+void GatewayAuthenticator::doAuth()
+{
+    PLOGI << "Perform the gateway prelogin at " << preloginUrl;
+
+    QNetworkReply *reply = createRequest(preloginUrl);
+    connect(reply, &QNetworkReply::finished, this, &GatewayAuthenticator::onPreloginFinished);
+}
+
+void GatewayAuthenticator::onPreloginFinished()
+{
+    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
+    if (reply->error()) {
+        PLOGE << QString("Failed to prelogin the gateway at %1, %2").arg(preloginUrl, reply->errorString());
+
+        emit fail("Error occurred on the gateway prelogin interface.");
+        return;
+    }
+
+    PLOGI << "Gateway prelogin succeeded.";
+
+    PreloginResponse response = PreloginResponse::parse(reply->readAll());
+
+    if (response.hasSamlAuthFields()) {
+        samlAuth(response.samlMethod(), response.samlRequest(), reply->url().toString());
+    } else if (response.hasNormalAuthFields()) {
+        normalAuth(response.labelUsername(), response.labelPassword(), response.authMessage());
+    } else {
+        PLOGE << QString("Unknown prelogin response for %1, got %2").arg(preloginUrl, QString::fromUtf8(response.rawResponse()));
+        emit fail("Unknown response for gateway prelogin interface.");
+    }
+
+    delete reply;
+}
+
+void GatewayAuthenticator::normalAuth(QString labelUsername, QString labelPassword, QString authMessage)
+{
+    PLOGI << QString("Trying to perform the normal login with %1 / %2 credentials").arg(labelUsername, labelPassword);
+
+    normalLoginWindow = new NormalLoginWindow;
+    normalLoginWindow->setPortalAddress(gateway);
+    normalLoginWindow->setAuthMessage(authMessage);
+    normalLoginWindow->setUsernameLabel(labelUsername);
+    normalLoginWindow->setPasswordLabel(labelPassword);
+
+    // Do login
+    connect(normalLoginWindow, &NormalLoginWindow::performLogin, this, &GatewayAuthenticator::onPerformNormalLogin);
+    connect(normalLoginWindow, &NormalLoginWindow::rejected, this, &GatewayAuthenticator::onLoginWindowRejected);
+    connect(normalLoginWindow, &NormalLoginWindow::finished, this, &GatewayAuthenticator::onLoginWindowFinished);
+
+    normalLoginWindow->show();
+}
+
+void GatewayAuthenticator::onPerformNormalLogin(const QString &username, const QString &password)
+{
+    PLOGI << "Start to perform normal login...";
+
+    normalLoginWindow->setProcessing(true);
+    params.setUsername(username);
+    params.setPassword(password);
+    
+    authenticate();
+}
+
+void GatewayAuthenticator::onLoginWindowRejected()
+{
+    emit fail();
+}
+
+void GatewayAuthenticator::onLoginWindowFinished()
+{
+    delete normalLoginWindow;
+    normalLoginWindow = nullptr;
+}
+
+void GatewayAuthenticator::samlAuth(QString samlMethod, QString samlRequest, QString preloginUrl)
+{
+    PLOGI << "Trying to perform SAML login with saml-method " << samlMethod;
+
+    SAMLLoginWindow *loginWindow = new SAMLLoginWindow;
+
+    connect(loginWindow, &SAMLLoginWindow::success, this, &GatewayAuthenticator::onSAMLLoginSuccess);
+    connect(loginWindow, &SAMLLoginWindow::fail, this, &GatewayAuthenticator::onSAMLLoginFail);
+    connect(loginWindow, &SAMLLoginWindow::rejected, this, &GatewayAuthenticator::onLoginWindowRejected);
+
+    loginWindow->login(samlMethod, samlRequest, preloginUrl);
+}
+
+void GatewayAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> &samlResult)
+{
+    if (samlResult.contains("preloginCookie")) {
+        PLOGI << "SAML login succeeded, got the prelogin-cookie " << samlResult.value("preloginCookie");
+    } else {
+        PLOGI << "SAML login succeeded, got the portal-userauthcookie " << samlResult.value("userAuthCookie");
+    }
+
+    LoginParams loginParams { params.clientos() };
+    loginParams.setUser(samlResult.value("username"));
+    loginParams.setPreloginCookie(samlResult.value("preloginCookie"));
+    loginParams.setUserAuthCookie(samlResult.value("userAuthCookie"));
+
+    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

@@ -0,0 +1,49 @@
+#ifndef GATEWAYAUTHENTICATOR_H
+#define GATEWAYAUTHENTICATOR_H
+
+#include <QtCore/QObject>
+
+#include "normalloginwindow.h"
+#include "challengedialog.h"
+#include "loginparams.h"
+#include "gatewayauthenticatorparams.h"
+
+class GatewayAuthenticator : public QObject
+{
+    Q_OBJECT
+public:
+    explicit GatewayAuthenticator(const QString& gateway, GatewayAuthenticatorParams params);
+    ~GatewayAuthenticator();
+
+    void authenticate();
+
+signals:
+    void success(const QString& authCookie);
+    void fail(const QString& msg = "");
+
+private slots:
+    void onLoginFinished();
+    void onPreloginFinished();
+    void onPerformNormalLogin(const QString &username, const QString &password);
+    void onLoginWindowRejected();
+    void onLoginWindowFinished();
+    void onSAMLLoginSuccess(const QMap<QString, QString> &samlResult);
+    void onSAMLLoginFail(const QString msg);
+
+private:
+    QString gateway;
+    GatewayAuthenticatorParams params;
+    QString preloginUrl;
+    QString loginUrl;
+
+    NormalLoginWindow *normalLoginWindow{ nullptr };
+    ChallengeDialog *challengeDialog{ nullptr };
+
+    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,227 +1,500 @@
+#include <QtGui/QIcon>
+#include <plog/Log.h>
+
 #include "gpclient.h"
+#include "gphelper.h"
 #include "ui_gpclient.h"
-#include "samlloginwindow.h"
+#include "portalauthenticator.h"
+#include "gatewayauthenticator.h"
+#include "settingsdialog.h"
+#include "gatewayauthenticatorparams.h"
 
-#include <QDesktopWidget>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QGraphicsPixmapItem>
-#include <QImage>
-#include <QStyle>
-#include <QMessageBox>
+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);
+
+    setWindowTitle("GlobalProtect");
     setFixedSize(width(), height());
-    moveCenter();
+    gpclient::helper::moveCenter(this);
+
+    setupSettings();
 
     // Restore portal from the previous settings
-    settings = new QSettings("com.yuezk.qt", "GPClient");
-    ui->portalInput->setText(settings->value("portal", "").toString());
-
-    QObject::connect(this, &GPClient::connectFailed, [this]() {
-        updateConnectionStatus("not_connected");
-    });
-
-    // QNetworkAccessManager setup
-    networkManager = new QNetworkAccessManager(this);
+    this->portal(settings::get("portal", "").toString());
 
     // DBus service setup
-    vpn = new com::yuezk::qt::GPService("com.yuezk.qt.GPService", "/", QDBusConnection::systemBus(), this);
-    QObject::connect(vpn, &com::yuezk::qt::GPService::connected, this, &GPClient::onVPNConnected);
-    QObject::connect(vpn, &com::yuezk::qt::GPService::disconnected, this, &GPClient::onVPNDisconnected);
-    QObject::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();
     initVpnStatus();
 }
 
 GPClient::~GPClient()
 {
     delete ui;
-    delete networkManager;
-    delete reply;
     delete vpn;
-    delete settings;
+    delete settingsDialog;
+    delete settingsButton;
+}
+
+void GPClient::setupSettings()
+{
+    settingsButton = new QPushButton(this);
+    settingsButton->setIcon(QIcon(":/images/settings_icon.png"));
+    settingsButton->setFixedSize(QSize(28, 28));
+
+    QRect rect = this->geometry();
+    settingsButton->setGeometry(
+                rect.width() - settingsButton->width() - 15,
+                15,
+                settingsButton->geometry().width(),
+                settingsButton->geometry().height()
+                );
+
+    connect(settingsButton, &QPushButton::clicked, this, &GPClient::onSettingsButtonClicked);
+    connect(settingsDialog, &QDialog::accepted, this, &GPClient::onSettingsAccepted);
+}
+
+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()
 {
-    QString btnText = ui->connectButton->text();
-
-    if (btnText == "Connect") {
-        QString portal = ui->portalInput->text();
-        settings->setValue("portal", portal);
-        ui->statusLabel->setText("Authenticating...");
-        updateConnectionStatus("pending");
-        doAuth(portal);
-    } else if (btnText == "Cancel") {
-        ui->statusLabel->setText("Canceling...");
-        updateConnectionStatus("pending");
-
-        if (reply->isRunning()) {
-            reply->abort();
-        }
-        vpn->disconnect();
-    } else {
-        ui->statusLabel->setText("Disconnecting...");
-        updateConnectionStatus("pending");
-        vpn->disconnect();
-    }
+    doConnect();
 }
 
-void GPClient::preloginResultFinished()
+void GPClient::on_portalInput_returnPressed()
 {
-    if (reply->error()) {
-        qWarning() << "Prelogin request error";
-        emit connectFailed();
-        return;
-    }
-
-    QByteArray bytes = reply->readAll();
-    const QString tagMethod = "saml-auth-method";
-    const QString tagRequest = "saml-request";
-    QString samlMethod;
-    QString samlRequest;
-
-    QXmlStreamReader xml(bytes);
-    while (!xml.atEnd()) {
-        xml.readNext();
-        if (xml.tokenType() == xml.StartElement) {
-            if (xml.name() == tagMethod) {
-                samlMethod = xml.readElementText();
-            } else if (xml.name() == tagRequest) {
-                samlRequest = QByteArray::fromBase64(QByteArray::fromStdString(xml.readElementText().toStdString()));
-            }
-        }
-    }
-
-    if (samlMethod == nullptr || samlRequest == nullptr) {
-        qWarning("This does not appear to be a SAML prelogin response (<saml-auth-method> or <saml-request> tags missing)");
-        emit connectFailed();
-        return;
-    }
-
-    if (samlMethod == "POST") {
-        // TODO
-        emit connectFailed();
-        QMessageBox msgBox;
-        msgBox.setText("TODO: SAML method is POST");
-        msgBox.exec();
-    } else if (samlMethod == "REDIRECT") {
-        samlLogin(samlRequest);
-    }
+    doConnect();
 }
 
-void GPClient::onLoginSuccess(QJsonObject loginResult)
+void GPClient::on_portalInput_editingFinished()
 {
-    QString fullpath = "/ssl-vpn/login.esp";
-    QString shortpath = "gateway";
-    QString user = loginResult.value("saml-username").toString();
-    QString cookieName;
-    QString cookieValue;
-    QString cookies[]{"prelogin-cookie", "portal-userauthcookie"};
-
-    for (int i = 0; i < cookies->length(); i++) {
-        cookieValue = loginResult.value(cookies[i]).toString();
-        if (cookieValue != nullptr) {
-            cookieName = cookies[i];
-            break;
-        }
-    }
-
-    QString host = QString("https://%1/%2:%3").arg(loginResult.value("server").toString(), shortpath, cookieName);
-    vpn->connect(host, user, cookieValue);
-    ui->statusLabel->setText("Connecting...");
-    updateConnectionStatus("pending");
+    populateGatewayMenu();
 }
 
-void GPClient::updateConnectionStatus(QString status)
+void GPClient::initSystemTrayIcon()
 {
-    if (status == "not_connected") {
-        ui->statusLabel->setText("Not Connected");
-        ui->statusImage->setStyleSheet("image: url(:/images/not_connected.png); padding: 15;");
-        ui->connectButton->setText("Connect");
-        ui->connectButton->setDisabled(false);
-    } else if (status == "pending") {
-        ui->statusImage->setStyleSheet("image: url(:/images/pending.png); padding: 15;");
-        ui->connectButton->setText("Cancel");
-        ui->connectButton->setDisabled(false);
-    } else if (status == "connected") {
-        ui->statusLabel->setText("Connected");
-        ui->statusImage->setStyleSheet("image: url(:/images/connected.png); padding: 15;");
-        ui->connectButton->setText("Disconnect");
-        ui->connectButton->setDisabled(false);
-    }
-}
+    systemTrayIcon = new QSystemTrayIcon(this);
+    contextMenu = new QMenu("GlobalProtect", this);
 
-void GPClient::onVPNConnected()
-{
-    updateConnectionStatus("connected");
-}
+    gatewaySwitchMenu = new QMenu("Switch Gateway", this);
+    gatewaySwitchMenu->setIcon(QIcon::fromTheme("network-workgroup"));
+    populateGatewayMenu();
 
-void GPClient::onVPNDisconnected()
-{
-    updateConnectionStatus("not_connected");
-}
+    systemTrayIcon->setIcon(QIcon(":/images/not_connected.png"));
+    systemTrayIcon->setToolTip("GlobalProtect");
+    systemTrayIcon->setContextMenu(contextMenu);
 
-void GPClient::onVPNLogAvailable(QString log)
-{
-    qInfo() << log;
+    connect(systemTrayIcon, &QSystemTrayIcon::activated, this, &GPClient::onSystemTrayActivated);
+    connect(gatewaySwitchMenu, &QMenu::triggered, this, &GPClient::onGatewayChanged);
+
+    openAction = contextMenu->addAction(QIcon::fromTheme("window-new"), "Open", this, &GPClient::activate);
+    connectAction = contextMenu->addAction(QIcon::fromTheme("preferences-system-network"), "Connect", this, &GPClient::doConnect);
+    contextMenu->addMenu(gatewaySwitchMenu);
+    contextMenu->addSeparator();
+    clearAction = contextMenu->addAction(QIcon::fromTheme("edit-clear"), "Reset Settings", this, &GPClient::clearSettings);
+    quitAction = contextMenu->addAction(QIcon::fromTheme("application-exit"), "Quit", this, &GPClient::quit);
+
+    systemTrayIcon->show();
 }
 
 void GPClient::initVpnStatus() {
     int status = vpn->status();
+
     if (status == 1) {
         ui->statusLabel->setText("Connecting...");
-        updateConnectionStatus("pending");
+        updateConnectionStatus(VpnStatus::pending);
     } else if (status == 2) {
-        updateConnectionStatus("connected");
+        updateConnectionStatus(VpnStatus::connected);
     } else if (status == 3) {
         ui->statusLabel->setText("Disconnecting...");
-        updateConnectionStatus("pending");
+        updateConnectionStatus(VpnStatus::pending);
+    } else {
+        updateConnectionStatus(VpnStatus::disconnected);
     }
 }
 
-void GPClient::moveCenter()
+void GPClient::populateGatewayMenu()
 {
-    QDesktopWidget *desktop = QApplication::desktop();
+    PLOGI << "Populating the Switch Gateway menu...";
 
-    int screenWidth, width;
-    int screenHeight, height;
-    int x, y;
-    QSize windowSize;
+    const QList<GPGateway> gateways = allGateways();
+    gatewaySwitchMenu->clear();
 
-    screenWidth = desktop->width();
-    screenHeight = desktop->height();
+    if (gateways.isEmpty()) {
+        gatewaySwitchMenu->addAction("<None>")->setData(-1);
+        return;
+    }
 
-    windowSize = size();
-    width = windowSize.width();
-    height = windowSize.height();
-
-    x = (screenWidth - width) / 2;
-    y = (screenHeight - height) / 2;
-    y -= 50;
-    move(x, y);
+    const QString currentGatewayName = currentGateway().name();
+    for (int i = 0; i < gateways.length(); i++) {
+        const GPGateway g = gateways.at(i);
+        QString iconImage = ":/images/radio_unselected.png";
+        if (g.name() == currentGatewayName) {
+            iconImage = ":/images/radio_selected.png";
+        }
+        gatewaySwitchMenu->addAction(QIcon(iconImage), g.name())->setData(i);
+    }
 }
 
-void GPClient::doAuth(const QString portal)
+void GPClient::updateConnectionStatus(const GPClient::VpnStatus &status)
 {
-    const QString preloginUrl = "https://" + portal + "/ssl-vpn/prelogin.esp";
-    reply = networkManager->post(QNetworkRequest(preloginUrl), (QByteArray) nullptr);
-    connect(reply, &QNetworkReply::finished, this, &GPClient::preloginResultFinished);
+    switch (status) {
+        case VpnStatus::disconnected:
+            ui->statusLabel->setText("Not Connected");
+            ui->statusImage->setStyleSheet("image: url(:/images/not_connected.png); padding: 15;");
+            ui->connectButton->setText("Connect");
+            ui->connectButton->setDisabled(false);
+            ui->portalInput->setReadOnly(false);
+
+            systemTrayIcon->setIcon(QIcon{ ":/images/not_connected.png" });
+            connectAction->setEnabled(true);
+            connectAction->setText("Connect");
+            gatewaySwitchMenu->setEnabled(true);
+            clearAction->setEnabled(true);
+            break;
+        case VpnStatus::pending:
+            ui->statusImage->setStyleSheet("image: url(:/images/pending.png); padding: 15;");
+            ui->connectButton->setDisabled(true);
+            ui->portalInput->setReadOnly(true);
+
+            systemTrayIcon->setIcon(QIcon{ ":/images/pending.png" });
+            connectAction->setEnabled(false);
+            gatewaySwitchMenu->setEnabled(false);
+            clearAction->setEnabled(false);
+            break;
+        case VpnStatus::connected:
+            ui->statusLabel->setText("Connected");
+            ui->statusImage->setStyleSheet("image: url(:/images/connected.png); padding: 15;");
+            ui->connectButton->setText("Disconnect");
+            ui->connectButton->setDisabled(false);
+            ui->portalInput->setReadOnly(true);
+
+            systemTrayIcon->setIcon(QIcon{ ":/images/connected.png" });
+            connectAction->setEnabled(true);
+            connectAction->setText("Disconnect");
+            gatewaySwitchMenu->setEnabled(true);
+            clearAction->setEnabled(false);
+            break;
+        default:
+            break;
+    }
 }
 
-void GPClient::samlLogin(const QString loginUrl)
+void GPClient::onSystemTrayActivated(QSystemTrayIcon::ActivationReason reason)
 {
-    SAMLLoginWindow *loginWindow = new SAMLLoginWindow(this);
-
-    QObject::connect(loginWindow, &SAMLLoginWindow::success, this, &GPClient::onLoginSuccess);
-    QObject::connect(loginWindow, &SAMLLoginWindow::rejected, this, &GPClient::connectFailed);
-
-    loginWindow->login(loginUrl);
-    loginWindow->exec();
-    delete loginWindow;
+    switch (reason) {
+        case QSystemTrayIcon::Trigger:
+        case QSystemTrayIcon::DoubleClick:
+            this->activate();
+            break;
+        default:
+            break;
+    }
+}
+
+void GPClient::onGatewayChanged(QAction *action)
+{
+    const int index = action->data().toInt();
+
+    if (index == -1) {
+        return;
+    }
+
+    const GPGateway g = allGateways().at(index);
+
+    // If the selected gateway is the same as the current gateway
+    if (g.name() == currentGateway().name()) {
+        return;
+    }
+
+    setCurrentGateway(g);
+
+    if (connected()) {
+        ui->statusLabel->setText("Switching Gateway...");
+        ui->connectButton->setEnabled(false);
+
+        vpn->disconnect();
+        isSwitchingGateway = true;
+    }
+}
+
+void GPClient::doConnect()
+{
+    PLOGI << "Start connecting...";
+
+    const QString btnText = ui->connectButton->text();
+    const QString portal = this->portal();
+
+    // Display the main window if portal is empty
+    if (portal.isEmpty()) {
+        activate();
+        return;
+    }
+
+    if (btnText.endsWith("Connect")) {
+        settings::save("portal", portal);
+
+        // Login to the previously saved gateway
+        if (!currentGateway().name().isEmpty()) {
+            PLOGI << "Start gateway login using the previously saved gateway...";
+            isQuickConnect = true;
+            gatewayLogin();
+        } else {
+            // Perform the portal login
+            PLOGI << "Start portal login...";
+            portalLogin();
+        }
+    } else {
+        PLOGI << "Start disconnecting the VPN...";
+
+        ui->statusLabel->setText("Disconnecting...");
+        updateConnectionStatus(VpnStatus::pending);
+        vpn->disconnect();
+    }
+}
+
+// Login to the portal interface to get the portal config and preferred gateway
+void GPClient::portalLogin()
+{
+    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
+    connect(portalAuth, &PortalAuthenticator::preloginFailed, this, &GPClient::onPortalPreloginFail);
+    connect(portalAuth, &PortalAuthenticator::portalConfigFailed, this, &GPClient::onPortalConfigFail);
+    // Portal login failed
+    connect(portalAuth, &PortalAuthenticator::fail, this, &GPClient::onPortalFail);
+
+    ui->statusLabel->setText("Authenticating...");
+    updateConnectionStatus(VpnStatus::pending);
+    portalAuth->authenticate();
+}
+
+void GPClient::onPortalSuccess(const PortalConfigResponse portalConfig, const QString region)
+{
+    PLOGI << "Portal authentication succeeded.";
+
+    // No gateway found in protal configuration
+    if (portalConfig.allGateways().size() == 0) {
+        PLOGI << "No gateway found in portal configuration, treat the portal address as a gateway.";
+        tryGatewayLogin();
+        return;
+    }
+
+    GPGateway gateway = filterPreferredGateway(portalConfig.allGateways(), region);
+    setAllGateways(portalConfig.allGateways());
+    setCurrentGateway(gateway);
+    this->portalConfig = portalConfig;
+
+    gatewayLogin();
+}
+
+void GPClient::onPortalPreloginFail(const QString msg)
+{
+    PLOGI << "Portal prelogin failed: " << msg;
+    tryGatewayLogin();
+}
+
+void GPClient::onPortalConfigFail(const QString msg)
+{
+    PLOGI << "Failed to get the portal configuration, " << msg << " Treat the portal address as gateway.";
+    tryGatewayLogin();
+}
+
+void GPClient::onPortalFail(const QString &msg)
+{
+    if (!msg.isEmpty()) {
+        openMessageBox("Portal authentication failed.", msg);
+    }
+
+    updateConnectionStatus(VpnStatus::disconnected);
+}
+
+void GPClient::tryGatewayLogin()
+{
+    PLOGI << "Try to preform login on the the gateway interface...";
+
+    // Treat the portal input as the gateway address
+    GPGateway g;
+    g.setName(portal());
+    g.setAddress(portal());
+
+    QList<GPGateway> gateways;
+    gateways.append(g);
+
+    setAllGateways(gateways);
+    setCurrentGateway(g);
+
+    gatewayLogin();
+}
+
+// Login to the gateway
+void GPClient::gatewayLogin()
+{
+    PLOGI << "Performing gateway login...";
+
+    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);
+
+    ui->statusLabel->setText("Authenticating...");
+    updateConnectionStatus(VpnStatus::pending);
+    gatewayAuth->authenticate();
+}
+
+void GPClient::onGatewaySuccess(const QString &authCookie)
+{
+    PLOGI << "Gateway login succeeded, got the cookie " << authCookie;
+
+    isQuickConnect = false;
+    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);
+}
+
+void GPClient::onGatewayFail(const QString &msg)
+{
+    // If the quick connect on gateway failed, perform the portal login
+    if (isQuickConnect && !msg.isEmpty()) {
+        isQuickConnect = false;
+        portalLogin();
+        return;
+    }
+
+    if (!msg.isEmpty()) {
+        openMessageBox("Gateway authentication failed.", msg);
+    }
+
+    updateConnectionStatus(VpnStatus::disconnected);
+}
+
+void GPClient::activate()
+{
+    activateWindow();
+    showNormal();
+}
+
+QString GPClient::portal() const
+{
+    const QString input = ui->portalInput->text().trimmed();
+
+    if (input.startsWith("http")) {
+        return QUrl(input).authority();
+    }
+    return input;
+}
+
+void GPClient::portal(QString p)
+{
+    ui->portalInput->setText(p);
+}
+
+bool GPClient::connected() const
+{
+    const QString statusText = ui->statusLabel->text();
+    return statusText.contains("Connected") && !statusText.contains("Not");
+}
+
+QList<GPGateway> GPClient::allGateways() const
+{
+    const QString gatewaysJson = settings::get(portal() + "_gateways").toString();
+    return GPGateway::fromJson(gatewaysJson);
+}
+
+void GPClient::setAllGateways(QList<GPGateway> gateways)
+{
+    PLOGI << "Updating all the gateways...";
+
+    settings::save(portal() + "_gateways", GPGateway::serialize(gateways));
+    populateGatewayMenu();
+}
+
+GPGateway GPClient::currentGateway() const
+{
+    const QString selectedGateway = settings::get(portal() + "_selectedGateway").toString();
+
+    for (auto g : allGateways()) {
+        if (g.name() == selectedGateway) {
+            return g;
+        }
+    }
+    return GPGateway{};
+}
+
+void GPClient::setCurrentGateway(const GPGateway gateway)
+{
+    PLOGI << "Updating the current gateway to " << gateway.name();
+
+    settings::save(portal() + "_selectedGateway", gateway.name());
+    populateGatewayMenu();
+}
+
+void GPClient::clearSettings()
+{
+    settings::clear();
+    populateGatewayMenu();
+    ui->portalInput->clear();
+}
+
+void GPClient::quit()
+{
+    vpn->disconnect();
+    QApplication::quit();
+}
+
+void GPClient::onVPNConnected()
+{
+    updateConnectionStatus(VpnStatus::connected);
+}
+
+void GPClient::onVPNDisconnected()
+{
+    updateConnectionStatus(VpnStatus::disconnected);
+
+    if (isSwitchingGateway) {
+        gatewayLogin();
+        isSwitchingGateway = false;
+    }
+}
+
+void GPClient::onVPNError(QString errorMessage)
+{
+    updateConnectionStatus(VpnStatus::disconnected);
+    openMessageBox("Failed to connect", errorMessage);
+}
+
+void GPClient::onVPNLogAvailable(QString log)
+{
+    PLOGI << log;
 }

GPClient/gpclient.h

@@ -1,10 +1,14 @@
 #ifndef GPCLIENT_H
 #define GPCLIENT_H
 
-#include "gpservice_interface.h"
-#include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QSystemTrayIcon>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QPushButton>
+
+#include "portalconfigresponse.h"
+#include "settingsdialog.h"
+#include "vpn.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class GPClient; }
@@ -15,33 +19,87 @@ class GPClient : public QMainWindow
     Q_OBJECT
 
 public:
-    GPClient(QWidget *parent = nullptr);
+    GPClient(QWidget *parent, IVpn *vpn);
     ~GPClient();
 
-signals:
-    void connectFailed();
+    void activate();
+    void quit();
+
+    QString portal() const;
+    void portal(QString);
+
+    GPGateway currentGateway() const;
+    void setCurrentGateway(const GPGateway gateway);
+
+    void doConnect();
 
 private slots:
-    void on_connectButton_clicked();
-    void preloginResultFinished();
+    void onSettingsButtonClicked();
+    void onSettingsAccepted();
 
-    void onLoginSuccess(QJsonObject loginResult);
+    void on_connectButton_clicked();
+    void on_portalInput_returnPressed();
+    void on_portalInput_editingFinished();
+
+    void onSystemTrayActivated(QSystemTrayIcon::ActivationReason reason);
+    void onGatewayChanged(QAction *action);
+
+    void onPortalSuccess(const PortalConfigResponse portalConfig, const QString region);
+    void onPortalPreloginFail(const QString msg);
+    void onPortalConfigFail(const QString msg);
+    void onPortalFail(const QString &msg);
+
+    void onGatewaySuccess(const QString &authCookie);
+    void onGatewayFail(const QString &msg);
 
     void onVPNConnected();
     void onVPNDisconnected();
+    void onVPNError(QString errorMessage);
     void onVPNLogAvailable(QString log);
 
 private:
-    Ui::GPClient *ui;
-    QNetworkAccessManager *networkManager;
-    QNetworkReply *reply;
-    com::yuezk::qt::GPService *vpn;
-    QSettings *settings;
+    enum class VpnStatus
+    {
+        disconnected,
+        pending,
+        connected
+    };
 
+    Ui::GPClient *ui;
+    IVpn *vpn;
+
+    QSystemTrayIcon *systemTrayIcon;
+    QMenu *contextMenu;
+    QAction *openAction;
+    QAction *connectAction;
+
+    QMenu *gatewaySwitchMenu;
+    QAction *clearAction;
+    QAction *quitAction;
+
+    SettingsDialog *settingsDialog;
+    QPushButton *settingsButton;
+
+    bool isQuickConnect { false };
+    bool isSwitchingGateway { false };
+    PortalConfigResponse portalConfig;
+
+    void setupSettings();
+
+    void initSystemTrayIcon();
     void initVpnStatus();
-    void moveCenter();
-    void updateConnectionStatus(QString status);
-    void doAuth(const QString portal);
-    void samlLogin(const QString loginUrl);
+    void populateGatewayMenu();
+    void updateConnectionStatus(const VpnStatus &status);
+
+    void portalLogin();
+    void tryGatewayLogin();
+    void gatewayLogin();
+
+    bool connected() const;
+
+    QList<GPGateway> allGateways() const;
+    void setAllGateways(QList<GPGateway> gateways);
+
+    void clearSettings();
 };
 #endif // GPCLIENT_H

GPClient/gpclient.ui

@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>260</width>
-    <height>338</height>
+    <height>362</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>GP VPN Client</string>
+   <string>GlobalProtect OpenConnect</string>
   </property>
   <property name="windowIcon">
    <iconset resource="resources.qrc">
@@ -36,7 +36,7 @@
    <property name="layoutDirection">
     <enum>Qt::LeftToRight</enum>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,0">
+   <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,0,0">
     <property name="leftMargin">
      <number>15</number>
     </property>
@@ -113,10 +113,26 @@
         <property name="text">
          <string>Connect</string>
         </property>
+        <property name="autoDefault">
+         <bool>true</bool>
+        </property>
+        <property name="default">
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
      </layout>
     </item>
+    <item>
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://bit.ly/3g5DHqy&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4c6b8a;&quot;&gt;Report a bug&lt;/span&gt;&lt;/a&gt; / &lt;a href=&quot;https://bit.ly/3jQYfEi&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4c6b8a;&quot;&gt;Buy me a coffee&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+      <property name="openExternalLinks">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

GPClient/gpgateway.cpp

@@ -0,0 +1,97 @@
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+
+#include "gpgateway.h"
+
+GPGateway::GPGateway()
+{
+}
+
+QString GPGateway::name() const
+{
+    return _name;
+}
+
+QString GPGateway::address() const
+{
+    return _address;
+}
+
+void GPGateway::setName(const QString &name)
+{
+    _name = name;
+}
+
+void GPGateway::setAddress(const QString &address)
+{
+    _address = address;
+}
+
+void GPGateway::setPriorityRules(const QMap<QString, int> &priorityRules)
+{
+    _priorityRules = priorityRules;
+}
+
+int GPGateway::priorityOf(QString ruleName) const
+{
+    if (_priorityRules.contains(ruleName)) {
+        return _priorityRules.value(ruleName);
+    }
+    return 0;
+}
+
+QJsonObject GPGateway::toJsonObject() const
+{
+    QJsonObject obj;
+    obj.insert("name", name());
+    obj.insert("address", address());
+
+    return obj;
+}
+
+QString GPGateway::toString() const
+{
+    QJsonDocument jsonDoc{ toJsonObject() };
+    return QString::fromUtf8(jsonDoc.toJson());
+}
+
+QString GPGateway::serialize(QList<GPGateway> &gateways)
+{
+    QJsonArray arr;
+
+    for (auto g : gateways) {
+        arr.append(g.toJsonObject());
+    }
+
+    QJsonDocument jsonDoc{ arr };
+    return QString::fromUtf8(jsonDoc.toJson());
+}
+
+QList<GPGateway> GPGateway::fromJson(const QString &jsonString)
+{
+    QList<GPGateway> gateways;
+
+    if (jsonString.isEmpty()) {
+        return gateways;
+    }
+
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonString.toUtf8());
+
+    for (auto item : jsonDoc.array()) {
+        GPGateway g = GPGateway::fromJsonObject(item.toObject());
+        gateways.append(g);
+    }
+
+    return gateways;
+}
+
+GPGateway GPGateway::fromJsonObject(const QJsonObject &jsonObj)
+{
+    GPGateway g;
+
+    g.setName(jsonObj.value("name").toString());
+    g.setAddress(jsonObj.value("address").toString());
+
+    return g;
+}

GPClient/gpgateway.h

@@ -0,0 +1,33 @@
+#ifndef GPGATEWAY_H
+#define GPGATEWAY_H
+
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QJsonObject>
+
+class GPGateway
+{
+public:
+    GPGateway();
+
+    QString name() const;
+    QString address() const;
+
+    void setName(const QString &name);
+    void setAddress(const QString &address);
+    void setPriorityRules(const QMap<QString, int> &priorityRules);
+    int priorityOf(QString ruleName) const;
+    QJsonObject toJsonObject() const;
+    QString toString() const;
+
+    static QString serialize(QList<GPGateway> &gateways);
+    static QList<GPGateway> fromJson(const QString &jsonString);
+    static GPGateway fromJsonObject(const QJsonObject &jsonObj);
+
+private:
+    QString _name;
+    QString _address;
+    QMap<QString, int> _priorityRules;
+};
+
+#endif // GPGATEWAY_H

GPClient/gphelper.cpp

@@ -0,0 +1,129 @@
+#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)
+{
+    QNetworkRequest request(url);
+
+    // Skip the ssl verifying
+    QSslConfiguration conf = request.sslConfiguration();
+    conf.setPeerVerifyMode(QSslSocket::VerifyNone);
+    request.setSslConfiguration(conf);
+
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+    request.setHeader(QNetworkRequest::UserAgentHeader, UA);
+
+    if (params == nullptr) {
+        return networkManager->post(request, QByteArray(nullptr));
+    }
+    return networkManager->post(request, params);
+}
+
+GPGateway gpclient::helper::filterPreferredGateway(QList<GPGateway> gateways, const QString ruleName)
+{
+    PLOGI << gateways.size() << " gateway(s) avaiable, filter the gateways with rule: " << ruleName;
+
+    GPGateway gateway = gateways.first();
+
+    for (GPGateway g : gateways) {
+        if (g.priorityOf(ruleName) > gateway.priorityOf(ruleName)) {
+            PLOGI << "Find a preferred gateway: " << g.name();
+            gateway = g;
+        }
+    }
+
+    return gateway;
+}
+
+QUrlQuery gpclient::helper::parseGatewayResponse(const QByteArray &xml)
+{
+    PLOGI << "Start parsing the gateway response...";
+    PLOGI << "The gateway response is: " << xml;
+
+    QXmlStreamReader xmlReader{xml};
+    QList<QString> args;
+
+    while (!xmlReader.atEnd()) {
+        xmlReader.readNextStartElement();
+        if (xmlReader.name() == "argument") {
+            args.append(QUrl::toPercentEncoding(xmlReader.readElementText()));
+        }
+    }
+
+    QUrlQuery params{};
+    params.addQueryItem("authcookie", args.at(1));
+    params.addQueryItem("portal", args.at(3));
+    params.addQueryItem("user", args.at(4));
+    params.addQueryItem("domain", args.at(7));
+    params.addQueryItem("preferred-ip", args.at(15));
+    params.addQueryItem("computer", QUrl::toPercentEncoding(QSysInfo::machineHostName()));
+
+    return params;
+}
+
+void gpclient::helper::openMessageBox(const QString &message, const QString& informativeText)
+{
+    QMessageBox msgBox;
+    msgBox.setWindowTitle("Notice");
+    msgBox.setText(message);
+    msgBox.setFixedWidth(500);
+    msgBox.setStyleSheet("QLabel{min-width: 250px}");
+    msgBox.setInformativeText(informativeText);
+    msgBox.exec();
+}
+
+void gpclient::helper::moveCenter(QWidget *widget)
+{
+    QDesktopWidget *desktop = QApplication::desktop();
+
+    int screenWidth, width;
+    int screenHeight, height;
+    int x, y;
+    QSize windowSize;
+
+    screenWidth = desktop->width();
+    screenHeight = desktop->height();
+
+    windowSize = widget->size();
+    width = windowSize.width();
+    height = windowSize.height();
+
+    x = (screenWidth - width) / 2;
+    y = (screenHeight - height) / 2;
+    y -= 50;
+    widget->move(x, y);
+}
+
+QSettings *gpclient::helper::settings::_settings = new QSettings("com.yuezk.qt", "GPClient");
+
+QVariant gpclient::helper::settings::get(const QString &key, const QVariant &defaultValue)
+{
+    return _settings->value(key, defaultValue);
+}
+
+void gpclient::helper::settings::save(const QString &key, const QVariant &value)
+{
+    _settings->setValue(key, value);
+}
+
+
+void gpclient::helper::settings::clear()
+{
+    QStringList keys = _settings->allKeys();
+    for (const auto &key : qAsConst(keys)) {
+        if (!reservedKeys.contains(key)) {
+            _settings->remove(key);
+        }
+    }
+}

GPClient/gphelper.h

@@ -0,0 +1,43 @@
+#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"
+
+
+const QString UA = "PAN GlobalProtect";
+
+namespace gpclient {
+    namespace helper {
+        extern QNetworkAccessManager *networkManager;
+
+        QNetworkReply* createRequest(QString url, QByteArray params = nullptr);
+
+        GPGateway filterPreferredGateway(QList<GPGateway> gateways, const QString ruleName);
+
+        QUrlQuery parseGatewayResponse(const QByteArray& xml);
+
+        void openMessageBox(const QString& message, const QString& informativeText = "");
+
+        void moveCenter(QWidget *widget);
+
+        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);
+            void clear();
+        }
+    }
+}
+
+#endif // GPHELPER_H

GPClient/gpservice_interface.cpp

@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -i gpservice_interface.h -p :gpservice_interface.cpp ../GPService/gpservice.xml
- *
- * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "gpservice_interface.h"
-/*
- * Implementation of interface class ComYuezkQtGPServiceInterface
- */
-
-ComYuezkQtGPServiceInterface::ComYuezkQtGPServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-ComYuezkQtGPServiceInterface::~ComYuezkQtGPServiceInterface()
-{
-}
-

GPClient/gpservice_interface.h

@@ -1,71 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p gpservice_interface.h: ../GPService/gpservice.xml
- *
- * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef GPSERVICE_INTERFACE_H
-#define GPSERVICE_INTERFACE_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface com.yuezk.qt.GPService
- */
-class ComYuezkQtGPServiceInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "com.yuezk.qt.GPService"; }
-
-public:
-    ComYuezkQtGPServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
-
-    ~ComYuezkQtGPServiceInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> connect(const QString &server, const QString &username, const QString &passwd)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(server) << QVariant::fromValue(username) << QVariant::fromValue(passwd);
-        return asyncCallWithArgumentList(QStringLiteral("connect"), argumentList);
-    }
-
-    inline QDBusPendingReply<> disconnect()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("disconnect"), argumentList);
-    }
-
-    inline QDBusPendingReply<int> status()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("status"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void connected();
-    void disconnected();
-    void logAvailable(const QString &log);
-};
-
-namespace com {
-  namespace yuezk {
-    namespace qt {
-      typedef ::ComYuezkQtGPServiceInterface GPService;
-    }
-  }
-}
-#endif

GPClient/loginparams.cpp

@@ -0,0 +1,80 @@
+#include <QtCore/QUrlQuery>
+
+#include "loginparams.h"
+
+LoginParams::LoginParams(const QString clientos)
+{
+    params.addQueryItem("prot", QUrl::toPercentEncoding("https:"));
+    params.addQueryItem("server", "");
+    params.addQueryItem("inputStr", "");
+    params.addQueryItem("jnlpReady", "jnlpReady");
+    params.addQueryItem("user", "");
+    params.addQueryItem("passwd", "");
+    params.addQueryItem("computer", QUrl::toPercentEncoding(QSysInfo::machineHostName()));
+    params.addQueryItem("ok", "Login");
+    params.addQueryItem("direct", "yes");
+    params.addQueryItem("clientVer", "4100");
+    params.addQueryItem("os-version", QUrl::toPercentEncoding(QSysInfo::prettyProductName()));
+
+    // 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", "");
+    params.addQueryItem("ipv6-support", "yes");
+}
+
+LoginParams::~LoginParams()
+{
+}
+
+void LoginParams::setUser(const QString user)
+{
+    updateQueryItem("user", user);
+}
+
+void LoginParams::setServer(const QString server)
+{
+    updateQueryItem("server", server);
+}
+
+void LoginParams::setPassword(const QString password)
+{
+    updateQueryItem("passwd", password);
+}
+
+void LoginParams::setUserAuthCookie(const QString cookie)
+{
+    updateQueryItem("portal-userauthcookie", cookie);
+}
+
+void LoginParams::setPrelogonAuthCookie(const QString cookie)
+{
+    updateQueryItem("portal-prelogonuserauthcookie", cookie);
+}
+
+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();
+}
+
+void LoginParams::updateQueryItem(const QString key, const QString value)
+{
+    if (params.hasQueryItem(key)) {
+        params.removeQueryItem(key);
+    }
+    params.addQueryItem(key, QUrl::toPercentEncoding(value));
+}

GPClient/loginparams.h

@@ -0,0 +1,28 @@
+#ifndef LOGINPARAMS_H
+#define LOGINPARAMS_H
+
+#include <QtCore/QUrlQuery>
+
+class LoginParams
+{
+public:
+    LoginParams(const QString clientos);
+    ~LoginParams();
+
+    void setUser(const QString user);
+    void setServer(const QString server);
+    void setPassword(const QString password);
+    void setUserAuthCookie(const QString cookie);
+    void setPrelogonAuthCookie(const QString cookie);
+    void setPreloginCookie(const QString cookie);
+    void setInputStr(const QString inputStr);
+
+    QByteArray toUtf8() const;
+
+private:
+    QUrlQuery params;
+
+    void updateQueryItem(const QString key, const QString value);
+};
+
+#endif // LOGINPARAMS_H

GPClient/main.cpp

@@ -1,18 +1,80 @@
+#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 "sigwatch.h"
+#include "version.h"
 
 int main(int argc, char *argv[])
 {
+    plog::ColorConsoleAppender<plog::TxtFormatter> consoleAppender(plog::streamStdErr);
+    plog::init(plog::debug, &consoleAppender);
+
+    PLOGI << "GlobalProtect started, version: " << VERSION;
+
     QString port = QString::fromLocal8Bit(qgetenv(ENV_CDP_PORT));
+
     if (port == "") {
         qputenv(ENV_CDP_PORT, "12315");
     }
+
     SingleApplication app(argc, argv);
-    GPClient w;
+    app.setQuitOnLastWindowClosed(false);
+
+    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();
 
-    QObject::connect(&app, &SingleApplication::instanceStarted, &w, &GPClient::raise);
+    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

@@ -0,0 +1,64 @@
+#include <QtGui/QCloseEvent>
+
+#include "normalloginwindow.h"
+#include "ui_normalloginwindow.h"
+
+NormalLoginWindow::NormalLoginWindow(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::NormalLoginWindow)
+{
+    ui->setupUi(this);
+    setWindowTitle("GlobalProtect Login");
+    setFixedSize(width(), height());
+    setModal(true);
+}
+
+NormalLoginWindow::~NormalLoginWindow()
+{
+    delete ui;
+}
+
+void NormalLoginWindow::setAuthMessage(QString message)
+{
+    ui->authMessage->setText(message);
+}
+
+void NormalLoginWindow::setUsernameLabel(QString label)
+{
+    ui->username->setPlaceholderText(label);
+}
+
+void NormalLoginWindow::setPasswordLabel(QString label)
+{
+    ui->password->setPlaceholderText(label);
+}
+
+void NormalLoginWindow::setPortalAddress(QString portal)
+{
+    ui->portalAddress->setText(portal);
+}
+
+void NormalLoginWindow::setProcessing(bool isProcessing)
+{
+    ui->username->setReadOnly(isProcessing);
+    ui->password->setReadOnly(isProcessing);
+    ui->loginButton->setDisabled(isProcessing);
+}
+
+void NormalLoginWindow::on_loginButton_clicked()
+{
+    const QString username = ui->username->text().trimmed();
+    const QString password = ui->password->text().trimmed();
+
+    if (username.isEmpty() || password.isEmpty()) {
+        return;
+    }
+
+    emit performLogin(username, password);
+}
+
+void NormalLoginWindow::closeEvent(QCloseEvent *event)
+{
+    event->accept();
+    reject();
+}

GPClient/normalloginwindow.h

@@ -0,0 +1,37 @@
+#ifndef PORTALAUTHWINDOW_H
+#define PORTALAUTHWINDOW_H
+
+#include <QtWidgets/QDialog>
+
+namespace Ui {
+class NormalLoginWindow;
+}
+
+class NormalLoginWindow : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit NormalLoginWindow(QWidget *parent = nullptr);
+    ~NormalLoginWindow();
+
+    void setAuthMessage(QString);
+    void setUsernameLabel(QString);
+    void setPasswordLabel(QString);
+    void setPortalAddress(QString);
+
+    void setProcessing(bool isProcessing);
+
+private slots:
+    void on_loginButton_clicked();
+
+signals:
+    void performLogin(QString username, QString password);
+
+private:
+    Ui::NormalLoginWindow *ui;
+
+    void closeEvent(QCloseEvent *event);
+};
+
+#endif // PORTALAUTHWINDOW_H

GPClient/normalloginwindow.ui

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NormalLoginWindow</class>
+ <widget class="QDialog" name="NormalLoginWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>255</width>
+    <height>269</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="cursor">
+   <cursorShape>ArrowCursor</cursorShape>
+  </property>
+  <property name="windowTitle">
+   <string>Login</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_4" stretch="1,0,0">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="font">
+          <font>
+           <pointsize>20</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Login</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="authMessage">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>2</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Please enter the login credentials</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="portalLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Portal:</string>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="portalAddress">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>vpn.example.com</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLineEdit" name="username">
+         <property name="placeholderText">
+          <string>Username</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="password">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="echoMode">
+          <enum>QLineEdit::Password</enum>
+         </property>
+         <property name="placeholderText">
+          <string>Password</string>
+         </property>
+         <property name="clearButtonEnabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="loginButton">
+         <property name="text">
+          <string>Login</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

GPClient/portalauthenticator.cpp

@@ -0,0 +1,207 @@
+#include <QtNetwork/QNetworkReply>
+#include <plog/Log.h>
+
+#include "portalauthenticator.h"
+#include "gphelper.h"
+#include "normalloginwindow.h"
+#include "samlloginwindow.h"
+#include "loginparams.h"
+#include "preloginresponse.h"
+#include "portalconfigresponse.h"
+#include "gpgateway.h"
+
+using namespace gpclient::helper;
+
+PortalAuthenticator::PortalAuthenticator(const QString& portal, const QString& clientos) : QObject()
+  , portal(portal)
+  , 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()
+{
+    delete normalLoginWindow;
+}
+
+void PortalAuthenticator::authenticate()
+{
+    PLOGI << "Preform portal prelogin at " << preloginUrl;
+
+    QNetworkReply *reply = createRequest(preloginUrl);
+    connect(reply, &QNetworkReply::finished, this, &PortalAuthenticator::onPreloginFinished);
+}
+
+void PortalAuthenticator::onPreloginFinished()
+{
+    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
+    if (reply->error()) {
+        PLOGE << QString("Error occurred while accessing %1, %2").arg(preloginUrl, reply->errorString());
+        emit preloginFailed("Error occurred on the portal prelogin interface.");
+        delete reply;
+        return;
+    }
+
+    PLOGI << "Portal prelogin succeeded.";
+
+    preloginResponse = PreloginResponse::parse(reply->readAll());
+
+    PLOGI << "Finished parsing the prelogin response. The region field is: " << preloginResponse.region();
+
+    if (preloginResponse.hasSamlAuthFields()) {
+        // Do SAML authentication
+        samlAuth();
+    } else if (preloginResponse.hasNormalAuthFields()) {
+        // Do normal username/password authentication
+        tryAutoLogin();
+    } else {
+        PLOGE << QString("Unknown prelogin response for %1 got %2").arg(preloginUrl).arg(QString::fromUtf8(preloginResponse.rawResponse()));
+        emit preloginFailed("Unknown response for portal prelogin interface.");
+    }
+
+    delete reply;
+}
+
+void PortalAuthenticator::tryAutoLogin()
+{
+    const QString username = settings::get("username").toString();
+    const QString password = settings::get("password").toString();
+
+    if (!username.isEmpty() && !password.isEmpty()) {
+        PLOGI << "Trying auto login using the saved credentials";
+        isAutoLogin = true;
+        fetchConfig(settings::get("username").toString(), settings::get("password").toString());
+    } else {
+        normalAuth();
+    }
+}
+
+void PortalAuthenticator::normalAuth()
+{
+    PLOGI << "Trying to launch the normal login window...";
+
+    normalLoginWindow = new NormalLoginWindow;
+    normalLoginWindow->setPortalAddress(portal);
+    normalLoginWindow->setAuthMessage(preloginResponse.authMessage());
+    normalLoginWindow->setUsernameLabel(preloginResponse.labelUsername());
+    normalLoginWindow->setPasswordLabel(preloginResponse.labelPassword());
+
+    // Do login
+    connect(normalLoginWindow, &NormalLoginWindow::performLogin, this, &PortalAuthenticator::onPerformNormalLogin);
+    connect(normalLoginWindow, &NormalLoginWindow::rejected, this, &PortalAuthenticator::onLoginWindowRejected);
+    connect(normalLoginWindow, &NormalLoginWindow::finished, this, &PortalAuthenticator::onLoginWindowFinished);
+
+    normalLoginWindow->show();
+}
+
+void PortalAuthenticator::onPerformNormalLogin(const QString &username, const QString &password)
+{
+    normalLoginWindow->setProcessing(true);
+    fetchConfig(username, password);
+}
+
+void PortalAuthenticator::onLoginWindowRejected()
+{
+    emitFail();
+}
+
+void PortalAuthenticator::onLoginWindowFinished()
+{
+    delete normalLoginWindow;
+    normalLoginWindow = nullptr;
+}
+
+void PortalAuthenticator::samlAuth()
+{
+    PLOGI << "Trying to perform SAML login with saml-method " << preloginResponse.samlMethod();
+
+    SAMLLoginWindow *loginWindow = new SAMLLoginWindow;
+
+    connect(loginWindow, &SAMLLoginWindow::success, this, &PortalAuthenticator::onSAMLLoginSuccess);
+    connect(loginWindow, &SAMLLoginWindow::fail, this, &PortalAuthenticator::onSAMLLoginFail);
+    connect(loginWindow, &SAMLLoginWindow::rejected, this, &PortalAuthenticator::onLoginWindowRejected);
+
+    loginWindow->login(preloginResponse.samlMethod(), preloginResponse.samlRequest(), preloginUrl);
+}
+
+void PortalAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> samlResult)
+{
+    if (samlResult.contains("preloginCookie")) {
+        PLOGI << "SAML login succeeded, got the prelogin-cookie " << samlResult.value("preloginCookie");
+    } else {
+        PLOGI << "SAML login succeeded, got the portal-userauthcookie " << samlResult.value("userAuthCookie");
+    }
+
+    fetchConfig(samlResult.value("username"), "", samlResult.value("preloginCookie"), samlResult.value("userAuthCookie"));
+}
+
+void PortalAuthenticator::onSAMLLoginFail(const QString msg)
+{
+    emitFail(msg);
+}
+
+void PortalAuthenticator::fetchConfig(QString username, QString password, QString preloginCookie, QString 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;
+    this->password = password;
+
+    PLOGI << "Fetching the portal config from " << configUrl << " for user: " << username;
+
+    QNetworkReply *reply = createRequest(configUrl, loginParams.toUtf8());
+    connect(reply, &QNetworkReply::finished, this, &PortalAuthenticator::onFetchConfigFinished);
+}
+
+void PortalAuthenticator::onFetchConfigFinished()
+{
+    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
+    if (reply->error()) {
+        PLOGE << QString("Failed to fetch the portal config from %1, %2").arg(configUrl).arg(reply->errorString());
+
+        // Login failed, enable the fields of the normal login window
+        if (normalLoginWindow) {
+            normalLoginWindow->setProcessing(false);
+            openMessageBox("Portal login failed.", "Please check your credentials and try again.");
+        } else if (isAutoLogin) {
+            isAutoLogin = false;
+            normalAuth();
+        } else {
+            emit portalConfigFailed("Failed to fetch the portal config.");
+        }
+        return;
+    }
+
+    PLOGI << "Fetch the portal config succeeded.";
+    PortalConfigResponse response = PortalConfigResponse::parse(reply->readAll());
+
+    // Add the username & password to the response object
+    response.setUsername(username);
+    response.setPassword(password);
+
+    // Close the login window
+    if (normalLoginWindow) {
+        PLOGI << "Closing the NormalLoginWindow...";
+
+        normalLoginWindow->close();
+    }
+
+    emit success(response, preloginResponse.region());
+}
+
+void PortalAuthenticator::emitFail(const QString& msg)
+{
+    emit fail(msg);
+}

GPClient/portalauthenticator.h

@@ -0,0 +1,57 @@
+#ifndef PORTALAUTHENTICATOR_H
+#define PORTALAUTHENTICATOR_H
+
+#include <QtCore/QObject>
+
+#include "portalconfigresponse.h"
+#include "normalloginwindow.h"
+#include "samlloginwindow.h"
+#include "preloginresponse.h"
+
+
+class PortalAuthenticator : public QObject
+{
+    Q_OBJECT
+public:
+    explicit PortalAuthenticator(const QString& portal, const QString& clientos);
+    ~PortalAuthenticator();
+
+    void authenticate();
+
+signals:
+    void success(const PortalConfigResponse response, const QString region);
+    void fail(const QString& msg);
+    void preloginFailed(const QString& msg);
+    void portalConfigFailed(const QString msg);
+
+private slots:
+    void onPreloginFinished();
+    void onPerformNormalLogin(const QString &username, const QString &password);
+    void onLoginWindowRejected();
+    void onLoginWindowFinished();
+    void onSAMLLoginSuccess(const QMap<QString, QString> samlResult);
+    void onSAMLLoginFail(const QString msg);
+    void onFetchConfigFinished();
+
+private:
+    QString portal;
+    QString clientos;
+    QString preloginUrl;
+    QString configUrl;
+    QString username;
+    QString password;
+
+    PreloginResponse preloginResponse;
+
+    bool isAutoLogin { false };
+
+    NormalLoginWindow *normalLoginWindow{ nullptr };
+
+    void tryAutoLogin();
+    void normalAuth();
+    void samlAuth();
+    void fetchConfig(QString username, QString password, QString preloginCookie = "", QString userAuthCookie = "");
+    void emitFail(const QString& msg = "");
+};
+
+#endif // PORTALAUTHENTICATOR_H

GPClient/portalconfigresponse.cpp

@@ -0,0 +1,178 @@
+#include <QtCore/QXmlStreamReader>
+#include <plog/Log.h>
+
+#include "portalconfigresponse.h"
+
+QString PortalConfigResponse::xmlUserAuthCookie = "portal-userauthcookie";
+QString PortalConfigResponse::xmlPrelogonUserAuthCookie = "portal-prelogonuserauthcookie";
+QString PortalConfigResponse::xmlGateways = "gateways";
+
+PortalConfigResponse::PortalConfigResponse()
+{
+}
+
+PortalConfigResponse::~PortalConfigResponse()
+{
+}
+
+PortalConfigResponse PortalConfigResponse::parse(const QByteArray xml)
+{
+    PLOGI << "Start parsing the portal configuration...";
+
+    QXmlStreamReader xmlReader(xml);
+    PortalConfigResponse response;
+    response.setRawResponse(xml);
+
+    while (!xmlReader.atEnd()) {
+        xmlReader.readNextStartElement();
+
+        QString name = xmlReader.name().toString();
+
+        if (name == xmlUserAuthCookie) {
+            PLOGI << "Start reading " << name;
+            response.setUserAuthCookie(xmlReader.readElementText());
+        } else if (name == xmlPrelogonUserAuthCookie) {
+            PLOGI << "Start reading " << name;
+            response.setPrelogonUserAuthCookie(xmlReader.readElementText());
+        } else if (name == xmlGateways) {
+            response.setAllGateways(parseGateways(xmlReader));
+        }
+    }
+
+    PLOGI << "Finished parsing portal configuration.";
+
+    return response;
+}
+
+const QByteArray PortalConfigResponse::rawResponse() const
+{
+    return m_rawResponse;
+}
+
+const QString &PortalConfigResponse::username() const
+{
+    return m_username;
+}
+
+QString PortalConfigResponse::password() const
+{
+    return m_password;
+}
+
+QList<GPGateway> PortalConfigResponse::parseGateways(QXmlStreamReader &xmlReader)
+{
+    PLOGI << "Start parsing the gateways from portal configuration...";
+
+    QList<GPGateway> gateways;
+
+    while (xmlReader.name() != "external"){
+        xmlReader.readNext();
+    }
+
+    while (xmlReader.name() != "list"){
+        xmlReader.readNext();
+    }
+
+    while (xmlReader.name() != xmlGateways || !xmlReader.isEndElement()) {
+        xmlReader.readNext();
+        // Parse the gateways -> external -> list -> entry
+        if (xmlReader.name() == "entry" && xmlReader.isStartElement()) {
+            GPGateway g;
+            QString address = xmlReader.attributes().value("name").toString();
+            g.setAddress(address);
+            g.setPriorityRules(parsePriorityRules(xmlReader));
+            g.setName(parseGatewayName(xmlReader));
+            gateways.append(g);
+        }
+    }
+
+    PLOGI << "Finished parsing the gateways.";
+
+    return gateways;
+}
+
+QMap<QString, int> PortalConfigResponse::parsePriorityRules(QXmlStreamReader &xmlReader)
+{
+    PLOGI << "Start parsing the priority rules...";
+
+    QMap<QString, int> priorityRules;
+
+    while ((xmlReader.name() != "priority-rule" || !xmlReader.isEndElement()) && !xmlReader.hasError()) {
+        xmlReader.readNext();
+
+        if (xmlReader.name() == "entry" && xmlReader.isStartElement()) {
+            QString ruleName = xmlReader.attributes().value("name").toString();
+            // Read the priority tag
+            while (xmlReader.name() != "priority"){
+                xmlReader.readNext();
+            }
+            int ruleValue = xmlReader.readElementText().toUInt();
+            priorityRules.insert(ruleName, ruleValue);
+        }
+    }
+
+    PLOGI << "Finished parsing the priority rules.";
+
+    return priorityRules;
+}
+
+QString PortalConfigResponse::parseGatewayName(QXmlStreamReader &xmlReader)
+{
+    PLOGI << "Start parsing the gateway name...";
+
+    while (xmlReader.name() != "description" || !xmlReader.isEndElement()) {
+        xmlReader.readNext();
+        if (xmlReader.name() == "description" && xmlReader.tokenType() == xmlReader.StartElement) {
+            PLOGI << "Finished parsing the gateway name";
+            return xmlReader.readElementText();
+        }
+    }
+
+    PLOGE << "Error: <description> tag not found";
+    return "";
+}
+
+QString PortalConfigResponse::userAuthCookie() const
+{
+    return m_userAuthCookie;
+}
+
+QString PortalConfigResponse::prelogonUserAuthCookie() const
+{
+    return m_prelogonAuthCookie;
+}
+
+QList<GPGateway> PortalConfigResponse::allGateways() const
+{
+    return m_gateways;
+}
+
+void PortalConfigResponse::setAllGateways(QList<GPGateway> gateways)
+{
+    m_gateways = gateways;
+}
+
+void PortalConfigResponse::setRawResponse(const QByteArray response)
+{
+    m_rawResponse = response;
+}
+
+void PortalConfigResponse::setUsername(const QString username)
+{
+    m_username = username;
+}
+
+void PortalConfigResponse::setPassword(const QString password)
+{
+    m_password = password;
+}
+
+void PortalConfigResponse::setUserAuthCookie(const QString cookie)
+{
+    m_userAuthCookie = cookie;
+}
+
+void PortalConfigResponse::setPrelogonUserAuthCookie(const QString cookie)
+{
+    m_prelogonAuthCookie = cookie;
+}

GPClient/portalconfigresponse.h

@@ -0,0 +1,51 @@
+#ifndef PORTALCONFIGRESPONSE_H
+#define PORTALCONFIGRESPONSE_H
+
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QtCore/QXmlStreamReader>
+
+#include "gpgateway.h"
+
+class PortalConfigResponse
+{
+public:
+    PortalConfigResponse();
+    ~PortalConfigResponse();
+
+    static PortalConfigResponse parse(const QByteArray xml);
+
+    const QByteArray rawResponse() const;
+    const QString &username() const;
+    QString password() const;
+    QString userAuthCookie() const;
+    QString prelogonUserAuthCookie() const;
+    QList<GPGateway> allGateways() const;
+    void setAllGateways(QList<GPGateway> gateways);
+
+    void setUsername(const QString username);
+    void setPassword(const QString password);
+
+private:
+    static QString xmlUserAuthCookie;
+    static QString xmlPrelogonUserAuthCookie;
+    static QString xmlGateways;
+
+    QByteArray m_rawResponse;
+    QString m_username;
+    QString m_password;
+    QString m_userAuthCookie;
+    QString m_prelogonAuthCookie;
+
+    QList<GPGateway> m_gateways;
+
+    void setRawResponse(const QByteArray response);
+    void setUserAuthCookie(const QString cookie);
+    void setPrelogonUserAuthCookie(const QString cookie);
+
+    static QList<GPGateway> parseGateways(QXmlStreamReader &xmlReader);
+    static QMap<QString, int> parsePriorityRules(QXmlStreamReader &xmlReader);
+    static QString parseGatewayName(QXmlStreamReader &xmlReader);
+};
+
+#endif // PORTALCONFIGRESPONSE_H

GPClient/preloginresponse.cpp

@@ -0,0 +1,100 @@
+#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";
+QString PreloginResponse::xmlSamlMethod = "saml-auth-method";
+QString PreloginResponse::xmlSamlRequest = "saml-request";
+QString PreloginResponse::xmlRegion = "region";
+
+PreloginResponse::PreloginResponse()
+{
+    add(xmlAuthMessage, "");
+    add(xmlLabelUsername, "");
+    add(xmlLabelPassword, "");
+    add(xmlSamlMethod, "");
+    add(xmlSamlRequest, "");
+    add(xmlRegion, "");
+}
+
+PreloginResponse PreloginResponse::parse(const QByteArray& xml)
+{
+    PLOGI << "Start parsing the prelogin response...";
+
+    QXmlStreamReader xmlReader(xml);
+    PreloginResponse response;
+    response.setRawResponse(xml);
+
+    while (!xmlReader.atEnd()) {
+        xmlReader.readNextStartElement();
+        QString name = xmlReader.name().toString();
+        if (response.has(name)) {
+            response.add(name, xmlReader.readElementText());
+        }
+    }
+    return response;
+}
+
+const QByteArray& PreloginResponse::rawResponse() const
+{
+    return _rawResponse;
+}
+
+QString PreloginResponse::authMessage() const
+{
+    return resultMap.value(xmlAuthMessage);
+}
+
+QString PreloginResponse::labelUsername() const
+{
+    return resultMap.value(xmlLabelUsername);
+}
+
+QString PreloginResponse::labelPassword() const
+{
+    return resultMap.value(xmlLabelPassword);
+}
+
+QString PreloginResponse::samlMethod() const
+{
+    return resultMap.value(xmlSamlMethod);
+}
+
+QString PreloginResponse::samlRequest() const
+{
+    return QByteArray::fromBase64(resultMap.value(xmlSamlRequest).toUtf8());
+}
+
+QString PreloginResponse::region() const
+{
+    return resultMap.value(xmlRegion);
+}
+
+bool PreloginResponse::hasSamlAuthFields() const
+{
+    return !samlMethod().isEmpty() && !samlRequest().isEmpty();
+}
+
+bool PreloginResponse::hasNormalAuthFields() const
+{
+    return !labelUsername().isEmpty() && !labelPassword().isEmpty();
+}
+
+void PreloginResponse::setRawResponse(const QByteArray response)
+{
+    _rawResponse = response;
+}
+
+bool PreloginResponse::has(const QString name) const
+{
+    return resultMap.contains(name);
+}
+
+void PreloginResponse::add(const QString name, const QString value)
+{
+    resultMap.insert(name, value);
+}

GPClient/preloginresponse.h

@@ -0,0 +1,41 @@
+#ifndef PRELOGINRESPONSE_H
+#define PRELOGINRESPONSE_H
+
+#include <QtCore/QString>
+#include <QtCore/QMap>
+
+class PreloginResponse
+{
+public:
+    PreloginResponse();
+
+    static PreloginResponse parse(const QByteArray& xml);
+
+    const QByteArray& rawResponse() const;
+    QString authMessage() const;
+    QString labelUsername() const;
+    QString labelPassword() const;
+    QString samlMethod() const;
+    QString samlRequest() const;
+    QString region() const;
+
+    bool hasSamlAuthFields() const;
+    bool hasNormalAuthFields() const;
+
+private:
+    static QString xmlAuthMessage;
+    static QString xmlLabelUsername;
+    static QString xmlLabelPassword;
+    static QString xmlSamlMethod;
+    static QString xmlSamlRequest;
+    static QString xmlRegion;
+
+    QMap<QString, QString> resultMap;
+    QByteArray _rawResponse;
+
+    void setRawResponse(const QByteArray response);
+    void add(const QString name, const QString value);
+    bool has(const QString name) const;
+};
+
+#endif // PRELOGINRESPONSE_H

GPClient/resources.qrc

@@ -1,8 +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.png</file>
     </qresource>
 </RCC>

GPClient/samlloginwindow.cpp

@@ -1,19 +1,26 @@
-#include "samlloginwindow.h"
+#include <QtWidgets/QVBoxLayout>
+#include <QtWebEngineWidgets/QWebEngineProfile>
+#include <QtWebEngineWidgets/QWebEngineView>
+#include <plog/Log.h>
 
-#include <QVBoxLayout>
+#include "samlloginwindow.h"
 
 SAMLLoginWindow::SAMLLoginWindow(QWidget *parent)
     : QDialog(parent)
+    , webView(new EnhancedWebView(this))
 {
-    setWindowTitle("SAML Login");
-    resize(610, 406);
+    setWindowTitle("GlobalProtect Login");
+    setModal(true);
+    resize(700, 550);
+
     QVBoxLayout *verticalLayout = new QVBoxLayout(this);
-    webView = new EnhancedWebView(this);
     webView->setUrl(QUrl("about:blank"));
+    // webView->page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
     verticalLayout->addWidget(webView);
 
     webView->initialize();
-    QObject::connect(webView, &EnhancedWebView::responseReceived, this, &SAMLLoginWindow::onResponseReceived);
+    connect(webView, &EnhancedWebView::responseReceived, this, &SAMLLoginWindow::onResponseReceived);
+    connect(webView, &EnhancedWebView::loadFinished, this, &SAMLLoginWindow::onLoadFinished);
 }
 
 SAMLLoginWindow::~SAMLLoginWindow()
@@ -27,9 +34,16 @@ void SAMLLoginWindow::closeEvent(QCloseEvent *event)
     reject();
 }
 
-void SAMLLoginWindow::login(QString url)
+void SAMLLoginWindow::login(const QString samlMethod, const QString samlRequest, const QString preloingUrl)
 {
-    webView->load(QUrl(url));
+    if (samlMethod == "POST") {
+        webView->setHtml(samlRequest, preloingUrl);
+    } else if (samlMethod == "REDIRECT") {
+        webView->load(samlRequest);
+    } else {
+        PLOGE << "Unknown saml-auth-method expected POST or REDIRECT, got " << samlMethod;
+        emit fail("Unknown saml-auth-method, got " + samlMethod);
+    }
 }
 
 void SAMLLoginWindow::onResponseReceived(QJsonObject params)
@@ -43,17 +57,43 @@ void SAMLLoginWindow::onResponseReceived(QJsonObject params)
     QJsonObject response = params.value("response").toObject();
     QJsonObject headers = response.value("headers").toObject();
 
-    foreach (const QString& key, headers.keys()) {
-        if (key.startsWith("saml-") || key == "prelogin-cookie" || key == "portal-userauthcookie") {
-            samlResult.insert(key, headers.value(key));
-        }
+    const QString username = headers.value("saml-username").toString();
+    const QString preloginCookie = headers.value("prelogin-cookie").toString();
+    const QString userAuthCookie = headers.value("portal-userauthcookie").toString();
+
+    LOGI << "Response received from " << response.value("url").toString();
+
+    if (!username.isEmpty()) {
+        LOGI << "Got username from SAML response headers " << username;
+        samlResult.insert("username", username);
+    }
+
+    if (!preloginCookie.isEmpty()) {
+        LOGI << "Got prelogin-cookie from SAML response headers " << preloginCookie;
+        samlResult.insert("preloginCookie", preloginCookie);
+    }
+
+    if (!userAuthCookie.isEmpty()) {
+        LOGI << "Got portal-userauthcookie from SAML response headers " << userAuthCookie;
+        samlResult.insert("userAuthCookie", userAuthCookie);
     }
 
     // Check the SAML result
-    if (samlResult.contains("saml-username")
-            && (samlResult.contains("prelogin-cookie") || samlResult.contains("portal-userauthcookie"))) {
-        samlResult.insert("server", QUrl(response.value("url").toString()).authority());
+    if (samlResult.contains("username")
+            && (samlResult.contains("preloginCookie") || samlResult.contains("userAuthCookie"))) {
+        LOGI << "Got the SAML authentication information successfully. "
+             << "username: " << samlResult.value("username")
+             << ", preloginCookie: " << samlResult.value("preloginCookie")
+             << ", userAuthCookie: " << samlResult.value("userAuthCookie");
+
         emit success(samlResult);
         accept();
+    } else {
+        this->show();
     }
 }
+
+void SAMLLoginWindow::onLoadFinished()
+{
+     LOGI << "Load finished " << this->webView->page()->url().toString();
+}

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 <QJsonObject>
-#include <QCloseEvent>
+#include "enhancedwebview.h"
 
 class SAMLLoginWindow : public QDialog
 {
@@ -15,17 +15,19 @@ public:
     explicit SAMLLoginWindow(QWidget *parent = nullptr);
     ~SAMLLoginWindow();
 
-    void login(QString url);
+    void login(const QString samlMethod, const QString samlRequest, const QString preloingUrl);
 
 signals:
-    void success(QJsonObject samlResult);
+    void success(QMap<QString, QString> samlResult);
+    void fail(const QString msg);
 
 private slots:
     void onResponseReceived(QJsonObject params);
+    void onLoadFinished();
 
 private:
     EnhancedWebView *webView;
-    QJsonObject samlResult;
+    QMap<QString, QString> samlResult;
 
     void closeEvent(QCloseEvent *event);
 };

GPClient/settingsdialog.cpp

@@ -0,0 +1,34 @@
+#include "settingsdialog.h"
+#include "ui_settingsdialog.h"
+
+SettingsDialog::SettingsDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::SettingsDialog)
+{
+    ui->setupUi(this);
+}
+
+SettingsDialog::~SettingsDialog()
+{
+    delete ui;
+}
+
+void SettingsDialog::setExtraArgs(QString extraArgs)
+{
+    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

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

GPClient/settingsdialog.ui

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SettingsDialog</class>
+ <widget class="QDialog" name="SettingsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>488</width>
+    <height>177</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Settings</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/images/connected.png</normaloff>:/images/connected.png</iconset>
+  </property>
+  <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 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 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>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SettingsDialog</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>SettingsDialog</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/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/local/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/local/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) {
@@ -49,7 +92,7 @@ void GPService::quit()
     }
 }
 
-void GPService::connect(QString server, QString username, QString passwd)
+void GPService::connect(QString server, QString username, QString passwd, QString extraArgs)
 {
     if (vpnStatus != GPService::VpnNotConnected) {
         log("VPN status is: " + QVariant::fromValue(vpnStatus).toString());
@@ -58,21 +101,53 @@ void GPService::connect(QString server, QString username, QString passwd)
 
     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"
-     << "-u" << username
-     << "--passwd-on-stdin"
-     << "--timestamp"
-     << 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.toUtf8());
-    openconnect->closeWriteChannel();
+    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();
     }
@@ -130,6 +205,5 @@ void GPService::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
 
 void GPService::log(QString msg)
 {
-    qInfo() << msg;
     emit logAvailable(msg);
 }

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);
+    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,22 +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"/>
-    </method>
-    <method name="disconnect">
-    </method>
-    <method name="status">
-      <arg type="i" direction="out"/>
-    </method>
-  </interface>
-</node>

GPService/gpservice_adaptor.cpp

@@ -1,55 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -i gpservice_adaptor.h -a :gpservice_adaptor.cpp gpservice.xml
- *
- * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "gpservice_adaptor.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-/*
- * Implementation of adaptor class GPServiceAdaptor
- */
-
-GPServiceAdaptor::GPServiceAdaptor(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
-{
-    // constructor
-    setAutoRelaySignals(true);
-}
-
-GPServiceAdaptor::~GPServiceAdaptor()
-{
-    // destructor
-}
-
-void GPServiceAdaptor::connect(const QString &server, const QString &username, const QString &passwd)
-{
-    // handle method call com.yuezk.qt.GPService.connect
-    QMetaObject::invokeMethod(parent(), "connect", Q_ARG(QString, server), Q_ARG(QString, username), Q_ARG(QString, passwd));
-}
-
-void GPServiceAdaptor::disconnect()
-{
-    // handle method call com.yuezk.qt.GPService.disconnect
-    QMetaObject::invokeMethod(parent(), "disconnect");
-}
-
-int GPServiceAdaptor::status()
-{
-    // handle method call com.yuezk.qt.GPService.status
-    int out0;
-    QMetaObject::invokeMethod(parent(), "status", Q_RETURN_ARG(int, out0));
-    return out0;
-}
-

GPService/gpservice_adaptor.h

@@ -1,66 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -a gpservice_adaptor.h: gpservice.xml
- *
- * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#ifndef GPSERVICE_ADAPTOR_H
-#define GPSERVICE_ADAPTOR_H
-
-#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-QT_BEGIN_NAMESPACE
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
-QT_END_NAMESPACE
-
-/*
- * Adaptor class for interface com.yuezk.qt.GPService
- */
-class GPServiceAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "com.yuezk.qt.GPService")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"com.yuezk.qt.GPService\">\n"
-"    <signal name=\"connected\"/>\n"
-"    <signal name=\"disconnected\"/>\n"
-"    <signal name=\"logAvailable\">\n"
-"      <arg type=\"s\" name=\"log\"/>\n"
-"    </signal>\n"
-"    <method name=\"connect\">\n"
-"      <arg direction=\"in\" type=\"s\" name=\"server\"/>\n"
-"      <arg direction=\"in\" type=\"s\" name=\"username\"/>\n"
-"      <arg direction=\"in\" type=\"s\" name=\"passwd\"/>\n"
-"    </method>\n"
-"    <method name=\"disconnect\"/>\n"
-"    <method name=\"status\">\n"
-"      <arg direction=\"out\" type=\"i\"/>\n"
-"    </method>\n"
-"  </interface>\n"
-        "")
-public:
-    GPServiceAdaptor(QObject *parent);
-    virtual ~GPServiceAdaptor();
-
-public: // PROPERTIES
-public Q_SLOTS: // METHODS
-    void connect(const QString &server, const QString &username, const QString &passwd);
-    void disconnect();
-    int status();
-Q_SIGNALS: // SIGNALS
-    void connected();
-    void disconnected();
-    void logAvailable(const QString &log);
-};
-
-#endif

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

@@ -2,9 +2,10 @@
 Description=GlobalProtect openconnect DBus service
 
 [Service]
+Environment="LANG=en_US.utf8"
 Type=dbus
 BusName=com.yuezk.qt.GPService
-ExecStart=/usr/local/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

README.md

@@ -2,32 +2,198 @@
 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>
 
-## Prerequisites
+<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.
+- Supports both SAML and non-SAML authentication modes.
+- Supports automatically selecting the preferred gateway from the multiple gateways.
+- Supports switching gateway from the system tray menu manually.
 
-- Openconnect v8.x
-- Qt5, qt5-webengine, qt5-websockets
 
-### Ubuntu
-1. Install openconnect v8.x
-    Update openconnect to 8.x, 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
-    ```sh
-    sudo apt install qt5-default libqt5websockets5-dev qtwebengine5-dev
-    ```
 ## Install
 
+|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)|
+
+Add the repository in the above table and install it with your favorite package manager tool.
+
+[![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 init && git submodule update
-qmake CONFIG+=release
-make
-sudo make install
 ```
-Open `GlobalProtect VPN` in the application dashboard.
+
+### Ubuntu/Mint
+
+> **⚠️ 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:
+
+```sh
+./scripts/install-ubuntu.sh
+```
+### openSUSE
+
+Build and install with:
+
+```sh
+./scripts/install-opensuse.sh
+```
+
+### Fedora
+
+Build and install with:
+
+```sh
+./scripts/install-fedora.sh
+```
+
+### Other Linux
+
+Install the Qt5 dependencies and OpenConnect:
+
+- QtCore
+- QtWebEngine
+- QtWebSockets
+- QtDBus
+- openconnect v8.x
+
+...then build and install with:
+
+```sh
+./scripts/install.sh
+```
+
+
+### NixOS
+  In `configuration.nix`:
+
+  ```
+  services.globalprotect = {
+    enable = true;
+    # if you need a Host Integrity Protection report
+    csdWrapper = "${pkgs.openconnect}/libexec/openconnect/hipreport.sh";
+  };
+  
+  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/README.Debian

@@ -0,0 +1,5 @@
+globalprotect-openconnect for Debian
+
+Added debian packaging 
+
+ -- Amit Joshi <>  Fri, 29 May 2020 21:52:59 -0400

debian/changelog

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

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,13 @@
+Source: globalprotect-openconnect
+Section: net
+Priority: optional
+Maintainer: Kevin Yue <k3vinyue@gmail.com>
+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
+
+Package: globalprotect-openconnect
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}, openconnect (>=8.0), libqt5websockets5 (>=5.9), libqt5webengine5 (>=5.9)
+Description: A GlobalProtect VPN client (GUI) based on OpenConnect.

debian/copyright

@@ -0,0 +1,15 @@
+Files: *
+Copyright: 1975-present Kevin Yue
+License: GPL-3+
+
+Files: 3rdparty/plog
+Copyright: 2016 Sergey Podobry (sergey.podobry at gmail.com)
+License: MPL-2.0
+
+Files: 3rdparty/qt-unix-signals
+Copyright: 2014 Simon Knopp
+License: MIT
+
+Files: 3rdparty/SingleApplication
+Copyright: Itay Grudev 2015 - 2020
+License: MIT

debian/patches/series

@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.

debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# You must remove unused comment lines for the released package.
+export DH_VERBOSE = 1
+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_installsystemd:
+	dh_installsystemd gpservice.service

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

debian/source/local-options

@@ -0,0 +1,2 @@
+#abort-on-upstream-changes
+#unapply-patches

debian/watch

@@ -0,0 +1,3 @@
+version=4
+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