reduce chunk size for qr code

Added masking parameters for native wireguard configs

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.5.0.0
+project(${PROJECT} VERSION 4.5.2.0
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 50)
+set(APP_ANDROID_VERSION_CODE 51)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

client/3rd/QSimpleCrypto/include/QX509.h

@@ -72,7 +72,7 @@ namespace QSimpleCrypto
         /// \param notAfter - X509 end date.
         /// \return Returns OpenSSL X509 structure or nullptr, if error happened. Returned value must be cleaned up with 'X509_free' to avoid memory leak.
         ///
-        X509* generateSelfSignedCertificate(const RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
+        X509* generateSelfSignedCertificate(RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
             const QByteArray& certificateFileName = "", const EVP_MD* md = EVP_sha512(),
             const long& serialNumber = 1, const long& version = x509LastVersion,
             const long& notBefore = 0, const long& notAfter = oneYear);

client/3rd/QSimpleCrypto/sources/QX509.cpp

@@ -139,7 +139,7 @@ X509* QSimpleCrypto::QX509::verifyCertificate(X509* x509, X509_STORE* store)
 /// \param notAfter - X509 end date.
 /// \return Returns OpenSSL X509 structure or nullptr, if error happened. Returned value must be cleaned up with 'X509_free' to avoid memory leak.
 ///
-X509* QSimpleCrypto::QX509::generateSelfSignedCertificate(const RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
+X509* QSimpleCrypto::QX509::generateSelfSignedCertificate(RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
     const QByteArray& certificateFileName, const EVP_MD* md,
     const long& serialNumber, const long& version,
     const long& notBefore, const long& notAfter)

client/amnezia_application.cpp

@@ -9,17 +9,16 @@
 #include <QTextDocument>
 #include <QTimer>
 #include <QTranslator>
-
 #include <QQuickItem>
 
 #include "logger.h"
-#include "version.h"
 #include "ui/models/installedAppsModel.h"
+#include "version.h"
 
 #include "platforms/ios/QRCodeReaderBase.h"
 #if defined(Q_OS_ANDROID)
-    #include "platforms/android/android_controller.h"
     #include "core/installedAppsImageProvider.h"
+    #include "platforms/android/android_controller.h"
 #endif
 
 #include "protocols/qml_register_protocols.h"
@@ -32,8 +31,8 @@
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_CLASS(argc, argv)
 #else
-AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecondary, SingleApplication::Options options,
-                                       int timeout, const QString &userData)
+AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecondary, SingleApplication::Options options, int timeout,
+                                       const QString &userData)
     : SingleApplication(argc, argv, allowSecondary, options, timeout, userData)
 #endif
 {
@@ -46,12 +45,12 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecond
         s.setValue("permFixed", true);
     }
 
-    QString configLoc1 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/"
-            + ORGANIZATION_NAME + "/" + APPLICATION_NAME + ".conf";
+    QString configLoc1 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/" + ORGANIZATION_NAME + "/"
+            + APPLICATION_NAME + ".conf";
     QFile::setPermissions(configLoc1, QFileDevice::ReadOwner | QFileDevice::WriteOwner);
 
-    QString configLoc2 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/"
-            + ORGANIZATION_NAME + "/" + APPLICATION_NAME + "/" + APPLICATION_NAME + ".conf";
+    QString configLoc2 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/" + ORGANIZATION_NAME + "/"
+            + APPLICATION_NAME + "/" + APPLICATION_NAME + ".conf";
     QFile::setPermissions(configLoc2, QFileDevice::ReadOwner | QFileDevice::WriteOwner);
 #endif
 
@@ -100,20 +99,17 @@ void AmneziaApplication::init()
     connect(m_settings.get(), &Settings::saveLogsChanged, AndroidController::instance(), &AndroidController::setSaveLogs);
 
     AndroidController::instance()->setScreenshotsEnabled(m_settings->isScreenshotsEnabled());
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, AndroidController::instance(),
-            &AndroidController::setScreenshotsEnabled);
+    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, AndroidController::instance(), &AndroidController::setScreenshotsEnabled);
 
-    connect(m_settings.get(), &Settings::serverRemoved, AndroidController::instance(),
-            &AndroidController::resetLastServer);
+    connect(m_settings.get(), &Settings::serverRemoved, AndroidController::instance(), &AndroidController::resetLastServer);
 
     connect(m_settings.get(), &Settings::settingsCleared, []() { AndroidController::instance()->resetLastServer(-1); });
 
-    connect(AndroidController::instance(), &AndroidController::initConnectionState, this,
-            [this](Vpn::ConnectionState state) {
-                m_connectionController->onConnectionStateChanged(state);
-                if (m_vpnConnection)
-                    m_vpnConnection->restoreConnection();
-            });
+    connect(AndroidController::instance(), &AndroidController::initConnectionState, this, [this](Vpn::ConnectionState state) {
+        m_connectionController->onConnectionStateChanged(state);
+        if (m_vpnConnection)
+            m_vpnConnection->restoreConnection();
+    });
     if (!AndroidController::instance()->initialize()) {
         qFatal("Android controller initialization failed");
     }
@@ -127,8 +123,6 @@ void AmneziaApplication::init()
     m_engine->addImageProvider(QLatin1String("installedAppImage"), new InstalledAppsImageProvider);
 #endif
 
-
-
 #ifdef Q_OS_IOS
     IosController::Instance()->initialize();
     connect(IosController::Instance(), &IosController::importConfigFromOutside, [this](QString data) {
@@ -145,8 +139,7 @@ void AmneziaApplication::init()
 
     QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
 
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged,
-            [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); });
+    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); });
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
@@ -154,14 +147,12 @@ void AmneziaApplication::init()
     connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
             &NotificationHandler::setConnectionState);
 
-    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(),
-            &PageController::raiseMainWindow);
+    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(), &PageController::raiseMainWindow);
     connect(m_notificationHandler.get(), &NotificationHandler::connectRequested, m_connectionController.get(),
             &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
-    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),
-            &NotificationHandler::onTranslationsUpdated);
+    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(), &NotificationHandler::onTranslationsUpdated);
 
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
@@ -312,8 +303,7 @@ void AmneziaApplication::initModels()
 
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
-    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(),
-            &ContainersModel::updateModel);
+    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(), &ContainersModel::updateModel);
     connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
             &ContainersModel::updateModel);
     m_serversModel->resetModel();
@@ -366,26 +356,23 @@ void AmneziaApplication::initModels()
 
 void AmneziaApplication::initControllers()
 {
-    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_clientManagementModel,
-                                                          m_vpnConnection, m_settings));
+    m_connectionController.reset(
+            new ConnectionController(m_serversModel, m_containersModel, m_clientManagementModel, m_vpnConnection, m_settings));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
-    connect(m_connectionController.get(), &ConnectionController::connectionErrorOccurred, this,
-            [this](const QString &errorMessage) {
-                emit m_pageController->showErrorMessage(errorMessage);
-                emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-            });
+    connect(m_connectionController.get(), &ConnectionController::connectionErrorOccurred, this, [this](const QString &errorMessage) {
+        emit m_pageController->showErrorMessage(errorMessage);
+        emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
+    });
     connect(m_connectionController.get(), &ConnectionController::connectButtonClicked, m_connectionController.get(),
             &ConnectionController::toggleConnection, Qt::QueuedConnection);
 
-    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(),
-            &ConnectionController::onTranslationsUpdated);
+    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
 
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
-    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel,
-                                                    m_clientManagementModel, m_settings));
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
     connect(m_installController.get(), &InstallController::passphraseRequestStarted, m_pageController.get(),
             &PageController::showPassphraseRequestDrawer);
@@ -401,13 +388,12 @@ void AmneziaApplication::initControllers()
     m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
 
     m_settingsController.reset(
-            new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_settings));
+            new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_appSplitTunnelingModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
     if (m_settingsController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
         QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); });
     }
-    connect(m_settingsController.get(), &SettingsController::amneziaDnsToggled, m_serversModel.get(),
-            &ServersModel::toggleAmneziaDns);
+    connect(m_settingsController.get(), &SettingsController::amneziaDnsToggled, m_serversModel.get(), &ServersModel::toggleAmneziaDns);
 
     m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
     m_engine->rootContext()->setContextProperty("SitesController", m_sitesController.get());

client/amnezia_application.h

@@ -14,8 +14,6 @@
 #include "settings.h"
 #include "vpnconnection.h"
 
-#include "core/controllers/apiController.h"
-
 #include "ui/controllers/connectionController.h"
 #include "ui/controllers/exportController.h"
 #include "ui/controllers/importController.h"
@@ -125,7 +123,6 @@ private:
     QScopedPointer<SettingsController> m_settingsController;
     QScopedPointer<SitesController> m_sitesController;
     QScopedPointer<SystemController> m_systemController;
-    QScopedPointer<ApiController> m_apiController;
     QScopedPointer<AppSplitTunnelingController> m_appSplitTunnelingController;
 };
 

client/cmake/android.cmake

@@ -49,8 +49,8 @@ foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpn3.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl/android/${abi}/libcrypto_3.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl/android/${abi}/libssl_3.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libcrypto_3.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libssl_3.so
     )
 endforeach()

client/cmake/ios.cmake

@@ -108,6 +108,7 @@ target_sources(${PROJECT} PRIVATE
     ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/ScreenProtection.swift
+    ${CLIENT_ROOT_DIR}/platforms/ios/VPNCController.swift
 )
 
 target_sources(${PROJECT} PRIVATE

client/configurators/awg_configurator.cpp

@@ -3,15 +3,13 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-#include "core/controllers/serverController.h"
-
-AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : WireguardConfigurator(settings, true, parent)
+AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
+    : WireguardConfigurator(settings, serverController, true, parent)
 {
 }
 
-QString AwgConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                      const QJsonObject &containerConfig, ErrorCode errorCode)
+QString AwgConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                      ErrorCode errorCode)
 {
     QString config = WireguardConfigurator::createConfig(credentials, container, containerConfig, errorCode);
 
@@ -41,8 +39,8 @@ QString AwgConfigurator::createConfig(const ServerCredentials &credentials, Dock
     jsonConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
     jsonConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
     jsonConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
-    jsonConfig[config_key::mtu] = containerConfig.value(ProtocolProps::protoToString(Proto::Awg)).toObject().
-                                  value(config_key::mtu).toString(protocols::awg::defaultMtu);
+    jsonConfig[config_key::mtu] =
+            containerConfig.value(ProtocolProps::protoToString(Proto::Awg)).toObject().value(config_key::mtu).toString(protocols::awg::defaultMtu);
 
     return QJsonDocument(jsonConfig).toJson();
 }

client/configurators/awg_configurator.h

@@ -9,7 +9,7 @@ class AwgConfigurator : public WireguardConfigurator
 {
     Q_OBJECT
 public:
-    AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    AwgConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     QString createConfig(const ServerCredentials &credentials, DockerContainer container,
                          const QJsonObject &containerConfig, ErrorCode errorCode);

client/configurators/cloak_configurator.cpp

@@ -1,33 +1,30 @@
 #include "cloak_configurator.h"
 
 #include <QFile>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
 
-#include "core/controllers/serverController.h"
 #include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"
 
-CloakConfigurator::CloakConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+CloakConfigurator::CloakConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent)
 {
-
 }
 
-QString CloakConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                        const QJsonObject &containerConfig, ErrorCode errorCode)
+QString CloakConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                        ErrorCode errorCode)
 {
-    ServerController serverController(m_settings);
-
-    QString cloakPublicKey = serverController.getTextFileFromContainer(container, credentials,
-        amnezia::protocols::cloak::ckPublicKeyPath, errorCode);
+    QString cloakPublicKey =
+            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::cloak::ckPublicKeyPath, errorCode);
     cloakPublicKey.replace("\n", "");
 
     if (errorCode != ErrorCode::NoError) {
         return "";
     }
 
-    QString cloakBypassUid = serverController.getTextFileFromContainer(container, credentials,
-        amnezia::protocols::cloak::ckBypassUidKeyPath, errorCode);
+    QString cloakBypassUid =
+            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::cloak::ckBypassUidKeyPath, errorCode);
     cloakBypassUid.replace("\n", "");
 
     if (errorCode != ErrorCode::NoError) {
@@ -47,8 +44,8 @@ QString CloakConfigurator::createConfig(const ServerCredentials &credentials, Do
     config.insert("RemoteHost", credentials.hostName);
     config.insert("RemotePort", "$CLOAK_SERVER_PORT");
 
-    QString textCfg = serverController.replaceVars(QJsonDocument(config).toJson(),
-                                                   serverController.genVarsForScript(credentials, container, containerConfig));
+    QString textCfg = m_serverController->replaceVars(QJsonDocument(config).toJson(),
+                                                      m_serverController->genVarsForScript(credentials, container, containerConfig));
 
     return textCfg;
 }

client/configurators/cloak_configurator.h

@@ -11,7 +11,7 @@ class CloakConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    CloakConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    CloakConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     QString createConfig(const ServerCredentials &credentials, DockerContainer container,
                          const QJsonObject &containerConfig, ErrorCode errorCode);

client/configurators/configurator_base.cpp

@@ -1,7 +1,7 @@
 #include "configurator_base.h"
 
-ConfiguratorBase::ConfiguratorBase(std::shared_ptr<Settings> settings, QObject *parent)
-    : QObject { parent }, m_settings(settings)
+ConfiguratorBase::ConfiguratorBase(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
+    : QObject { parent }, m_settings(settings), m_serverController(serverController)
 {
 }
 

client/configurators/configurator_base.h

@@ -5,13 +5,14 @@
 
 #include "containers/containers_defs.h"
 #include "core/defs.h"
+#include "core/controllers/serverController.h"
 #include "settings.h"
 
 class ConfiguratorBase : public QObject
 {
     Q_OBJECT
 public:
-    explicit ConfiguratorBase(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    explicit ConfiguratorBase(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     virtual QString createConfig(const ServerCredentials &credentials, DockerContainer container,
                                  const QJsonObject &containerConfig, ErrorCode errorCode) = 0;
@@ -25,6 +26,8 @@ protected:
     void processConfigWithDnsSettings(const QPair<QString, QString> &dns, QString &protocolConfigString);
 
     std::shared_ptr<Settings> m_settings;
+    QSharedPointer<ServerController> m_serverController;
+
 };
 
 #endif // CONFIGURATORBASE_H

client/configurators/ikev2_configurator.cpp

@@ -9,18 +9,18 @@
 #include <QUuid>
 
 #include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
 #include "core/server_defs.h"
-#include "core/controllers/serverController.h"
 #include "utilities.h"
 
-Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : ConfiguratorBase(settings, parent)
+Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent)
 {
 }
 
-Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const ServerCredentials &credentials,
-                                                                        DockerContainer container, ErrorCode errorCode)
+Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const ServerCredentials &credentials, DockerContainer container,
+                                                                        ErrorCode errorCode)
 {
     Ikev2Configurator::ConnectionData connData;
     connData.host = credentials.hostName;
@@ -39,18 +39,14 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
                                        "--extKeyUsage serverAuth,clientAuth -8 \"%1\"")
                                        .arg(connData.clientId);
 
-    ServerController serverController(m_settings);
-    errorCode = serverController.runContainerScript(credentials, container, scriptCreateCert);
+    errorCode = m_serverController->runContainerScript(credentials, container, scriptCreateCert);
 
-    QString scriptExportCert = QString("pk12util -W \"%1\" -d sql:/etc/ipsec.d -n \"%2\" -o \"%3\"")
-                                       .arg(connData.password)
-                                       .arg(connData.clientId)
-                                       .arg(certFileName);
-    errorCode = serverController.runContainerScript(credentials, container, scriptExportCert);
+    QString scriptExportCert =
+            QString("pk12util -W \"%1\" -d sql:/etc/ipsec.d -n \"%2\" -o \"%3\"").arg(connData.password).arg(connData.clientId).arg(certFileName);
+    errorCode = m_serverController->runContainerScript(credentials, container, scriptExportCert);
 
-    connData.clientCert = serverController.getTextFileFromContainer(container, credentials, certFileName, errorCode);
-    connData.caCert =
-            serverController.getTextFileFromContainer(container, credentials, "/etc/ipsec.d/ca_cert_base64.p12", errorCode);
+    connData.clientCert = m_serverController->getTextFileFromContainer(container, credentials, certFileName, errorCode);
+    connData.caCert = m_serverController->getTextFileFromContainer(container, credentials, "/etc/ipsec.d/ca_cert_base64.p12", errorCode);
 
     qDebug() << "Ikev2Configurator::ConnectionData client cert size:" << connData.clientCert.size();
     qDebug() << "Ikev2Configurator::ConnectionData ca cert size:" << connData.caCert.size();
@@ -58,8 +54,8 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
     return connData;
 }
 
-QString Ikev2Configurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                        const QJsonObject &containerConfig, ErrorCode errorCode)
+QString Ikev2Configurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                        ErrorCode errorCode)
 {
     Q_UNUSED(containerConfig)
 

client/configurators/ikev2_configurator.h

@@ -11,7 +11,7 @@ class Ikev2Configurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    Ikev2Configurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    Ikev2Configurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     struct ConnectionData {
         QByteArray clientCert; // p12 client cert

client/configurators/openvpn_configurator.cpp

@@ -24,14 +24,14 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 
-OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : ConfiguratorBase(settings, parent)
+OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
+                                         QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent)
 {
 }
 
 OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(const ServerCredentials &credentials,
-                                                                              DockerContainer container,
-                                                                              ErrorCode errorCode)
+                                                                              DockerContainer container, ErrorCode errorCode)
 {
     OpenVpnConfigurator::ConnectionData connData = OpenVpnConfigurator::createCertRequest();
     connData.host = credentials.hostName;
@@ -43,8 +43,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co
 
     QString reqFileName = QString("%1/%2.req").arg(amnezia::protocols::openvpn::clientsDirPath).arg(connData.clientId);
 
-    ServerController serverController(m_settings);
-    errorCode = serverController.uploadTextFileToContainer(container, credentials, connData.request, reqFileName);
+    errorCode = m_serverController->uploadTextFileToContainer(container, credentials, connData.request, reqFileName);
     if (errorCode != ErrorCode::NoError) {
         return connData;
     }
@@ -54,18 +53,16 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co
         return connData;
     }
 
-    connData.caCert = serverController.getTextFileFromContainer(container, credentials,
-                                                                amnezia::protocols::openvpn::caCertPath, errorCode);
-    connData.clientCert = serverController.getTextFileFromContainer(
-            container, credentials,
-            QString("%1/%2.crt").arg(amnezia::protocols::openvpn::clientCertPath).arg(connData.clientId), errorCode);
+    connData.caCert =
+            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::openvpn::caCertPath, errorCode);
+    connData.clientCert = m_serverController->getTextFileFromContainer(
+            container, credentials, QString("%1/%2.crt").arg(amnezia::protocols::openvpn::clientCertPath).arg(connData.clientId), errorCode);
 
     if (errorCode != ErrorCode::NoError) {
         return connData;
     }
 
-    connData.taKey = serverController.getTextFileFromContainer(container, credentials,
-                                                               amnezia::protocols::openvpn::taKeyPath, errorCode);
+    connData.taKey = m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::openvpn::taKeyPath, errorCode);
 
     if (connData.caCert.isEmpty() || connData.clientCert.isEmpty() || connData.taKey.isEmpty()) {
         errorCode = ErrorCode::SshScpFailureError;
@@ -77,10 +74,8 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co
 QString OpenVpnConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
                                           const QJsonObject &containerConfig, ErrorCode errorCode)
 {
-    ServerController serverController(m_settings);
-    QString config =
-            serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
-                                         serverController.genVarsForScript(credentials, container, containerConfig));
+    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
+                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareOpenVpnConfig(credentials, container, errorCode);
     if (errorCode != ErrorCode::NoError) {
@@ -122,17 +117,15 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString,
         QRegularExpression regex("redirect-gateway.*");
         config.replace(regex, "");
 
-        if (m_settings->routeMode() == Settings::VpnAllSites) {
+        if (!m_settings->getSitesSplitTunnelingEnabled()) {
             config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
             // Prevent ipv6 leak
             config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
             config.append("block-ipv6\n");
-        }
-        if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
+        } else if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
 
             // no redirect-gateway
-        }
-        if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
 #ifndef Q_OS_ANDROID
             config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
 #endif
@@ -196,12 +189,10 @@ ErrorCode OpenVpnConfigurator::signCert(DockerContainer container, const ServerC
                                   .arg(ContainerProps::containerToString(container))
                                   .arg(clientId);
 
-    ServerController serverController(m_settings);
     QStringList scriptList { script_import, script_sign };
-    QString script = serverController.replaceVars(scriptList.join("\n"),
-                                                  serverController.genVarsForScript(credentials, container));
+    QString script = m_serverController->replaceVars(scriptList.join("\n"), m_serverController->genVarsForScript(credentials, container));
 
-    return serverController.runScript(credentials, script);
+    return m_serverController->runScript(credentials, script);
 }
 
 OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
@@ -235,8 +226,8 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
 
     X509_NAME_add_entry_by_txt(x509_name, "C", MBSTRING_ASC, (unsigned char *)"ORG", -1, -1, 0);
     X509_NAME_add_entry_by_txt(x509_name, "O", MBSTRING_ASC, (unsigned char *)"", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(x509_name, "CN", MBSTRING_ASC,
-                               reinterpret_cast<unsigned char const *>(clientIdUtf8.data()), clientIdUtf8.size(), -1, 0);
+    X509_NAME_add_entry_by_txt(x509_name, "CN", MBSTRING_ASC, reinterpret_cast<unsigned char const *>(clientIdUtf8.data()),
+                               clientIdUtf8.size(), -1, 0);
 
     // 4. set public key of x509 req
     ret = X509_REQ_set_pubkey(x509_req, pKey);

client/configurators/openvpn_configurator.h

@@ -11,7 +11,7 @@ class OpenVpnConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    OpenVpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    OpenVpnConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     struct ConnectionData
     {

client/configurators/shadowsocks_configurator.cpp

@@ -1,25 +1,23 @@
 #include "shadowsocks_configurator.h"
 
 #include <QFile>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
 
 #include "containers/containers_defs.h"
 #include "core/controllers/serverController.h"
 
-ShadowSocksConfigurator::ShadowSocksConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+ShadowSocksConfigurator::ShadowSocksConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
+                                                 QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent)
 {
-
 }
 
 QString ShadowSocksConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
                                               const QJsonObject &containerConfig, ErrorCode errorCode)
 {
-    ServerController serverController(m_settings);
-
-    QString ssKey = serverController.getTextFileFromContainer(container, credentials,
-                                                              amnezia::protocols::shadowsocks::ssKeyPath, errorCode);
+    QString ssKey =
+            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::shadowsocks::ssKeyPath, errorCode);
     ssKey.replace("\n", "");
 
     if (errorCode != ErrorCode::NoError) {
@@ -34,10 +32,9 @@ QString ShadowSocksConfigurator::createConfig(const ServerCredentials &credentia
     config.insert("timeout", 60);
     config.insert("method", "$SHADOWSOCKS_CIPHER");
 
+    QString textCfg = m_serverController->replaceVars(QJsonDocument(config).toJson(),
+                                                      m_serverController->genVarsForScript(credentials, container, containerConfig));
 
-    QString textCfg = serverController.replaceVars(QJsonDocument(config).toJson(),
-                                                   serverController.genVarsForScript(credentials, container, containerConfig));
-
-    //qDebug().noquote() << textCfg;
+    // qDebug().noquote() << textCfg;
     return textCfg;
 }

client/configurators/shadowsocks_configurator.h

@@ -10,7 +10,7 @@ class ShadowSocksConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    ShadowSocksConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    ShadowSocksConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     QString createConfig(const ServerCredentials &credentials, DockerContainer container,
                          const QJsonObject &containerConfig, ErrorCode errorCode);

client/configurators/ssh_configurator.cpp

@@ -17,8 +17,8 @@
 #include "core/server_defs.h"
 #include "utilities.h"
 
-SshConfigurator::SshConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : ConfiguratorBase(settings, parent)
+SshConfigurator::SshConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent)
 {
 }
 
@@ -82,8 +82,7 @@ void SshConfigurator::openSshTerminal(const ServerCredentials &credentials)
         //        p->setNativeArguments(QString("%1@%2")
         //            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     } else {
-        p->setNativeArguments(
-                QString("%1@%2 -pw %3").arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
+        p->setNativeArguments(QString("%1@%2 -pw %3").arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     }
     #else
     p->setProgram("/bin/bash");

client/configurators/ssh_configurator.h

@@ -11,7 +11,7 @@ class SshConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    SshConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    SshConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     QProcessEnvironment prepareEnv();
     QString convertOpenSShKey(const QString &key);

client/configurators/wireguard_configurator.cpp

@@ -19,15 +19,13 @@
 #include "settings.h"
 #include "utilities.h"
 
-WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAwg, QObject *parent)
-    : ConfiguratorBase(settings, parent), m_isAwg(isAwg)
+WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
+                                             bool isAwg, QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent), m_isAwg(isAwg)
 {
-    m_serverConfigPath =
-            m_isAwg ? amnezia::protocols::awg::serverConfigPath : amnezia::protocols::wireguard::serverConfigPath;
-    m_serverPublicKeyPath =
-            m_isAwg ? amnezia::protocols::awg::serverPublicKeyPath : amnezia::protocols::wireguard::serverPublicKeyPath;
-    m_serverPskKeyPath =
-            m_isAwg ? amnezia::protocols::awg::serverPskKeyPath : amnezia::protocols::wireguard::serverPskKeyPath;
+    m_serverConfigPath = m_isAwg ? amnezia::protocols::awg::serverConfigPath : amnezia::protocols::wireguard::serverConfigPath;
+    m_serverPublicKeyPath = m_isAwg ? amnezia::protocols::awg::serverPublicKeyPath : amnezia::protocols::wireguard::serverPublicKeyPath;
+    m_serverPskKeyPath = m_isAwg ? amnezia::protocols::awg::serverPskKeyPath : amnezia::protocols::wireguard::serverPskKeyPath;
     m_configTemplate = m_isAwg ? ProtocolScriptType::awg_template : ProtocolScriptType::wireguard_template;
 
     m_protocolName = m_isAwg ? config_key::awg : config_key::wireguard;
@@ -67,8 +65,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardConfig(const ServerCredentials &credentials,
                                                                                     DockerContainer container,
-                                                                                    const QJsonObject &containerConfig,
-                                                                                    ErrorCode errorCode)
+                                                                                    const QJsonObject &containerConfig, ErrorCode errorCode)
 {
     WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
     connData.host = credentials.hostName;
@@ -79,8 +76,6 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         return connData;
     }
 
-    ServerController serverController(m_settings);
-
     // Get list of already created clients (only IP addresses)
     QString nextIpNumber;
     {
@@ -91,7 +86,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
             return ErrorCode::NoError;
         };
 
-        errorCode = serverController.runContainerScript(credentials, container, script, cbReadStdOut);
+        errorCode = m_serverController->runContainerScript(credentials, container, script, cbReadStdOut);
         if (errorCode != ErrorCode::NoError) {
             return connData;
         }
@@ -113,8 +108,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         }
     }
 
-    QString subnetIp =
-            containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
+    QString subnetIp = containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     {
         QStringList l = subnetIp.split(".", Qt::SkipEmptyParts);
         if (l.isEmpty()) {
@@ -128,14 +122,13 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     }
 
     // Get keys
-    connData.serverPubKey =
-            serverController.getTextFileFromContainer(container, credentials, m_serverPublicKeyPath, errorCode);
+    connData.serverPubKey = m_serverController->getTextFileFromContainer(container, credentials, m_serverPublicKeyPath, errorCode);
     connData.serverPubKey.replace("\n", "");
     if (errorCode != ErrorCode::NoError) {
         return connData;
     }
 
-    connData.pskKey = serverController.getTextFileFromContainer(container, credentials, m_serverPskKeyPath, errorCode);
+    connData.pskKey = m_serverController->getTextFileFromContainer(container, credentials, m_serverPskKeyPath, errorCode);
     connData.pskKey.replace("\n", "");
 
     if (errorCode != ErrorCode::NoError) {
@@ -149,18 +142,17 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
                                  "AllowedIPs = %3/32\n\n")
                                  .arg(connData.clientPubKey, connData.pskKey, connData.clientIP);
 
-    errorCode = serverController.uploadTextFileToContainer(container, credentials, configPart, m_serverConfigPath,
-                                                           libssh::ScpOverwriteMode::ScpAppendToExisting);
+    errorCode = m_serverController->uploadTextFileToContainer(container, credentials, configPart, m_serverConfigPath,
+                                                              libssh::ScpOverwriteMode::ScpAppendToExisting);
 
     if (errorCode != ErrorCode::NoError) {
         return connData;
     }
 
-    QString script = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'")
-                             .arg(m_serverConfigPath);
+    QString script = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'").arg(m_serverConfigPath);
 
-    errorCode = serverController.runScript(
-            credentials, serverController.replaceVars(script, serverController.genVarsForScript(credentials, container)));
+    errorCode = m_serverController->runScript(
+            credentials, m_serverController->replaceVars(script, m_serverController->genVarsForScript(credentials, container)));
 
     return connData;
 }
@@ -168,10 +160,9 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
 QString WireguardConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
                                             const QJsonObject &containerConfig, ErrorCode errorCode)
 {
-    ServerController serverController(m_settings);
     QString scriptData = amnezia::scriptData(m_configTemplate, container);
-    QString config = serverController.replaceVars(
-            scriptData, serverController.genVarsForScript(credentials, container, containerConfig));
+    QString config =
+            m_serverController->replaceVars(scriptData, m_serverController->genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareWireguardConfig(credentials, container, containerConfig, errorCode);
     if (errorCode != ErrorCode::NoError) {
@@ -201,16 +192,16 @@ QString WireguardConfigurator::createConfig(const ServerCredentials &credentials
     return QJsonDocument(jConfig).toJson();
 }
 
-QString WireguardConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns,
-                                                              const bool isApiConfig, QString &protocolConfigString)
+QString WireguardConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                              QString &protocolConfigString)
 {
     processConfigWithDnsSettings(dns, protocolConfigString);
 
     return protocolConfigString;
 }
 
-QString WireguardConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns,
-                                                               const bool isApiConfig, QString &protocolConfigString)
+QString WireguardConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                               QString &protocolConfigString)
 {
     processConfigWithDnsSettings(dns, protocolConfigString);
 

client/configurators/wireguard_configurator.h

@@ -12,7 +12,8 @@ class WireguardConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAwg, QObject *parent = nullptr);
+    WireguardConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, bool isAwg,
+                          QObject *parent = nullptr);
 
     struct ConnectionData
     {
@@ -25,13 +26,11 @@ public:
         QString port;
     };
 
-    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
-                         const QJsonObject &containerConfig, ErrorCode errorCode);
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                         ErrorCode errorCode);
 
-    QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                           QString &protocolConfigString);
-    QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                            QString &protocolConfigString);
+    QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig, QString &protocolConfigString);
+    QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig, QString &protocolConfigString);
 
     static ConnectionData genClientKeys();
 

client/configurators/xray_configurator.cpp

@@ -8,26 +8,26 @@
 #include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
 
-XrayConfigurator::XrayConfigurator(std::shared_ptr<Settings> settings, QObject *parent) : ConfiguratorBase(settings, parent)
+XrayConfigurator::XrayConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
+    : ConfiguratorBase(settings, serverController, parent)
 {
 }
 
 QString XrayConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
                                        ErrorCode errorCode)
 {
-    ServerController serverController(m_settings);
-
-    QString config = serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::xray_template, container),
-                                                  serverController.genVarsForScript(credentials, container, containerConfig));
+    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::xray_template, container),
+                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));
 
     QString xrayPublicKey =
-            serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::xray::PublicKeyPath, errorCode);
+            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::PublicKeyPath, errorCode);
     xrayPublicKey.replace("\n", "");
 
-    QString xrayUuid = serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::xray::uuidPath, errorCode);
+    QString xrayUuid = m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::uuidPath, errorCode);
     xrayUuid.replace("\n", "");
 
-    QString xrayShortId = serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::xray::shortidPath, errorCode);
+    QString xrayShortId =
+            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::shortidPath, errorCode);
     xrayShortId.replace("\n", "");
 
     if (errorCode != ErrorCode::NoError) {

client/configurators/xray_configurator.h

@@ -10,7 +10,7 @@ class XrayConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    XrayConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    XrayConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);
 
     QString createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
                          ErrorCode errorCode);

client/core/controllers/apiController.cpp

@@ -5,7 +5,6 @@
 #include <QNetworkReply>
 #include <QtConcurrent>
 
-#include "core/errorstrings.h"
 #include "configurators/wireguard_configurator.h"
 
 namespace
@@ -20,6 +19,7 @@ namespace
         constexpr char certificate[] = "certificate";
         constexpr char publicKey[] = "public_key";
         constexpr char protocol[] = "protocol";
+        constexpr char uuid[] = "installation_uuid";
     }
 }
 
@@ -64,11 +64,11 @@ QJsonObject ApiController::fillApiPayload(const QString &protocol, const ApiCont
     return obj;
 }
 
-ErrorCode ApiController::updateServerConfigFromApi(QJsonObject &serverConfig)
+ErrorCode ApiController::updateServerConfigFromApi(const QString &installationUuid, QJsonObject &serverConfig)
 {
     QFutureWatcher<ErrorCode> watcher;
 
-    QFuture<ErrorCode> future = QtConcurrent::run([this, &serverConfig]() {
+    QFuture<ErrorCode> future = QtConcurrent::run([this, &serverConfig, &installationUuid]() {
         auto containerConfig = serverConfig.value(config_key::containers).toArray();
 
         if (serverConfig.value(config_key::configVersion).toInt()) {
@@ -86,7 +86,10 @@ ErrorCode ApiController::updateServerConfigFromApi(QJsonObject &serverConfig)
 
             auto apiPayloadData = generateApiPayloadData(protocol);
 
-            QByteArray requestBody = QJsonDocument(fillApiPayload(protocol, apiPayloadData)).toJson();
+            auto apiPayload = fillApiPayload(protocol, apiPayloadData);
+            apiPayload[configKey::uuid] = installationUuid;
+
+            QByteArray requestBody = QJsonDocument(apiPayload).toJson();
 
             QScopedPointer<QNetworkReply> reply;
             reply.reset(manager.post(request, requestBody));

client/core/controllers/apiController.h

@@ -13,7 +13,7 @@ public:
     explicit ApiController(QObject *parent = nullptr);
 
 public slots:
-    ErrorCode updateServerConfigFromApi(QJsonObject &serverConfig);
+    ErrorCode updateServerConfigFromApi(const QString &installationUuid, QJsonObject &serverConfig);
 
 private:
     struct ApiPayloadData {

client/core/controllers/serverController.cpp

@@ -23,10 +23,10 @@
 #include <thread>
 
 #include "containers/containers_defs.h"
-#include "logger.h"
+#include "core/networkUtilities.h"
 #include "core/scripts_registry.h"
 #include "core/server_defs.h"
-#include "core/networkUtilities.h"
+#include "logger.h"
 #include "settings.h"
 #include "utilities.h"
 #include "vpnConfigurationController.h"
@@ -95,10 +95,9 @@ ErrorCode ServerController::runScript(const ServerCredentials &credentials, QStr
     return ErrorCode::NoError;
 }
 
-ErrorCode
-ServerController::runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
-                                     const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut,
-                                     const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr)
+ErrorCode ServerController::runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
+                                               const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut,
+                                               const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr)
 {
     QString fileName = "/opt/amnezia/" + Utils::getRandomString(16) + ".sh";
     Logger::appendSshLog("Run container script for " + ContainerProps::containerToString(container) + ":\n" + script);
@@ -116,9 +115,8 @@ ServerController::runContainerScript(const ServerCredentials &credentials, Docke
     return e;
 }
 
-ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials,
-                                                      const QString &file, const QString &path,
-                                                      libssh::ScpOverwriteMode overwriteMode)
+ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials, const QString &file,
+                                                      const QString &path, libssh::ScpOverwriteMode overwriteMode)
 {
     ErrorCode e = ErrorCode::NoError;
     QString tmpFileName = QString("/tmp/%1.tmp").arg(Utils::getRandomString(16));
@@ -156,12 +154,10 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
         if (e)
             return e;
 
-        e = runScript(
-                credentials,
-                replaceVars(
-                        QString("sudo docker exec -i $CONTAINER_NAME sh -c \"cat %1 >> %2\"").arg(tmpFileName).arg(path),
-                        genVarsForScript(credentials, container)),
-                cbReadStd, cbReadStd);
+        e = runScript(credentials,
+                      replaceVars(QString("sudo docker exec -i $CONTAINER_NAME sh -c \"cat %1 >> %2\"").arg(tmpFileName).arg(path),
+                                  genVarsForScript(credentials, container)),
+                      cbReadStd, cbReadStd);
 
         if (e)
             return e;
@@ -172,20 +168,17 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
         return ErrorCode::ServerContainerMissingError;
     }
 
-    runScript(credentials, 
-              replaceVars(QString("sudo shred -u %1").arg(tmpFileName), genVarsForScript(credentials, container)));
+    runScript(credentials, replaceVars(QString("sudo shred -u %1").arg(tmpFileName), genVarsForScript(credentials, container)));
     return e;
 }
 
-QByteArray ServerController::getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials,
-                                                      const QString &path, ErrorCode errorCode)
+QByteArray ServerController::getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials, const QString &path,
+                                                      ErrorCode errorCode)
 {
 
     errorCode = ErrorCode::NoError;
 
-    QString script = QString("sudo docker exec -i %1 sh -c \"xxd -p \'%2\'\"")
-                             .arg(ContainerProps::containerToString(container))
-                             .arg(path);
+    QString script = QString("sudo docker exec -i %1 sh -c \"xxd -p \'%2\'\"").arg(ContainerProps::containerToString(container)).arg(path);
 
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -197,8 +190,8 @@ QByteArray ServerController::getTextFileFromContainer(DockerContainer container,
     return QByteArray::fromHex(stdOut.toUtf8());
 }
 
-ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data,
-                                             const QString &remotePath, libssh::ScpOverwriteMode overwriteMode)
+ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
+                                             libssh::ScpOverwriteMode overwriteMode)
 {
     auto error = m_sshClient.connectToHost(credentials);
     if (error != ErrorCode::NoError) {
@@ -244,12 +237,10 @@ ErrorCode ServerController::removeAllContainers(const ServerCredentials &credent
 ErrorCode ServerController::removeContainer(const ServerCredentials &credentials, DockerContainer container)
 {
     return runScript(credentials,
-                     replaceVars(amnezia::scriptData(SharedScriptType::remove_container),
-                                 genVarsForScript(credentials, container)));
+                     replaceVars(amnezia::scriptData(SharedScriptType::remove_container), genVarsForScript(credentials, container)));
 }
 
-ErrorCode ServerController::setupContainer(const ServerCredentials &credentials, DockerContainer container,
-                                           QJsonObject &config, bool isUpdate)
+ErrorCode ServerController::setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config, bool isUpdate)
 {
     qDebug().noquote() << "ServerController::setupContainer" << ContainerProps::containerToString(container);
     ErrorCode e = ErrorCode::NoError;
@@ -309,12 +300,11 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
     return startupContainerWorker(credentials, container, config);
 }
 
-ErrorCode ServerController::updateContainer(const ServerCredentials &credentials, DockerContainer container,
-                                            const QJsonObject &oldConfig, QJsonObject &newConfig)
+ErrorCode ServerController::updateContainer(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &oldConfig,
+                                            QJsonObject &newConfig)
 {
     bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
-    qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is"
-             << reinstallRequired;
+    qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is" << reinstallRequired;
 
     if (reinstallRequired) {
         return setupContainer(credentials, container, newConfig, true);
@@ -327,8 +317,7 @@ ErrorCode ServerController::updateContainer(const ServerCredentials &credentials
     }
 }
 
-bool ServerController::isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
-                                                    const QJsonObject &newConfig)
+bool ServerController::isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 
@@ -359,7 +348,7 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
 
     if (container == DockerContainer::Awg) {
         if ((oldProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort)
-            != newProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort))
+             != newProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort))
             || (oldProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount)
                 != newProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount))
             || (oldProtoConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize)
@@ -381,7 +370,7 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
             return true;
     }
 
-    if (container == DockerContainer::WireGuard){
+    if (container == DockerContainer::WireGuard) {
         if (oldProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)
             != newProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort))
             return true;
@@ -407,8 +396,7 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
     };
 
     ErrorCode error =
-            runScript(credentials,
-                      replaceVars(amnezia::scriptData(SharedScriptType::install_docker), genVarsForScript(credentials)),
+            runScript(credentials, replaceVars(amnezia::scriptData(SharedScriptType::install_docker), genVarsForScript(credentials)),
                       cbReadStdOut, cbReadStdErr);
 
     qDebug().noquote() << "ServerController::installDockerWorker" << stdOut;
@@ -420,17 +408,13 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
     return error;
 }
 
-ErrorCode ServerController::prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
-                                              const QJsonObject &config)
+ErrorCode ServerController::prepareHostWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
 {
     // create folder on host
-    return runScript(
-            credentials,
-            replaceVars(amnezia::scriptData(SharedScriptType::prepare_host), genVarsForScript(credentials, container)));
+    return runScript(credentials, replaceVars(amnezia::scriptData(SharedScriptType::prepare_host), genVarsForScript(credentials, container)));
 }
 
-ErrorCode ServerController::buildContainerWorker(const ServerCredentials &credentials, DockerContainer container,
-                                                 const QJsonObject &config)
+ErrorCode ServerController::buildContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
 {
     ErrorCode e = uploadFileToHost(credentials, amnezia::scriptData(ProtocolScriptType::dockerfile, container).toUtf8(),
                                    amnezia::server::getDockerfileFolder(container) + "/Dockerfile");
@@ -445,8 +429,7 @@ ErrorCode ServerController::buildContainerWorker(const ServerCredentials &creden
     };
 
     e = runScript(credentials,
-                  replaceVars(amnezia::scriptData(SharedScriptType::build_container),
-                              genVarsForScript(credentials, container, config)),
+                  replaceVars(amnezia::scriptData(SharedScriptType::build_container), genVarsForScript(credentials, container, config)),
                   cbReadStdOut);
     if (e)
         return e;
@@ -454,8 +437,7 @@ ErrorCode ServerController::buildContainerWorker(const ServerCredentials &creden
     return e;
 }
 
-ErrorCode ServerController::runContainerWorker(const ServerCredentials &credentials, DockerContainer container,
-                                               QJsonObject &config)
+ErrorCode ServerController::runContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config)
 {
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -478,8 +460,7 @@ ErrorCode ServerController::runContainerWorker(const ServerCredentials &credenti
     return e;
 }
 
-ErrorCode ServerController::configureContainerWorker(const ServerCredentials &credentials, DockerContainer container,
-                                                     QJsonObject &config)
+ErrorCode ServerController::configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config)
 {
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -501,8 +482,7 @@ ErrorCode ServerController::configureContainerWorker(const ServerCredentials &cr
     return e;
 }
 
-ErrorCode ServerController::startupContainerWorker(const ServerCredentials &credentials, DockerContainer container,
-                                                   const QJsonObject &config)
+ErrorCode ServerController::startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
 {
     QString script = amnezia::scriptData(ProtocolScriptType::container_startup, container);
 
@@ -510,8 +490,7 @@ ErrorCode ServerController::startupContainerWorker(const ServerCredentials &cred
         return ErrorCode::NoError;
     }
 
-    ErrorCode e = uploadTextFileToContainer(container, credentials,
-                                            replaceVars(script, genVarsForScript(credentials, container, config)),
+    ErrorCode e = uploadTextFileToContainer(container, credentials, replaceVars(script, genVarsForScript(credentials, container, config)),
                                             "/opt/amnezia/start.sh");
     if (e)
         return e;
@@ -522,8 +501,8 @@ ErrorCode ServerController::startupContainerWorker(const ServerCredentials &cred
                                  genVarsForScript(credentials, container, config)));
 }
 
-ServerController::Vars ServerController::genVarsForScript(const ServerCredentials &credentials,
-                                                          DockerContainer container, const QJsonObject &config)
+ServerController::Vars ServerController::genVarsForScript(const ServerCredentials &credentials, DockerContainer container,
+                                                          const QJsonObject &config)
 {
     const QJsonObject &openvpnConfig = config.value(ProtocolProps::protoToString(Proto::OpenVpn)).toObject();
     const QJsonObject &cloakConfig = config.value(ProtocolProps::protoToString(Proto::Cloak)).toObject();
@@ -538,24 +517,19 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$REMOTE_HOST", credentials.hostName } });
 
     // OpenVPN vars
-    vars.append(
-            { { "$OPENVPN_SUBNET_IP",
-                openvpnConfig.value(config_key::subnet_address).toString(protocols::openvpn::defaultSubnetAddress) } });
-    vars.append({ { "$OPENVPN_SUBNET_CIDR",
-                    openvpnConfig.value(config_key::subnet_cidr).toString(protocols::openvpn::defaultSubnetCidr) } });
-    vars.append({ { "$OPENVPN_SUBNET_MASK",
-                    openvpnConfig.value(config_key::subnet_mask).toString(protocols::openvpn::defaultSubnetMask) } });
+    vars.append({ { "$OPENVPN_SUBNET_IP",
+                    openvpnConfig.value(config_key::subnet_address).toString(protocols::openvpn::defaultSubnetAddress) } });
+    vars.append({ { "$OPENVPN_SUBNET_CIDR", openvpnConfig.value(config_key::subnet_cidr).toString(protocols::openvpn::defaultSubnetCidr) } });
+    vars.append({ { "$OPENVPN_SUBNET_MASK", openvpnConfig.value(config_key::subnet_mask).toString(protocols::openvpn::defaultSubnetMask) } });
 
     vars.append({ { "$OPENVPN_PORT", openvpnConfig.value(config_key::port).toString(protocols::openvpn::defaultPort) } });
-    vars.append(
-            { { "$OPENVPN_TRANSPORT_PROTO",
-                openvpnConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto) } });
+    vars.append({ { "$OPENVPN_TRANSPORT_PROTO",
+                    openvpnConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto) } });
 
     bool isNcpDisabled = openvpnConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
     vars.append({ { "$OPENVPN_NCP_DISABLE", isNcpDisabled ? protocols::openvpn::ncpDisableString : "" } });
 
-    vars.append({ { "$OPENVPN_CIPHER",
-                    openvpnConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher) } });
+    vars.append({ { "$OPENVPN_CIPHER", openvpnConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher) } });
     vars.append({ { "$OPENVPN_HASH", openvpnConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash) } });
 
     bool isTlsAuth = openvpnConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
@@ -566,43 +540,35 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     }
 
     vars.append({ { "$OPENVPN_ADDITIONAL_CLIENT_CONFIG",
-                    openvpnConfig.value(config_key::additional_client_config)
-                            .toString(protocols::openvpn::defaultAdditionalClientConfig) } });
+                    openvpnConfig.value(config_key::additional_client_config).toString(protocols::openvpn::defaultAdditionalClientConfig) } });
     vars.append({ { "$OPENVPN_ADDITIONAL_SERVER_CONFIG",
-                    openvpnConfig.value(config_key::additional_server_config)
-                            .toString(protocols::openvpn::defaultAdditionalServerConfig) } });
+                    openvpnConfig.value(config_key::additional_server_config).toString(protocols::openvpn::defaultAdditionalServerConfig) } });
 
     // ShadowSocks vars
-    vars.append({ { "$SHADOWSOCKS_SERVER_PORT",
-                    ssConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) } });
+    vars.append({ { "$SHADOWSOCKS_SERVER_PORT", ssConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) } });
     vars.append({ { "$SHADOWSOCKS_LOCAL_PORT",
                     ssConfig.value(config_key::local_port).toString(protocols::shadowsocks::defaultLocalProxyPort) } });
-    vars.append({ { "$SHADOWSOCKS_CIPHER",
-                    ssConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher) } });
+    vars.append({ { "$SHADOWSOCKS_CIPHER", ssConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher) } });
 
     vars.append({ { "$CONTAINER_NAME", ContainerProps::containerToString(container) } });
     vars.append({ { "$DOCKERFILE_FOLDER", "/opt/amnezia/" + ContainerProps::containerToString(container) } });
 
     // Cloak vars
     vars.append({ { "$CLOAK_SERVER_PORT", cloakConfig.value(config_key::port).toString(protocols::cloak::defaultPort) } });
-    vars.append({ { "$FAKE_WEB_SITE_ADDRESS",
-                    cloakConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite) } });
+    vars.append({ { "$FAKE_WEB_SITE_ADDRESS", cloakConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite) } });
 
     // Xray vars
-    vars.append({ { "$XRAY_SITE_NAME",
-                  xrayConfig.value(config_key::site).toString(protocols::xray::defaultSite) } });
+    vars.append({ { "$XRAY_SITE_NAME", xrayConfig.value(config_key::site).toString(protocols::xray::defaultSite) } });
 
     // Wireguard vars
-    vars.append(
-            { { "$WIREGUARD_SUBNET_IP",
-                wireguarConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress) } });
+    vars.append({ { "$WIREGUARD_SUBNET_IP",
+                    wireguarConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress) } });
     vars.append({ { "$WIREGUARD_SUBNET_CIDR",
                     wireguarConfig.value(config_key::subnet_cidr).toString(protocols::wireguard::defaultSubnetCidr) } });
     vars.append({ { "$WIREGUARD_SUBNET_MASK",
                     wireguarConfig.value(config_key::subnet_mask).toString(protocols::wireguard::defaultSubnetMask) } });
 
-    vars.append({ { "$WIREGUARD_SERVER_PORT",
-                    wireguarConfig.value(config_key::port).toString(protocols::wireguard::defaultPort) } });
+    vars.append({ { "$WIREGUARD_SERVER_PORT", wireguarConfig.value(config_key::port).toString(protocols::wireguard::defaultPort) } });
 
     // IPsec vars
     vars.append({ { "$IPSEC_VPN_L2TP_NET", "192.168.42.0/24" } });
@@ -625,30 +591,22 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$SECONDARY_SERVER_DNS", m_settings->secondaryDns() } });
 
     // Sftp vars
-    vars.append(
-            { { "$SFTP_PORT",
-                sftpConfig.value(config_key::port).toString(QString::number(ProtocolProps::defaultPort(Proto::Sftp))) } });
+    vars.append({ { "$SFTP_PORT", sftpConfig.value(config_key::port).toString(QString::number(ProtocolProps::defaultPort(Proto::Sftp))) } });
     vars.append({ { "$SFTP_USER", sftpConfig.value(config_key::userName).toString() } });
     vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
     // Amnezia wireguard vars
-    vars.append({ { "$AWG_SERVER_PORT",
-                    amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
+    vars.append({ { "$AWG_SERVER_PORT", amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
 
     vars.append({ { "$JUNK_PACKET_COUNT", amneziaWireguarConfig.value(config_key::junkPacketCount).toString() } });
     vars.append({ { "$JUNK_PACKET_MIN_SIZE", amneziaWireguarConfig.value(config_key::junkPacketMinSize).toString() } });
     vars.append({ { "$JUNK_PACKET_MAX_SIZE", amneziaWireguarConfig.value(config_key::junkPacketMaxSize).toString() } });
     vars.append({ { "$INIT_PACKET_JUNK_SIZE", amneziaWireguarConfig.value(config_key::initPacketJunkSize).toString() } });
-    vars.append({ { "$RESPONSE_PACKET_JUNK_SIZE",
-                    amneziaWireguarConfig.value(config_key::responsePacketJunkSize).toString() } });
-    vars.append({ { "$INIT_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::initPacketMagicHeader).toString() } });
-    vars.append({ { "$RESPONSE_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::responsePacketMagicHeader).toString() } });
-    vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader).toString() } });
-    vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::transportPacketMagicHeader).toString() } });
+    vars.append({ { "$RESPONSE_PACKET_JUNK_SIZE", amneziaWireguarConfig.value(config_key::responsePacketJunkSize).toString() } });
+    vars.append({ { "$INIT_PACKET_MAGIC_HEADER", amneziaWireguarConfig.value(config_key::initPacketMagicHeader).toString() } });
+    vars.append({ { "$RESPONSE_PACKET_MAGIC_HEADER", amneziaWireguarConfig.value(config_key::responsePacketMagicHeader).toString() } });
+    vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER", amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader).toString() } });
+    vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER", amneziaWireguarConfig.value(config_key::transportPacketMagicHeader).toString() } });
 
     QString serverIp = NetworkUtilities::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
@@ -684,9 +642,7 @@ void ServerController::cancelInstallation()
 
 ErrorCode ServerController::setupServerFirewall(const ServerCredentials &credentials)
 {
-    return runScript(
-            credentials,
-            replaceVars(amnezia::scriptData(SharedScriptType::setup_host_firewall), genVarsForScript(credentials)));
+    return runScript(credentials, replaceVars(amnezia::scriptData(SharedScriptType::setup_host_firewall), genVarsForScript(credentials)));
 }
 
 QString ServerController::replaceVars(const QString &script, const Vars &vars)
@@ -698,8 +654,7 @@ QString ServerController::replaceVars(const QString &script, const Vars &vars)
     return s;
 }
 
-ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
-                                             const QJsonObject &config)
+ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
 {
     if (container == DockerContainer::Dns) {
         return ErrorCode::NoError;
@@ -722,15 +677,12 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
     QStringList fixedPorts = ContainerProps::fixedPortsForContainer(container);
 
     QString defaultPort("%1");
-    QString port =
-            containerConfig.value(config_key::port).toString(defaultPort.arg(ProtocolProps::defaultPort(protocol)));
-    QString defaultTransportProto =
-            ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(protocol), protocol);
+    QString port = containerConfig.value(config_key::port).toString(defaultPort.arg(ProtocolProps::defaultPort(protocol)));
+    QString defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(protocol), protocol);
     QString transportProto = containerConfig.value(config_key::transport_proto).toString(defaultTransportProto);
 
     // TODO reimplement with netstat
-    QString script =
-            QString("which lsof &>/dev/null || true && sudo lsof -i -P -n 2>/dev/null | grep -E ':%1 ").arg(port);
+    QString script = QString("which lsof &>/dev/null || true && sudo lsof -i -P -n 2>/dev/null | grep -E ':%1 ").arg(port);
     for (auto &port : fixedPorts) {
         script = script.append("|:%1").arg(port);
     }
@@ -740,8 +692,7 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
         script = script.append(" | grep LISTEN");
     }
 
-    ErrorCode errorCode = runScript(credentials, replaceVars(script, genVarsForScript(credentials, container)),
-                                    cbReadStdOut, cbReadStdErr);
+    ErrorCode errorCode = runScript(credentials, replaceVars(script, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
     if (errorCode != ErrorCode::NoError) {
         return errorCode;
     }
@@ -769,8 +720,7 @@ ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, D
     };
 
     const QString scriptData = amnezia::scriptData(SharedScriptType::check_user_in_sudo);
-    ErrorCode error =
-            runScript(credentials, replaceVars(scriptData, genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
+    ErrorCode error = runScript(credentials, replaceVars(scriptData, genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
 
     if (!stdOut.contains("sudo"))
         return ErrorCode::ServerUserNotInSudo;
@@ -800,9 +750,7 @@ ErrorCode ServerController::isServerDpkgBusy(const ServerCredentials &credential
                 return ErrorCode::ServerCancelInstallation;
             }
             stdOut.clear();
-            runScript(credentials,
-                      replaceVars(amnezia::scriptData(SharedScriptType::check_server_is_busy),
-                                  genVarsForScript(credentials)),
+            runScript(credentials, replaceVars(amnezia::scriptData(SharedScriptType::check_server_is_busy), genVarsForScript(credentials)),
                       cbReadStdOut, cbReadStdErr);
 
             if (stdOut.contains("Packet manager not found"))

client/core/controllers/serverController.h

@@ -25,19 +25,18 @@ public:
     ErrorCode rebootServer(const ServerCredentials &credentials);
     ErrorCode removeAllContainers(const ServerCredentials &credentials);
     ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container);
-    ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config,
-                             bool isUpdate = false);
-    ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container,
-                              const QJsonObject &oldConfig, QJsonObject &newConfig);
+    ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config, bool isUpdate = false);
+    ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &oldConfig,
+                              QJsonObject &newConfig);
 
     ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container,
                                      const QJsonObject &config = QJsonObject());
 
-    ErrorCode uploadTextFileToContainer(
-            DockerContainer container, const ServerCredentials &credentials, const QString &file, const QString &path,
-            libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
-    QByteArray getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials,
-                                        const QString &path, ErrorCode errorCode);
+    ErrorCode uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials, const QString &file,
+                                        const QString &path,
+                                        libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
+    QByteArray getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials, const QString &path,
+                                        ErrorCode errorCode);
 
     QString replaceVars(const QString &script, const Vars &vars);
     Vars genVarsForScript(const ServerCredentials &credentials, DockerContainer container = DockerContainer::None,
@@ -47,10 +46,9 @@ public:
                         const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
                         const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
 
-    ErrorCode
-    runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
-                       const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
-                       const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
+    ErrorCode runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
+                                 const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
+                                 const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
 
     QString checkSshConnection(const ServerCredentials &credentials, ErrorCode errorCode);
 
@@ -61,18 +59,14 @@ public:
 
 private:
     ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
-    ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
-                                const QJsonObject &config = QJsonObject());
+    ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
     ErrorCode buildContainerWorker(const ServerCredentials &credentials, DockerContainer container,
                                    const QJsonObject &config = QJsonObject());
     ErrorCode runContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
-    ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container,
-                                       QJsonObject &config);
+    ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
 
-    ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
-                               const QJsonObject &config);
-    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
-                                      const QJsonObject &newConfig);
+    ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config);
+    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig);
     ErrorCode isUserInSudo(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);
 

client/core/controllers/vpnConfigurationController.cpp

@@ -8,21 +8,22 @@
 #include "configurators/wireguard_configurator.h"
 #include "configurators/xray_configurator.h"
 
-VpnConfigurationsController::VpnConfigurationsController(const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject { parent }, m_settings(settings)
+VpnConfigurationsController::VpnConfigurationsController(const std::shared_ptr<Settings> &settings,
+                                                         QSharedPointer<ServerController> serverController, QObject *parent)
+    : QObject { parent }, m_settings(settings), m_serverController(serverController)
 {
 }
 
 QScopedPointer<ConfiguratorBase> VpnConfigurationsController::createConfigurator(const Proto protocol)
 {
     switch (protocol) {
-    case Proto::OpenVpn: return QScopedPointer<ConfiguratorBase>(new OpenVpnConfigurator(m_settings));
-    case Proto::ShadowSocks: return QScopedPointer<ConfiguratorBase>(new ShadowSocksConfigurator(m_settings));
-    case Proto::Cloak: return QScopedPointer<ConfiguratorBase>(new CloakConfigurator(m_settings));
-    case Proto::WireGuard: return QScopedPointer<ConfiguratorBase>(new WireguardConfigurator(m_settings, false));
-    case Proto::Awg: return QScopedPointer<ConfiguratorBase>(new AwgConfigurator(m_settings));
-    case Proto::Ikev2: return QScopedPointer<ConfiguratorBase>(new Ikev2Configurator(m_settings));
-    case Proto::Xray: return QScopedPointer<ConfiguratorBase>(new XrayConfigurator(m_settings));
+    case Proto::OpenVpn: return QScopedPointer<ConfiguratorBase>(new OpenVpnConfigurator(m_settings, m_serverController));
+    case Proto::ShadowSocks: return QScopedPointer<ConfiguratorBase>(new ShadowSocksConfigurator(m_settings, m_serverController));
+    case Proto::Cloak: return QScopedPointer<ConfiguratorBase>(new CloakConfigurator(m_settings, m_serverController));
+    case Proto::WireGuard: return QScopedPointer<ConfiguratorBase>(new WireguardConfigurator(m_settings, m_serverController, false));
+    case Proto::Awg: return QScopedPointer<ConfiguratorBase>(new AwgConfigurator(m_settings, m_serverController));
+    case Proto::Ikev2: return QScopedPointer<ConfiguratorBase>(new Ikev2Configurator(m_settings, m_serverController));
+    case Proto::Xray: return QScopedPointer<ConfiguratorBase>(new XrayConfigurator(m_settings, m_serverController));
     default: return QScopedPointer<ConfiguratorBase>();
     }
 }

client/core/controllers/vpnConfigurationController.h

@@ -12,7 +12,7 @@ class VpnConfigurationsController : public QObject
 {
     Q_OBJECT
 public:
-    explicit VpnConfigurationsController(const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
+    explicit VpnConfigurationsController(const std::shared_ptr<Settings> &settings, QSharedPointer<ServerController> serverController, QObject *parent = nullptr);
 
 public slots:
     ErrorCode createProtocolConfigForContainer(const ServerCredentials &credentials, const DockerContainer container,
@@ -30,6 +30,7 @@ private:
     QScopedPointer<ConfiguratorBase> createConfigurator(const Proto protocol);
 
     std::shared_ptr<Settings> m_settings;
+    QSharedPointer<ServerController> m_serverController;
 };
 
 #endif // VPNCONFIGIRATIONSCONTROLLER_H

client/core/sshclient.cpp

@@ -23,6 +23,13 @@ namespace libssh {
 
     ErrorCode Client::connectToHost(const ServerCredentials &credentials)
     {
+        if (m_session != nullptr) {
+            if (!ssh_is_connected(m_session)) {
+                ssh_free(m_session);
+                m_session = nullptr;
+            }
+        }
+
         if (m_session == nullptr) {
             m_session = ssh_new();
 

client/daemon/daemon.cpp

@@ -373,19 +373,31 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
     return false;
   }
 
-  if (!obj.value("Jc").isNull() && !obj.value("Jmin").isNull() 
-  && !obj.value("Jmax").isNull() && !obj.value("S1").isNull() 
-  && !obj.value("S2").isNull() && !obj.value("H1").isNull() 
-  && !obj.value("H2").isNull() && !obj.value("H3").isNull() 
-  && !obj.value("H4").isNull()) {
+  if (!obj.value("Jc").isNull()) {
     config.m_junkPacketCount = obj.value("Jc").toString();
+  }
+  if (!obj.value("Jmin").isNull()) {
     config.m_junkPacketMinSize = obj.value("Jmin").toString();
+  }
+  if (!obj.value("Jmax").isNull()) {
     config.m_junkPacketMaxSize = obj.value("Jmax").toString();
+  }
+  if (!obj.value("S1").isNull()) {
     config.m_initPacketJunkSize = obj.value("S1").toString();
+  }
+  if (!obj.value("S2").isNull()) {
     config.m_responsePacketJunkSize = obj.value("S2").toString();
+  }
+  if (!obj.value("H1").isNull()) {
     config.m_initPacketMagicHeader = obj.value("H1").toString();
+  }
+  if (!obj.value("H2").isNull()) {
     config.m_responsePacketMagicHeader = obj.value("H2").toString();
+  }
+  if (!obj.value("H3").isNull()) {
     config.m_underloadPacketMagicHeader = obj.value("H3").toString();
+  }
+  if (!obj.value("H4").isNull()) {
     config.m_transportPacketMagicHeader = obj.value("H4").toString();
   }
 

client/mozilla/localsocketcontroller.cpp

@@ -232,6 +232,24 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
     json.insert(amnezia::config_key::responsePacketMagicHeader, wgConfig.value(amnezia::config_key::responsePacketMagicHeader));
     json.insert(amnezia::config_key::underloadPacketMagicHeader, wgConfig.value(amnezia::config_key::underloadPacketMagicHeader));
     json.insert(amnezia::config_key::transportPacketMagicHeader, wgConfig.value(amnezia::config_key::transportPacketMagicHeader));
+  } else if (!wgConfig.value(amnezia::config_key::junkPacketCount).isUndefined()
+             && !wgConfig.value(amnezia::config_key::junkPacketMinSize).isUndefined()
+             && !wgConfig.value(amnezia::config_key::junkPacketMaxSize).isUndefined()
+             && !wgConfig.value(amnezia::config_key::initPacketJunkSize).isUndefined()
+             && !wgConfig.value(amnezia::config_key::responsePacketJunkSize).isUndefined()
+             && !wgConfig.value(amnezia::config_key::initPacketMagicHeader).isUndefined()
+             && !wgConfig.value(amnezia::config_key::responsePacketMagicHeader).isUndefined()
+             && !wgConfig.value(amnezia::config_key::underloadPacketMagicHeader).isUndefined()
+             && !wgConfig.value(amnezia::config_key::transportPacketMagicHeader).isUndefined()) {
+    json.insert(amnezia::config_key::junkPacketCount, wgConfig.value(amnezia::config_key::junkPacketCount));
+    json.insert(amnezia::config_key::junkPacketMinSize, wgConfig.value(amnezia::config_key::junkPacketMinSize));
+    json.insert(amnezia::config_key::junkPacketMaxSize, wgConfig.value(amnezia::config_key::junkPacketMaxSize));
+    json.insert(amnezia::config_key::initPacketJunkSize, wgConfig.value(amnezia::config_key::initPacketJunkSize));
+    json.insert(amnezia::config_key::responsePacketJunkSize, wgConfig.value(amnezia::config_key::responsePacketJunkSize));
+    json.insert(amnezia::config_key::initPacketMagicHeader, wgConfig.value(amnezia::config_key::initPacketMagicHeader));
+    json.insert(amnezia::config_key::responsePacketMagicHeader, wgConfig.value(amnezia::config_key::responsePacketMagicHeader));
+    json.insert(amnezia::config_key::underloadPacketMagicHeader, wgConfig.value(amnezia::config_key::underloadPacketMagicHeader));
+    json.insert(amnezia::config_key::transportPacketMagicHeader, wgConfig.value(amnezia::config_key::transportPacketMagicHeader));
   }
 
   write(json);

client/platforms/ios/Log.swift

@@ -16,6 +16,11 @@ struct Log {
 
   private static let appGroupID = "group.org.amnezia.AmneziaVPN"
 
+  static let appLogURL = {
+    let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)!
+    return sharedContainerURL.appendingPathComponent("app.log", isDirectory: false)
+  }()
+
   static let neLogURL = {
     let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)!
     return sharedContainerURL.appendingPathComponent("ne.log", isDirectory: false)
@@ -70,8 +75,12 @@ struct Log {
   }
 
   static func log(_ type: OSLogType, title: String = "", message: String, url: URL = neLogURL) {
+    NSLog("\(title) \(message)")
+
     guard isLoggingEnabled else { return }
 
+    osLog.log(level: type, "\(title) \(message)")
+
     let date = Date()
     let level = Record.Level(from: type)
     let messages = message.split(whereSeparator: \.isNewline)
@@ -107,3 +116,7 @@ extension Log: CustomStringConvertible {
       .joined(separator: "\n")
   }
 }
+
+func log(_ type: OSLogType, title: String = "", message: String) {
+  Log.log(type, title: "App: \(title)", message: message, url: Log.appLogURL)
+}

client/platforms/ios/LogController.swift

@@ -1,50 +1,33 @@
 import Foundation
-import NetworkExtension
 
 public func swiftUpdateLogData(_ qtString: std.string) -> std.string {
   let qtLog = Log(String(describing: qtString))
   var log = qtLog
 
+  if let appLog = Log(at: Log.appLogURL) {
+    appLog.records.forEach {
+      log.records.append($0)
+    }
+  }
+
   if let neLog = Log(at: Log.neLogURL) {
     neLog.records.forEach {
       log.records.append($0)
     }
+  }
 
-    log.records.sort {
-      $0.date < $1.date
-    }
+  log.records.sort {
+    $0.date < $1.date
   }
 
   return std.string(log.description)
 }
 
 public func swiftDeleteLog() {
+  Log.clear(at: Log.appLogURL)
   Log.clear(at: Log.neLogURL)
 }
 
 public func toggleLogging(_ isEnabled: Bool) {
   Log.isLoggingEnabled = isEnabled
 }
-
-public func clearSettings() {
-  NETunnelProviderManager.loadAllFromPreferences { managers, error in
-    if let error {
-      NSLog("clearSettings removeFromPreferences error: \(error.localizedDescription)")
-      return
-    }
-
-    managers?.forEach { manager in
-      manager.removeFromPreferences { error in
-        if let error {
-          NSLog("NE removeFromPreferences error: \(error.localizedDescription)")
-        } else {
-          manager.loadFromPreferences { error in
-            if let error {
-              NSLog("NE loadFromPreferences after remove error: \(error.localizedDescription)")
-            }
-          }
-        }
-      }
-    }
-  }
-}

client/platforms/ios/PacketTunnelProvider+OpenVPN.swift

@@ -94,6 +94,8 @@ extension PacketTunnelProvider {
   }
 
   func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+    ovpnLog(.info, message: "Stopping tunnel: reason: \(reason.description)")
+
     stopHandler = completionHandler
     if vpnReachability.isTracking {
       vpnReachability.stopTracking()

client/platforms/ios/PacketTunnelProvider+WireGuard.swift

@@ -200,7 +200,7 @@ extension PacketTunnelProvider {
   //  }
 
   func stopWireguard(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-    wg_log(.info, staticMessage: "Stopping tunnel")
+    wg_log(.info, message: "Stopping tunnel: reason: \(reason.description)")
 
     wgAdapter.stop { error in
       ErrorNotifier.removeLastErrorFile()

client/platforms/ios/PacketTunnelProvider.swift

@@ -200,3 +200,46 @@ extension WireGuardLogLevel {
     }
   }
 }
+
+extension NEProviderStopReason: CustomStringConvertible {
+  public var description: String {
+    switch self {
+    case .none:
+      return "No specific reason"
+    case .userInitiated:
+      return "The user stopped the NE"
+    case .providerFailed:
+      return "The NE failed to function correctly"
+    case .noNetworkAvailable:
+      return "No network connectivity is currently available"
+    case .unrecoverableNetworkChange:
+      return "The device’s network connectivity changed"
+    case .providerDisabled:
+      return "The NE was disabled"
+    case .authenticationCanceled:
+      return "The authentication process was canceled"
+    case .configurationFailed:
+      return "The VPNC is invalid"
+    case .idleTimeout:
+      return "The session timed out"
+    case .configurationDisabled:
+      return "The VPNC was disabled"
+    case .configurationRemoved:
+      return "The VPNC was removed"
+    case .superceded:
+      return "VPNC was superceded by a higher-priority VPNC"
+    case .userLogout:
+      return "The user logged out"
+    case .userSwitch:
+      return "The current console user changed"
+    case .connectionFailed:
+      return "The connection failed"
+    case .sleep:
+      return "A stop reason indicating the VPNC enabled disconnect on sleep and the device went to sleep"
+    case .appUpdate:
+      return "appUpdat"
+    @unknown default:
+      return "@unknown default"
+    }
+  }
+}

client/platforms/ios/VPNCController.swift

@@ -0,0 +1,50 @@
+import Foundation
+import NetworkExtension
+
+public func removeVPNC(_ vpncName: std.string) {
+  let vpncName = String(describing: vpncName)
+
+  Task {
+    await getManagers()?.first { manager in
+      if let name = manager.localizedDescription, name == vpncName {
+        Task {
+          await remove(manager)
+        }
+
+        return true
+      } else {
+        return false
+      }
+    }
+  }
+}
+
+public func clearSettings() {
+  Task {
+    await getManagers()?.forEach { manager in
+      Task {
+        await remove(manager)
+      }
+    }
+  }
+}
+
+func getManagers() async -> [NETunnelProviderManager]? {
+  do {
+    return try await NETunnelProviderManager.loadAllFromPreferences()
+  } catch {
+    log(.error, title: "VPNC: ", message: "loadAllFromPreferences error: \(error.localizedDescription)")
+    return nil
+  }
+}
+
+func remove(_ manager: NETunnelProviderManager) async {
+  let vpncName = manager.localizedDescription ?? "Unknown"
+  do {
+    try await manager.removeFromPreferences()
+    try await manager.loadFromPreferences()
+    log(.info, title: "VPNC: ", message: "Remove \(vpncName)")
+  } catch {
+    log(.error, title: "VPNC: ", message: "Failed to remove \(vpncName) (\(error.localizedDescription))")
+  }
+}

client/platforms/ios/WGConfig.swift

@@ -86,6 +86,9 @@ struct WGConfig: Decodable {
     AllowedIPs = \(allowedIPs.joined(separator: ", "))
     Endpoint = \(hostName):\(port)
     PersistentKeepalive = \(persistentKeepAlive)
+
+    SplitTunnelType = \(splitTunnelType)
+    SplitTunnelSites = \(splitTunnelSites.joined(separator: ", "))
     """
   }
 }

client/platforms/ios/ios_controller.mm

@@ -89,9 +89,11 @@ bool IosController::initialize()
 
 
             for (NETunnelProviderManager *manager in managers) {
+                qDebug() << "IosController::initialize : VPNC: " << manager.localizedDescription;
+
                 if (manager.connection.status == NEVPNStatusConnected) {
                     m_currentTunnel = manager;
-                    qDebug() << "IosController::initialize : VPN already connected";
+                    qDebug() << "IosController::initialize : VPN already connected with" << manager.localizedDescription;
                     emit connectionStateChanged(Vpn::ConnectionState::Connected);
                     break;
 
@@ -138,7 +140,7 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
     [NETunnelProviderManager loadAllFromPreferencesWithCompletionHandler:^(NSArray<NETunnelProviderManager *> * _Nullable managers, NSError * _Nullable error) {
         @try {
             if (error) {
-                qDebug() << "IosController::connectVpn : Error:" << [error.localizedDescription UTF8String];
+                qDebug() << "IosController::connectVpn : VPNC: loadAllFromPreferences error:" << [error.localizedDescription UTF8String];
                 emit connectionStateChanged(Vpn::ConnectionState::Error);
                 ok = false;
                 return;
@@ -151,7 +153,7 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
             for (NETunnelProviderManager *manager in managers) {
                 if ([manager.localizedDescription isEqualToString:tunnelName.toNSString()]) {
                     m_currentTunnel = manager;
-                    qDebug() << "IosController::connectVpn : Using existing tunnel";
+                    qDebug() << "IosController::connectVpn : Using existing tunnel:" << manager.localizedDescription;
                     if (manager.connection.status == NEVPNStatusConnected) {
                         emit connectionStateChanged(Vpn::ConnectionState::Connected);
                         return;
@@ -162,10 +164,10 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
             }
 
             if (!m_currentTunnel) {
-                qDebug() << "IosController::connectVpn : Creating new tunnel";
                 isNewTunnelCreated = true;
                 m_currentTunnel = [[NETunnelProviderManager alloc] init];
                 m_currentTunnel.localizedDescription = [NSString stringWithUTF8String:tunnelName.toStdString().c_str()];
+                qDebug() << "IosController::connectVpn : Creating new tunnel" << m_currentTunnel.localizedDescription;
             }
 
         }
@@ -598,13 +600,14 @@ void IosController::startTunnel()
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
             if (saveError) {
+                qDebug().nospace() << "IosController::startTunnel" << protocolName << ": Connect " << protocolName << " Tunnel Save Error" << saveError.localizedDescription.UTF8String;
                 emit connectionStateChanged(Vpn::ConnectionState::Error);
                 return;
             }
 
             [m_currentTunnel loadFromPreferencesWithCompletionHandler:^(NSError *loadError) {
                     if (loadError) {
-                        qDebug().nospace() << "IosController::start" << protocolName << ": Connect " << protocolName << " Tunnel Load Error" << loadError.localizedDescription.UTF8String;
+                        qDebug().nospace() << "IosController::startTunnel :" << m_currentTunnel.localizedDescription << protocolName << ": Connect " << protocolName << " Tunnel Load Error" << loadError.localizedDescription.UTF8String;
                         emit connectionStateChanged(Vpn::ConnectionState::Error);
                         return;
                     }
@@ -615,11 +618,11 @@ void IosController::startTunnel()
                     BOOL started = [m_currentTunnel.connection startVPNTunnelWithOptions:nil andReturnError:&startError];
 
                     if (!started || startError) {
-                        qDebug().nospace() << "IosController::start" << protocolName << " : Connect " << protocolName << " Tunnel Start Error"
+                        qDebug().nospace() << "IosController::startTunnel :" << m_currentTunnel.localizedDescription << protocolName << " : Connect " << protocolName << " Tunnel Start Error"
                             << (startError ? startError.localizedDescription.UTF8String : "");
                         emit connectionStateChanged(Vpn::ConnectionState::Error);
                     } else {
-                        qDebug().nospace() << "IosController::start" << protocolName << " : Starting the tunnel succeeded";
+                        qDebug().nospace() << "IosController::startTunnel :" << m_currentTunnel.localizedDescription << protocolName << " : Starting the tunnel succeeded";
                     }
             }];
         });

client/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -103,15 +103,32 @@ bool WireguardUtilsLinux::addInterface(const InterfaceConfig& config) {
     out << "private_key=" << QString(privateKey.toHex()) << "\n";
     out << "replace_peers=true\n";
 
-    if (config.m_junkPacketCount != "") {
+
+    if (!config.m_junkPacketCount.isEmpty()) {
         out << "jc=" << config.m_junkPacketCount << "\n";
+    }
+    if (!config.m_junkPacketMinSize.isEmpty()) {
         out << "jmin=" << config.m_junkPacketMinSize << "\n";
+    }
+    if (!config.m_junkPacketMaxSize.isEmpty()) {
         out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+    }
+    if (!config.m_initPacketJunkSize.isEmpty()) {
         out << "s1=" << config.m_initPacketJunkSize << "\n";
+    }
+    if (!config.m_responsePacketJunkSize.isEmpty()) {
         out << "s2=" << config.m_responsePacketJunkSize << "\n";
+    }
+    if (!config.m_initPacketMagicHeader.isEmpty()) {
         out << "h1=" << config.m_initPacketMagicHeader << "\n";
+    }
+    if (!config.m_responsePacketMagicHeader.isEmpty()) {
         out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+    }
+    if (!config.m_underloadPacketMagicHeader.isEmpty()) {
         out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+    }
+    if (!config.m_transportPacketMagicHeader.isEmpty()) {
         out << "h4=" << config.m_transportPacketMagicHeader << "\n";
     }
 

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -101,15 +101,31 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
   out << "private_key=" << QString(privateKey.toHex()) << "\n";
   out << "replace_peers=true\n";
 
-  if (config.m_junkPacketCount != "") {
+  if (!config.m_junkPacketCount.isEmpty()) {
     out << "jc=" << config.m_junkPacketCount << "\n";
+  }
+  if (!config.m_junkPacketMinSize.isEmpty()) {
     out << "jmin=" << config.m_junkPacketMinSize << "\n";
+  }
+  if (!config.m_junkPacketMaxSize.isEmpty()) {
     out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+  }
+  if (!config.m_initPacketJunkSize.isEmpty()) {
     out << "s1=" << config.m_initPacketJunkSize << "\n";
+  }
+  if (!config.m_responsePacketJunkSize.isEmpty()) {
     out << "s2=" << config.m_responsePacketJunkSize << "\n";
+  }
+  if (!config.m_initPacketMagicHeader.isEmpty()) {
     out << "h1=" << config.m_initPacketMagicHeader << "\n";
+  }
+  if (!config.m_responsePacketMagicHeader.isEmpty()) {
     out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+  }
+  if (!config.m_underloadPacketMagicHeader.isEmpty()) {
     out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+  }
+  if (!config.m_transportPacketMagicHeader.isEmpty()) {
     out << "h4=" << config.m_transportPacketMagicHeader << "\n";
   }
 

client/secure_qsettings.cpp

@@ -125,6 +125,10 @@ QByteArray SecureQSettings::backupAppConfig() const
     QJsonObject cfg;
 
     for (const QString &key : m_settings.allKeys()) {
+        if (key == "Conf/installationUuid") {
+            continue;
+        }
+
         cfg.insert(key, QJsonValue::fromVariant(value(key)));
     }
 
@@ -138,6 +142,10 @@ bool SecureQSettings::restoreAppConfig(const QByteArray &json)
         return false;
 
     for (const QString &key : cfg.keys()) {
+        if (key == "Conf/installationUuid") {
+            continue;
+        }
+
         setValue(key, cfg.value(key).toVariant());
     }
 

client/settings.cpp

@@ -361,7 +361,9 @@ QString Settings::secondaryDns() const
 
 void Settings::clearSettings()
 {
+    auto uuid = getInstallationUuid(false);
     m_settings.clearSettings();
+    setInstallationUuid(uuid);
     emit settingsCleared();
 }
 
@@ -423,6 +425,21 @@ void Settings::setAppsSplitTunnelingEnabled(bool enabled)
     setValue("Conf/appsSplitTunnelingEnabled", enabled);
 }
 
+QString Settings::getInstallationUuid(const bool needCreate)
+{
+    auto uuid = value("Conf/installationUuid", "").toString();
+    if (needCreate && uuid.isEmpty()) {
+        uuid = QUuid::createUuid().toString();
+        setInstallationUuid(uuid);
+    }
+    return uuid;
+}
+
+void Settings::setInstallationUuid(const QString &uuid)
+{
+    setValue("Conf/installationUuid", uuid);
+}
+
 ServerCredentials Settings::defaultServerCredentials() const
 {
     return serverCredentials(defaultServerIndex());

client/settings.h

@@ -214,6 +214,8 @@ public:
     bool getAppsSplitTunnelingEnabled() const;
     void setAppsSplitTunnelingEnabled(bool enabled);
 
+    QString getInstallationUuid(const bool needCreate);
+
 signals:
     void saveLogsChanged(bool enabled);
     void screenshotsEnabledChanged(bool enabled);
@@ -224,6 +226,8 @@ private:
     QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
     void setValue(const QString &key, const QVariant &value);
 
+    void setInstallationUuid(const QString &uuid);
+
     mutable SecureQSettings m_settings;
 };
 

client/ui/controllers/connectionController.cpp

@@ -14,8 +14,8 @@
 ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                            const QSharedPointer<ContainersModel> &containersModel,
                                            const QSharedPointer<ClientManagementModel> &clientManagementModel,
-                                           const QSharedPointer<VpnConnection> &vpnConnection,
-                                           const std::shared_ptr<Settings> &settings, QObject *parent)
+                                           const QSharedPointer<VpnConnection> &vpnConnection, const std::shared_ptr<Settings> &settings,
+                                           QObject *parent)
     : QObject(parent),
       m_serversModel(serversModel),
       m_containersModel(containersModel),
@@ -23,12 +23,9 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
       m_vpnConnection(vpnConnection),
       m_settings(settings)
 {
-    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, this,
-            &ConnectionController::onConnectionStateChanged);
-    connect(this, &ConnectionController::connectToVpn, m_vpnConnection.get(), &VpnConnection::connectToVpn,
-            Qt::QueuedConnection);
-    connect(this, &ConnectionController::disconnectFromVpn, m_vpnConnection.get(), &VpnConnection::disconnectFromVpn,
-            Qt::QueuedConnection);
+    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, this, &ConnectionController::onConnectionStateChanged);
+    connect(this, &ConnectionController::connectToVpn, m_vpnConnection.get(), &VpnConnection::connectToVpn, Qt::QueuedConnection);
+    connect(this, &ConnectionController::disconnectFromVpn, m_vpnConnection.get(), &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
 
     m_state = Vpn::ConnectionState::Disconnected;
 }
@@ -45,7 +42,7 @@ void ConnectionController::openConnection()
     if (serverConfig.value(config_key::configVersion).toInt()
         && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
         ApiController apiController;
-        errorCode = apiController.updateServerConfigFromApi(serverConfig);
+        errorCode = apiController.updateServerConfigFromApi(m_settings->getInstallationUuid(true), serverConfig);
         if (errorCode != ErrorCode::NoError) {
             emit connectionErrorOccurred(errorString(errorCode));
             return;
@@ -59,8 +56,7 @@ void ConnectionController::openConnection()
         return;
     }
 
-    DockerContainer container =
-            qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
+    DockerContainer container = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
 
     if (!m_containersModel->isSupportedByCurrentPlatform(container)) {
         emit connectionErrorOccurred(tr("The selected protocol is not supported on the current platform"));
@@ -74,11 +70,12 @@ void ConnectionController::openConnection()
 
     qApp->processEvents();
 
-    VpnConfigurationsController vpnConfigurationController(m_settings);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
 
     QJsonObject containerConfig = m_containersModel->getContainerConfig(container);
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
-    errorCode = updateProtocolConfig(container, credentials, containerConfig);
+    errorCode = updateProtocolConfig(container, credentials, containerConfig, serverController);
     if (errorCode != ErrorCode::NoError) {
         emit connectionErrorOccurred(errorString(errorCode));
         return;
@@ -87,8 +84,7 @@ void ConnectionController::openConnection()
     auto dns = m_serversModel->getDnsPair(serverIndex);
     serverConfig = m_serversModel->getServerConfig(serverIndex);
 
-    auto vpnConfiguration =
-            vpnConfigurationController.createVpnConfiguration(dns, serverConfig, containerConfig, container, errorCode);
+    auto vpnConfiguration = vpnConfigurationController.createVpnConfiguration(dns, serverConfig, containerConfig, container, errorCode);
     if (errorCode != ErrorCode::NoError) {
         emit connectionErrorOccurred(tr("unable to create configuration"));
         return;
@@ -215,10 +211,8 @@ bool ConnectionController::isConnected() const
 bool ConnectionController::isProtocolConfigExists(const QJsonObject &containerConfig, const DockerContainer container)
 {
     for (Proto protocol : ContainerProps::protocolsForContainer(container)) {
-        QString protocolConfig = containerConfig.value(ProtocolProps::protoToString(protocol))
-                                         .toObject()
-                                         .value(config_key::last_config)
-                                         .toString();
+        QString protocolConfig =
+                containerConfig.value(ProtocolProps::protoToString(protocol)).toObject().value(config_key::last_config).toString();
 
         if (protocolConfig.isEmpty()) {
             return false;
@@ -227,24 +221,27 @@ bool ConnectionController::isProtocolConfigExists(const QJsonObject &containerCo
     return true;
 }
 
-ErrorCode ConnectionController::updateProtocolConfig(const DockerContainer container,
-                                                     const ServerCredentials &credentials, QJsonObject &containerConfig)
+ErrorCode ConnectionController::updateProtocolConfig(const DockerContainer container, const ServerCredentials &credentials,
+                                                     QJsonObject &containerConfig, QSharedPointer<ServerController> serverController)
 {
     QFutureWatcher<ErrorCode> watcher;
 
-    QFuture<ErrorCode> future = QtConcurrent::run([this, container, &credentials, &containerConfig]() {
+    if (serverController.isNull()) {
+        serverController.reset(new ServerController(m_settings));
+    }
+
+    QFuture<ErrorCode> future = QtConcurrent::run([this, container, &credentials, &containerConfig, &serverController]() {
         ErrorCode errorCode = ErrorCode::NoError;
         if (!isProtocolConfigExists(containerConfig, container)) {
-            VpnConfigurationsController vpnConfigurationController(m_settings);
-            errorCode =
-                    vpnConfigurationController.createProtocolConfigForContainer(credentials, container, containerConfig);
+            VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
+            errorCode = vpnConfigurationController.createProtocolConfigForContainer(credentials, container, containerConfig);
             if (errorCode != ErrorCode::NoError) {
                 return errorCode;
             }
             m_serversModel->updateContainerConfig(container, containerConfig);
 
             errorCode = m_clientManagementModel->appendClient(container, credentials, containerConfig,
-                                                              QString("Admin [%1]").arg(QSysInfo::prettyProductName()));
+                                                              QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController);
             if (errorCode != ErrorCode::NoError) {
                 return errorCode;
             }

client/ui/controllers/connectionController.h

@@ -16,11 +16,10 @@ public:
     Q_PROPERTY(bool isConnectionInProgress READ isConnectionInProgress NOTIFY connectionStateChanged)
     Q_PROPERTY(QString connectionStateText READ connectionStateText NOTIFY connectionStateChanged)
 
-    explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
-                                  const QSharedPointer<ContainersModel> &containersModel,
+    explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel, const QSharedPointer<ContainersModel> &containersModel,
                                   const QSharedPointer<ClientManagementModel> &clientManagementModel,
-                                  const QSharedPointer<VpnConnection> &vpnConnection,
-                                  const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
+                                  const QSharedPointer<VpnConnection> &vpnConnection, const std::shared_ptr<Settings> &settings,
+                                  QObject *parent = nullptr);
 
     ~ConnectionController() = default;
 
@@ -41,12 +40,11 @@ public slots:
 
     void onTranslationsUpdated();
 
-    ErrorCode updateProtocolConfig(const DockerContainer container, const ServerCredentials &credentials,
-                                   QJsonObject &containerConfig);
+    ErrorCode updateProtocolConfig(const DockerContainer container, const ServerCredentials &credentials, QJsonObject &containerConfig,
+                                   QSharedPointer<ServerController> serverController = nullptr);
 
 signals:
-    void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
-                      const QJsonObject &vpnConfiguration);
+    void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &vpnConfiguration);
     void disconnectFromVpn();
     void connectionStateChanged();
 

client/ui/controllers/exportController.cpp

@@ -95,10 +95,11 @@ void ExportController::generateConnectionConfig(const QString &clientName)
     QJsonObject containerConfig = m_containersModel->getContainerConfig(container);
     containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
 
-    VpnConfigurationsController vpnConfigurationController(m_settings);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
     ErrorCode errorCode = vpnConfigurationController.createProtocolConfigForContainer(credentials, container, containerConfig);
 
-    errorCode = m_clientManagementModel->appendClient(container, credentials, containerConfig, clientName);
+    errorCode = m_clientManagementModel->appendClient(container, credentials, containerConfig, clientName, serverController);
     if (errorCode != ErrorCode::NoError) {
         emit exportErrorOccurred(errorString(errorCode));
         return;
@@ -138,10 +139,10 @@ ErrorCode ExportController::generateNativeConfig(const DockerContainer container
     QJsonObject containerConfig = m_containersModel->getContainerConfig(container);
     containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
 
-    VpnConfigurationsController vpnConfigurationController(m_settings);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
 
     QString protocolConfigString;
-
     ErrorCode errorCode = vpnConfigurationController.createProtocolConfigString(isApiConfig, dns, credentials, container, containerConfig,
                                                                                 protocol, protocolConfigString);
     if (errorCode != ErrorCode::NoError) {
@@ -152,7 +153,7 @@ ErrorCode ExportController::generateNativeConfig(const DockerContainer container
 
     if (protocol == Proto::OpenVpn || protocol == Proto::WireGuard || protocol == Proto::Awg) {
         auto clientId = jsonNativeConfig.value(config_key::clientId).toString();
-        errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
+        errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials, serverController);
     }
     return errorCode;
 }
@@ -316,7 +317,8 @@ void ExportController::exportConfig(const QString &fileName)
 
 void ExportController::updateClientManagementModel(const DockerContainer container, ServerCredentials credentials)
 {
-    ErrorCode errorCode = m_clientManagementModel->updateModel(container, credentials);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    ErrorCode errorCode = m_clientManagementModel->updateModel(container, credentials, serverController);
     if (errorCode != ErrorCode::NoError) {
         emit exportErrorOccurred(errorString(errorCode));
     }
@@ -324,7 +326,9 @@ void ExportController::updateClientManagementModel(const DockerContainer contain
 
 void ExportController::revokeConfig(const int row, const DockerContainer container, ServerCredentials credentials)
 {
-    ErrorCode errorCode = m_clientManagementModel->revokeClient(row, container, credentials, m_serversModel->getProcessedServerIndex());
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    ErrorCode errorCode =
+            m_clientManagementModel->revokeClient(row, container, credentials, m_serversModel->getProcessedServerIndex(), serverController);
     if (errorCode != ErrorCode::NoError) {
         emit exportErrorOccurred(errorString(errorCode));
     }
@@ -332,7 +336,8 @@ void ExportController::revokeConfig(const int row, const DockerContainer contain
 
 void ExportController::renameClient(const int row, const QString &clientName, const DockerContainer container, ServerCredentials credentials)
 {
-    ErrorCode errorCode = m_clientManagementModel->renameClient(row, clientName, container, credentials);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    ErrorCode errorCode = m_clientManagementModel->renameClient(row, clientName, container, credentials, serverController);
     if (errorCode != ErrorCode::NoError) {
         emit exportErrorOccurred(errorString(errorCode));
     }
@@ -340,7 +345,7 @@ void ExportController::renameClient(const int row, const QString &clientName, co
 
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
 {
-    double k = 850;
+    double k = 750;
 
     quint8 chunksCount = std::ceil(data.size() / k);
     QList<QString> chunks;

client/ui/controllers/importController.cpp

@@ -4,6 +4,7 @@
 #include <QFileInfo>
 #include <QQuickItem>
 #include <QStandardPaths>
+#include <QRandomGenerator>
 
 #include "core/errorstrings.h"
 #ifdef Q_OS_ANDROID
@@ -15,15 +16,6 @@
 
 namespace
 {
-    enum class ConfigTypes {
-        Amnezia,
-        OpenVpn,
-        WireGuard,
-        Xray,
-        Backup,
-        Invalid
-    };
-
     ConfigTypes checkConfigFormat(const QString &config)
     {
         const QString openVpnConfigPatternCli = "client";
@@ -39,19 +31,23 @@ namespace
         const QString xrayConfigPatternOutbound = "outbounds";
 
         const QString amneziaConfigPattern = "containers";
+        const QString amneziaConfigPatternHostName = "hostName";
+        const QString amneziaConfigPatternUserName = "userName";
+        const QString amneziaConfigPatternPassword = "password";
         const QString amneziaFreeConfigPattern = "api_key";
         const QString backupPattern = "Servers/serversList";
 
         if (config.contains(backupPattern)) {
             return ConfigTypes::Backup;
-        } else if (config.contains(amneziaConfigPattern) || config.contains(amneziaFreeConfigPattern)) {
+        } else if (config.contains(amneziaConfigPattern) || config.contains(amneziaFreeConfigPattern)
+                   || (config.contains(amneziaConfigPatternHostName) && config.contains(amneziaConfigPatternUserName)
+                       && config.contains(amneziaConfigPatternPassword))) {
             return ConfigTypes::Amnezia;
         } else if (config.contains(openVpnConfigPatternCli)
                    && (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2))
                    && (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
             return ConfigTypes::OpenVpn;
-        } else if (config.contains(wireguardConfigPatternSectionInterface)
-                   && config.contains(wireguardConfigPatternSectionPeer)) {
+        } else if (config.contains(wireguardConfigPatternSectionInterface) && config.contains(wireguardConfigPatternSectionPeer)) {
             return ConfigTypes::WireGuard;
         } else if ((config.contains(xrayConfigPatternInbound)) && (config.contains(xrayConfigPatternOutbound))) {
             return ConfigTypes::Xray;
@@ -64,8 +60,7 @@ namespace
 #endif
 } // namespace
 
-ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel,
-                                   const QSharedPointer<ContainersModel> &containersModel,
+ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel, const QSharedPointer<ContainersModel> &containersModel,
                                    const std::shared_ptr<Settings> &settings, QObject *parent)
     : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
 {
@@ -92,25 +87,25 @@ bool ImportController::extractConfigFromFile(const QString &fileName)
 bool ImportController::extractConfigFromData(QString data)
 {
     QString config = data;
-    auto configFormat = checkConfigFormat(config);
-    if (configFormat == ConfigTypes::Invalid) {
+    m_configType = checkConfigFormat(config);
+    if (m_configType == ConfigTypes::Invalid) {
         data.replace("vpn://", "");
-        QByteArray ba =
-                QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+        QByteArray ba = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
         QByteArray ba_uncompressed = qUncompress(ba);
         if (!ba_uncompressed.isEmpty()) {
             ba = ba_uncompressed;
         }
 
         config = ba;
-        configFormat = checkConfigFormat(config);
+        m_configType = checkConfigFormat(config);
     }
 
-    switch (configFormat) {
+    switch (m_configType) {
     case ConfigTypes::OpenVpn: {
         m_config = extractOpenVpnConfig(config);
         return m_config.empty() ? false : true;
     }
+    case ConfigTypes::Awg:
     case ConfigTypes::WireGuard: {
         m_config = extractWireGuardConfig(config);
         return m_config.empty() ? false : true;
@@ -166,6 +161,39 @@ QString ImportController::getConfigFileName()
     return m_configFileName;
 }
 
+bool ImportController::isNativeWireGuardConfig()
+{
+    return m_configType == ConfigTypes::WireGuard;
+}
+
+void ImportController::processNativeWireGuardConfig()
+{
+    auto containers = m_config.value(config_key::containers).toArray();
+    if (!containers.isEmpty()) {
+        auto container = containers.at(0).toObject();
+        auto containerConfig = container.value(ContainerProps::containerTypeToString(DockerContainer::WireGuard)).toObject();
+        auto protocolConfig = QJsonDocument::fromJson(containerConfig.value(config_key::last_config).toString().toUtf8()).object();
+
+        QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
+        QString junkPacketMinSize = QString::number(50);
+        QString junkPacketMaxSize = QString::number(1000);
+        protocolConfig[config_key::junkPacketCount] = junkPacketCount;
+        protocolConfig[config_key::junkPacketMinSize] = junkPacketMinSize;
+        protocolConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;
+        protocolConfig[config_key::initPacketJunkSize] = "0";
+        protocolConfig[config_key::responsePacketJunkSize] = "0";
+        protocolConfig[config_key::initPacketMagicHeader] = "1";
+        protocolConfig[config_key::responsePacketMagicHeader] = "2";
+        protocolConfig[config_key::underloadPacketMagicHeader] = "3";
+        protocolConfig[config_key::transportPacketMagicHeader] = "4";
+
+        containerConfig[config_key::last_config] = QString(QJsonDocument(protocolConfig).toJson());
+        container["wireguard"] = containerConfig;
+        containers.replace(0, container);
+        m_config[config_key::containers] = containers;
+    }
+}
+
 void ImportController::importConfig()
 {
     ServerCredentials credentials;
@@ -279,8 +307,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     lastConfig[config_key::hostName] = hostName;
     lastConfig[config_key::port] = port.toInt();
 
-    if (!configMap.value("PrivateKey").isEmpty() && !configMap.value("Address").isEmpty()
-        && !configMap.value("PublicKey").isEmpty()) {
+    if (!configMap.value("PrivateKey").isEmpty() && !configMap.value("Address").isEmpty() && !configMap.value("PublicKey").isEmpty()) {
         lastConfig[config_key::client_priv_key] = configMap.value("PrivateKey");
         lastConfig[config_key::client_ip] = configMap.value("Address");
 
@@ -306,12 +333,9 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     lastConfig[config_key::allowed_ips] = allowedIpsJsonArray;
 
     QString protocolName = "wireguard";
-    if (!configMap.value(config_key::junkPacketCount).isEmpty()
-        && !configMap.value(config_key::junkPacketMinSize).isEmpty()
-        && !configMap.value(config_key::junkPacketMaxSize).isEmpty()
-        && !configMap.value(config_key::initPacketJunkSize).isEmpty()
-        && !configMap.value(config_key::responsePacketJunkSize).isEmpty()
-        && !configMap.value(config_key::initPacketMagicHeader).isEmpty()
+    if (!configMap.value(config_key::junkPacketCount).isEmpty() && !configMap.value(config_key::junkPacketMinSize).isEmpty()
+        && !configMap.value(config_key::junkPacketMaxSize).isEmpty() && !configMap.value(config_key::initPacketJunkSize).isEmpty()
+        && !configMap.value(config_key::responsePacketJunkSize).isEmpty() && !configMap.value(config_key::initPacketMagicHeader).isEmpty()
         && !configMap.value(config_key::responsePacketMagicHeader).isEmpty()
         && !configMap.value(config_key::underloadPacketMagicHeader).isEmpty()
         && !configMap.value(config_key::transportPacketMagicHeader).isEmpty()) {
@@ -325,6 +349,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
         lastConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
         lastConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
         protocolName = "awg";
+        m_configType = ConfigTypes::Awg;
     }
 
     QJsonObject wireguardConfig;

client/ui/controllers/importController.h

@@ -3,11 +3,22 @@
 
 #include <QObject>
 
-#include "containers/containers_defs.h"
-#include "core/defs.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
 
+namespace
+{
+    enum class ConfigTypes {
+        Amnezia,
+        OpenVpn,
+        WireGuard,
+        Awg,
+        Xray,
+        Backup,
+        Invalid
+    };
+}
+
 class ImportController : public QObject
 {
     Q_OBJECT
@@ -36,6 +47,9 @@ public slots:
     static bool decodeQrCode(const QString &code);
 #endif
 
+    bool isNativeWireGuardConfig();
+    void processNativeWireGuardConfig();
+
 signals:
     void importFinished();
     void importErrorOccurred(const QString &errorMessage, bool goToPageHome);
@@ -59,6 +73,7 @@ private:
 
     QJsonObject m_config;
     QString m_configFileName;
+    ConfigTypes m_configType;
 
 #if defined Q_OS_ANDROID || defined Q_OS_IOS
     QMap<int, QByteArray> m_qrCodeChunks;

client/ui/controllers/installController.cpp

@@ -10,11 +10,15 @@
 #include "core/controllers/serverController.h"
 #include "core/controllers/vpnConfigurationController.h"
 #include "core/errorstrings.h"
-#include "logger.h"
 #include "core/networkUtilities.h"
-#include "utilities.h"
+#include "logger.h"
 #include "ui/models/protocols/awgConfigModel.h"
 #include "ui/models/protocols/wireguardConfigModel.h"
+#include "utilities.h"
+
+#ifdef Q_OS_IOS
+    #include <AmneziaVPN-Swift.h>
+#endif
 
 namespace
 {
@@ -85,14 +89,20 @@ void InstallController::install(DockerContainer container, int port, TransportPr
                 QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
                 QString junkPacketMinSize = QString::number(50);
                 QString junkPacketMaxSize = QString::number(1000);
-                QString initPacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
-                QString responsePacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
+
+                int s1 = QRandomGenerator::global()->bounded(15, 150);
+                int s2 = QRandomGenerator::global()->bounded(15, 150);
+                while (s1 + AwgConstant::messageInitiationSize == s2 + AwgConstant::messageResponseSize) {
+                    s2 = QRandomGenerator::global()->bounded(15, 150);
+                }
+
+                QString initPacketJunkSize = QString::number(s1);
+                QString responsePacketJunkSize = QString::number(s2);
 
                 QSet<QString> headersValue;
                 while (headersValue.size() != 4) {
-
                     auto max = (std::numeric_limits<qint32>::max)();
-                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(1, max)));
+                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(5, max)));
                 }
 
                 auto headersValueList = headersValue.values();
@@ -132,12 +142,12 @@ void InstallController::install(DockerContainer container, int port, TransportPr
         serverCredentials = qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
     }
 
-    ServerController serverController(m_settings);
-    connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
-    connect(this, &InstallController::cancelInstallation, &serverController, &ServerController::cancelInstallation);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    connect(serverController.get(), &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
+    connect(this, &InstallController::cancelInstallation, serverController.get(), &ServerController::cancelInstallation);
 
     QMap<DockerContainer, QJsonObject> installedContainers;
-    ErrorCode errorCode = getAlreadyInstalledContainers(serverCredentials, installedContainers);
+    ErrorCode errorCode = getAlreadyInstalledContainers(serverCredentials, serverController, installedContainers);
     if (errorCode) {
         emit installationErrorOccurred(errorString(errorCode));
         return;
@@ -146,7 +156,7 @@ void InstallController::install(DockerContainer container, int port, TransportPr
     QString finishMessage = "";
 
     if (!installedContainers.contains(container)) {
-        errorCode = serverController.setupContainer(serverCredentials, container, config);
+        errorCode = serverController->setupContainer(serverCredentials, container, config);
         if (errorCode) {
             emit installationErrorOccurred(errorString(errorCode));
             return;
@@ -164,14 +174,15 @@ void InstallController::install(DockerContainer container, int port, TransportPr
     }
 
     if (m_shouldCreateServer) {
-        installServer(container, installedContainers, serverCredentials, finishMessage);
+        installServer(container, installedContainers, serverCredentials, serverController, finishMessage);
     } else {
-        installContainer(container, installedContainers, serverCredentials, finishMessage);
+        installContainer(container, installedContainers, serverCredentials, serverController, finishMessage);
     }
 }
 
 void InstallController::installServer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers,
-                                      const ServerCredentials &serverCredentials, QString &finishMessage)
+                                      const ServerCredentials &serverCredentials, const QSharedPointer<ServerController> &serverController,
+                                      QString &finishMessage)
 {
     if (installedContainers.size() > 1) {
         finishMessage += tr("\nAdded containers that were already installed on the server");
@@ -185,13 +196,13 @@ void InstallController::installServer(const DockerContainer container, const QMa
     server.insert(config_key::description, m_settings->nextAvailableServerName());
 
     QJsonArray containerConfigs;
-    VpnConfigurationsController vpnConfigurationController(m_settings);
+    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
     for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
         auto containerConfig = iterator.value();
 
         if (ContainerProps::isSupportedByCurrentPlatform(container)) {
-            auto errorCode =
-                    vpnConfigurationController.createProtocolConfigForContainer(m_processedServerCredentials, iterator.key(), containerConfig);
+            auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(m_processedServerCredentials, iterator.key(),
+                                                                                         containerConfig);
             if (errorCode) {
                 emit installationErrorOccurred(errorString(errorCode));
                 return;
@@ -199,7 +210,7 @@ void InstallController::installServer(const DockerContainer container, const QMa
             containerConfigs.append(containerConfig);
 
             errorCode = m_clientManagementModel->appendClient(iterator.key(), serverCredentials, containerConfig,
-                                                              QString("Admin [%1]").arg(QSysInfo::prettyProductName()));
+                                                              QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController);
             if (errorCode) {
                 emit installationErrorOccurred(errorString(errorCode));
                 return;
@@ -218,18 +229,20 @@ void InstallController::installServer(const DockerContainer container, const QMa
 }
 
 void InstallController::installContainer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers,
-                                         const ServerCredentials &serverCredentials, QString &finishMessage)
+                                         const ServerCredentials &serverCredentials,
+                                         const QSharedPointer<ServerController> &serverController, QString &finishMessage)
 {
     bool isInstalledContainerAddedToGui = false;
 
-    VpnConfigurationsController vpnConfigurationController(m_settings);
+    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
     for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
         QJsonObject containerConfig = m_containersModel->getContainerConfig(iterator.key());
         if (containerConfig.isEmpty()) {
             containerConfig = iterator.value();
 
             if (ContainerProps::isSupportedByCurrentPlatform(container)) {
-                auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, iterator.key(), containerConfig);
+                auto errorCode =
+                        vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, iterator.key(), containerConfig);
                 if (errorCode) {
                     emit installationErrorOccurred(errorString(errorCode));
                     return;
@@ -237,7 +250,7 @@ void InstallController::installContainer(const DockerContainer container, const
                 m_serversModel->addContainerConfig(iterator.key(), containerConfig);
 
                 errorCode = m_clientManagementModel->appendClient(iterator.key(), serverCredentials, containerConfig,
-                                                                  QString("Admin [%1]").arg(QSysInfo::prettyProductName()));
+                                                                  QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController);
                 if (errorCode) {
                     emit installationErrorOccurred(errorString(errorCode));
                     return;
@@ -279,14 +292,13 @@ void InstallController::scanServerForInstalledContainers()
     ServerCredentials serverCredentials =
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
-    ServerController serverController(m_settings);
-
     QMap<DockerContainer, QJsonObject> installedContainers;
-    ErrorCode errorCode = getAlreadyInstalledContainers(serverCredentials, installedContainers);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    ErrorCode errorCode = getAlreadyInstalledContainers(serverCredentials, serverController, installedContainers);
 
     if (errorCode == ErrorCode::NoError) {
         bool isInstalledContainerAddedToGui = false;
-        VpnConfigurationsController vpnConfigurationController(m_settings);
+        VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
 
         for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
             auto container = iterator.key();
@@ -304,7 +316,8 @@ void InstallController::scanServerForInstalledContainers()
                     m_serversModel->addContainerConfig(container, containerConfig);
 
                     errorCode = m_clientManagementModel->appendClient(container, serverCredentials, containerConfig,
-                                                                      QString("Admin [%1]").arg(QSysInfo::prettyProductName()));
+                                                                      QString("Admin [%1]").arg(QSysInfo::prettyProductName()),
+                                                                      serverController);
                     if (errorCode) {
                         emit installationErrorOccurred(errorString(errorCode));
                         return;
@@ -325,6 +338,7 @@ void InstallController::scanServerForInstalledContainers()
 }
 
 ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentials &credentials,
+                                                           const QSharedPointer<ServerController> &serverController,
                                                            QMap<DockerContainer, QJsonObject> &installedContainers)
 {
     QString stdOut;
@@ -337,10 +351,9 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
         return ErrorCode::NoError;
     };
 
-    ServerController serverController(m_settings);
     QString script = QString("sudo docker ps --format '{{.Names}} {{.Ports}}'");
 
-    ErrorCode errorCode = serverController.runScript(credentials, script, cbReadStdOut, cbReadStdErr);
+    ErrorCode errorCode = serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr);
     if (errorCode != ErrorCode::NoError) {
         return errorCode;
     }
@@ -367,8 +380,8 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
                     containerConfig.insert(config_key::transport_proto, transportProto);
 
                     if (protocol == Proto::Awg) {
-                        QString serverConfig = serverController.getTextFileFromContainer(container, credentials,
-                                                                                         protocols::awg::serverConfigPath, errorCode);
+                        QString serverConfig = serverController->getTextFileFromContainer(container, credentials,
+                                                                                          protocols::awg::serverConfigPath, errorCode);
 
                         QMap<QString, QString> serverConfigMap;
                         auto serverConfigLines = serverConfig.split("\n");
@@ -399,7 +412,7 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
                         stdOut.clear();
                         script = QString("sudo docker inspect --format '{{.Config.Cmd}}' %1").arg(name);
 
-                        ErrorCode errorCode = serverController.runScript(credentials, script, cbReadStdOut, cbReadStdErr);
+                        ErrorCode errorCode = serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr);
                         if (errorCode != ErrorCode::NoError) {
                             return errorCode;
                         }
@@ -443,7 +456,7 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
                         stdOut.clear();
                         script = QString("sudo docker exec -i %1 sh -c 'cat /var/lib/tor/hidden_service/hostname'").arg(name);
 
-                        ErrorCode errorCode = serverController.runScript(credentials, script, cbReadStdOut, cbReadStdErr);
+                        ErrorCode errorCode = serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr);
                         if (errorCode != ErrorCode::NoError) {
                             return errorCode;
                         }
@@ -480,12 +493,12 @@ void InstallController::updateContainer(QJsonObject config)
     ErrorCode errorCode = ErrorCode::NoError;
 
     if (isUpdateDockerContainerRequired(container, oldContainerConfig, config)) {
-        ServerController serverController(m_settings);
-        connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
-        connect(this, &InstallController::cancelInstallation, &serverController, &ServerController::cancelInstallation);
+        QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+        connect(serverController.get(), &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
+        connect(this, &InstallController::cancelInstallation, serverController.get(), &ServerController::cancelInstallation);
 
-        errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
-        clearCachedProfile();
+        errorCode = serverController->updateContainer(serverCredentials, container, oldContainerConfig, config);
+        clearCachedProfile(serverController);
     }
 
     if (errorCode == ErrorCode::NoError) {
@@ -510,8 +523,13 @@ void InstallController::rebootProcessedServer()
     int serverIndex = m_serversModel->getProcessedServerIndex();
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
-    m_serversModel->rebootServer();
-    emit rebootProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    const auto errorCode = m_serversModel->rebootServer(serverController);
+    if (errorCode == ErrorCode::NoError) {
+        emit rebootProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
+    } else {
+        emit installationErrorOccurred(errorString(errorCode));
+    }
 }
 
 void InstallController::removeProcessedServer()
@@ -528,7 +546,8 @@ void InstallController::removeAllContainers()
     int serverIndex = m_serversModel->getProcessedServerIndex();
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
-    ErrorCode errorCode = m_serversModel->removeAllContainers();
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    ErrorCode errorCode = m_serversModel->removeAllContainers(serverController);
     if (errorCode == ErrorCode::NoError) {
         emit removeAllContainersFinished(tr("All containers from server '%1' have been removed").arg(serverName));
         return;
@@ -544,7 +563,8 @@ void InstallController::removeProcessedContainer()
     int container = m_containersModel->getProcessedContainerIndex();
     QString containerName = m_containersModel->getProcessedContainerName();
 
-    ErrorCode errorCode = m_serversModel->removeContainer(container);
+    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
+    ErrorCode errorCode = m_serversModel->removeContainer(serverController, container);
     if (errorCode == ErrorCode::NoError) {
 
         emit removeProcessedContainerFinished(tr("%1 has been removed from the server '%2'").arg(containerName, serverName));
@@ -553,9 +573,18 @@ void InstallController::removeProcessedContainer()
     emit installationErrorOccurred(errorString(errorCode));
 }
 
-void InstallController::removeApiConfig()
+void InstallController::removeApiConfig(const int serverIndex)
 {
-    auto serverConfig = m_serversModel->getServerConfig(m_serversModel->getDefaultServerIndex());
+    auto serverConfig = m_serversModel->getServerConfig(serverIndex);
+
+#ifdef Q_OS_IOS
+    QString vpncName = QString("%1 (%2) %3")
+        .arg(serverConfig[config_key::description].toString())
+        .arg(serverConfig[config_key::hostName].toString())
+        .arg(serverConfig[config_key::vpnproto].toString());
+
+    AmneziaVPN::removeVPNC(vpncName.toStdString());
+#endif
 
     serverConfig.remove(config_key::dns1);
     serverConfig.remove(config_key::dns2);
@@ -564,11 +593,15 @@ void InstallController::removeApiConfig()
 
     serverConfig.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));
 
-    m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+    m_serversModel->editServer(serverConfig, serverIndex);
 }
 
-void InstallController::clearCachedProfile()
+void InstallController::clearCachedProfile(QSharedPointer<ServerController> serverController)
 {
+    if (serverController.isNull()) {
+        serverController.reset(new ServerController(m_settings));
+    }
+
     int serverIndex = m_serversModel->getProcessedServerIndex();
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getProcessedContainerIndex());
     QJsonObject containerConfig = m_containersModel->getContainerConfig(container);
@@ -576,7 +609,7 @@ void InstallController::clearCachedProfile()
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     m_serversModel->clearCachedProfile(container);
-    m_clientManagementModel->revokeClient(containerConfig, container, serverCredentials, serverIndex);
+    m_clientManagementModel->revokeClient(containerConfig, container, serverCredentials, serverIndex, serverController);
 
     emit cachedProfileCleared(tr("%1 cached profile cleared").arg(ContainerProps::containerHumanNames().value(container)));
 }
@@ -678,13 +711,15 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
         process->write((password + "\n").toUtf8());
     }
 
-
 #endif
 }
 
-bool InstallController::checkSshConnection()
+bool InstallController::checkSshConnection(QSharedPointer<ServerController> serverController)
 {
-    ServerController serverController(m_settings);
+    if (serverController.isNull()) {
+        serverController.reset(new ServerController(m_settings));
+    }
+
     ErrorCode errorCode = ErrorCode::NoError;
     m_privateKeyPassphrase = "";
 
@@ -699,7 +734,7 @@ bool InstallController::checkSshConnection()
         };
 
         QString decryptedPrivateKey;
-        errorCode = serverController.getDecryptedPrivateKey(m_processedServerCredentials, decryptedPrivateKey, passphraseCallback);
+        errorCode = serverController->getDecryptedPrivateKey(m_processedServerCredentials, decryptedPrivateKey, passphraseCallback);
         if (errorCode == ErrorCode::NoError) {
             m_processedServerCredentials.secretData = decryptedPrivateKey;
         } else {
@@ -709,7 +744,7 @@ bool InstallController::checkSshConnection()
     }
 
     QString output;
-    output = serverController.checkSshConnection(m_processedServerCredentials, errorCode);
+    output = serverController->checkSshConnection(m_processedServerCredentials, errorCode);
 
     if (errorCode != ErrorCode::NoError) {
         emit installationErrorOccurred(errorString(errorCode));
@@ -746,7 +781,8 @@ void InstallController::addEmptyServer()
     emit installServerFinished(tr("Server added successfully"));
 }
 
-bool InstallController::isUpdateDockerContainerRequired(const DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig)
+bool InstallController::isUpdateDockerContainerRequired(const DockerContainer container, const QJsonObject &oldConfig,
+                                                        const QJsonObject &newConfig)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 

client/ui/controllers/installController.h

@@ -35,16 +35,16 @@ public slots:
     void removeAllContainers();
     void removeProcessedContainer();
 
-    void removeApiConfig();
+    void removeApiConfig(const int serverIndex);
 
-    void clearCachedProfile();
+    void clearCachedProfile(QSharedPointer<ServerController> serverController = nullptr);
 
     QRegularExpression ipAddressPortRegExp();
     QRegularExpression ipAddressRegExp();
 
     void mountSftpDrive(const QString &port, const QString &password, const QString &username);
 
-    bool checkSshConnection();
+    bool checkSshConnection(QSharedPointer<ServerController> serverController = nullptr);
 
     void setEncryptedPassphrase(QString passphrase);
 
@@ -79,12 +79,15 @@ signals:
 
 private:
     void installServer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers,
-                       const ServerCredentials &serverCredentials, QString &finishMessage);
+                       const ServerCredentials &serverCredentials, const QSharedPointer<ServerController> &serverController,
+                       QString &finishMessage);
     void installContainer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers,
-                          const ServerCredentials &serverCredentials, QString &finishMessage);
+                          const ServerCredentials &serverCredentials, const QSharedPointer<ServerController> &serverController,
+                          QString &finishMessage);
     bool isServerAlreadyExists();
 
-    ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials, QMap<DockerContainer, QJsonObject> &installedContainers);
+    ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController,
+                                            QMap<DockerContainer, QJsonObject> &installedContainers);
     bool isUpdateDockerContainerRequired(const DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig);
 
     QSharedPointer<ServersModel> m_serversModel;

client/ui/controllers/pageController.h

@@ -123,6 +123,9 @@ signals:
     void escapePressed();
     void closeTopDrawer();
 
+    void forceTabBarActiveFocus();
+    void forceStackActiveFocus();
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
 

client/ui/controllers/settingsController.cpp

@@ -18,12 +18,14 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
                                        const QSharedPointer<ContainersModel> &containersModel,
                                        const QSharedPointer<LanguageModel> &languageModel,
                                        const QSharedPointer<SitesModel> &sitesModel,
+                                       const QSharedPointer<AppSplitTunnelingModel> &appSplitTunnelingModel,
                                        const std::shared_ptr<Settings> &settings, QObject *parent)
     : QObject(parent),
       m_serversModel(serversModel),
       m_containersModel(containersModel),
       m_languageModel(languageModel),
       m_sitesModel(sitesModel),
+      m_appSplitTunnelingModel(appSplitTunnelingModel),
       m_settings(settings)
 {
     m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
@@ -76,6 +78,9 @@ void SettingsController::toggleLogging(bool enable)
 #endif
     if (enable == true) {
         checkIfNeedDisableLogs();
+        
+        qInfo().noquote() << QString("Logging has enabled on %1 version %2 %3").arg(APPLICATION_NAME, APP_VERSION, GIT_COMMIT_HASH);
+        qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
     }
     emit loggingStateChanged();
 }
@@ -144,7 +149,12 @@ void SettingsController::clearSettings()
     m_serversModel->resetModel();
     m_languageModel->changeLanguage(
             static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
-    m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
+
+    m_sitesModel->setRouteMode(Settings::RouteMode::VpnOnlyForwardSites);
+    m_sitesModel->toggleSplitTunneling(false);
+
+    m_appSplitTunnelingModel->setRouteMode(Settings::AppsRouteMode::VpnAllExceptApps);
+    m_appSplitTunnelingModel->toggleSplitTunneling(false);
 
     emit changeSettingsFinished(tr("All settings have been reset to default values"));
 

client/ui/controllers/settingsController.h

@@ -7,6 +7,7 @@
 #include "ui/models/languageModel.h"
 #include "ui/models/servers_model.h"
 #include "ui/models/sites_model.h"
+#include "ui/models/appSplitTunnelingModel.h"
 
 class SettingsController : public QObject
 {
@@ -16,6 +17,7 @@ public:
                                 const QSharedPointer<ContainersModel> &containersModel,
                                 const QSharedPointer<LanguageModel> &languageModel,
                                 const QSharedPointer<SitesModel> &sitesModel,
+                                const QSharedPointer<AppSplitTunnelingModel> &appSplitTunnelingModel,
                                 const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
 
     Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
@@ -83,6 +85,7 @@ private:
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<LanguageModel> m_languageModel;
     QSharedPointer<SitesModel> m_sitesModel;
+    QSharedPointer<AppSplitTunnelingModel> m_appSplitTunnelingModel;
     std::shared_ptr<Settings> m_settings;
 
     QString m_appVersion;

client/ui/models/appSplitTunnelingModel.cpp

@@ -7,6 +7,10 @@ AppSplitTunnelingModel::AppSplitTunnelingModel(std::shared_ptr<Settings> setting
 {
     m_isSplitTunnelingEnabled = m_settings->getAppsSplitTunnelingEnabled();
     m_currentRouteMode = m_settings->getAppsRouteMode();
+    if (m_currentRouteMode == Settings::VpnAllApps) { // for old split tunneling configs
+        m_settings->setAppsRouteMode(static_cast<Settings::AppsRouteMode>(Settings::VpnAllExceptApps));
+        m_currentRouteMode = Settings::VpnAllExceptApps;
+    }
     m_apps = m_settings->getVpnApps(m_currentRouteMode);
 }
 

client/ui/models/clientManagementModel.cpp

@@ -64,13 +64,12 @@ void ClientManagementModel::migration(const QByteArray &clientsTableString)
     }
 }
 
-ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCredentials credentials)
+ErrorCode ClientManagementModel::updateModel(const DockerContainer container, const ServerCredentials &credentials,
+                                             const QSharedPointer<ServerController> &serverController)
 {
     beginResetModel();
     m_clientsTable = QJsonArray();
 
-    ServerController serverController(m_settings);
-
     ErrorCode error = ErrorCode::NoError;
 
     QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
@@ -80,7 +79,7 @@ ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCr
         clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
     }
 
-    const QByteArray clientsTableString = serverController.getTextFileFromContainer(container, credentials, clientsTableFile, error);
+    const QByteArray clientsTableString = serverController->getTextFileFromContainer(container, credentials, clientsTableFile, error);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to get the clientsTable file from the server";
         endResetModel();
@@ -95,9 +94,9 @@ ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCr
         int count = 0;
 
         if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-            error = getOpenVpnClients(serverController, container, credentials, count);
+            error = getOpenVpnClients(container, credentials, serverController, count);
         } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
-            error = getWireGuardClients(serverController, container, credentials, count);
+            error = getWireGuardClients(container, credentials, serverController, count);
         }
         if (error != ErrorCode::NoError) {
             endResetModel();
@@ -106,7 +105,7 @@ ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCr
 
         const QByteArray newClientsTableString = QJsonDocument(m_clientsTable).toJson();
         if (clientsTableString != newClientsTableString) {
-            error = serverController.uploadTextFileToContainer(container, credentials, newClientsTableString, clientsTableFile);
+            error = serverController->uploadTextFileToContainer(container, credentials, newClientsTableString, clientsTableFile);
             if (error != ErrorCode::NoError) {
                 logger.error() << "Failed to upload the clientsTable file to the server";
             }
@@ -117,8 +116,8 @@ ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCr
     return error;
 }
 
-ErrorCode ClientManagementModel::getOpenVpnClients(ServerController &serverController, DockerContainer container,
-                                                   ServerCredentials credentials, int &count)
+ErrorCode ClientManagementModel::getOpenVpnClients(const DockerContainer container, const ServerCredentials &credentials,
+                                                   const QSharedPointer<ServerController> &serverController, int &count)
 {
     ErrorCode error = ErrorCode::NoError;
     QString stdOut;
@@ -128,8 +127,8 @@ ErrorCode ClientManagementModel::getOpenVpnClients(ServerController &serverContr
     };
 
     const QString getOpenVpnClientsList = "sudo docker exec -i $CONTAINER_NAME bash -c 'ls /opt/amnezia/openvpn/pki/issued'";
-    QString script = serverController.replaceVars(getOpenVpnClientsList, serverController.genVarsForScript(credentials, container));
-    error = serverController.runScript(credentials, script, cbReadStdOut);
+    QString script = serverController->replaceVars(getOpenVpnClientsList, serverController->genVarsForScript(credentials, container));
+    error = serverController->runScript(credentials, script, cbReadStdOut);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to retrieve the list of issued certificates on the server";
         return error;
@@ -158,13 +157,13 @@ ErrorCode ClientManagementModel::getOpenVpnClients(ServerController &serverContr
     return error;
 }
 
-ErrorCode ClientManagementModel::getWireGuardClients(ServerController &serverController, DockerContainer container,
-                                                     ServerCredentials credentials, int &count)
+ErrorCode ClientManagementModel::getWireGuardClients(const DockerContainer container, const ServerCredentials &credentials,
+                                                     const QSharedPointer<ServerController> &serverController, int &count)
 {
     ErrorCode error = ErrorCode::NoError;
 
     const QString wireGuardConfigFile = QString("opt/amnezia/%1/wg0.conf").arg(container == DockerContainer::WireGuard ? "wireguard" : "awg");
-    const QString wireguardConfigString = serverController.getTextFileFromContainer(container, credentials, wireGuardConfigFile, error);
+    const QString wireguardConfigString = serverController->getTextFileFromContainer(container, credentials, wireGuardConfigFile, error);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to get the wg conf file from the server";
         return error;
@@ -198,7 +197,7 @@ ErrorCode ClientManagementModel::getWireGuardClients(ServerController &serverCon
 
 bool ClientManagementModel::isClientExists(const QString &clientId)
 {
-    for (const QJsonValue &value : qAsConst(m_clientsTable)) {
+    for (const QJsonValue &value : std::as_const(m_clientsTable)) {
         if (value.isObject()) {
             QJsonObject obj = value.toObject();
             if (obj.contains(configKey::clientId) && obj[configKey::clientId].toString() == clientId) {
@@ -210,7 +209,8 @@ bool ClientManagementModel::isClientExists(const QString &clientId)
 }
 
 ErrorCode ClientManagementModel::appendClient(const DockerContainer container, const ServerCredentials &credentials,
-                                              const QJsonObject &containerConfig, const QString &clientName)
+                                              const QJsonObject &containerConfig, const QString &clientName,
+                                              const QSharedPointer<ServerController> &serverController)
 {
     Proto protocol;
     if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
@@ -223,22 +223,22 @@ ErrorCode ClientManagementModel::appendClient(const DockerContainer container, c
 
     auto protocolConfig = ContainerProps::getProtocolConfigFromContainer(protocol, containerConfig);
 
-    return appendClient(protocolConfig.value(config_key::clientId).toString(), clientName, container, credentials);
+    return appendClient(protocolConfig.value(config_key::clientId).toString(), clientName, container, credentials, serverController);
 }
 
 ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
-                                              ServerCredentials credentials)
+                                              const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController)
 {
     ErrorCode error = ErrorCode::NoError;
 
-    error = updateModel(container, credentials);
+    error = updateModel(container, credentials, serverController);
     if (error != ErrorCode::NoError) {
         return error;
     }
 
     for (int i = 0; i < m_clientsTable.size(); i++) {
         if (m_clientsTable.at(i).toObject().value(configKey::clientId) == clientId) {
-            return renameClient(i, clientName, container, credentials, true);
+            return renameClient(i, clientName, container, credentials, serverController, true);
         }
     }
 
@@ -255,7 +255,6 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
 
     const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
 
-    ServerController serverController(m_settings);
     QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
     if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
         clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
@@ -263,7 +262,7 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
         clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
     }
 
-    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
+    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to upload the clientsTable file to the server";
     }
@@ -272,7 +271,8 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
 }
 
 ErrorCode ClientManagementModel::renameClient(const int row, const QString &clientName, const DockerContainer container,
-                                              ServerCredentials credentials, bool addTimeStamp)
+                                              const ServerCredentials &credentials,
+                                              const QSharedPointer<ServerController> &serverController, bool addTimeStamp)
 {
     auto client = m_clientsTable.at(row).toObject();
     auto userData = client[configKey::userData].toObject();
@@ -287,7 +287,6 @@ ErrorCode ClientManagementModel::renameClient(const int row, const QString &clie
 
     const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
 
-    ServerController serverController(m_settings);
     QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
     if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
         clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
@@ -295,7 +294,7 @@ ErrorCode ClientManagementModel::renameClient(const int row, const QString &clie
         clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
     }
 
-    ErrorCode error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
+    ErrorCode error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to upload the clientsTable file to the server";
     }
@@ -303,17 +302,17 @@ ErrorCode ClientManagementModel::renameClient(const int row, const QString &clie
     return error;
 }
 
-ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContainer container, ServerCredentials credentials,
-                                              const int serverIndex)
+ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContainer container, const ServerCredentials &credentials,
+                                              const int serverIndex, const QSharedPointer<ServerController> &serverController)
 {
     ErrorCode errorCode = ErrorCode::NoError;
     auto client = m_clientsTable.at(row).toObject();
     QString clientId = client.value(configKey::clientId).toString();
 
     if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-        errorCode = revokeOpenVpn(row, container, credentials, serverIndex);
+        errorCode = revokeOpenVpn(row, container, credentials, serverIndex, serverController);
     } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
-        errorCode = revokeWireGuard(row, container, credentials);
+        errorCode = revokeWireGuard(row, container, credentials, serverController);
     }
 
     if (errorCode == ErrorCode::NoError) {
@@ -340,11 +339,12 @@ ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContain
     return errorCode;
 }
 
-ErrorCode ClientManagementModel::revokeClient(const QJsonObject &containerConfig, const DockerContainer container, ServerCredentials credentials,
-                                              const int serverIndex)
+ErrorCode ClientManagementModel::revokeClient(const QJsonObject &containerConfig, const DockerContainer container,
+                                              const ServerCredentials &credentials, const int serverIndex,
+                                              const QSharedPointer<ServerController> &serverController)
 {
     ErrorCode errorCode = ErrorCode::NoError;
-    errorCode = updateModel(container, credentials);
+    errorCode = updateModel(container, credentials, serverController);
     if (errorCode != ErrorCode::NoError) {
         return errorCode;
     }
@@ -375,15 +375,15 @@ ErrorCode ClientManagementModel::revokeClient(const QJsonObject &containerConfig
     }
 
     if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-        errorCode = revokeOpenVpn(row, container, credentials, serverIndex);
+        errorCode = revokeOpenVpn(row, container, credentials, serverIndex, serverController);
     } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
-        errorCode = revokeWireGuard(row, container, credentials);
+        errorCode = revokeWireGuard(row, container, credentials, serverController);
     }
     return errorCode;
 }
 
-ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContainer container, ServerCredentials credentials,
-                                               const int serverIndex)
+ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials,
+                                               const int serverIndex, const QSharedPointer<ServerController> &serverController)
 {
     auto client = m_clientsTable.at(row).toObject();
     QString clientId = client.value(configKey::clientId).toString();
@@ -396,9 +396,8 @@ ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContai
                                                "cp pki/crl.pem .'")
                                                .arg(clientId);
 
-    ServerController serverController(m_settings);
-    const QString script = serverController.replaceVars(getOpenVpnCertData, serverController.genVarsForScript(credentials, container));
-    ErrorCode error = serverController.runScript(credentials, script);
+    const QString script = serverController->replaceVars(getOpenVpnCertData, serverController->genVarsForScript(credentials, container));
+    ErrorCode error = serverController->runScript(credentials, script);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to revoke the certificate";
         return error;
@@ -412,7 +411,7 @@ ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContai
 
     QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
     clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
-    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
+    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to upload the clientsTable file to the server";
         return error;
@@ -421,14 +420,14 @@ ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContai
     return ErrorCode::NoError;
 }
 
-ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerContainer container, ServerCredentials credentials)
+ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
+                                                 const QSharedPointer<ServerController> &serverController)
 {
     ErrorCode error = ErrorCode::NoError;
-    ServerController serverController(m_settings);
 
     const QString wireGuardConfigFile =
             QString("/opt/amnezia/%1/wg0.conf").arg(container == DockerContainer::WireGuard ? "wireguard" : "awg");
-    const QString wireguardConfigString = serverController.getTextFileFromContainer(container, credentials, wireGuardConfigFile, error);
+    const QString wireguardConfigString = serverController->getTextFileFromContainer(container, credentials, wireGuardConfigFile, error);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to get the wg conf file from the server";
         return error;
@@ -446,7 +445,7 @@ ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerCont
     }
     QString newWireGuardConfig = configSections.join("[");
     newWireGuardConfig.insert(0, "[");
-    error = serverController.uploadTextFileToContainer(container, credentials, newWireGuardConfig, wireGuardConfigFile);
+    error = serverController->uploadTextFileToContainer(container, credentials, newWireGuardConfig, wireGuardConfigFile);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to upload the wg conf file to the server";
         return error;
@@ -464,16 +463,16 @@ ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerCont
     } else {
         clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
     }
-    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
+    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to upload the clientsTable file to the server";
         return error;
     }
 
     const QString script = "sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'";
-    error = serverController.runScript(
+    error = serverController->runScript(
             credentials,
-            serverController.replaceVars(script.arg(wireGuardConfigFile), serverController.genVarsForScript(credentials, container)));
+            serverController->replaceVars(script.arg(wireGuardConfigFile), serverController->genVarsForScript(credentials, container)));
     if (error != ErrorCode::NoError) {
         logger.error() << "Failed to execute the command 'wg syncconf' on the server";
         return error;

client/ui/models/clientManagementModel.h

@@ -23,15 +23,18 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 public slots:
-    ErrorCode updateModel(DockerContainer container, ServerCredentials credentials);
+    ErrorCode updateModel(const DockerContainer container, const ServerCredentials &credentials,
+                          const QSharedPointer<ServerController> &serverController);
     ErrorCode appendClient(const DockerContainer container, const ServerCredentials &credentials, const QJsonObject &containerConfig,
-                           const QString &clientName);
+                           const QString &clientName, const QSharedPointer<ServerController> &serverController);
     ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
-                           ServerCredentials credentials);
-    ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container, ServerCredentials credentials,
-                           bool addTimeStamp = false);
-    ErrorCode revokeClient(const int index, const DockerContainer container, ServerCredentials credentials, const int serverIndex);
-    ErrorCode revokeClient(const QJsonObject &containerConfig, const DockerContainer container, ServerCredentials credentials, const int serverIndex);
+                           const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController);
+    ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container, const ServerCredentials &credentials,
+                           const QSharedPointer<ServerController> &serverController, bool addTimeStamp = false);
+    ErrorCode revokeClient(const int index, const DockerContainer container, const ServerCredentials &credentials, const int serverIndex,
+                           const QSharedPointer<ServerController> &serverController);
+    ErrorCode revokeClient(const QJsonObject &containerConfig, const DockerContainer container, const ServerCredentials &credentials,
+                           const int serverIndex, const QSharedPointer<ServerController> &serverController);
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
@@ -44,11 +47,15 @@ private:
 
     void migration(const QByteArray &clientsTableString);
 
-    ErrorCode revokeOpenVpn(const int row, const DockerContainer container, ServerCredentials credentials, const int serverIndex);
-    ErrorCode revokeWireGuard(const int row, const DockerContainer container, ServerCredentials credentials);
+    ErrorCode revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials, const int serverIndex,
+                            const QSharedPointer<ServerController> &serverController);
+    ErrorCode revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
+                              const QSharedPointer<ServerController> &serverController);
 
-    ErrorCode getOpenVpnClients(ServerController &serverController, DockerContainer container, ServerCredentials credentials, int &count);
-    ErrorCode getWireGuardClients(ServerController &serverController, DockerContainer container, ServerCredentials credentials, int &count);
+    ErrorCode getOpenVpnClients(const DockerContainer container, const ServerCredentials &credentials,
+                                const QSharedPointer<ServerController> &serverController, int &count);
+    ErrorCode getWireGuardClients(const DockerContainer container, const ServerCredentials &credentials,
+                                  const QSharedPointer<ServerController> &serverController, int &count);
 
     QJsonArray m_clientsTable;
 

client/ui/models/installedAppsModel.cpp

@@ -37,6 +37,9 @@ QVariant InstalledAppsModel::data(const QModelIndex &index, int role) const
     case PackageNameRole: {
         return m_installedApps.at(index.row()).toObject().value("package");
     }
+    case IsAppSelectedRole: {
+        return m_selectedAppIndexes.contains(index.row());
+    }
     }
 
     return QVariant();
@@ -93,5 +96,6 @@ QHash<int, QByteArray> InstalledAppsModel::roleNames() const
     roles[AppNameRole] = "appName";
     roles[AppIconRole] = "appIcon";
     roles[PackageNameRole] = "packageName";
+    roles[IsAppSelectedRole] = "isAppSelected";
     return roles;
 }

client/ui/models/installedAppsModel.h

@@ -1,18 +1,19 @@
 #ifndef INSTALLEDAPPSMODEL_H
 #define INSTALLEDAPPSMODEL_H
 
-#include <QJsonArray>
 #include <QAbstractListModel>
+#include <QJsonArray>
 
-class InstalledAppsModel: public QAbstractListModel
+class InstalledAppsModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
     enum Roles {
-        AppNameRole= Qt::UserRole + 1,
+        AppNameRole = Qt::UserRole + 1,
         PackageNameRole,
-        AppIconRole
+        AppIconRole,
+        IsAppSelectedRole
     };
 
     explicit InstalledAppsModel(QObject *parent = nullptr);
@@ -22,7 +23,7 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 public slots:
-    void selectedStateChanged(const int index,  const bool selected);
+    void selectedStateChanged(const int index, const bool selected);
     QVector<QPair<QString, QString>> getSelectedAppsInfo();
 
     void updateModel();

client/ui/models/protocols/awgConfigModel.cpp

@@ -129,6 +129,16 @@ QJsonObject AwgConfigModel::getConfig()
     return m_fullConfig;
 }
 
+bool AwgConfigModel::isHeadersEqual(const QString &h1, const QString &h2, const QString &h3, const QString &h4)
+{
+    return (h1 == h2) || (h1 == h3) || (h1 == h4) || (h2 == h3) || (h2 == h4) || (h3 == h4);
+}
+
+bool AwgConfigModel::isPacketSizeEqual(const int s1, const int s2)
+{
+    return (AwgConstant::messageInitiationSize + s1 == AwgConstant::messageResponseSize + s2);
+}
+
 QHash<int, QByteArray> AwgConfigModel::roleNames() const
 {
     QHash<int, QByteArray> roles;

client/ui/models/protocols/awgConfigModel.h

@@ -6,6 +6,11 @@
 
 #include "containers/containers_defs.h"
 
+namespace AwgConstant {
+    const int messageInitiationSize = 148;
+    const int messageResponseSize = 92;
+}
+
 struct AwgConfig
 {
     AwgConfig(const QJsonObject &jsonConfig);
@@ -57,6 +62,9 @@ public slots:
     void updateModel(const QJsonObject &config);
     QJsonObject getConfig();
 
+    bool isHeadersEqual(const QString &h1, const QString &h2, const QString &h3, const QString &h4);
+    bool isPacketSizeEqual(const int s1, const int s2);
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 

client/ui/models/servers_model.cpp

@@ -384,13 +384,6 @@ void ServersModel::updateContainerConfig(const int containerIndex, const QJsonOb
     }
 
     server.insert(config_key::containers, containers);
-
-    auto defaultContainer = server.value(config_key::defaultContainer).toString();
-    if ((ContainerProps::containerFromString(defaultContainer) == DockerContainer::None
-         || ContainerProps::containerService(container) != ServiceType::Other)) {
-        server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
-    }
-
     editServer(server, m_processedServerIndex);
 }
 
@@ -428,10 +421,10 @@ const QString ServersModel::getDefaultServerDefaultContainerName()
     return ContainerProps::containerHumanNames().value(defaultContainer);
 }
 
-ErrorCode ServersModel::removeAllContainers()
+ErrorCode ServersModel::removeAllContainers(const QSharedPointer<ServerController> &serverController)
 {
-    ServerController serverController(m_settings);
-    ErrorCode errorCode = serverController.removeAllContainers(m_settings->serverCredentials(m_processedServerIndex));
+
+    ErrorCode errorCode = serverController->removeAllContainers(m_settings->serverCredentials(m_processedServerIndex));
 
     if (errorCode == ErrorCode::NoError) {
         QJsonObject s = m_servers.at(m_processedServerIndex).toObject();
@@ -443,22 +436,22 @@ ErrorCode ServersModel::removeAllContainers()
     return errorCode;
 }
 
-ErrorCode ServersModel::rebootServer()
+ErrorCode ServersModel::rebootServer(const QSharedPointer<ServerController> &serverController)
 {
-    ServerController serverController(m_settings);
+
     auto credentials = m_settings->serverCredentials(m_processedServerIndex);
 
-    ErrorCode errorCode = serverController.rebootServer(credentials);
+    ErrorCode errorCode = serverController->rebootServer(credentials);
     return errorCode;
 }
 
-ErrorCode ServersModel::removeContainer(const int containerIndex)
+ErrorCode ServersModel::removeContainer(const QSharedPointer<ServerController> &serverController, const int containerIndex)
 {
-    ServerController serverController(m_settings);
+
     auto credentials = m_settings->serverCredentials(m_processedServerIndex);
     auto dockerContainer = static_cast<DockerContainer>(containerIndex);
 
-    ErrorCode errorCode = serverController.removeContainer(credentials, dockerContainer);
+    ErrorCode errorCode = serverController->removeContainer(credentials, dockerContainer);
 
     if (errorCode == ErrorCode::NoError) {
         QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
@@ -630,4 +623,4 @@ bool ServersModel::isDefaultServerDefaultContainerHasSplitTunneling()
     }
 
     return false;
-}
+}

client/ui/models/servers_model.h

@@ -4,6 +4,7 @@
 #include <QAbstractListModel>
 
 #include "settings.h"
+#include "core/controllers/serverController.h"
 
 class ServersModel : public QAbstractListModel
 {
@@ -88,9 +89,9 @@ public slots:
 
     void clearCachedProfile(const DockerContainer container);
 
-    ErrorCode removeContainer(const int containerIndex);
-    ErrorCode removeAllContainers();
-    ErrorCode rebootServer();
+    ErrorCode removeContainer(const QSharedPointer<ServerController> &serverController, const int containerIndex);
+    ErrorCode removeAllContainers(const QSharedPointer<ServerController> &serverController);
+    ErrorCode rebootServer(const QSharedPointer<ServerController> &serverController);
 
     void setDefaultContainer(const int serverIndex, const int containerIndex);
 

client/ui/models/sites_model.cpp

@@ -5,6 +5,10 @@ SitesModel::SitesModel(std::shared_ptr<Settings> settings, QObject *parent)
 {
     m_isSplitTunnelingEnabled = m_settings->getSitesSplitTunnelingEnabled();
     m_currentRouteMode = m_settings->routeMode();
+    if (m_currentRouteMode == Settings::VpnAllSites) { // for old split tunneling configs
+        m_settings->setRouteMode(static_cast<Settings::RouteMode>(Settings::VpnOnlyForwardSites));
+        m_currentRouteMode = Settings::VpnOnlyForwardSites;
+    }
     fillSites();
 }
 

client/ui/qml/Components/ConnectButton.qml

@@ -49,10 +49,26 @@ Button {
                 verticalOffset: 0
                 radius: 10
                 samples: 25
-                color: "#FBB26A"
+                color: root.activeFocus ? "#D7D8DB" : "#FBB26A"
                 source: backgroundCircle
             }
 
+            ShapePath {
+                fillColor: "transparent"
+                strokeColor: "#D7D8DB"
+                strokeWidth: root.activeFocus ? 1 : 0
+                capStyle: ShapePath.RoundCap
+
+                PathAngleArc {
+                    centerX: backgroundCircle.width / 2
+                    centerY: backgroundCircle.height / 2
+                    radiusX: 94
+                    radiusY: 94
+                    startAngle: 0
+                    sweepAngle: 360
+                }
+            }
+
             ShapePath {
                 fillColor: "transparent"
                 strokeColor: {
@@ -64,14 +80,14 @@ Button {
                         return defaultButtonColor
                     }
                 }
-                strokeWidth: 3
+                strokeWidth: root.activeFocus ? 2 : 3
                 capStyle: ShapePath.RoundCap
 
                 PathAngleArc {
                     centerX: backgroundCircle.width / 2
                     centerY: backgroundCircle.height / 2
-                    radiusX: 93
-                    radiusY: 93
+                    radiusX: 93 - (root.activeFocus ? 2 : 0)
+                    radiusY: 93 - (root.activeFocus ? 2 : 0)
                     startAngle: 0
                     sweepAngle: 360
                 }
@@ -141,4 +157,7 @@ Button {
         ServersModel.setProcessedServerIndex(ServersModel.defaultIndex)
         ConnectionController.connectButtonClicked()
     }
+
+    Keys.onEnterPressed: this.clicked()
+    Keys.onReturnPressed: this.clicked()
 }

client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml

@@ -26,6 +26,14 @@ DrawerType2 {
             root.expandedHeight = content.implicitHeight + 32
         }
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
         Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
@@ -36,6 +44,11 @@ DrawerType2 {
             headerText: qsTr("Add new connection")
         }
 
+        Item {
+            id: focusItem
+            KeyNavigation.tab: ip.rightButton
+        }
+
         LabelWithButtonType {
             id: ip
             Layout.fillWidth: true
@@ -48,11 +61,14 @@ DrawerType2 {
                 PageController.goToPage(PageEnum.PageSetupWizardCredentials)
                 root.close()
             }
+
+            KeyNavigation.tab: qrCode.rightButton
         }
 
         DividerType {}
 
         LabelWithButtonType {
+            id: qrCode
             Layout.fillWidth: true
 
             text: qsTr("Open config file, key or QR code")
@@ -62,6 +78,8 @@ DrawerType2 {
                 PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
                 root.close()
             }
+
+            KeyNavigation.tab: focusItem
         }
 
         DividerType {}

client/ui/qml/Components/HomeContainersListView.qml

@@ -17,12 +17,56 @@ ListView {
     property var rootWidth
     property var selectedText
 
+    property bool a: true
+
     width: rootWidth
     height: menuContent.contentItem.height
 
     clip: true
     interactive: false
 
+    property FlickableType parentFlickable
+    property var lastItemTabClicked
+
+    property int currentFocusIndex: 0
+
+    activeFocusOnTab: true
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            this.currentFocusIndex = 0
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        }
+    }
+
+    Keys.onTabPressed: {
+        if (currentFocusIndex < this.count - 1) {
+            currentFocusIndex += 1
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        } else {
+            currentFocusIndex = 0
+            if (lastItemTabClicked && typeof lastItemTabClicked === "function") {
+                lastItemTabClicked()
+            }
+        }
+    }
+
+    onVisibleChanged: {
+         if (visible) {
+             currentFocusIndex = 0
+             focusItem.forceActiveFocus()
+         }
+     }
+
+    Item {
+        id: focusItem
+    }
+
+    onCurrentFocusIndexChanged: {
+        if (parentFlickable) {
+            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
+        }
+    }
+
     ButtonGroup {
         id: containersRadioButtonGroup
     }
@@ -31,6 +75,12 @@ ListView {
         implicitWidth: rootWidth
         implicitHeight: content.implicitHeight
 
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                containerRadioButton.forceActiveFocus()
+            }
+        }
+
         ColumnLayout {
             id: content
 
@@ -76,6 +126,19 @@ ListView {
                     cursorShape: Qt.PointingHandCursor
                     enabled: false
                 }
+
+                Keys.onEnterPressed: {
+                    if (checkable) {
+                        checked = true
+                    }
+                    containerRadioButton.clicked()
+                }
+                Keys.onReturnPressed: {
+                    if (checkable) {
+                        checked = true
+                    }
+                    containerRadioButton.clicked()
+                }
             }
 
             DividerType {

client/ui/qml/Components/HomeSplitTunnelingDrawer.qml

@@ -24,6 +24,14 @@ DrawerType2 {
         anchors.right: parent.right
         spacing: 0
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
         Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
@@ -35,7 +43,13 @@ DrawerType2 {
             descriptionText:  qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others")
         }
 
+        Item {
+            id: focusItem
+            KeyNavigation.tab: splitTunnelingSwitch.visible ? splitTunnelingSwitch : siteBasedSplitTunnelingSwitch.rightButton
+        }
+
         LabelWithButtonType {
+            id: splitTunnelingSwitch
             Layout.fillWidth: true
             Layout.topMargin: 16
 
@@ -45,6 +59,8 @@ DrawerType2 {
             descriptionText: qsTr("Enabled \nCan't be disabled for current server")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+            KeyNavigation.tab: siteBasedSplitTunnelingSwitch.visible ? siteBasedSplitTunnelingSwitch.rightButton : focusItem
+
             clickedFunction: function() {
 //                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
 //                root.close()
@@ -56,6 +72,7 @@ DrawerType2 {
         }
 
         LabelWithButtonType {
+            id: siteBasedSplitTunnelingSwitch
             Layout.fillWidth: true
             Layout.topMargin: 16
 
@@ -63,6 +80,10 @@ DrawerType2 {
             descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+            KeyNavigation.tab: appSplitTunnelingSwitch.visible ?
+                                   appSplitTunnelingSwitch.rightButton :
+                                   focusItem
+
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
                 root.close()
@@ -73,6 +94,7 @@ DrawerType2 {
         }
 
         LabelWithButtonType {
+            id: appSplitTunnelingSwitch
             visible: isAppSplitTinnelingEnabled
 
             Layout.fillWidth: true
@@ -81,6 +103,8 @@ DrawerType2 {
             descriptionText: AppSplitTunnelingModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+            KeyNavigation.tab: focusItem
+
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSettingsAppSplitTunneling)
                 root.close()

client/ui/qml/Components/InstalledAppsDrawer.qml

@@ -101,7 +101,7 @@ DrawerType2 {
                                 Layout.fillWidth: true
 
                                 text: appName
-
+                                checked: isAppSelected
                                 onCheckedChanged: {
                                     installedAppsModel.selectedStateChanged(proxyInstalledAppsModel.mapToSource(index), checked)
                                 }

client/ui/qml/Components/QuestionDrawer.qml

@@ -5,6 +5,8 @@ import QtQuick.Layouts
 import "../Controls2"
 import "../Controls2/TextTypes"
 
+import "../Config"
+
 DrawerType2 {
     id: root
 
@@ -29,6 +31,14 @@ DrawerType2 {
             root.expandedHeight = content.implicitHeight + 32
         }
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
         Header2TextType {
             Layout.fillWidth: true
             Layout.topMargin: 16
@@ -47,7 +57,13 @@ DrawerType2 {
             text: descriptionText
         }
 
+        Item {
+            id: focusItem
+            KeyNavigation.tab: yesButton
+        }
+
         BasicButtonType {
+            id: yesButton
             Layout.fillWidth: true
             Layout.topMargin: 16
             Layout.rightMargin: 16
@@ -60,9 +76,12 @@ DrawerType2 {
                     yesButtonFunction()
                 }
             }
+
+            KeyNavigation.tab: noButton
         }
 
         BasicButtonType {
+            id: noButton
             Layout.fillWidth: true
             Layout.rightMargin: 16
             Layout.leftMargin: 16
@@ -81,6 +100,8 @@ DrawerType2 {
                     noButtonFunction()
                 }
             }
+
+            KeyNavigation.tab: focusItem
         }
     }
 }

client/ui/qml/Components/SelectLanguageDrawer.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts
 
 import "../Controls2"
 import "../Controls2/TextTypes"
+import "../Config"
 
 DrawerType2 {
     id: root
@@ -17,8 +18,21 @@ DrawerType2 {
             root.expandedHeight = container.implicitHeight
         }
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
+        Item {
+            id: focusItem
+            KeyNavigation.tab: backButton
+        }
+
         ColumnLayout {
-            id: backButton
+            id: backButtonLayout
 
             anchors.top: parent.top
             anchors.left: parent.left
@@ -26,15 +40,15 @@ DrawerType2 {
             anchors.topMargin: 16
 
             BackButtonType {
+                id: backButton
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                backButtonFunction: function() {
-                    root.close()
-                }
+                backButtonFunction: function() { root.close() }
+                KeyNavigation.tab: listView
             }
         }
 
         FlickableType {
-            anchors.top: backButton.bottom
+            anchors.top: backButtonLayout.bottom
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
@@ -71,10 +85,50 @@ DrawerType2 {
                         id: buttonGroup
                     }
 
+                    property int currentFocusIndex: 0
+
+                    activeFocusOnTab: true
+                    onActiveFocusChanged: {
+                        if (activeFocus) {
+                            this.currentFocusIndex = 0
+                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+                        }
+                    }
+
+                    Keys.onTabPressed: {
+                        if (currentFocusIndex < this.count - 1) {
+                            currentFocusIndex += 1
+                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+                        } else {
+                            listViewFocusItem.forceActiveFocus()
+                            focusItem.forceActiveFocus()
+                        }
+                    }
+
+                    Item {
+                        id: listViewFocusItem
+                        Keys.onTabPressed: {
+                            root.forceActiveFocus()
+                        }
+                    }
+
+                    onVisibleChanged: {
+                        if (visible) {
+                            listViewFocusItem.forceActiveFocus()
+                            focusItem.forceActiveFocus()
+                        }
+                    }
+
                     delegate: Item {
                         implicitWidth: root.width
                         implicitHeight: delegateContent.implicitHeight
 
+                        onActiveFocusChanged: {
+                            if (activeFocus) {
+                                radioButton.forceActiveFocus()
+                            }
+                        }
+
                         ColumnLayout {
                             id: delegateContent
 
@@ -89,12 +143,18 @@ DrawerType2 {
                                 hoverEnabled: true
 
                                 indicator: Rectangle {
-                                    anchors.fill: parent
+                                    width: parent.width - 1
+                                    height: parent.height
                                     color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                                    border.color: radioButton.focus ? "#D7D8DB" : "transparent"
+                                    border.width: radioButton.focus ? 1 : 0
 
                                     Behavior on color {
                                         PropertyAnimation { duration: 200 }
                                     }
+                                    Behavior on border.color {
+                                        PropertyAnimation { duration: 200 }
+                                    }
                                 }
 
                                 RowLayout {
@@ -137,6 +197,9 @@ DrawerType2 {
                                 }
                             }
                         }
+
+                        Keys.onEnterPressed: radioButton.clicked()
+                        Keys.onReturnPressed: radioButton.clicked()
                     }
                 }
             }

client/ui/qml/Components/SettingsContainersListView.qml

@@ -22,16 +22,52 @@ ListView {
     clip: true
     interactive: false
 
+    activeFocusOnTab: true
+    Keys.onTabPressed: {
+        if (currentIndex < this.count - 1) {
+            this.incrementCurrentIndex()
+        } else {
+            currentIndex = 0
+            lastItemTabClickedSignal()
+        }
+    }
+
+    onCurrentIndexChanged: {
+        if (visible) {
+            if (fl.contentHeight > fl.height) {
+                var item = this.currentItem
+                if (item.y < fl.height) {
+                    fl.contentY = item.y
+                } else if (item.y + item.height > fl.contentY + fl.height) {
+                    fl.contentY = item.y + item.height - fl.height
+                }
+            }
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            this.currentIndex = 0
+        }
+    }
+
     delegate: Item {
         implicitWidth: root.width
         implicitHeight: delegateContent.implicitHeight
 
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                containerRadioButton.rightButton.forceActiveFocus()
+            }
+        }
+
         ColumnLayout {
             id: delegateContent
 
             anchors.fill: parent
 
             LabelWithButtonType {
+                id: containerRadioButton
                 implicitWidth: parent.width
 
                 text: name

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -121,6 +121,9 @@ DrawerType2 {
                     text: qsTr("Copy")
                     imageSource: "qrc:/images/controls/copy.svg"
 
+                    Keys.onReturnPressed: { copyConfigTextButton.clicked() }
+                    Keys.onEnterPressed: { copyConfigTextButton.clicked() }
+
                     KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
                 }
 
@@ -174,11 +177,30 @@ DrawerType2 {
                     anchors.fill: parent
                     expandedHeight: parent.height * 0.9
 
+                    onClosed: {
+                        if (!GC.isMobile()) {
+                            header.forceActiveFocus()
+                        }
+                    }
+
                     expandedContent: Item {
                         id: configContentContainer
 
                         implicitHeight: configContentDrawer.expandedHeight
 
+                        Connections {
+                            target: configContentDrawer
+                            enabled: !GC.isMobile()
+                            function onOpened() {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
+
+                        Item {
+                            id: focusItem
+                            KeyNavigation.tab: backButton
+                        }
+
                         Connections {
                             target: copyNativeConfigStringButton
                             function onClicked() {
@@ -196,6 +218,7 @@ DrawerType2 {
                                 configText.copy()
                                 configText.select(0, 0)
                                 PageController.showNotificationMessage(qsTr("Copied"))
+                                header.forceActiveFocus()
                             }
                         }
 
@@ -207,9 +230,9 @@ DrawerType2 {
                             anchors.right: parent.right
                             anchors.topMargin: 16
 
-                            backButtonFunction: function() {
-                                configContentDrawer.close()
-                            }
+                            backButtonFunction: function() { configContentDrawer.close() }
+
+                            KeyNavigation.tab: focusItem
                         }
 
                         FlickableType {
@@ -256,6 +279,7 @@ DrawerType2 {
                                     height: 24
 
                                     readOnly: true
+                                    activeFocusOnTab: false
 
                                     color: "#D7D8DB"
                                     selectionColor:  "#633303"

client/ui/qml/Components/TransportProtoSelector.qml

@@ -17,12 +17,19 @@ Rectangle {
     color: "#1C1D21"
     radius: 16
 
+    onFocusChanged: {
+        if (focus) {
+            udpButton.forceActiveFocus()
+        }
+    }
+
     RowLayout {
         id: transportProtoButtonGroup
 
         spacing: 0
 
         HorizontalRadioButton {
+            id: udpButton
             checked: root.currentIndex === 0
 
             hoverEnabled: root.enabled
@@ -30,12 +37,15 @@ Rectangle {
             implicitWidth: (rootWidth - 32) / 2
             text: "UDP"
 
+            KeyNavigation.tab: tcpButton
+
             onClicked: {
                 root.currentIndex = 0
             }
         }
 
         HorizontalRadioButton {
+            id: tcpButton
             checked: root.currentIndex === 1
 
             hoverEnabled: root.enabled

client/ui/qml/Controls2/BackButtonType.qml

@@ -13,6 +13,12 @@ Item {
 
     visible: backButtonImage !== ""
 
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            backButton.forceActiveFocus()
+        }
+    }
+
     RowLayout {
         id: content
 
@@ -20,6 +26,7 @@ Item {
         anchors.leftMargin: 8
 
         ImageButtonType {
+            id: backButton
             image: backButtonImage
             imageColor: "#D7D8DB"
 
@@ -42,4 +49,7 @@ Item {
             color: "transparent"
         }
     }
+
+    Keys.onEnterPressed: backButton.clicked()
+    Keys.onReturnPressed: backButton.clicked()
 }

client/ui/qml/Controls2/BasicButtonType.qml

@@ -26,18 +26,29 @@ Button {
 
     property bool squareLeftSide: false
 
+    property FlickableType parentFlickable
+
     property var clickedFunc
 
     implicitHeight: 56
 
     hoverEnabled: true
+    focusPolicy: Qt.TabFocus
+
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(this)
+            }
+        }
+    }
 
     background: Rectangle {
         id: focusBorder
 
         color: "transparent"
         border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
-        border.width: root.activeFocus ? root.borderFocusedWidth : "transparent"
+        border.width: root.activeFocus ? root.borderFocusedWidth : 0
 
         anchors.fill: parent
 

client/ui/qml/Controls2/CheckBoxType.qml

@@ -23,6 +23,8 @@ CheckBox {
     property string checkedBorderColor: "#FBB26A"
     property string checkedBorderDisabledColor: "#402102"
 
+    property string borderFocusedColor: "#D7D8DB"
+
     property string checkedImageColor: "#FBB26A"
     property string pressedImageColor: "#A85809"
     property string defaultImageColor: "transparent"
@@ -30,7 +32,24 @@ CheckBox {
 
     property string imageSource: "qrc:/images/controls/check.svg"
 
+    property var parentFlickable
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
+    }
+
     hoverEnabled: enabled ? true : false
+    focusPolicy: Qt.NoFocus
+
+    background: Rectangle {
+        color: "transparent"
+        border.color: root.focus ? borderFocusedColor : "transparent"
+        border.width: 1
+        radius: 16
+    }
 
     indicator: Rectangle {
         id: background
@@ -59,7 +78,11 @@ CheckBox {
             width: 24
             height: 24
             color: "transparent"
-            border.color: root.checked ? (root.enabled ? checkedBorderColor : checkedBorderDisabledColor) : defaultBorderColor
+            border.color: root.checked ?
+                              (root.enabled ?
+                                   checkedBorderColor :
+                                   checkedBorderDisabledColor) :
+                              defaultBorderColor
             border.width: 1
             radius: 4
 
@@ -130,6 +153,16 @@ CheckBox {
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }
+
+
+    Keys.onEnterPressed: {
+        root.checked = !root.checked
+    }
+
+    Keys.onReturnPressed: {
+        root.checked = !root.checked
+    }
+
 }
 
 

client/ui/qml/Controls2/DropDownType.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 
 import "TextTypes"
+import "../Config"
 
 Item {
     id: root
@@ -27,6 +28,9 @@ Item {
     property string rootButtonBackgroundHoveredColor: "#1C1D21"
     property string rootButtonBackgroundPressedColor: "#1C1D21"
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
     property string rootButtonHoveredBorderColor: "#494B50"
     property string rootButtonDefaultBorderColor: "#2C2D30"
     property string rootButtonPressedBorderColor: "#D7D8DB"
@@ -42,44 +46,70 @@ Item {
     signal open
     signal close
 
+    function popupClosedFunc() {
+        if (!GC.isMobile()) {
+            this.forceActiveFocus()
+        }
+    }
+
+    property var parentFlickable
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
+    }
+
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
     onOpen: {
         menu.open()
-        rootButtonBackground.border.color = rootButtonPressedBorderColor
     }
 
     onClose: {
         menu.close()
-        rootButtonBackground.border.color = rootButtonDefaultBorderColor
-    }
-
-    onEnabledChanged: {
-        if (enabled) {
-            rootButtonBackground.color = rootButtonBackgroundColor
-            rootButtonBackground.border.color = rootButtonDefaultBorderColor
-        } else {
-            rootButtonBackground.color = "transparent"
-            rootButtonBackground.border.color = rootButtonHoveredBorderColor
-        }
     }
 
     Rectangle {
-        id: rootButtonBackground
+        id: focusBorder
+
+        color: "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.width: root.activeFocus ? root.borderFocusedWidth : 0
         anchors.fill: rootButtonContent
-
         radius: 16
-        color: root.enabled ? rootButtonBackgroundColor : "transparent"
-        border.color: root.enabled ? rootButtonDefaultBorderColor : rootButtonHoveredBorderColor
-        border.width: 1
 
-        Behavior on border.color {
-            PropertyAnimation { duration: 200 }
-        }
 
-        Behavior on color {
-            PropertyAnimation { duration: 200 }
+        Rectangle {
+            id: rootButtonBackground
+
+            anchors.fill: focusBorder
+            anchors.margins: root.activeFocus ? 2 : 0
+            radius: root.activeFocus ? 14 : 16
+
+            color: {
+                if (root.enabled) {
+                    if (root.pressed) {
+                        return root.rootButtonBackgroundPressedColor
+                    }
+                    return root.hovered ? root.rootButtonBackgroundHoveredColor : root.rootButtonBackgroundColor
+                } else {
+                    return "transparent"
+                }
+            }
+
+            border.color: rootButtonDefaultBorderColor
+            border.width: 1
+
+            Behavior on border.color {
+                PropertyAnimation { duration: 200 }
+            }
+
+            Behavior on color {
+                PropertyAnimation { duration: 200 }
+            }
         }
     }
 
@@ -107,6 +137,7 @@ Item {
             }
 
             ButtonTextType {
+                id: buttonText
                 Layout.fillWidth: true
 
                 horizontalAlignment: Text.AlignLeft
@@ -136,26 +167,6 @@ Item {
         cursorShape: Qt.PointingHandCursor
         hoverEnabled: root.enabled ? true : false
 
-        onEntered: {
-            if (menu.isClosed) {
-                rootButtonBackground.border.color = rootButtonHoveredBorderColor
-                rootButtonBackground.color = rootButtonBackgroundHoveredColor
-            }
-        }
-
-        onExited: {
-            if (menu.isClosed) {
-                rootButtonBackground.border.color = rootButtonDefaultBorderColor
-                rootButtonBackground.color = rootButtonBackgroundColor
-            }
-        }
-
-        onPressed: {
-            if (menu.isClosed) {
-                rootButtonBackground.color = pressed ? rootButtonBackgroundPressedColor : entered ? rootButtonHoveredBorderColor : rootButtonDefaultBorderColor
-            }
-        }
-
         onClicked: {
             if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                 rootButtonClickedFunction()
@@ -173,11 +184,27 @@ Item {
         anchors.fill: parent
         expandedHeight: drawerParent.height * drawerHeight
 
+        onClosed: {
+            root.popupClosedFunc()
+        }
+
         expandedContent: Item {
             id: container
-
             implicitHeight: menu.expandedHeight
 
+            Connections {
+                target: menu
+                enabled: !GC.isMobile()
+                function onOpened() {
+                    focusItem.forceActiveFocus()
+                }
+            }
+
+            Item {
+                id: focusItem
+                KeyNavigation.tab: backButton
+            }
+
             ColumnLayout {
                 id: header
 
@@ -187,14 +214,15 @@ Item {
                 anchors.topMargin: 16
 
                 BackButtonType {
+                    id: backButton
                     backButtonImage: root.headerBackButtonImage
-                    backButtonFunction: function() {
-                        menu.close()
-                    }
+                    backButtonFunction: function() { menu.close() }
+                    KeyNavigation.tab: listViewLoader.item
                 }
             }
 
             FlickableType {
+                id: flickable
                 anchors.top: header.bottom
                 anchors.topMargin: 16
                 contentHeight: col.implicitHeight
@@ -221,9 +249,28 @@ Item {
                     Loader {
                         id: listViewLoader
                         sourceComponent: root.listView
+
+                        onLoaded: {
+                            listViewLoader.item.parentFlickable = flickable
+                            listViewLoader.item.lastItemTabClicked = function() {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
                     }
                 }
             }
         }
     }
+
+    Keys.onEnterPressed: {
+        if (menu.isClosed) {
+            menu.open()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (menu.isClosed) {
+            menu.open()
+        }
+    }
 }

client/ui/qml/Controls2/FlickableType.qml

@@ -5,6 +5,14 @@ import "../Config"
 Flickable {
     id: fl
 
+    function ensureVisible(item) {
+        if (item.y < fl.contentY) {
+            fl.contentY = item.y
+        } else if (item.y + item.height > fl.contentY + fl.height) {
+            fl.contentY = item.y + item.height - fl.height + 40 // 40 is a bottom margin
+        }
+    }
+
     clip: true
     width: parent.width
 

client/ui/qml/Controls2/Header2Type.qml

@@ -9,6 +9,8 @@ Item {
     property string actionButtonImage
     property var actionButtonFunction
 
+    property alias actionButton: headerActionButton
+
     property string headerText
     property string descriptionText
 
@@ -60,4 +62,16 @@ Item {
             visible: root.descriptionText !== ""
         }
     }
+
+    Keys.onEnterPressed: {
+        if (actionButtonFunction && typeof actionButtonFunction === "function") {
+            actionButtonFunction()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (actionButtonFunction && typeof actionButtonFunction === "function") {
+            actionButtonFunction()
+        }
+    }
 }

client/ui/qml/Controls2/HeaderType.qml

@@ -9,12 +9,16 @@ Item {
     property string actionButtonImage
     property var actionButtonFunction
 
+    property alias actionButton: headerActionButton
+
     property string headerText
     property int headerTextMaximumLineCount: 2
     property int headerTextElide: Qt.ElideRight
 
     property string descriptionText
 
+    focus: true
+
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
@@ -67,4 +71,16 @@ Item {
             visible: root.descriptionText !== ""
         }
     }
+
+    Keys.onEnterPressed: {
+        if (actionButtonFunction && typeof actionButtonFunction === "function") {
+            actionButtonFunction()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (actionButtonFunction && typeof actionButtonFunction === "function") {
+            actionButtonFunction()
+        }
+    }
 }

client/ui/qml/Controls2/HorizontalRadioButton.qml

@@ -19,6 +19,7 @@ RadioButton {
     property string checkedBorderColor: "#FBB26A"
     property string defaultBodredColor: "transparent"
     property string checkedDisabledBorderColor: "#84603D"
+    property string borderFocusedColor: "#D7D8DB"
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -47,6 +48,8 @@ RadioButton {
                     return root.pressedBorderColor
                 } else if (root.checked) {
                     return root.checkedBorderColor
+                } else if (root.activeFocus) {
+                    return root.borderFocusedColor
                 }
                 return root.defaultBodredColor
             } else {
@@ -58,7 +61,7 @@ RadioButton {
         }
 
         border.width: {
-            if(root.checked) {
+            if(root.checked || root.activeFocus) {
                 return 1
             }
             return root.pressed ? 1 : 0
@@ -97,4 +100,12 @@ RadioButton {
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }
+
+    Keys.onEnterPressed: {
+        this.clicked()
+    }
+
+    Keys.onReturnPressed: {
+        this.clicked()
+    }
 }

client/ui/qml/Controls2/ImageButtonType.qml

@@ -18,11 +18,26 @@ Button {
     property alias backgroundColor: background.color
     property alias backgroundRadius: background.radius
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
     hoverEnabled: true
+    focus: true
+    focusPolicy: Qt.TabFocus
 
     icon.source: image
     icon.color: root.enabled ? imageColor : disableImageColor
 
+    property Flickable parentFlickable
+
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(this)
+            }
+        }
+    }
+
     Behavior on icon.color {
         PropertyAnimation { duration: 200 }
     }
@@ -31,6 +46,9 @@ Button {
         id: background
 
         anchors.fill: parent
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.width: root.activeFocus ? root.borderFocusedWidth : 0
+
         color: {
             if (root.enabled) {
                 if (root.pressed) {
@@ -44,6 +62,9 @@ Button {
         Behavior on color {
             PropertyAnimation { duration: 200 }
         }
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     MouseArea {

client/ui/qml/Controls2/LabelWithButtonType.qml

@@ -19,12 +19,18 @@ Item {
     property string leftImageSource
     property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3
 
+    property alias rightButton: rightImage
+    property FlickableType parentFlickable
+
     property string textColor: "#d7d8db"
     property string textDisabledColor: "#878B91"
     property string descriptionColor: "#878B91"
     property string descriptionDisabledColor: "#494B50"
     property real textOpacity: 1.0
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
     property string rightImageColor: "#d7d8db"
 
     property bool descriptionOnTop: false
@@ -32,6 +38,25 @@ Item {
     implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
     implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
 
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
+    }
+
+    Connections {
+        target: rightImage
+        function onFocusChanged() {
+            if (rightImage.activeFocus) {
+                if (root.parentFlickable) {
+                    root.parentFlickable.ensureVisible(root)
+                }
+            }
+        }
+    }
+
     RowLayout {
         id: content
         anchors.fill: parent
@@ -163,6 +188,9 @@ Item {
         anchors.fill: root
         color: "transparent"
 
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.width: root.activeFocus ? root.borderFocusedWidth : 0
+
 
         Behavior on color {
             PropertyAnimation { duration: 200 }
@@ -207,4 +235,16 @@ Item {
             }
         }
     }
+
+    Keys.onEnterPressed: {
+        if (clickedFunction && typeof clickedFunction === "function") {
+            clickedFunction()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (clickedFunction && typeof clickedFunction === "function") {
+            clickedFunction()
+        }
+    }
 }

client/ui/qml/Controls2/ListViewWithRadioButtonType.qml

@@ -26,6 +26,47 @@ ListView {
     clip: true
     interactive: false
 
+    property FlickableType parentFlickable
+    property var lastItemTabClicked
+
+    property int currentFocusIndex: 0
+
+    activeFocusOnTab: true
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            this.currentFocusIndex = 0
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        }
+    }
+
+    Keys.onTabPressed: {
+        if (currentFocusIndex < this.count - 1) {
+            currentFocusIndex += 1
+        } else {
+            currentFocusIndex = 0
+        }
+        this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+    }
+
+    Item {
+        id: focusItem
+        Keys.onTabPressed: {
+            root.forceActiveFocus()
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            focusItem.forceActiveFocus()
+        }
+    }
+
+    onCurrentFocusIndexChanged: {
+        if (parentFlickable) {
+            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
+        }
+    }
+
     ButtonGroup {
         id: buttonGroup
     }
@@ -40,6 +81,12 @@ ListView {
         implicitWidth: rootWidth
         implicitHeight: content.implicitHeight
 
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                radioButton.forceActiveFocus()
+            }
+        }
+
         ColumnLayout {
             id: content
 
@@ -54,12 +101,18 @@ ListView {
                 hoverEnabled: true
 
                 indicator: Rectangle {
-                    anchors.fill: parent
+                    width: parent.width - 1
+                    height: parent.height
                     color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                    border.color: radioButton.focus ? "#D7D8DB" : "transparent"
+                    border.width: radioButton.focus ? 1 : 0
 
                     Behavior on color {
                         PropertyAnimation { duration: 200 }
                     }
+                    Behavior on border.color {
+                        PropertyAnimation { duration: 200 }
+                    }
 
                     MouseArea {
                         anchors.fill: parent
@@ -117,5 +170,13 @@ ListView {
                 root.selectedText = name
             }
         }
+
+        Keys.onReturnPressed: {
+            radioButton.clicked()
+        }
+
+        Keys.onEnterPressed: {
+            radioButton.clicked()
+        }
     }
 }

client/ui/qml/Controls2/PageType.qml

@@ -11,6 +11,28 @@ Item {
 
     property var defaultActiveFocusItem: null
 
+    onVisibleChanged: {
+        if (visible && !GC.isMobile()) {
+            timer.start()
+        }
+    }
+
+    function lastItemTabClicked(focusItem) {
+        if (GC.isMobile()) {
+            return
+        }
+
+        if (focusItem) {
+            focusItem.forceActiveFocus()
+            PageController.forceTabBarActiveFocus()
+        } else {
+            if (defaultActiveFocusItem) {
+                defaultActiveFocusItem.forceActiveFocus()
+            }
+            PageController.forceTabBarActiveFocus()
+        }
+    }
+
 //    MouseArea {
 //        id: globalMouseArea
 //        z: 99

client/ui/qml/Controls2/PopupType.qml

@@ -25,6 +25,14 @@ Popup {
         color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
     }
 
+    onOpened: {
+        focusItem.forceActiveFocus()
+    }
+
+    onClosed: {
+        PageController.forceStackActiveFocus()
+    }
+
     background: Rectangle {
         anchors.fill: parent
 
@@ -52,7 +60,13 @@ Popup {
                 text: root.text
             }
 
+            Item {
+                id: focusItem
+                KeyNavigation.tab: closeButton
+            }
+
             BasicButtonType {
+                id: closeButton
                 visible: closeButtonVisible
 
                 implicitHeight: 32
@@ -66,6 +80,8 @@ Popup {
                 borderWidth: 0
 
                 text: qsTr("Close")
+                KeyNavigation.tab: focusItem
+
                 clickedFunc: function() {
                     root.close()
                 }

client/ui/qml/Controls2/SwitcherType.qml

@@ -18,6 +18,9 @@ Switch {
     property string defaultIndicatorColor: "transparent"
     property string checkedDisabledIndicatorColor: "#402102"
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
     property string checkedIndicatorBorderColor: "#633303"
     property string defaultIndicatorBorderColor: "#494B50"
     property string checkedDisabledIndicatorBorderColor: "#402102"
@@ -31,6 +34,16 @@ Switch {
     property string defaultIndicatorBackgroundColor: "transparent"
 
     hoverEnabled: enabled ? true : false
+    focusPolicy: Qt.TabFocus
+
+    property FlickableType parentFlickable: null
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
+    }
 
     indicator: Rectangle {
         id: switcher
@@ -44,8 +57,9 @@ Switch {
         radius: 16
         color: root.checked ? (root.enabled ? root.checkedIndicatorColor : root.checkedDisabledIndicatorColor)
                             : root.defaultIndicatorColor
-        border.color: root.checked ? (root.enabled ? root.checkedIndicatorBorderColor : root.checkedDisabledIndicatorBorderColor)
-                                   : root.defaultIndicatorBorderColor
+
+        border.color: root.activeFocus ? root.borderFocusedColor : (root.checked ? (root.enabled ? root.checkedIndicatorBorderColor : root.checkedDisabledIndicatorBorderColor)
+                            : root.defaultIndicatorBorderColor)
 
         Behavior on color {
             PropertyAnimation { duration: 200 }
@@ -114,4 +128,14 @@ Switch {
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }
+
+    Keys.onEnterPressed: {
+        root.checked = !root.checked
+        root.checkedChanged()
+    }
+
+    Keys.onReturnPressed: {
+        root.checked = !root.checked
+        root.checkedChanged()
+    }
 }

client/ui/qml/Controls2/TabButtonType.qml

@@ -10,11 +10,15 @@ TabButton {
 
     property string textColor: "#D7D8DB"
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
     property bool isSelected: false
 
     implicitHeight: 48
 
     hoverEnabled: true
+    focusPolicy: Qt.TabFocus
 
     background: Rectangle {
         id: background
@@ -22,6 +26,9 @@ TabButton {
         anchors.fill: parent
         color: "transparent"
 
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.width: root.activeFocus ? root.borderFocusedWidth : 0
+
         Rectangle {
             width: parent.width
             height: 1

client/ui/qml/Controls2/TabImageButtonType.qml

@@ -12,7 +12,13 @@ TabButton {
 
     property bool isSelected: false
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
+    property var clickedFunc
+
     hoverEnabled: true
+    focusPolicy: Qt.TabFocus
 
     icon.source: image
     icon.color: isSelected ? selectedColor : defaultColor
@@ -21,6 +27,11 @@ TabButton {
         id: background
         anchors.fill: parent
         color: "transparent"
+        radius: 10
+
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.width: root.activeFocus ? root.borderFocusedWidth : 0
+
     }
 
     MouseArea {
@@ -28,4 +39,22 @@ TabButton {
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }
+
+    Keys.onEnterPressed: {
+        if (root.clickedFunc && typeof root.clickedFunc === "function") {
+            root.clickedFunc()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (root.clickedFunc && typeof root.clickedFunc === "function") {
+            root.clickedFunc()
+        }
+    }
+
+    onClicked: {
+        if (root.clickedFunc && typeof root.clickedFunc === "function") {
+            root.clickedFunc()
+        }
+    }
 }

client/ui/qml/Controls2/TextAreaType.qml

@@ -19,6 +19,15 @@ Rectangle {
     border.color: getBorderColor(borderNormalColor)
     radius: 16
 
+    property FlickableType parentFlickable: null
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
+    }
+
     MouseArea {
         id: parentMouse
         anchors.fill: parent

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -13,6 +13,7 @@ Item {
 
     property alias errorText: errorField.text
     property bool checkEmptyText: false
+    property bool rightButtonClickedOnEnter: false
 
     property string buttonText
     property string buttonImageSource
@@ -36,6 +37,18 @@ Item {
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
+    property FlickableType parentFlickable
+    Connections {
+        target: textField
+        function onFocusChanged() {
+            if (textField.activeFocus) {
+                if (root.parentFlickable) {
+                    root.parentFlickable.ensureVisible(root)
+                }
+            }
+        }
+    }
+
     ColumnLayout {
         id: content
         anchors.fill: parent
@@ -188,10 +201,22 @@ Item {
     }
 
     Keys.onEnterPressed: {
-         KeyNavigation.tab.forceActiveFocus();
+        if (root.rightButtonClickedOnEnter && root.clickedFunc && typeof root.clickedFunc === "function") {
+            clickedFunc()
+        }
+
+        if (KeyNavigation.tab) {
+            KeyNavigation.tab.forceActiveFocus();
+        }
     }
 
     Keys.onReturnPressed: {
-         KeyNavigation.tab.forceActiveFocus();
+        if (root.rightButtonClickedOnEnter &&root.clickedFunc && typeof root.clickedFunc === "function") {
+            clickedFunc()
+        }
+
+        if (KeyNavigation.tab) {
+            KeyNavigation.tab.forceActiveFocus();
+        }
     }
 }

client/ui/qml/Controls2/VerticalRadioButton.qml

@@ -20,16 +20,23 @@ RadioButton {
     property string textColor: "#D7D8DB"
     property string selectedTextColor: "#FBB26A"
 
+    property string borderFocusedColor: "#D7D8DB"
+    property int borderFocusedWidth: 1
+
     property string imageSource
     property bool showImage
 
     hoverEnabled: true
+    focusPolicy: Qt.TabFocus
 
     indicator: Rectangle {
         id: background
 
         anchors.verticalCenter: parent.verticalCenter
 
+        border.color: root.focus ? root.borderFocusedColor : "transparent"
+        border.width: root.focus ? root.borderFocusedWidth : 0
+
         implicitWidth: 56
         implicitHeight: 56
         radius: 16
@@ -51,6 +58,10 @@ RadioButton {
             PropertyAnimation { duration: 200 }
         }
 
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
+
         Image {
             source: {
                 if (showImage) {

client/ui/qml/Pages2/PageHome.qml

@@ -18,6 +18,8 @@ import "../Components"
 PageType {
     id: root
 
+    defaultActiveFocusItem: focusItem
+
     Connections {
         target: PageController
 
@@ -38,7 +40,15 @@ PageType {
             anchors.topMargin: 34
             anchors.bottomMargin: 34
 
+            Item {
+                id: focusItem
+                KeyNavigation.tab: loggingButton.visible ?
+                                       loggingButton :
+                                       connectButton
+            }
+
             BasicButtonType {
+                id: loggingButton
                 property bool isLoggingEnabled: SettingsController.isLoggingEnabled
 
                 Layout.alignment: Qt.AlignHCenter
@@ -55,6 +65,11 @@ PageType {
                 visible: isLoggingEnabled ? true : false
                 text: qsTr("Logging enabled")
 
+                Keys.onEnterPressed: loggingButton.clicked()
+                Keys.onReturnPressed: loggingButton.clicked()
+
+                KeyNavigation.tab: connectButton
+
                 onClicked: {
                     PageController.goToPage(PageEnum.PageSettingsLogging)
                 }
@@ -64,9 +79,11 @@ PageType {
                 id: connectButton
                 Layout.fillHeight: true
                 Layout.alignment: Qt.AlignCenter
+                KeyNavigation.tab: splitTunnelingButton
             }
 
             BasicButtonType {
+                id: splitTunnelingButton
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
                 Layout.bottomMargin: 34
                 leftPadding: 16
@@ -90,6 +107,11 @@ PageType {
                 imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
                 rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
+                Keys.onEnterPressed: splitTunnelingButton.clicked()
+                Keys.onReturnPressed: splitTunnelingButton.clicked()
+
+                KeyNavigation.tab: drawer
+
                 onClicked: {
                     homeSplitTunnelingDrawer.open()
                 }
@@ -97,6 +119,12 @@ PageType {
                 HomeSplitTunnelingDrawer {
                     id: homeSplitTunnelingDrawer
                     parent: root
+
+                    onClosed: {
+                        if (!GC.isMobile()) {
+                            focusItem.forceActiveFocus()
+                        }
+                    }
                 }
             }
         }
@@ -107,11 +135,26 @@ PageType {
         id: drawer
         anchors.fill: parent
 
-        collapsedContent:  Item {
+        onClosed: {
+            if (!GC.isMobile()) {
+                focusItem.forceActiveFocus()
+            }
+        }
+
+        collapsedContent: Item {
             implicitHeight: Qt.platform.os !== "ios" ? root.height * 0.9 : screen.height * 0.77
             Component.onCompleted: {
                 drawer.expandedHeight = implicitHeight
             }
+            Connections {
+                target: drawer
+                enabled: !GC.isMobile()
+                function onActiveFocusChanged() {
+                    if (drawer.activeFocus && !drawer.isOpened) {
+                        collapsedButtonChevron.forceActiveFocus()
+                    }
+                }
+            }
             ColumnLayout {
                 id: collapsed
 
@@ -178,6 +221,8 @@ PageType {
                         text: ServersModel.defaultServerName
                         horizontalAlignment: Qt.AlignHCenter
 
+                        KeyNavigation.tab: tabBar
+
                         Behavior on opacity {
                             PropertyAnimation { duration: 200 }
                         }
@@ -201,6 +246,11 @@ PageType {
                         topPadding: 4
                         bottomPadding: 3
 
+                        Keys.onEnterPressed: collapsedButtonChevron.clicked()
+                        Keys.onReturnPressed: collapsedButtonChevron.clicked()
+                        Keys.onTabPressed: lastItemTabClicked()
+
+
                         onClicked: {
                             if (drawer.isCollapsed) {
                                 drawer.open()
@@ -217,6 +267,16 @@ PageType {
                 }
             }
 
+            Connections {
+                target: drawer
+                enabled: !GC.isMobile()
+                function onIsCollapsedChanged() {
+                    if (!drawer.isCollapsed) {
+                        focusItem1.forceActiveFocus()
+                    }
+                }
+            }
+
             ColumnLayout {
                 id: serversMenuHeader
 
@@ -230,6 +290,11 @@ PageType {
 
                     visible: !ServersModel.isDefaultServerFromApi
 
+                    Item {
+                        id: focusItem1
+                        KeyNavigation.tab: containersDropDown
+                    }
+
                     DropDownType {
                         id: containersDropDown
 
@@ -252,9 +317,16 @@ PageType {
                         }
 
                         drawerParent: root
+                        KeyNavigation.tab: serversMenuContent
 
                         listView: HomeContainersListView {
+                            id: containersListView
                             rootWidth: root.width
+                            onVisibleChanged: {
+                                if (containersDropDown.visible && !GC.isMobile()) {
+                                    focusItem1.forceActiveFocus()
+                                }
+                            }
 
                             Connections {
                                 target: ServersModel
@@ -317,9 +389,43 @@ PageType {
                     policy: serversMenuContent.height >= serversMenuContent.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
                 }
 
+
+                activeFocusOnTab: true
+                focus: true
+
+                property int focusItemIndex: 0
+                onActiveFocusChanged: {
+                    if (activeFocus) {
+                        serversMenuContent.focusItemIndex = 0
+                        serversMenuContent.itemAtIndex(focusItemIndex).forceActiveFocus()
+                    }
+                }
+
+                onFocusItemIndexChanged: {
+                    const focusedElement = serversMenuContent.itemAtIndex(focusItemIndex)
+                    if (focusedElement) {
+                        if (focusedElement.y + focusedElement.height > serversMenuContent.height) {
+                            serversMenuContent.contentY = focusedElement.y + focusedElement.height - serversMenuContent.height
+                        } else {
+                            serversMenuContent.contentY = 0
+                        }
+                    }
+                }
+
                 Keys.onUpPressed: scrollBar.decrease()
                 Keys.onDownPressed: scrollBar.increase()
 
+                Connections {
+                    target: drawer
+                    enabled: !GC.isMobile()
+                    function onIsCollapsedChanged() {
+                        if (drawer.isCollapsed) {
+                            const item = serversMenuContent.itemAtIndex(serversMenuContent.focusItemIndex)
+                            if (item) { item.serverRadioButtonProperty.focus = false }
+                        }
+                    }
+                }
+
                 Connections {
                     target: ServersModel
                     function onDefaultServerIndexChanged(serverIndex) {
@@ -333,10 +439,17 @@ PageType {
                     id: menuContentDelegate
 
                     property variant delegateData: model
+                    property VerticalRadioButton serverRadioButtonProperty: serverRadioButton
 
                     implicitWidth: serversMenuContent.width
                     implicitHeight: serverRadioButtonContent.implicitHeight
 
+                    onActiveFocusChanged: {
+                        if (activeFocus) {
+                            serverRadioButton.forceActiveFocus()
+                        }
+                    }
+
                     ColumnLayout {
                         id: serverRadioButtonContent
 
@@ -377,9 +490,14 @@ PageType {
                                     cursorShape: Qt.PointingHandCursor
                                     enabled: false
                                 }
+
+                                Keys.onTabPressed: serverInfoButton.forceActiveFocus()
+                                Keys.onEnterPressed: serverRadioButton.clicked()
+                                Keys.onReturnPressed: serverRadioButton.clicked()
                             }
 
                             ImageButtonType {
+                                id: serverInfoButton
                                 image: "qrc:/images/controls/settings.svg"
                                 imageColor: "#D7D8DB"
 
@@ -388,6 +506,18 @@ PageType {
 
                                 z: 1
 
+                                Keys.onTabPressed: {
+                                    if (serversMenuContent.focusItemIndex < serversMenuContent.count - 1) {
+                                        serversMenuContent.focusItemIndex++
+                                        serversMenuContent.itemAtIndex(serversMenuContent.focusItemIndex).forceActiveFocus()
+                                    } else {
+                                        focusItem1.forceActiveFocus()
+                                        serversMenuContent.contentY = 0
+                                    }
+                                }
+                                Keys.onEnterPressed: serverInfoButton.clicked()
+                                Keys.onReturnPressed: serverInfoButton.clicked()
+
                                 onClicked: function() {
                                     ServersModel.processedIndex = index
                                     PageController.goToPage(PageEnum.PageSettingsServerInfo)

client/ui/qml/Pages2/PageProtocolAwgSettings.qml

@@ -18,8 +18,18 @@ PageType {
 
     defaultActiveFocusItem: listview.currentItem.portTextField.textField
 
+    Item {
+        id: focusItem
+        onFocusChanged: {
+            if (activeFocus) {
+                fl.ensureVisible(focusItem)
+            }
+        }
+        KeyNavigation.tab: backButton
+    }
+
     ColumnLayout {
-        id: backButton
+        id: backButtonLayout
 
         anchors.top: parent.top
         anchors.left: parent.left
@@ -28,12 +38,14 @@ PageType {
         anchors.topMargin: 20
 
         BackButtonType {
+            id: backButton
+            KeyNavigation.tab: listview.currentItem.portTextField.textField
         }
     }
 
     FlickableType {
         id: fl
-        anchors.top: backButton.bottom
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
         contentHeight: content.implicitHeight
 
@@ -47,8 +59,6 @@ PageType {
             enabled: ServersModel.isProcessedServerHasWriteAccess()
 
             ListView {
-
-
                 id: listview
 
                 width: parent.width
@@ -94,6 +104,7 @@ PageType {
                             textFieldText: port
                             textField.maximumLength: 5
                             textField.validator: IntValidator { bottom: 1; top: 65535 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
@@ -103,7 +114,7 @@ PageType {
 
                             checkEmptyText: true
 
-                            KeyNavigation.tab: junkPacketCountTextField.textField
+                            KeyNavigation.tab: mtuTextField.textField
                         }
 
                         TextFieldWithHeaderType {
@@ -124,6 +135,7 @@ PageType {
                                 }
                             }
                             checkEmptyText: true
+                            KeyNavigation.tab: junkPacketCountTextField.textField
                         }
 
                         TextFieldWithHeaderType {
@@ -134,9 +146,9 @@ PageType {
                             headerText: "Jc - Junk packet count"
                             textFieldText: junkPacketCount
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
-                                console.log("1")
                                 if (textFieldText === "") {
                                     textFieldText = "0"
                                 }
@@ -159,6 +171,7 @@ PageType {
                             headerText: "Jmin - Junk packet minimum size"
                             textFieldText: junkPacketMinSize
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== junkPacketMinSize) {
@@ -179,6 +192,7 @@ PageType {
                             headerText: "Jmax - Junk packet maximum size"
                             textFieldText: junkPacketMaxSize
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== junkPacketMaxSize) {
@@ -199,6 +213,7 @@ PageType {
                             headerText: "S1 - Init packet junk size"
                             textFieldText: initPacketJunkSize
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== initPacketJunkSize) {
@@ -219,6 +234,7 @@ PageType {
                             headerText: "S2 - Response packet junk size"
                             textFieldText: responsePacketJunkSize
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== responsePacketJunkSize) {
@@ -239,6 +255,7 @@ PageType {
                             headerText: "H1 - Init packet magic header"
                             textFieldText: initPacketMagicHeader
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== initPacketMagicHeader) {
@@ -259,6 +276,7 @@ PageType {
                             headerText: "H2 - Response packet magic header"
                             textFieldText: responsePacketMagicHeader
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== responsePacketMagicHeader) {
@@ -279,6 +297,7 @@ PageType {
                             headerText: "H4 - Transport packet magic header"
                             textFieldText: transportPacketMagicHeader
                             textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== transportPacketMagicHeader) {
@@ -295,6 +314,7 @@ PageType {
                             id: underloadPacketMagicHeaderTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
+                            parentFlickable: fl
 
                             headerText: "H3 - Underload packet magic header"
                             textFieldText: underloadPacketMagicHeader
@@ -313,6 +333,7 @@ PageType {
 
                         BasicButtonType {
                             id: saveRestartButton
+                            parentFlickable: fl
 
                             Layout.fillWidth: true
                             Layout.topMargin: 24
@@ -331,7 +352,23 @@ PageType {
 
                             text: qsTr("Save")
 
-                            onClicked: {
+                            Keys.onTabPressed: lastItemTabClicked(focusItem)
+
+                            clickedFunc: function() {
+                                if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
+                                                                  transportPacketMagicHeaderTextField.textField.text,
+                                                                  responsePacketMagicHeaderTextField.textField.text,
+                                                                  initPacketMagicHeaderTextField.textField.text)) {
+                                    PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
+                                    return
+                                }
+
+                                if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
+                                                                     parseInt(responsePacketJunkSizeTextField.textField.text))) {
+                                    PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
+                                    return
+                                }
+
                                 var headerText = qsTr("Save settings?")
                                 var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
                                 var yesButtonText = qsTr("Continue")
@@ -339,10 +376,19 @@ PageType {
 
                                 var yesButtonFunction = function() {
                                     forceActiveFocus()
+
+                                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                                        return
+                                    }
+
                                     PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                     InstallController.updateContainer(AwgConfigModel.getConfig())
                                 }
                                 var noButtonFunction = function() {
+                                    if (!GC.isMobile()) {
+                                        saveRestartButton.forceActiveFocus()
+                                    }
                                 }
                                 showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                             }