Credentials autocompleting (secure version) (#179)

Co-authored-by: simon <simon.leary42@gmail.com>

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "plog"]
 	path = 3rdparty/plog
 	url = https://github.com/SergiusTheBest/plog.git
+[submodule "3rdparty/qtkeychain"]
+	path = 3rdparty/qtkeychain
+	url = git@github.com:frankosterfeld/qtkeychain.git

GPClient/CMakeLists.txt

@@ -64,6 +64,17 @@ add_3rdparty(
         -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
 )
 
+add_3rdparty(
+    qtkeychain
+    GIT_REPOSITORY https://github.com/frankosterfeld/qtkeychain.git
+    GIT_TAG master
+    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}
+)
+
 ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
 set(SingleApplication_INCLUDE_DIR ${SOURCE_DIR})
 set(SingleApplication_LIBRARY ${BINARY_DIR}/libSingleApplication.a)
@@ -71,7 +82,12 @@ 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})
+ExternalProject_Get_Property(qtkeychain-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
+set(qtkeychain_INCLUDE_DIR "${SOURCE_DIR}")
+set(qtkeychain_BINARY_DIR "${BINARY_DIR}")
+set(qtkeychain_LIBRARY ${BINARY_DIR}/libqt5keychain.so)
+
+add_dependencies(gpclient SingleApplication-${PROJECT_NAME} plog-${PROJECT_NAME} qtkeychain-${PROJECT_NAME})
 
 target_include_directories(gpclient PRIVATE
     ${CMAKE_BINARY_DIR}
@@ -79,10 +95,13 @@ target_include_directories(gpclient PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR}
     ${SingleApplication_INCLUDE_DIR}
     ${plog_INCLUDE_DIR}
+    ${qtkeychain_INCLUDE_DIR}
+    ${qtkeychain_BINARY_DIR}
 )
 
 target_link_libraries(gpclient
     ${SingleApplication_LIBRARY}
+    ${qtkeychain_LIBRARY}
     Qt5::Widgets
     Qt5::Network
     Qt5::WebSockets

GPClient/gpclient.cpp

@@ -446,8 +446,14 @@ bool GPClient::connected() const
 
 QList<GPGateway> GPClient::allGateways() const
 {
-    const QString gatewaysJson = settings::get(portal() + "_gateways").toString();
-    return GPGateway::fromJson(gatewaysJson);
+
+    QList<GPGateway> gateways;
+
+    for (auto g :settings::get_all("_gateways$") ){
+
+    	gateways.append(GPGateway::fromJson(settings::get(g).toString()));
+    }
+    return gateways;
 }
 
 void GPClient::setAllGateways(QList<GPGateway> gateways)
@@ -475,6 +481,7 @@ void GPClient::setCurrentGateway(const GPGateway gateway)
     LOGI << "Updating the current gateway to " << gateway.name();
 
     settings::save(portal() + "_selectedGateway", gateway.name());
+    ui->portalInput->setText(gateway.address());
     populateGatewayMenu();
 }
 

GPClient/gphelper.cpp

@@ -9,9 +9,12 @@
 #include <plog/Log.h>
 #include <QWebEngineProfile>
 #include <QWebEngineCookieStore>
+#include <keychain.h>
 
 #include "gphelper.h"
 
+using namespace QKeychain;
+
 QNetworkAccessManager* gpclient::helper::networkManager = new QNetworkAccessManager;
 
 QNetworkReply* gpclient::helper::createRequest(QString url, QByteArray params)
@@ -115,6 +118,12 @@ QVariant gpclient::helper::settings::get(const QString &key, const QVariant &def
     return _settings->value(key, defaultValue);
 }
 
+QStringList gpclient::helper::settings::get_all(const QString &key, const QVariant &defaultValue)
+{
+	QRegularExpression re(key);
+	return 	_settings->allKeys().filter(re);
+}
+
 void gpclient::helper::settings::save(const QString &key, const QVariant &value)
 {
     _settings->setValue(key, value);
@@ -132,3 +141,38 @@ void gpclient::helper::settings::clear()
 
     QWebEngineProfile::defaultProfile()->cookieStore()->deleteAllCookies();
 }
+
+
+bool gpclient::helper::settings::secureSave(const QString &key, const QString &value) {
+    WritePasswordJob job( QLatin1String("gpclient") );
+    job.setAutoDelete( false );
+    job.setKey( key );
+    job.setTextData( value );
+    QEventLoop loop;
+    job.connect( &job, SIGNAL(finished(QKeychain::Job*)), &loop, SLOT(quit()) );
+    job.start();
+    loop.exec();
+    if ( job.error() ) {
+        return false;
+    }
+
+    return true;
+}
+
+bool gpclient::helper::settings::secureGet(const QString &key, QString &value) {
+    ReadPasswordJob job( QLatin1String("gpclient") );
+    job.setAutoDelete( false );
+    job.setKey( key );
+    QEventLoop loop;
+    job.connect( &job, SIGNAL(finished(QKeychain::Job*)), &loop, SLOT(quit()) );
+    job.start();
+    loop.exec();
+
+    const QString pw = job.textData();
+    if ( job.error() ) {
+        return false;
+    }
+    
+    value = pw;
+    return true;
+}

GPClient/gphelper.h

@@ -34,8 +34,12 @@ namespace gpclient {
             static const QStringList reservedKeys {"extraArgs", "clientos"};
 
             QVariant get(const QString &key, const QVariant &defaultValue = QVariant());
+            QStringList get_all(const QString &key, const QVariant &defaultValue = QVariant());
             void save(const QString &key, const QVariant &value);
             void clear();
+
+            bool secureSave(const QString &key, const QString &value);
+            bool secureGet(const QString &key, QString &value);
         }
     }
 }

GPClient/standardloginwindow.cpp

@@ -2,6 +2,9 @@
 
 #include "standardloginwindow.h"
 #include "ui_standardloginwindow.h"
+#include "gphelper.h"
+
+using namespace gpclient::helper;
 
 StandardLoginWindow::StandardLoginWindow(const QString &portalAddress, const QString &labelUsername,
                                          const QString &labelPassword, const QString &authMessage) :
@@ -13,11 +16,24 @@ StandardLoginWindow::StandardLoginWindow(const QString &portalAddress, const QSt
     ui->password->setPlaceholderText(labelPassword);
     ui->authMessage->setText(authMessage);
 
+    autocomplete();
+
     setWindowTitle("GlobalProtect Login");
     setFixedSize(width(), height());
     setModal(true);
 }
 
+void StandardLoginWindow::autocomplete() {
+    QString username, password;
+    settings::secureGet("username", username);
+    settings::secureGet("password", password);
+
+    if (!username.isEmpty() && !password.isEmpty()) {
+        ui->username->setText(username);
+        ui->password->setText(password);
+    }
+}
+
 void StandardLoginWindow::setProcessing(bool isProcessing) {
     ui->username->setReadOnly(isProcessing);
     ui->password->setReadOnly(isProcessing);
@@ -32,6 +48,9 @@ void StandardLoginWindow::on_loginButton_clicked() {
         return;
     }
 
+    settings::secureSave("username", username);
+    settings::secureSave("password", password);
+
     emit performLogin(username, password);
 }
 

GPClient/standardloginwindow.h

@@ -28,6 +28,7 @@ private:
     Ui::StandardLoginWindow *ui;
 
     void closeEvent(QCloseEvent *event);
+    void autocomplete();
 };
 
 #endif // STANDARDLOGINWINDOW_H

GPService/gpservice.cpp

@@ -199,7 +199,9 @@ void GPService::onProcessStdout()
     QString output = openconnect->readAllStandardOutput();
 
     log(output);
-    if (output.indexOf("Connected as") >= 0 || output.indexOf("Configured as") >= 0) {
+    if (output.indexOf("Connected as") >= 0 ||
+        output.indexOf("Configured as") >= 0 ||
+        output.indexOf("Configurado como") >= 0) {
         vpnStatus = GPService::VpnConnected;
         emit connected();
     }

scripts/install-debian.sh

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

scripts/install-ubuntu.sh

@@ -6,6 +6,7 @@ sudo apt-get install -y \
     qtbase5-dev \
     libqt5websockets5-dev \
     qtwebengine5-dev \
+	qttools5-dev \
     openconnect
 
 ./scripts/install.sh