Release 1.4.5

This reverts commit 4940830885.

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
-    
+
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -42,16 +42,20 @@ jobs:
         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
 
+      - name: Verify debian package
+        run: |
+          ./scripts/verify-debian-package.sh
+
       - uses: actions/upload-artifact@v2
         with:
           name: snapshot-source-code
@@ -67,7 +71,7 @@ jobs:
         with:
           name: snapshot-source-code
           path: artifacts
-      
+
       - name: Extract source code
         run: |
           cd $GITHUB_WORKSPACE/artifacts
@@ -81,7 +85,7 @@ jobs:
           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
@@ -135,14 +139,14 @@ jobs:
         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:
@@ -164,16 +168,20 @@ jobs:
         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
 
+      - name: Verify debian package
+        run: |
+          ./scripts/verify-debian-package.sh
+
       - uses: actions/upload-artifact@v2
         with:
           name: release-source-code
@@ -203,7 +211,7 @@ jobs:
           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
@@ -226,7 +234,7 @@ jobs:
           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
@@ -245,7 +253,7 @@ jobs:
           username: yuezk
           password: ${{ secrets.OBS_PASSWORD }}
           files: ./artifacts/obs/*
-  
+
   release-github:
     if: startsWith(github.ref, 'refs/tags/v')
     needs:

.gitignore

@@ -8,6 +8,7 @@ build
 artifacts
 
 .cmake
+.idea
 
 # Auto generated DBus files
 *_adaptor.cpp
@@ -62,7 +63,7 @@ target_wrapper.*
 # QtCreator CMake
 CMakeLists.txt.user*
 
-# QtCreator 4.8< compilation database 
+# QtCreator 4.8< compilation database
 compile_commands.json
 
 # QtCreator local machine specific files for imported projects

.vscode/settings.json

@@ -23,4 +23,4 @@
         "qsslsocket": "cpp",
         "qapplication": "cpp"
     }
-}
+}

GPClient/CMakeLists.txt

@@ -92,7 +92,7 @@ target_link_libraries(gpclient
     QtSignals
 )
 
-if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0 AND CMAKE_BUILD_TYPE STREQUAL Release)
     target_compile_options(gpclient PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
 endif()
 

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

@@ -6,7 +6,7 @@ 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
+Exec=env QT_AUTO_SCREEN_SCALE_FACTOR=1 @CMAKE_INSTALL_PREFIX@/bin/gpclient
 Icon=com.yuezk.qt.gpclient
 Keywords=GlobalProtect;Openconnect;SAML;connection;VPN;
 StartupWMClass=gpclient

GPClient/gatewayauthenticator.cpp

@@ -162,9 +162,18 @@ void GatewayAuthenticator::samlAuth(QString samlMethod, QString samlRequest, QSt
 
     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);
+    connect(loginWindow, &SAMLLoginWindow::success, [this, loginWindow](const QMap<QString, QString> &samlResult) {
+        this->onSAMLLoginSuccess(samlResult);
+        loginWindow->deleteLater();
+    });
+    connect(loginWindow, &SAMLLoginWindow::fail, [this, loginWindow](const QString &error) {
+        this->onSAMLLoginFail(error);
+        loginWindow->deleteLater();
+    });
+    connect(loginWindow, &SAMLLoginWindow::rejected, [this, loginWindow]() {
+        this->onLoginWindowRejected();
+        loginWindow->deleteLater();
+    });
 
     loginWindow->login(samlMethod, samlRequest, preloginUrl);
 }

GPClient/gpclient.cpp

@@ -35,7 +35,7 @@ GPClient::GPClient(QWidget *parent, IVpn *vpn)
     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.
+    // Initialize the context menu of system tray.
     initSystemTrayIcon();
     initVpnStatus();
 }
@@ -279,12 +279,24 @@ void GPClient::portalLogin()
 {
     PortalAuthenticator *portalAuth = new PortalAuthenticator(portal(), settings::get("clientos", "Linux").toString());
 
-    connect(portalAuth, &PortalAuthenticator::success, this, &GPClient::onPortalSuccess);
+    connect(portalAuth, &PortalAuthenticator::success, [this, portalAuth](const PortalConfigResponse response, const QString region) {
+        this->onPortalSuccess(response, region);
+        portalAuth->deleteLater();
+    });
     // 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);
+    connect(portalAuth, &PortalAuthenticator::preloginFailed, [this, portalAuth](const QString msg) {
+        this->onPortalPreloginFail(msg);
+        portalAuth->deleteLater();
+    });
+    connect(portalAuth, &PortalAuthenticator::portalConfigFailed, [this, portalAuth](const QString msg) {
+        this->onPortalConfigFail(msg);
+        portalAuth->deleteLater();
+    });
     // Portal login failed
-    connect(portalAuth, &PortalAuthenticator::fail, this, &GPClient::onPortalFail);
+    connect(portalAuth, &PortalAuthenticator::fail, [this, portalAuth](const QString &msg) {
+        this->onPortalFail(msg);
+        portalAuth->deleteLater();
+    });
 
     ui->statusLabel->setText("Authenticating...");
     updateConnectionStatus(VpnStatus::pending);
@@ -359,8 +371,14 @@ void GPClient::gatewayLogin()
 
     GatewayAuthenticator *gatewayAuth = new GatewayAuthenticator(currentGateway().address(), params);
 
-    connect(gatewayAuth, &GatewayAuthenticator::success, this, &GPClient::onGatewaySuccess);
-    connect(gatewayAuth, &GatewayAuthenticator::fail, this, &GPClient::onGatewayFail);
+    connect(gatewayAuth, &GatewayAuthenticator::success, [this, gatewayAuth](const QString &authToken) {
+        this->onGatewaySuccess(authToken);
+        gatewayAuth->deleteLater();
+    });
+    connect(gatewayAuth, &GatewayAuthenticator::fail, [this, gatewayAuth](const QString &msg) {
+        this->onGatewayFail(msg);
+        gatewayAuth->deleteLater();
+    });
 
     ui->statusLabel->setText("Authenticating...");
     updateConnectionStatus(VpnStatus::pending);

GPClient/gpclient.h

@@ -9,6 +9,7 @@
 #include "portalconfigresponse.h"
 #include "settingsdialog.h"
 #include "vpn.h"
+#include "gatewayauthenticator.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class GPClient; }
@@ -80,6 +81,8 @@ private:
     SettingsDialog *settingsDialog;
     QPushButton *settingsButton;
 
+    GatewayAuthenticator *gatewayAuthenticator;
+
     bool isQuickConnect { false };
     bool isSwitchingGateway { false };
     PortalConfigResponse portalConfig;

GPClient/main.cpp

@@ -1,6 +1,5 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtCore/QDir>
 #include <QtCore/QStandardPaths>
 #include <plog/Log.h>
 #include <plog/Init.h>
@@ -32,7 +31,7 @@ int main(int argc, char *argv[])
     }
 
     if (hidpiSupport.isEmpty()) {
-        qputenv(QT_AUTO_SCREEN_SCALE_FACTOR, "true");
+        qputenv(QT_AUTO_SCREEN_SCALE_FACTOR, "1");
     }
 
     SingleApplication app(argc, argv);
@@ -46,6 +45,7 @@ int main(int argc, char *argv[])
     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."},
+      {"start-minimized", "Launch the client minimized."},
     });
     parser.process(app);
 
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
       ? 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();
+    parser.isSet("start-minimized") ? w.showMinimized() : w.show();
 
     if (positional.size() > 0) {
       w.portal(positional.at(0));

GPClient/portalconfigresponse.cpp

@@ -78,10 +78,7 @@ QList<GPGateway> PortalConfigResponse::parseGateways(QXmlStreamReader &xmlReader
         // 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));
+            parseGateway(xmlReader, g);
             gateways.append(g);
         }
     }
@@ -91,45 +88,44 @@ QList<GPGateway> PortalConfigResponse::parseGateways(QXmlStreamReader &xmlReader
     return gateways;
 }
 
-QMap<QString, int> PortalConfigResponse::parsePriorityRules(QXmlStreamReader &xmlReader)
-{
-    PLOGI << "Start parsing the priority rules...";
+void PortalConfigResponse::parseGateway(QXmlStreamReader &reader, GPGateway &gateway) {
+    PLOGI << "Start parsing gateway...";
 
-    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);
+    auto finished = false;
+    while (!finished) {
+        if (reader.name() == "entry") {
+            auto address = reader.attributes().value("name").toString();
+            gateway.setAddress(address);
+        } else if (reader.name() == "description") { // gateway name
+            gateway.setName(reader.readElementText());
+        } else if (reader.name() == "priority-rule") { // priority rules
+            parsePriorityRule(reader, gateway);
         }
+        finished = !reader.readNextStartElement();
     }
-
-    PLOGI << "Finished parsing the priority rules.";
-
-    return priorityRules;
 }
 
-QString PortalConfigResponse::parseGatewayName(QXmlStreamReader &xmlReader)
-{
-    PLOGI << "Start parsing the gateway name...";
+void PortalConfigResponse::parsePriorityRule(QXmlStreamReader &reader, GPGateway &gateway) {
+    PLOGI << "Start parsing priority rule...";
 
-    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();
+    QMap<QString, int> priorityRules;
+    auto finished = false;
+
+    while (!finished) {
+        // Parse the priority-rule -> entry
+        if (reader.name() == "entry") {
+            auto ruleName = reader.attributes().value("name").toString();
+            // move to the priority value
+            while (reader.name() != "priority") {
+                reader.readNextStartElement();
+            }
+            auto priority = reader.readElementText().toInt();
+            priorityRules.insert(ruleName, priority);
         }
+        finished = !reader.readNextStartElement();
     }
 
-    PLOGE << "Error: <description> tag not found";
-    return "";
+    gateway.setPriorityRules(priorityRules);
 }
 
 QString PortalConfigResponse::userAuthCookie() const
@@ -137,11 +133,6 @@ QString PortalConfigResponse::userAuthCookie() const
     return m_userAuthCookie;
 }
 
-QString PortalConfigResponse::prelogonUserAuthCookie() const
-{
-    return m_prelogonAuthCookie;
-}
-
 QList<GPGateway> PortalConfigResponse::allGateways() const
 {
     return m_gateways;
@@ -176,3 +167,4 @@ void PortalConfigResponse::setPrelogonUserAuthCookie(const QString cookie)
 {
     m_prelogonAuthCookie = cookie;
 }
+

GPClient/portalconfigresponse.h

@@ -19,7 +19,6 @@ public:
     const QString &username() const;
     QString password() const;
     QString userAuthCookie() const;
-    QString prelogonUserAuthCookie() const;
     QList<GPGateway> allGateways() const;
     void setAllGateways(QList<GPGateway> gateways);
 
@@ -44,8 +43,9 @@ private:
     void setPrelogonUserAuthCookie(const QString cookie);
 
     static QList<GPGateway> parseGateways(QXmlStreamReader &xmlReader);
-    static QMap<QString, int> parsePriorityRules(QXmlStreamReader &xmlReader);
-    static QString parseGatewayName(QXmlStreamReader &xmlReader);
+    static void parseGateway(QXmlStreamReader &reader, GPGateway &gateway);
+    static void parsePriorityRule(QXmlStreamReader &reader, GPGateway &gateway);
+
 };
 
 #endif // PORTALCONFIGRESPONSE_H

GPClient/samlloginwindow.cpp

@@ -15,6 +15,7 @@ SAMLLoginWindow::SAMLLoginWindow(QWidget *parent)
 
     QVBoxLayout *verticalLayout = new QVBoxLayout(this);
     webView->setUrl(QUrl("about:blank"));
+    webView->setAttribute(Qt::WA_DeleteOnClose);
     // webView->page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
     verticalLayout->addWidget(webView);
 

GPService/CMakeLists.txt

@@ -4,6 +4,12 @@ project(GPService)
 
 set(gpservice_GENERATED_SOURCES)
 
+execute_process(COMMAND logname OUTPUT_VARIABLE CMAKE_LOGNAME)
+string(STRIP "${CMAKE_LOGNAME}" CMAKE_LOGNAME)
+
+message(STATUS "CMAKE_LOGNAME: ${CMAKE_LOGNAME}")
+
+configure_file(dbus/com.yuezk.qt.GPService.conf.in dbus/com.yuezk.qt.GPService.conf)
 configure_file(dbus/com.yuezk.qt.GPService.service.in dbus/com.yuezk.qt.GPService.service)
 configure_file(systemd/gpservice.service.in systemd/gpservice.service)
 
@@ -65,7 +71,7 @@ target_link_libraries(gpservice
 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.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)
 install(FILES "gp.conf" DESTINATION /etc/gpservice)
 

GPService/gpservice.cpp

@@ -136,7 +136,7 @@ void GPService::connect(QString server, QString username, QString passwd)
          << "--cookie-on-stdin"
          << server;
 
-    log("Start process with arugments: " + args.join(" "));
+    log("Start process with arugments: " + args.join(", "));
 
     openconnect->start(bin, args);
     openconnect->write((passwd + "\n").toUtf8());

README.md

@@ -42,7 +42,7 @@ Add the repository in the above table and install it with your favorite package
 ```sh
 sudo add-apt-repository ppa:yuezk/globalprotect-openconnect
 sudo apt-get update
-sudo apt install globalprotect-openconnect
+sudo apt-get 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`.
@@ -105,7 +105,7 @@ cd GlobalProtect-openconnect
 >
 > ```sh
 > sudo add-apt-repository ppa:dwmw2/openconnect
-> sudo apt update
+> sudo apt-get update
 > ```
 
 Build and install with:

VERSION

@@ -1 +1 @@
-1.4.4
+1.4.5

debian/changelog

@@ -1,3 +1,25 @@
+globalprotect-openconnect (1.4.5-1) unstable; urgency=medium
+
+  * Updated VERSION, Bumped 1.4.4 –> 1.4.5
+  * chore: refine vscode settings
+  * fix: rollback dbus configuration
+  * feat: add option to start minimized
+  * packaging: fix postinst for debian
+  * packaging: add postinst for debian
+  * test: test debian packaging
+  * ci: fix the foder path
+  * chore: apt -> apt-get
+  * ci: verify debian package
+  * Revert "Revert "fix: improve the dbus security""
+  * fix: improve the portal config parsing
+  * Revert "fix: improve the dbus security"
+  * fix: improve the dbus security
+  * fix: free resources in slots
+  * chore: refine cmake files
+  * fix: support high DPI screen
+
+ -- Kevin Yue <k3vinyue@gmail.com>  Sun, 29 May 2022 21:15:40 +0800
+
 globalprotect-openconnect (1.4.4-1) unstable; urgency=medium
 
   * Updated VERSION, Bumped 1.4.3 –> 1.4.4

packaging/aur/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Keinv Yue <yuezk001@gmail.com>
 
-_pkgver="1.4.4"
-_commit="4327235093159c6569af33021d4c763ebea3787a"
+_pkgver="1.4.5"
+_commit="a489c5881bdc9d3565da0f2efac4963bec3f7069"
 pkgname=globalprotect-openconnect-git
 pkgver=${_pkgver}
 pkgrel=1

packaging/aur/gp.install

@@ -5,4 +5,4 @@ post_install() {
 
 post_upgrade() {
     post_install
-}
+}

packaging/obs/globalprotect-openconnect.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun May 29 13:15:40 UTC 2022 - k3vinyue@gmail.com - 1.4.5
+
+- Update to 1.4.5
+  * Updated VERSION, Bumped 1.4.4 –> 1.4.5
+  * chore: refine vscode settings
+  * fix: rollback dbus configuration
+  * feat: add option to start minimized
+  * packaging: fix postinst for debian
+  * packaging: add postinst for debian
+  * test: test debian packaging
+  * ci: fix the foder path
+  * chore: apt -> apt-get
+  * ci: verify debian package
+  * Revert "Revert "fix: improve the dbus security""
+  * fix: improve the portal config parsing
+  * Revert "fix: improve the dbus security"
+  * fix: improve the dbus security
+  * fix: free resources in slots
+  * chore: refine cmake files
+  * fix: support high DPI screen
+
 -------------------------------------------------------------------
 Sat May 14 11:21:14 UTC 2022 - k3vinyue@gmail.com - 1.4.4
 

packaging/obs/globalprotect-openconnect.spec

@@ -1,5 +1,5 @@
 Name:           globalprotect-openconnect
-Version:        1.4.4
+Version:        1.4.5
 Release:        1
 Summary:        A GlobalProtect VPN client powered by OpenConnect
 Group:          Productivity/Networking/PPP

scripts/install-ubuntu.sh

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

scripts/verify-debian-package.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+sudo apt-get update
+sudo apt-get install -y \
+	build-essential \
+	qtbase5-dev \
+	libqt5websockets5-dev \
+	qtwebengine5-dev \
+	cmake \
+	debhelper
+
+mkdir -p build
+
+cp ./artifacts/*.tar.gz build/ && cd build
+tar -xzf *.tar.gz && cd globalprotect-openconnect-*/
+
+dpkg-buildpackage -us -uc