remove duplicate protocol

client/CMakeLists.txt

@@ -174,6 +174,15 @@ endif()
 if(LINUX AND NOT ANDROID)
     set(LIBS ${LIBS} -static-libstdc++ -static-libgcc -ldl)
     link_directories(${CMAKE_CURRENT_LIST_DIR}/platforms/linux)
+
+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/ikev2_vpn_protocol_linux.h
+    )
+    
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/ikev2_vpn_protocol_linux.cpp
+    )
+
 endif()
 
 if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))

client/amnezia_application.cpp

@@ -53,16 +53,14 @@ AmneziaApplication::~AmneziaApplication()
 {
     if (m_vpnConnection) {
         QMetaObject::invokeMethod(m_vpnConnection.get(), "disconnectFromVpn", Qt::QueuedConnection);
-        QThread::msleep(2000);
-        QMetaObject::invokeMethod(m_vpnConnection.get(), "disconnectSlots", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(m_vpnConnection.get(), "deleteLater", Qt::QueuedConnection);
     }
 
-    m_vpnConnectionThread.requestInterruption();
     m_vpnConnectionThread.quit();
 
-    if (!m_vpnConnectionThread.wait(3000)) {
+    if (!m_vpnConnectionThread.wait(5000)) {
         m_vpnConnectionThread.terminate();
-        m_vpnConnectionThread.wait(500);
+        m_vpnConnectionThread.wait();
     }
 
     if (m_engine) {

client/cmake/macos.cmake

@@ -20,6 +20,7 @@ set(LIBS ${LIBS}
 
 set_target_properties(${PROJECT} PROPERTIES 
     MACOSX_BUNDLE TRUE
+    XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/macos/app/AmneziaVPN.entitlements"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}"
     MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
 )
@@ -29,10 +30,12 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
 
 set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/ui/macos_util.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/ikev2_vpn_protocol_mac.h
 )
 
 set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/ui/macos_util.mm
+    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/ikev2_vpn_protocol_mac.mm
 )
 
 

client/configurators/ikev2_configurator.cpp

@@ -64,6 +64,26 @@ QString Ikev2Configurator::createConfig(const ServerCredentials &credentials, Do
         return "";
     }
 
+#if defined(Q_OS_LINUX)
+    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::ipsec_template, container),
+                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));
+
+    config.replace("$CLIENT_NAME", connData.clientId);
+    config.replace("$UUID1", QUuid::createUuid().toString());
+    config.replace("$SERVER_ADDR", connData.host);
+
+    QJsonObject jConfig;
+    jConfig[config_key::config] = config;
+
+    jConfig[config_key::hostName] = connData.host;
+    jConfig[config_key::userName] = connData.clientId;
+    jConfig[config_key::cert] = QString(connData.clientCert.toBase64());
+    jConfig[config_key::cacert] = QString(connData.caCert);
+    jConfig[config_key::password] = connData.password;
+
+    return QJsonDocument(jConfig).toJson();
+#endif
+
     return genIkev2Config(connData);
 }
 
@@ -73,6 +93,7 @@ QString Ikev2Configurator::genIkev2Config(const ConnectionData &connData)
     config[config_key::hostName] = connData.host;
     config[config_key::userName] = connData.clientId;
     config[config_key::cert] = QString(connData.clientCert.toBase64());
+    config[config_key::cacert] = QString(connData.caCert);
     config[config_key::password] = connData.password;
 
     return QJsonDocument(config).toJson();
@@ -115,3 +136,22 @@ QString Ikev2Configurator::genStrongSwanConfig(const ConnectionData &connData)
 
     return config;
 }
+
+QString Ikev2Configurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                              QString &protocolConfigString)
+{
+    processConfigWithDnsSettings(dns, protocolConfigString);
+
+    QJsonObject json;
+    json[config_key::config] = protocolConfigString;
+    return QJsonDocument(json).toJson();
+}
+
+QString Ikev2Configurator::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                               QString &protocolConfigString)
+{
+    processConfigWithDnsSettings(dns, protocolConfigString);
+    QJsonObject json;
+    json[config_key::config] = protocolConfigString;
+    return QJsonDocument(json).toJson();
+}

client/configurators/ikev2_configurator.h

@@ -27,6 +27,10 @@ public:
     QString genIkev2Config(const ConnectionData &connData);
     QString genMobileConfig(const ConnectionData &connData);
     QString genStrongSwanConfig(const ConnectionData &connData);
+    QString genIPSecConfig(const ConnectionData &connData);
+
+    QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig, QString &protocolConfigString);
+    QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig, QString &protocolConfigString);
 
     ConnectionData prepareIkev2Config(const ServerCredentials &credentials,
         DockerContainer container, ErrorCode &errorCode);

client/containers/containers_defs.cpp

@@ -257,7 +257,7 @@ Proto ContainerProps::defaultProtocol(DockerContainer c)
 
 bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
 {
-#ifdef Q_OS_WINDOWS
+#if defined(Q_OS_WINDOWS) || defined(Q_OS_LINUX)
     return true;
 
 #elif defined(Q_OS_IOS)
@@ -291,7 +291,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
 #elif defined(Q_OS_MAC)
     switch (c) {
     case DockerContainer::WireGuard: return true;
-    case DockerContainer::Ipsec: return false;
+    case DockerContainer::Ipsec: return true;
     default: return true;
     }
 
@@ -306,13 +306,6 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     case DockerContainer::SSXray: return true;
     default: return false;
     }
-
-#elif defined(Q_OS_LINUX)
-    switch (c) {
-    case DockerContainer::Ipsec: return false;
-    default: return true;
-    }
-
 #else
     return false;
 #endif

client/core/ipcclient.cpp

@@ -85,9 +85,8 @@ bool IpcClient::init(IpcClient *instance)
     }
 
     qDebug() << "IpcClient::init succeed";
-    instance->m_isSocketConnected = (Instance()->m_ipcClient->isReplicaValid() && Instance()->m_Tun2SocksClient->isReplicaValid());
 
-    return Instance()->isSocketConnected();
+    return (Instance()->m_ipcClient->isReplicaValid() && Instance()->m_Tun2SocksClient->isReplicaValid());
 }
 
 QSharedPointer<PrivilegedProcess> IpcClient::CreatePrivilegedProcess()

client/core/networkUtilities.cpp

@@ -30,6 +30,13 @@
     #include <netinet/in.h>
     #include <arpa/inet.h>
     #include <net/route.h>
+    #include <arpa/inet.h>
+    #include <ifaddrs.h>
+    #include <libproc.h>
+    #include <netdb.h>
+    #include <netinet/in.h>
+    #include <semaphore.h>
+    #include <unistd.h>
 #endif
 
 #include <QHostAddress>
@@ -475,3 +482,112 @@ QString NetworkUtilities::getGatewayAndIface()
     return gateway;
 #endif
 }
+
+#if defined(Q_OS_MAC)
+QString NetworkUtilities::ipAddressByInterfaceName(const QString &interfaceName)
+{
+    struct ifaddrs *ifaddr, *ifa;
+    char host[NI_MAXHOST];
+
+    if (getifaddrs(&ifaddr) == -1)
+    {
+        return "";
+    }
+
+    for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next)
+    {
+        if (ifa->ifa_addr == NULL)
+        {
+            continue;
+        }
+        int family = ifa->ifa_addr->sa_family;
+        QString iname = QString::fromStdString(ifa->ifa_name);
+
+        if (family == AF_INET && iname == interfaceName)
+        {
+            int s = getnameinfo(ifa->ifa_addr,
+                            (family == AF_INET) ? sizeof(struct sockaddr_in) :
+                                                  sizeof(struct sockaddr_in6),
+                            host, NI_MAXHOST,
+                            NULL, 0, NI_NUMERICHOST);
+            if (s != 0)
+            {
+                continue;
+            }
+
+            return QString::fromStdString(host);
+        }
+    }
+
+    freeifaddrs(ifaddr);
+    return "";
+}
+
+QString NetworkUtilities::lastConnectedNetworkInterfaceName()
+{
+    QString ifname("");
+
+    struct ifaddrs * interfaces = NULL;
+    struct ifaddrs * temp_addr = NULL;
+
+    if( getifaddrs(&interfaces) == 0 )
+    {
+        //Loop through linked list of interfaces
+        temp_addr = interfaces;
+        while( temp_addr != NULL )
+        {
+            if( temp_addr->ifa_addr->sa_family == AF_INET )
+            {
+                QString tname = temp_addr->ifa_name;
+                if( tname.startsWith("utun") )
+                    ifname = tname;
+                else if( tname.startsWith("ipsec") )
+                    ifname = tname;
+                else if( tname.startsWith("ppp") )
+                    ifname = tname;
+            }
+
+            temp_addr = temp_addr->ifa_next;
+        }
+
+        freeifaddrs(interfaces);
+    }
+    return ifname;
+}
+
+QString execCmd(const QString &cmd)
+{
+    char buffer[1024];
+    QString result = "";
+    FILE* pipe = popen(cmd.toStdString().c_str(), "r");
+    if (!pipe) return "";
+    while (!feof(pipe))
+    {
+        if (fgets(buffer, 1024, pipe) != NULL)
+        {
+            result += buffer;
+        }
+    }
+    pclose(pipe);
+    return result;
+}
+
+QStringList NetworkUtilities::getListOfDnsNetworkServiceEntries()
+{
+    QStringList result;
+    QString command = "echo 'list' | scutil | grep /Network/Service | grep DNS";
+    QString cmdOutput = execCmd(command).trimmed();
+    // qDebug() << "Raw result: " << cmdOutput;
+
+    QStringList lines = cmdOutput.split('\n');
+    for (QString line : lines)
+    {
+        if (line.contains("="))
+        {
+            QString entry = line.mid(line.indexOf("=")+1).trimmed();
+            result.append(entry);
+        }
+    }
+    return result;
+}
+#endif

client/core/networkUtilities.h

@@ -20,16 +20,22 @@ public:
     static QString getGatewayAndIface();
     // Returns the Interface Index that could Route to dst
     static int AdapterIndexTo(const QHostAddress& dst);
-
+    
     static QRegularExpression ipAddressRegExp();
     static QRegularExpression ipAddressPortRegExp();
     static QRegExp ipAddressWithSubnetRegExp();
     static QRegExp ipNetwork24RegExp();
     static QRegExp ipPortRegExp();
     static QRegExp domainRegExp();
-
+    
     static QString netMaskFromIpWithSubnet(const QString ip);
     static QString ipAddressFromIpWithSubnet(const QString ip);
+    
+#if defined(Q_OS_MAC)
+    static QString ipAddressByInterfaceName(const QString &interfaceName);
+    static QString lastConnectedNetworkInterfaceName();
+    static QStringList getListOfDnsNetworkServiceEntries();
+#endif
     static QStringList summarizeRoutes(const QStringList &ips, const QString cidr);
 };
 

client/core/scripts_registry.cpp

@@ -50,6 +50,7 @@ QString amnezia::scriptName(ProtocolScriptType type)
     case ProtocolScriptType::wireguard_template: return QLatin1String("template.conf");
     case ProtocolScriptType::awg_template: return QLatin1String("template.conf");
     case ProtocolScriptType::xray_template: return QLatin1String("template.json");
+    case ProtocolScriptType::ipsec_template: return QLatin1String("template.conf");
     default: return QString();
     }
 }

client/core/scripts_registry.h

@@ -28,7 +28,8 @@ enum ProtocolScriptType {
     openvpn_template,
     wireguard_template,
     awg_template,
-    xray_template
+    xray_template,
+    ipsec_template
 };
 
 

client/macos/app/AmneziaVPN.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.networking.networkextension</key>
+	<array>
+		<string>packet-tunnel-provider</string>
+	</array>
+	<key>com.apple.developer.networking.vpn.api</key>
+	<array>
+		<string>allow-vpn</string>
+	</array>
+</dict>
+</plist>

client/protocols/ikev2_vpn_protocol_linux.cpp

@@ -0,0 +1,158 @@
+#include <QCoreApplication>
+#include <QFileInfo>
+#include <QProcess>
+
+#include <QThread>
+
+#include <chrono>
+
+#include "core/networkUtilities.h"
+
+#include "settings.h"
+#include "logger.h"
+#include "ikev2_vpn_protocol_linux.h"
+#include "utilities.h"
+#include "core/ipcclient.h"
+#include <openssl/pkcs12.h>
+#include <openssl/bio.h>
+#include <openssl/pem.h>
+
+
+static Ikev2Protocol* self = nullptr;
+
+
+Ikev2Protocol::Ikev2Protocol(const QJsonObject &configuration, QObject* parent) :
+    VpnProtocol(configuration, parent)
+{
+    self = this;
+    readIkev2Configuration(configuration);
+    m_routeGateway = NetworkUtilities::getGatewayAndIface();
+    m_vpnGateway = "192.168.43.10";
+    m_vpnLocalAddress = "192.168.43.10";
+    m_remoteAddress = NetworkUtilities::getIPAddress(configuration.value(amnezia::config_key::hostName).toString());
+    m_routeMode = static_cast<Settings::RouteMode>(configuration.value(amnezia::config_key::splitTunnelType).toInt());
+}
+
+Ikev2Protocol::~Ikev2Protocol()
+{
+    qDebug() << "IpsecProtocol::~IpsecProtocol()";
+    Ikev2Protocol::stop();
+}
+
+void Ikev2Protocol::stop()
+{
+    setConnectionState(Vpn::ConnectionState::Disconnected);
+    Ikev2Protocol::disconnect_vpn();
+    qDebug() << "IpsecProtocol::stop()";
+}
+
+void Ikev2Protocol::readIkev2Configuration(const QJsonObject &configuration)
+{
+    QJsonObject ikev2_data = configuration.value(ProtocolProps::key_proto_config_data(Proto::Ikev2)).toObject();
+    m_config = QJsonDocument::fromJson(ikev2_data.value(config_key::config).toString().toUtf8()).object();
+}
+
+ErrorCode Ikev2Protocol::start()
+{
+    STACK_OF(X509) *certstack = sk_X509_new_null();
+    BIO *p12 = BIO_new(BIO_s_mem());
+
+    EVP_PKEY *pkey;
+    X509 *cert;
+
+    BIO_write(p12, QByteArray::fromBase64(m_config[config_key::cert].toString().toUtf8()),
+              QByteArray::fromBase64(m_config[config_key::cert].toString().toUtf8()).size());
+
+    PKCS12 *pkcs12 = d2i_PKCS12_bio(p12, NULL);
+    PKCS12_parse(pkcs12, m_config[config_key::password].toString().toStdString().c_str(), &pkey, &cert, &certstack);
+    BIO *bio = BIO_new(BIO_s_mem());
+    PEM_write_bio_X509(bio, cert);
+
+    BUF_MEM *mem = NULL;
+    BIO_get_mem_ptr(bio, &mem);
+
+    std::string pem(mem->data, mem->length);
+    QString alias(pem.c_str());
+
+    IpcClient::Interface()->writeIPsecUserCert(alias, m_config[config_key::userName].toString());
+    IpcClient::Interface()->writeIPsecConfig(m_config[config_key::config].toString());
+    IpcClient::Interface()->writeIPsecCaCert(m_config[config_key::cacert].toString(), m_config[config_key::userName].toString());
+    IpcClient::Interface()->writeIPsecPrivate(m_config[config_key::cert].toString(), m_config[config_key::userName].toString());
+    IpcClient::Interface()->writeIPsecPrivatePass(m_config[config_key::password].toString(), m_config[config_key::hostName].toString(),
+                                                  m_config[config_key::userName].toString());
+
+    connect_to_vpn("ikev2-vpn");
+
+    if (!IpcClient::Interface()) {
+        return ErrorCode::AmneziaServiceConnectionFailed;
+    }
+
+    QString connectionStatus;
+
+    auto futureResult = IpcClient::Interface()->getTunnelStatus("ikev2-vpn");
+    futureResult.waitForFinished();
+
+    if (futureResult.returnValue().isEmpty()) {
+        auto futureResult = IpcClient::Interface()->getTunnelStatus("ikev2-vpn");
+        futureResult.waitForFinished();
+    }
+
+    connectionStatus = futureResult.returnValue();
+
+    if (connectionStatus.contains("ESTABLISHED")) {
+        QStringList lines = connectionStatus.split('\n');
+        for (auto iter = lines.begin(); iter!=lines.end(); iter++)
+        {
+            if (iter->contains("0.0.0.0/0")) {
+                m_vpnGateway = iter->split("===", Qt::SkipEmptyParts).first();
+                m_vpnGateway = m_vpnGateway.split("   ").at(2);
+                m_vpnGateway = m_vpnGateway.split("/").first();
+                m_vpnLocalAddress = m_vpnGateway;
+                qDebug() << "m_vpnGateway " << m_vpnGateway;
+
+                // killSwitch toggle
+                if (QVariant(m_config.value(config_key::killSwitchOption).toString()).toBool()) {
+                    m_config.insert("vpnServer", m_remoteAddress);
+                    IpcClient::Interface()->enableKillSwitch(m_config, 0);
+                }
+
+                if (m_routeMode == Settings::RouteMode::VpnAllSites) {
+                    IpcClient::Interface()->routeAddList(m_vpnGateway, QStringList() << "0.0.0.0/1");
+                    IpcClient::Interface()->routeAddList(m_vpnGateway, QStringList() << "128.0.0.0/1");
+                    IpcClient::Interface()->routeAddList(m_routeGateway, QStringList() << m_remoteAddress);
+                }
+
+                IpcClient::Interface()->StopRoutingIpv6();
+            }
+        }
+        setConnectionState(Vpn::ConnectionState::Connected);
+    } else {
+        setConnectionState(Vpn::ConnectionState::Disconnected);
+    }
+
+    return ErrorCode::NoError;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::create_new_vpn(const QString & vpn_name,
+                                   const QString & serv_addr) {
+   qDebug() << "Ikev2Protocol::create_new_vpn()";
+   return true;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::delete_vpn_connection(const QString &vpn_name) {
+
+    return false;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::connect_to_vpn(const QString &vpn_name) {
+    IpcClient::Interface()->startIPsec(vpn_name);
+    QThread::msleep(3000);
+    return true;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::disconnect_vpn() {
+    IpcClient::Interface()->stopIPsec("ikev2-vpn");
+    IpcClient::Interface()->disableKillSwitch();
+    IpcClient::Interface()->StartRoutingIpv6();
+    return true;
+}

client/protocols/ikev2_vpn_protocol_linux.h

@@ -0,0 +1,51 @@
+#ifndef IKEV2_VPN_PROTOCOL_LINUX_H
+#define IKEV2_VPN_PROTOCOL_LINUX_H
+
+#include <QObject>
+#include <QProcess>
+#include <QString>
+#include <QTemporaryFile>
+#include <QTimer>
+
+#include "vpnprotocol.h"
+
+#include <string>
+#include <memory>
+#include <atomic>
+#include <thread>
+#include <condition_variable>
+#include <mutex>
+
+class Ikev2Protocol : public VpnProtocol
+{
+    Q_OBJECT
+
+public:
+    explicit Ikev2Protocol(const QJsonObject& configuration, QObject* parent = nullptr);
+    virtual ~Ikev2Protocol() override;
+
+    ErrorCode start() override;
+    void stop() override;
+
+    static QString tunnelName() { return "AmneziaVPN IKEv2"; }
+
+
+private:
+    void readIkev2Configuration(const QJsonObject &configuration);
+
+private:
+    QJsonObject m_config;
+    QString m_remoteAddress;
+    int m_routeMode;
+
+
+    bool create_new_vpn(const QString & vpn_name,
+                        const QString & serv_addr);
+    bool delete_vpn_connection(const QString &vpn_name);
+
+    bool connect_to_vpn(const QString & vpn_name);
+    bool disconnect_vpn();
+};
+
+
+#endif // IKEV2_VPN_PROTOCOL_LINUX_H

client/protocols/ikev2_vpn_protocol_mac.h

@@ -0,0 +1,45 @@
+#pragma once
+
+#include <QObject>
+#include <QTimer>
+
+
+#include "openvpnprotocol.h"
+
+
+class Ikev2Protocol : public VpnProtocol
+{
+    Q_OBJECT
+public:
+    explicit Ikev2Protocol(const QJsonObject& configuration, QObject* parent = nullptr);
+    virtual ~Ikev2Protocol() override;
+
+    void readIkev2Configuration(const QJsonObject &configuration);
+    bool create_new_vpn(const QString &vpn_name, const QString &serv_addr);
+    bool delete_vpn_connection(const QString &vpn_name);
+    bool connect_to_vpn(const QString & vpn_name);
+    bool disconnect_vpn();
+    void closeWindscribeActiveConnection();
+    ErrorCode start() override;
+    void stop() override;
+
+    static QString tunnelName() { return "AmneziaVPN IKEv2"; }
+
+private slots:
+    void handleNotificationImpl(int status);
+
+private:
+    mutable QRecursiveMutex mutex_;
+    void *notificationId_;
+    QJsonObject m_config;
+    QJsonObject m_ikev2_config;
+
+    QString ipsecAdapterName_;
+    
+    bool isConnectingStateReachedAfterStartingConnection_;
+    
+    void handleNotification(void *notification);
+    bool isFailedAuthError(QMap<time_t, QString> &logs);
+    bool isSocketError(QMap<time_t, QString> &logs);
+    bool setCustomDns(const QString &overrideDnsIpAddress);
+};

client/protocols/ikev2_vpn_protocol_mac.mm

@@ -0,0 +1,397 @@
+#include "ikev2_vpn_protocol_mac.h"
+
+#include <core/networkUtilities.h>
+#include <SystemConfiguration/SCSchemaDefinitions.h>
+#include <SystemConfiguration/SCNetwork.h>
+#include <SystemConfiguration/SCNetworkConnection.h>
+#include <SystemConfiguration/SCNetworkConfiguration.h>
+#import <NetworkExtension/NetworkExtension.h>
+#import <Foundation/Foundation.h>
+#include <QWaitCondition>
+
+#include <openssl/bio.h>
+#include <openssl/pkcs12.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+
+#include <sys/sysctl.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <net/route.h>
+
+static NSString * const IKEv2ServiceName = @"AmneziaVPN IKEv2";
+
+static Ikev2Protocol* self = nullptr;
+
+Ikev2Protocol::Ikev2Protocol(const QJsonObject &configuration, QObject* parent) :
+    VpnProtocol(configuration, parent)
+{
+    qDebug() << "IpsecProtocol::IpsecProtocol()";
+    m_routeGateway = NetworkUtilities::getGatewayAndIface();
+    self = this;
+    readIkev2Configuration(configuration);
+}
+
+Ikev2Protocol::~Ikev2Protocol()
+{
+    qDebug() << "IpsecProtocol::~IpsecProtocol()";
+    disconnect_vpn();
+    QThread::msleep(1000);
+    Ikev2Protocol::stop();
+}
+
+void Ikev2Protocol::stop()
+{
+    setConnectionState(Vpn::ConnectionState::Disconnected);
+    qDebug() << "IpsecProtocol::stop()";
+}
+
+void Ikev2Protocol::readIkev2Configuration(const QJsonObject &configuration)
+{
+    qDebug() << "IpsecProtocol::readIkev2Configuration";
+    m_config = configuration;
+    auto ikev2_data = m_config.value(ProtocolProps::key_proto_config_data(Proto::Ikev2)).toObject();
+    m_ikev2_config = QJsonDocument::fromJson(ikev2_data.value(config_key::config).toString().toUtf8()).object();
+   
+}
+
+CFDataRef CreatePersistentRefForIdentity(SecIdentityRef identity)
+{
+    CFTypeRef  persistent_ref = NULL;
+    const void *keys[] =   { kSecReturnPersistentRef, kSecValueRef };
+    const void *values[] = { kCFBooleanTrue,          identity };
+    CFDictionaryRef dict = CFDictionaryCreate(NULL, keys, values,
+                                              sizeof(keys) / sizeof(*keys), NULL, NULL);
+
+    if (SecItemCopyMatching(dict, &persistent_ref) != 0) {
+        SecItemAdd(dict, &persistent_ref);
+    }
+    
+    if (dict)
+        CFRelease(dict);
+    
+    return (CFDataRef)persistent_ref;
+}
+
+NSData *searchKeychainCopyMatching(const char *certName)
+{
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+    [dict setObject:(__bridge id)kSecClassCertificate forKey:(__bridge id)kSecClass];
+    [dict setObject:[NSString stringWithUTF8String:certName] forKey:(__bridge id)kSecAttrLabel];
+    [dict setObject:(__bridge id)kSecMatchLimitOne forKey:(__bridge id)kSecMatchLimit];
+    [dict setObject:@YES forKey:(__bridge id)kSecReturnPersistentRef];
+
+    CFTypeRef result = NULL;
+    SecItemCopyMatching((__bridge CFDictionaryRef)dict, &result);
+
+    return (NSData *)result;
+}
+
+ErrorCode Ikev2Protocol::start()
+{
+
+    qDebug() << "IpsecProtocol::start";
+    
+    static QMutex mutexLocal;
+    mutexLocal.lock();
+    
+    setConnectionState(Vpn::ConnectionState::Disconnected);
+    NEVPNManager *manager = [NEVPNManager sharedManager];
+
+    [manager loadFromPreferencesWithCompletionHandler:^(NSError *err)
+    {
+        mutexLocal.lock();
+
+        if (err)
+        {
+            qDebug() << "First load vpn preferences failed:" << QString::fromNSString(err.localizedDescription);
+            setConnectionState(Vpn::ConnectionState::Disconnected);
+            mutexLocal.unlock();
+        }
+        else
+        {
+            
+            NSData *output = NULL;
+
+            BIO *ibio, *obio = NULL;
+            BUF_MEM *bptr;
+
+            STACK_OF(X509) *certstack = sk_X509_new_null();
+            BIO *p12 = BIO_new(BIO_s_mem());
+
+            EVP_PKEY *pkey;
+            X509 *cert;
+
+            BIO_write(p12, QByteArray::fromBase64(m_ikev2_config[config_key::cert].toString().toUtf8()),
+                      QByteArray::fromBase64(m_ikev2_config[config_key::cert].toString().toUtf8()).size());
+
+            PKCS12 *pkcs12 = d2i_PKCS12_bio(p12, NULL);
+            PKCS12_parse(pkcs12, m_ikev2_config[config_key::password].toString().toStdString().c_str(), &pkey, &cert, &certstack);
+            
+            // We output everything in PEM
+            obio = BIO_new(BIO_s_mem());
+
+            // TODO: support protecting the private key with a PEM passphrase
+            if (pkey)
+              {
+                PEM_write_bio_PrivateKey(obio, pkey, NULL, NULL, 0, NULL, NULL);
+              }
+
+            if (cert)
+              {
+                PEM_write_bio_X509(obio, cert);
+              }
+
+            if (certstack && sk_X509_num(certstack))
+              {
+                for (int i = 0; i < sk_X509_num(certstack); i++)
+                  PEM_write_bio_X509_AUX(obio, sk_X509_value(certstack, i));
+              }
+
+            BIO_get_mem_ptr(obio, &bptr);
+
+            output = [NSData dataWithBytes: bptr->data  length: bptr->length];
+            
+            NSData *PKCS12Data = [[NSData alloc] initWithBase64EncodedString:m_ikev2_config[config_key::cert].toString().toNSString() options:0];
+            
+            CFArrayRef items = CFArrayCreate(NULL, 0, 0, NULL);
+            OSStatus ret = SecPKCS12Import(
+                                           (__bridge CFDataRef)output,
+                                           (__bridge CFDictionaryRef)@{(id)kSecImportExportPassphrase:@""},
+                                           &items);
+            
+            if (ret != errSecSuccess) {
+                qDebug() << "import err ret " << ret;
+            }
+            
+            NSDictionary *firstItem = [(__bridge_transfer NSArray *)items firstObject];
+            SecIdentityRef identity = (__bridge SecIdentityRef)(firstItem[(__bridge id)kSecImportItemIdentity]);
+
+            NEVPNProtocolIKEv2 *protocol = [[NEVPNProtocolIKEv2 alloc] init];
+            protocol.serverAddress = m_ikev2_config.value(amnezia::config_key::hostName).toString().toNSString();
+            protocol.certificateType = NEVPNIKEv2CertificateTypeRSA;
+            
+            protocol.remoteIdentifier = m_ikev2_config.value(amnezia::config_key::hostName).toString().toNSString();
+            protocol.authenticationMethod = NEVPNIKEAuthenticationMethodCertificate;
+            protocol.identityReference = searchKeychainCopyMatching(m_ikev2_config.value(amnezia::config_key::userName).toString().toLocal8Bit().data());
+
+            protocol.useExtendedAuthentication = NO;
+            protocol.enablePFS = YES;
+            
+            protocol.IKESecurityAssociationParameters.encryptionAlgorithm = NEVPNIKEv2EncryptionAlgorithmAES256;
+            protocol.IKESecurityAssociationParameters.diffieHellmanGroup = NEVPNIKEv2DiffieHellmanGroup19;
+            protocol.IKESecurityAssociationParameters.integrityAlgorithm = NEVPNIKEv2IntegrityAlgorithmSHA256;
+            protocol.IKESecurityAssociationParameters.lifetimeMinutes = 1440;
+
+            protocol.childSecurityAssociationParameters.encryptionAlgorithm = NEVPNIKEv2EncryptionAlgorithmAES256;
+            protocol.childSecurityAssociationParameters.diffieHellmanGroup = NEVPNIKEv2DiffieHellmanGroup19;
+            protocol.childSecurityAssociationParameters.integrityAlgorithm = NEVPNIKEv2IntegrityAlgorithmSHA256;
+            protocol.childSecurityAssociationParameters.lifetimeMinutes = 1440;
+        
+            [manager setEnabled:YES];
+            [manager setProtocolConfiguration:(protocol)];
+            [manager setOnDemandEnabled:NO];
+            [manager setLocalizedDescription:@"Amnezia VPN"];
+
+#ifdef QT_DEBUG
+            NSString *strProtocol = [NSString stringWithFormat:@"{Protocol: %@", protocol];
+            qDebug() << QString::fromNSString(strProtocol);
+#endif
+            
+            // do config stuff
+            [manager saveToPreferencesWithCompletionHandler:^(NSError *err)
+            {
+                if (err)
+                {
+                    qDebug() << "First save vpn preferences failed:" << QString::fromNSString(err.localizedDescription);
+                    setConnectionState(Vpn::ConnectionState::Disconnected);
+                    mutexLocal.unlock();
+                }
+                else
+                {
+                    // load and save preferences again, otherwise Mac bug (https://forums.developer.apple.com/thread/25928)
+                    [manager loadFromPreferencesWithCompletionHandler:^(NSError *err)
+                    {
+                        if (err)
+                        {
+                            qDebug() << "Second load vpn preferences failed:" << QString::fromNSString(err.localizedDescription);
+                            setConnectionState(Vpn::ConnectionState::Disconnected);
+                            mutexLocal.unlock();
+                        }
+                        else
+                        {
+                            [manager saveToPreferencesWithCompletionHandler:^(NSError *err)
+                            {
+                                if (err)
+                                {
+                                    qDebug() << "Second Save vpn preferences failed:" << QString::fromNSString(err.localizedDescription);
+                                    setConnectionState(Vpn::ConnectionState::Disconnected);
+                                    mutexLocal.unlock();
+                                }
+                                else
+                                {
+                                    notificationId_ = [[NSNotificationCenter defaultCenter] addObserverForName: (NSString *)NEVPNStatusDidChangeNotification object: manager.connection queue: nil usingBlock: ^ (NSNotification *notification)
+                                    {
+                                        this->handleNotification(notification);
+                                    }];
+
+                                    qDebug() << "NEVPNConnection current status:" << (int)manager.connection.status;
+
+                                    NSError *startError;
+                                    [manager.connection startVPNTunnelAndReturnError:&startError];
+                                    if (startError)
+                                    {
+                                        qDebug() << "Error starting ikev2 connection:" << QString::fromNSString(startError.localizedDescription);
+                                        [[NSNotificationCenter defaultCenter] removeObserver: (id)notificationId_ name: (NSString *)NEVPNStatusDidChangeNotification object: manager.connection];
+                                        setConnectionState(Vpn::ConnectionState::Disconnected);
+                                    }
+                                    mutexLocal.unlock();
+                                }
+                            }];
+                        }
+                    }];
+                }
+            }];
+        }
+    }];
+
+    mutexLocal.unlock();
+
+    setConnectionState(Vpn::ConnectionState::Connected);
+    return ErrorCode::NoError;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::create_new_vpn(const QString & vpn_name,
+                                   const QString & serv_addr) {
+   qDebug() << "Ikev2Protocol::create_new_vpn()";
+   return true;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::delete_vpn_connection(const QString &vpn_name) {
+
+    return false;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::connect_to_vpn(const QString & vpn_name) {
+    return false;
+}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool Ikev2Protocol::disconnect_vpn() {
+    
+    NEVPNManager *manager = [NEVPNManager sharedManager];
+
+    // #713: If user had started connecting to IKev2 on Mac and quickly started after this connecting to Wireguard
+
+    //       then manager.connection.status doesn't have time to change to NEVPNStatusConnecting
+    //       and remains NEVPNStatusDisconnected as it was before connection tries.
+    //       Then we should check below isConnectingStateReachedAfterStartingConnection_ flag to be sure that connecting started.
+    //       Without this check we will start connecting to the Wireguard when IKEv2 connecting process hasn't finished yet.
+    if (manager.connection.status == NEVPNStatusDisconnected && isConnectingStateReachedAfterStartingConnection_)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver: (id)notificationId_ name: (NSString *)NEVPNStatusDidChangeNotification object: manager.connection];
+        setConnectionState(Vpn::ConnectionState::Disconnected);
+    }
+    else
+    {
+        [manager.connection stopVPNTunnel];
+    }
+
+    return true;
+}
+
+
+void Ikev2Protocol::closeWindscribeActiveConnection()
+{
+
+    NEVPNManager *manager = [NEVPNManager sharedManager];
+    if (manager)
+    {
+        [manager loadFromPreferencesWithCompletionHandler:^(NSError *err)
+        {
+            if (!err)
+            {
+                NEVPNConnection * connection = [manager connection];
+                if (connection.status == NEVPNStatusConnected || connection.status == NEVPNStatusConnecting)
+                {
+                    if ([manager.localizedDescription isEqualToString:@"Amnezia VPN"] == YES)
+                    {
+                        qDebug() << "Previous IKEv2 connection is active. Stop it.";
+                        [connection stopVPNTunnel];
+                    }
+                }
+            }
+        }];
+    }
+    
+}
+
+void Ikev2Protocol::handleNotificationImpl(int status)
+{
+    QMutexLocker locker(&mutex_);
+
+    NEVPNManager *manager = [NEVPNManager sharedManager];
+
+    if (status == NEVPNStatusInvalid)
+    {
+        qDebug() << "Connection status changed: NEVPNStatusInvalid";
+        [[NSNotificationCenter defaultCenter] removeObserver: (id)notificationId_ name: (NSString *)NEVPNStatusDidChangeNotification object: manager.connection];
+        setConnectionState(Vpn::ConnectionState::Disconnected);
+    }
+    else if (status == NEVPNStatusDisconnected)
+    {
+        qDebug() << "Connection status changed: NEVPNStatusDisconnected";
+        IpcClient::Interface()->disableKillSwitch();
+        
+        setConnectionState(Vpn::ConnectionState::Disconnected);
+        [[NSNotificationCenter defaultCenter] removeObserver: (id)notificationId_ name: (NSString *)NEVPNStatusDidChangeNotification object: manager.connection];
+
+    }
+    else if (status == NEVPNStatusConnecting)
+    {
+        isConnectingStateReachedAfterStartingConnection_ = true;
+        setConnectionState(Vpn::ConnectionState::Connecting);
+        qDebug() << "Connection status changed: NEVPNStatusConnecting";
+    }
+    else if (status == NEVPNStatusConnected)
+    {
+        qDebug() << "Connection status changed: NEVPNStatusConnected";
+        
+        QString ipsecAdapterName_ = NetworkUtilities::lastConnectedNetworkInterfaceName();
+        m_vpnLocalAddress = NetworkUtilities::ipAddressByInterfaceName(ipsecAdapterName_);
+        m_vpnGateway = m_vpnLocalAddress;
+        
+        QList<QHostAddress> dnsAddr;
+        dnsAddr.push_back(QHostAddress(m_config.value(config_key::dns1).toString()));
+        dnsAddr.push_back(QHostAddress(m_config.value(config_key::dns2).toString()));
+
+        IpcClient::Interface()->updateResolvers(ipsecAdapterName_, dnsAddr);
+              
+        if (QVariant(m_config.value(config_key::killSwitchOption).toString()).toBool()) {
+            qDebug() << "enable killswitch";
+            IpcClient::Interface()->enableKillSwitch(m_config, 0);
+        }
+
+        setConnectionState(Vpn::ConnectionState::Connected);
+    }
+    else if (status == NEVPNStatusReasserting)
+    {
+        qDebug() << "Connection status changed: NEVPNStatusReasserting";
+        setConnectionState(Vpn::ConnectionState::Connecting);
+    }
+    else if (status == NEVPNStatusDisconnecting)
+    {
+        qDebug() << "Connection status changed: NEVPNStatusDisconnecting";
+        setConnectionState(Vpn::ConnectionState::Disconnecting);
+    }
+
+}
+
+
+void Ikev2Protocol::handleNotification(void *notification)
+{
+    QMutexLocker locker(&mutex_);
+    NSNotification *nsNotification = (NSNotification *)notification;
+    NEVPNConnection *connection = nsNotification.object;
+    QMetaObject::invokeMethod(this, "handleNotificationImpl", Q_ARG(int, (int)connection.status));
+}
+

client/protocols/ikev2_vpn_protocol_windows.cpp

@@ -172,7 +172,8 @@ void Ikev2Protocol::newConnectionStateEventReceived(UINT unMsg, tagRASCONNSTATE
 
 void Ikev2Protocol::readIkev2Configuration(const QJsonObject &configuration)
 {
-    m_config = configuration.value(ProtocolProps::key_proto_config_data(Proto::Ikev2)).toObject();
+    QJsonObject ikev2_data = configuration.value(ProtocolProps::key_proto_config_data(Proto::Ikev2)).toObject();
+    m_config = QJsonDocument::fromJson(ikev2_data.value(config_key::config).toString().toUtf8()).object();
 }
 
 ErrorCode Ikev2Protocol::start()

client/protocols/openvpnprotocol.cpp

@@ -56,8 +56,7 @@ void OpenVpnProtocol::stop()
     }
 
 #if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
-    QRemoteObjectPendingReply<bool> disableKillSwitchResp = IpcClient::Interface()->disableKillSwitch();
-    disableKillSwitchResp.waitForFinished(1000);
+    IpcClient::Interface()->disableKillSwitch();
 #endif
 
     setConnectionState(Vpn::ConnectionState::Disconnected);

client/protocols/protocols_defs.h

@@ -24,6 +24,7 @@ namespace amnezia
         constexpr char description[] = "description";
         constexpr char name[] = "name";
         constexpr char cert[] = "cert";
+        constexpr char cacert[] = "cacert";
         constexpr char config[] = "config";
 
         constexpr char containers[] = "containers";

client/protocols/vpnprotocol.cpp

@@ -16,6 +16,14 @@
     #include "ikev2_vpn_protocol_windows.h"
 #endif
 
+#ifdef Q_OS_LINUX
+    #include "ikev2_vpn_protocol_linux.h"
+#endif
+
+#ifdef Q_OS_MACX
+    #include "ikev2_vpn_protocol_mac.h"
+#endif
+
 VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject *parent)
     : QObject(parent),
       m_connectionState(Vpn::ConnectionState::Unknown),
@@ -106,10 +114,7 @@ QString VpnProtocol::vpnGateway() const
 VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &configuration)
 {
     switch (container) {
-#if defined(Q_OS_WINDOWS)
-    case DockerContainer::Ipsec: return new Ikev2Protocol(configuration);
-#endif
-#if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) and !defined MACOS_NE || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+#if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) && !defined(MACOS_NE) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
     case DockerContainer::OpenVpn: return new OpenVpnProtocol(configuration);
     case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration);
     case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration);
@@ -117,6 +122,7 @@ VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &
     case DockerContainer::Awg: return new WireguardProtocol(configuration);
     case DockerContainer::Xray: return new XrayProtocol(configuration);
     case DockerContainer::SSXray: return new XrayProtocol(configuration);
+    case DockerContainer::Ipsec: return new Ikev2Protocol(configuration);
 #endif
     default: return nullptr;
     }

client/protocols/xrayprotocol.cpp

@@ -167,10 +167,8 @@ ErrorCode XrayProtocol::startTun2Sock()
 void XrayProtocol::stop()
 {
 #if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
-    QRemoteObjectPendingReply<bool> disableKillSwitchResp = IpcClient::Interface()->disableKillSwitch();
-    disableKillSwitchResp.waitForFinished(1000);
-    QRemoteObjectPendingReply<bool> StartRoutingIpv6Resp = IpcClient::Interface()->StartRoutingIpv6();
-    StartRoutingIpv6Resp.waitForFinished(1000);
+    IpcClient::Interface()->disableKillSwitch();
+    IpcClient::Interface()->StartRoutingIpv6();
 #endif
     qDebug() << "XrayProtocol::stop()";
     m_xrayProcess.disconnect();
@@ -178,7 +176,6 @@ void XrayProtocol::stop()
     m_xrayProcess.waitForFinished(3000);
     if (m_t2sProcess) {
         m_t2sProcess->stop();
-        QThread::msleep(200);
     }
 
     setConnectionState(Vpn::ConnectionState::Disconnected);

client/resources.qrc

@@ -77,6 +77,7 @@
         <file>server_scripts/ipsec/mobileconfig.plist</file>
         <file>server_scripts/ipsec/run_container.sh</file>
         <file>server_scripts/ipsec/start.sh</file>
+        <file>server_scripts/ipsec/template.conf</file>
         <file>server_scripts/ipsec/strongswan.profile</file>
         <file>server_scripts/openvpn_cloak/configure_container.sh</file>
         <file>server_scripts/openvpn_cloak/Dockerfile</file>

client/server_scripts/ipsec/configure_container.sh

@@ -242,6 +242,7 @@ conn ikev2-cp
   dpdtimeout=120
   dpdaction=clear
   auto=add
+  authby=rsa-sha1
   ikev2=insist
   rekey=no
   pfs=yes

client/server_scripts/ipsec/template.conf

@@ -0,0 +1,28 @@
+config setup
+    charondebug="ike 1, knl 1, cfg 0"
+    uniqueids=no
+
+conn ikev2-vpn
+    auto=add
+    type=tunnel
+    keyexchange=ikev2
+    fragmentation=yes
+    forceencaps=yes 
+    dpdaction=clear
+    dpddelay=300s
+    rekey=no 
+    leftid=$CLIENT_NAME
+    leftcert=$CLIENT_NAME.crt
+    leftdns=$PRIMARY_DNS,$SECONDARY_DNS
+    leftsendcert=always
+    leftsourceip=%config
+    right=$SERVER_IP_ADDRESS
+    rightsubnet=0.0.0.0/0
+    rightsendcert=never
+    eap_identity=%identity
+    encapsulation=yes 
+    pfs=yes 
+    ike=aes256-sha256-modp2048,aes256-sha1-modp1024,3des-sha1-modp1024
+    esp=aes256-sha256,aes256-sha1,3des-sha1
+
+

client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml

@@ -34,7 +34,7 @@ PageType {
     ListViewType {
         id: listView
 
-        anchors.top: backButton.bottom
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: saveButton.top
         anchors.right: parent.right
         anchors.left: parent.left

client/ui/qml/Pages2/PageProtocolAwgSettings.qml

@@ -37,7 +37,7 @@ PageType {
     ListViewType {
         id: listView
 
-        anchors.top: backButton.bottom
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: parent.right

client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml

@@ -17,413 +17,427 @@ import "../Components"
 PageType {
     id: root
 
-    BackButtonType {
-        id: backButton
+    ColumnLayout {
+        id: backButtonLayout
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+
         anchors.topMargin: 20
-        
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
+
+        BackButtonType {
+            id: backButton
         }
     }
 
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
+    FlickableType {
+        id: fl
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
+        contentHeight: content.implicitHeight
 
-        enabled: ServersModel.isProcessedServerHasWriteAccess()
+        Column {
+            id: content
 
-        header: ColumnLayout {
-            width: listView.width
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
 
-            BaseHeaderType {
-                id: header
+            enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
+            ListView {
+                id: listview
 
-                headerText: qsTr("OpenVPN Settings")
-            }
-        }
+                width: parent.width
+                height: listview.contentItem.height
 
-        model: OpenVpnConfigModel             
+                clip: true
+                interactive: false
 
-        delegate: ColumnLayout {
-            width: listView.width
+                model: OpenVpnConfigModel             
 
-            spacing: 0
+                delegate: Item {
+                    id: delegateItem
 
-            TextFieldWithHeaderType {
-                id: vpnAddressSubnetTextField
+                    property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
+                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
 
-                enabled: listView.enabled
+                    ColumnLayout {
+                        id: col
 
-                headerText: qsTr("VPN address subnet")
-                textField.text: subnetAddress
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
 
-                textField.onEditingFinished: {
-                    if (textField.text !== subnetAddress) {
-                        subnetAddress = textField.text
-                    }
-                }
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
 
-                checkEmptyText: true
-            }
+                        spacing: 0
 
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                        BaseHeaderType {
+                            Layout.fillWidth: true
+                            headerText: qsTr("OpenVPN settings")
+                        }
 
-                text: qsTr("Network protocol")
-            }
+                        TextFieldWithHeaderType {
+                            id: vpnAddressSubnetTextField
 
-            TransportProtoSelector {
-                id: transportProtoSelector
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
 
-                rootWidth: root.width
+                            enabled: delegateItem.isEnabled
 
-                enabled: isTransportProtoEditable
+                            headerText: qsTr("VPN address subnet")
+                            textField.text: subnetAddress
 
-                currentIndex: {
-                    return transportProto === "tcp" ? 1 : 0
-                }
+                            parentFlickable: fl
 
-                onCurrentIndexChanged: {
-                    if (transportProto === "tcp" && currentIndex === 0) {
-                        transportProto = "udp"
-                    } else if (transportProto === "udp" && currentIndex === 1) {
-                        transportProto = "tcp"
-                    }
-                }
-            }
+                            textField.onEditingFinished: {
+                                if (textField.text !== subnetAddress) {
+                                    subnetAddress = textField.text
+                                }
+                            }
 
-            TextFieldWithHeaderType {
-                id: portTextField
+                            checkEmptyText: true
+                        }
 
-                Layout.fillWidth: true
-                Layout.topMargin: 40
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                        ParagraphTextType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
 
-                enabled: listView.enabled
+                            text: qsTr("Network protocol")
+                        }
 
-                headerText: qsTr("Port")
-                textField.text: port
-                textField.maximumLength: 5
-                textField.validator: IntValidator { bottom: 1; top: 65535 }
+                        TransportProtoSelector {
+                            id: transportProtoSelector
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            rootWidth: root.width
 
-                textField.onEditingFinished: {
-                    if (textField.text !== port) {
-                        port = textField.text
-                    }
-                }
+                            enabled: isTransportProtoEditable
 
-                checkEmptyText: true
-            }
+                            currentIndex: {
+                                return transportProto === "tcp" ? 1 : 0
+                            }
 
-            SwitcherType {
-                id: autoNegotiateEncryprionSwitcher
-
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                text: qsTr("Auto-negotiate encryption")
-                checked: autoNegotiateEncryprion
-
-                onCheckedChanged: {
-                    if (checked !== autoNegotiateEncryprion) {
-                        autoNegotiateEncryprion = checked
-                    }
-                }
-            }
-
-            DropDownType {
-                id: hashDropDown
-                Layout.fillWidth: true
-                Layout.topMargin: 20
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                enabled: !autoNegotiateEncryprionSwitcher.checked
-
-                descriptionText: qsTr("Hash")
-                headerText: qsTr("Hash")
-
-                drawerParent: root
-
-                listView: ListViewWithRadioButtonType {
-                    id: hashListView
-
-                    rootWidth: root.width
-
-                    model: ListModel {
-                        ListElement { name : qsTr("SHA512") }
-                        ListElement { name : qsTr("SHA384") }
-                        ListElement { name : qsTr("SHA256") }
-                        ListElement { name : qsTr("SHA3-512") }
-                        ListElement { name : qsTr("SHA3-384") }
-                        ListElement { name : qsTr("SHA3-256") }
-                        ListElement { name : qsTr("whirlpool") }
-                        ListElement { name : qsTr("BLAKE2b512") }
-                        ListElement { name : qsTr("BLAKE2s256") }
-                        ListElement { name : qsTr("SHA1") }
-                    }
-
-                    clickedFunction: function() {
-                        hashDropDown.text = selectedText
-                        hash = hashDropDown.text
-                        hashDropDown.closeTriggered()
-                    }
-
-                    Component.onCompleted: {
-                        hashDropDown.text = hash
-
-                        for (var i = 0; i < hashListView.model.count; i++) {
-                            if (hashListView.model.get(i).name === hashDropDown.text) {
-                                currentIndex = i
+                            onCurrentIndexChanged: {
+                                if (transportProto === "tcp" && currentIndex === 0) {
+                                    transportProto = "udp"
+                                } else if (transportProto === "udp" && currentIndex === 1) {
+                                    transportProto = "tcp"
+                                }
                             }
                         }
-                    }
-                }
-            }
 
-            DropDownType {
-                id: cipherDropDown
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                        TextFieldWithHeaderType {
+                            id: portTextField
 
-                enabled: !autoNegotiateEncryprionSwitcher.checked
+                            Layout.fillWidth: true
+                            Layout.topMargin: 40
+                            parentFlickable: fl
 
-                descriptionText: qsTr("Cipher")
-                headerText: qsTr("Cipher")
+                            enabled: delegateItem.isEnabled
 
-                drawerParent: root
+                            headerText: qsTr("Port")
+                            textField.text: port
+                            textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                listView: ListViewWithRadioButtonType {
-                    id: cipherListView
+                            textField.onEditingFinished: {
+                                if (textField.text !== port) {
+                                    port = textField.text
+                                }
+                            }
 
-                    rootWidth: root.width
+                            checkEmptyText: true
+                        }
 
-                    model: ListModel {
-                        ListElement { name : qsTr("AES-256-GCM") }
-                        ListElement { name : qsTr("AES-192-GCM") }
-                        ListElement { name : qsTr("AES-128-GCM") }
-                        ListElement { name : qsTr("AES-256-CBC") }
-                        ListElement { name : qsTr("AES-192-CBC") }
-                        ListElement { name : qsTr("AES-128-CBC") }
-                        ListElement { name : qsTr("ChaCha20-Poly1305") }
-                        ListElement { name : qsTr("ARIA-256-CBC") }
-                        ListElement { name : qsTr("CAMELLIA-256-CBC") }
-                        ListElement { name : qsTr("none") }
-                    }
+                        SwitcherType {
+                            id: autoNegotiateEncryprionSwitcher
 
-                    clickedFunction: function() {
-                        cipherDropDown.text = selectedText
-                        cipher = cipherDropDown.text
-                        cipherDropDown.closeTriggered()
-                    }
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            parentFlickable: fl
 
-                    Component.onCompleted: {
-                        cipherDropDown.text = cipher
+                            text: qsTr("Auto-negotiate encryption")
+                            checked: autoNegotiateEncryprion
 
-                        for (var i = 0; i < cipherListView.model.count; i++) {
-                            if (cipherListView.model.get(i).name === cipherDropDown.text) {
-                                currentIndex = i
+                            onCheckedChanged: {
+                                if (checked !== autoNegotiateEncryprion) {
+                                    autoNegotiateEncryprion = checked
+                                }
                             }
                         }
-                    }
-                }
-            }
 
-            Rectangle {
-                id: contentRect
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                        DropDownType {
+                            id: hashDropDown
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
 
-                Layout.preferredHeight: checkboxLayout.implicitHeight
-                color: AmneziaStyle.color.onyxBlack
-                radius: 16
+                            enabled: !autoNegotiateEncryprionSwitcher.checked
 
-                ColumnLayout {
-                    id: checkboxLayout
+                            descriptionText: qsTr("Hash")
+                            headerText: qsTr("Hash")
 
-                    anchors.fill: parent
+                            drawerParent: root
 
-                    CheckBoxType {
-                        id: tlsAuthCheckBox
-                        Layout.fillWidth: true
+                            listView: ListViewWithRadioButtonType {
+                                id: hashListView
 
-                        text: qsTr("TLS auth")
-                        checked: tlsAuth
+                                rootWidth: root.width
 
-                        onCheckedChanged: {
-                            if (checked !== tlsAuth) {
-                                console.log("tlsAuth changed to: " + checked)
-                                tlsAuth = checked
+                                model: ListModel {
+                                    ListElement { name : qsTr("SHA512") }
+                                    ListElement { name : qsTr("SHA384") }
+                                    ListElement { name : qsTr("SHA256") }
+                                    ListElement { name : qsTr("SHA3-512") }
+                                    ListElement { name : qsTr("SHA3-384") }
+                                    ListElement { name : qsTr("SHA3-256") }
+                                    ListElement { name : qsTr("whirlpool") }
+                                    ListElement { name : qsTr("BLAKE2b512") }
+                                    ListElement { name : qsTr("BLAKE2s256") }
+                                    ListElement { name : qsTr("SHA1") }
+                                }
+
+                                clickedFunction: function() {
+                                    hashDropDown.text = selectedText
+                                    hash = hashDropDown.text
+                                    hashDropDown.closeTriggered()
+                                }
+
+                                Component.onCompleted: {
+                                    hashDropDown.text = hash
+
+                                    for (var i = 0; i < hashListView.model.count; i++) {
+                                        if (hashListView.model.get(i).name === hashDropDown.text) {
+                                            currentIndex = i
+                                        }
+                                    }
+                                }
                             }
                         }
-                    }
 
-                    DividerType {}
+                        DropDownType {
+                            id: cipherDropDown
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
 
-                    CheckBoxType {
-                        id: blockDnsCheckBox
-                        Layout.fillWidth: true
+                            enabled: !autoNegotiateEncryprionSwitcher.checked
 
-                        text: qsTr("Block DNS requests outside of VPN")
-                        checked: blockDns
+                            descriptionText: qsTr("Cipher")
+                            headerText: qsTr("Cipher")
 
-                        onCheckedChanged: {
-                            if (checked !== blockDns) {
-                                blockDns = checked
+                            drawerParent: root
+
+                            listView: ListViewWithRadioButtonType {
+                                id: cipherListView
+
+                                rootWidth: root.width
+
+                                model: ListModel {
+                                    ListElement { name : qsTr("AES-256-GCM") }
+                                    ListElement { name : qsTr("AES-192-GCM") }
+                                    ListElement { name : qsTr("AES-128-GCM") }
+                                    ListElement { name : qsTr("AES-256-CBC") }
+                                    ListElement { name : qsTr("AES-192-CBC") }
+                                    ListElement { name : qsTr("AES-128-CBC") }
+                                    ListElement { name : qsTr("ChaCha20-Poly1305") }
+                                    ListElement { name : qsTr("ARIA-256-CBC") }
+                                    ListElement { name : qsTr("CAMELLIA-256-CBC") }
+                                    ListElement { name : qsTr("none") }
+                                }
+
+                                clickedFunction: function() {
+                                    cipherDropDown.text = selectedText
+                                    cipher = cipherDropDown.text
+                                    cipherDropDown.closeTriggered()
+                                }
+
+                                Component.onCompleted: {
+                                    cipherDropDown.text = cipher
+
+                                    for (var i = 0; i < cipherListView.model.count; i++) {
+                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                            currentIndex = i
+                                        }
+                                    }
+                                }
                             }
                         }
-                    }
-                }
-            }
 
-            SwitcherType {
-                id: additionalClientCommandsSwitcher
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                        Rectangle {
+                            id: contentRect
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+                            Layout.preferredHeight: checkboxLayout.implicitHeight
+                            color: AmneziaStyle.color.onyxBlack
+                            radius: 16
 
-                checked: additionalClientCommands !== ""
+                            Connections {
+                                target: tlsAuthCheckBox
+                                enabled: !GC.isMobile()
 
-                text: qsTr("Additional client configuration commands")
+                                function onFocusChanged() {
+                                    if (tlsAuthCheckBox.activeFocus) {
+                                        fl.ensureVisible(contentRect)
+                                    }
+                                }
+                            }
 
-                onCheckedChanged: {
-                    if (!checked) {
-                        additionalClientCommands = ""
-                    }
-                }
-            }
+                            ColumnLayout {
+                                id: checkboxLayout
 
-            TextAreaType {
-                id: additionalClientCommandsTextArea
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                                anchors.fill: parent
+                                CheckBoxType {
+                                    id: tlsAuthCheckBox
+                                    Layout.fillWidth: true
 
-                visible: additionalClientCommandsSwitcher.checked
+                                    text: qsTr("TLS auth")
+                                    checked: tlsAuth
 
-                textAreaText: additionalClientCommands
-                placeholderText: qsTr("Commands:")
+                                    onCheckedChanged: {
+                                        if (checked !== tlsAuth) {
+                                            console.log("tlsAuth changed to: " + checked)
+                                            tlsAuth = checked
+                                        }
+                                    }
+                                }
 
-                textArea.onEditingFinished: {
-                    if (additionalClientCommands !== textAreaText) {
-                        additionalClientCommands = textAreaText
-                    }
-                }
-            }
+                                DividerType {}
 
-            SwitcherType {
-                id: additionalServerCommandsSwitcher
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                                CheckBoxType {
+                                    id: blockDnsCheckBox
+                                    Layout.fillWidth: true
 
-                checked: additionalServerCommands !== ""
+                                    text: qsTr("Block DNS requests outside of VPN")
+                                    checked: blockDns
 
-                text: qsTr("Additional server configuration commands")
-
-                onCheckedChanged: {
-                    if (!checked) {
-                        additionalServerCommands = ""
-                    }
-                }
-            }
-
-            TextAreaType {
-                id: additionalServerCommandsTextArea
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                visible: additionalServerCommandsSwitcher.checked
-
-                textAreaText: additionalServerCommands
-                placeholderText: qsTr("Commands:")
-
-                textArea.onEditingFinished: {
-                    if (additionalServerCommands !== textAreaText) {
-                        additionalServerCommands = textAreaText
-                    }
-                }
-            }
-
-            BasicButtonType {
-                id: saveButton
-
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.bottomMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                enabled: vpnAddressSubnetTextField.errorText === "" &&
-                            portTextField.errorText === ""
-
-                text: qsTr("Save")
-
-                onClicked: function() {
-                    forceActiveFocus()
-
-                    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")
-                    var noButtonText = qsTr("Cancel")
-
-                    var yesButtonFunction = function() {
-                        if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                            PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                            return
+                                    onCheckedChanged: {
+                                        if (checked !== blockDns) {
+                                            blockDns = checked
+                                        }
+                                    }
+                                }
+                            }
                         }
 
-                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                        InstallController.updateContainer(OpenVpnConfigModel.getConfig())
-                    }
-                    var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
-                            saveButton.forceActiveFocus()
+                        SwitcherType {
+                            id: additionalClientCommandsSwitcher
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+                            parentFlickable: fl
+
+                            checked: additionalClientCommands !== ""
+
+                            text: qsTr("Additional client configuration commands")
+
+                            onCheckedChanged: {
+                                if (!checked) {
+                                    additionalClientCommands = ""
+                                }
+                            }
+                        }
+
+                        TextAreaType {
+                            id: additionalClientCommandsTextArea
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            visible: additionalClientCommandsSwitcher.checked
+
+                            parentFlickable: fl
+
+                            textAreaText: additionalClientCommands
+                            placeholderText: qsTr("Commands:")
+
+                            textArea.onEditingFinished: {
+                                if (additionalClientCommands !== textAreaText) {
+                                    additionalClientCommands = textAreaText
+                                }
+                            }
+                        }
+
+                        SwitcherType {
+                            id: additionalServerCommandsSwitcher
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            parentFlickable: fl
+
+                            checked: additionalServerCommands !== ""
+
+                            text: qsTr("Additional server configuration commands")
+
+                            onCheckedChanged: {
+                                if (!checked) {
+                                    additionalServerCommands = ""
+                                }
+                            }
+                        }
+
+                        TextAreaType {
+                            id: additionalServerCommandsTextArea
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            visible: additionalServerCommandsSwitcher.checked
+
+                            textAreaText: additionalServerCommands
+                            placeholderText: qsTr("Commands:")
+                            parentFlickable: fl
+                            textArea.onEditingFinished: {
+                                if (additionalServerCommands !== textAreaText) {
+                                    additionalServerCommands = textAreaText
+                                }
+                            }
+                        }
+
+                        BasicButtonType {
+                            id: saveButton
+
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+
+                            enabled: vpnAddressSubnetTextField.errorText === "" &&
+                                     portTextField.errorText === ""
+
+                            text: qsTr("Save")
+                            parentFlickable: fl
+
+                            onClicked: function() {
+                                forceActiveFocus()
+
+                                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")
+                                var noButtonText = qsTr("Cancel")
+
+                                var yesButtonFunction = function() {
+                                    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(OpenVpnConfigModel.getConfig())
+                                }
+                                var noButtonFunction = function() {
+                                    if (!GC.isMobile()) {
+                                        saveButton.forceActiveFocus()
+                                    }
+                                }
+                                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                            }
+
+                            Keys.onEnterPressed: saveButton.clicked()
+                            Keys.onReturnPressed: saveButton.clicked()
                         }
                     }
-                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
-
-                Keys.onEnterPressed: saveButton.clicked()
-                Keys.onReturnPressed: saveButton.clicked()
             }
         }
     }

client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml

@@ -66,6 +66,8 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
+                enabled: delegateItem.isEnabled
+
                 headerText: qsTr("VPN address subnet")
                 textField.text: subnetAddress
 
@@ -85,6 +87,8 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
+                enabled: delegateItem.isEnabled
+
                 headerText: qsTr("Port")
                 textField.text: port
                 textField.maximumLength: 5

client/ui/qml/Pages2/PageSettings.qml

@@ -43,6 +43,8 @@ PageType {
 
             LabelWithButtonType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 visible: isVisible
 
@@ -66,6 +68,8 @@ PageType {
 
                 visible: GC.isDesktop()
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Close application")
                 leftImageSource: "qrc:/images/controls/x-circle.svg"

client/ui/qml/Pages2/PageSettingsDns.qml

@@ -66,13 +66,6 @@ PageType {
                 
                 text: qsTr("If AmneziaDNS is not used or installed")
             }
-        }
-
-        model: 1 // fake model to force the ListView to be created without a model
-
-        delegate: ColumnLayout {
-            width: listView.width
-            spacing: 16
 
             TextFieldWithHeaderType {
                 id: primaryDns
@@ -103,6 +96,13 @@ PageType {
                     regularExpression: InstallController.ipAddressRegExp()
                 }
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+        spacing: 16
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: restoreDefaultButton
@@ -139,6 +139,10 @@ PageType {
                     showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: saveButton

client/ui/qml/Pages2/PageSettingsServerData.qml

@@ -18,8 +18,6 @@ PageType {
 
     signal lastItemTabClickedSignal()
 
-    property bool isServerWithWriteAccess: ServersModel.isProcessedServerHasWriteAccess()
-
     Connections {
         target: InstallController
 
@@ -61,13 +59,15 @@ PageType {
         target: ServersModel
 
         function onProcessedServerIndexChanged() {
-            root.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
+            listView.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
         }
     }
 
     ListViewType {
         id: listView
 
+        property bool isServerWithWriteAccess: ServersModel.isProcessedServerHasWriteAccess()
+
         anchors.fill: parent
 
         model: serverActions
@@ -107,7 +107,7 @@ PageType {
     QtObject {
         id: check
 
-        property bool isVisible: root.isServerWithWriteAccess
+        property bool isVisible: true
         readonly property string title: qsTr("Check the server for previously installed Amnezia services")
         readonly property string description: qsTr("Add them to the application if they were not displayed")
         readonly property var tColor: AmneziaStyle.color.paleGray
@@ -121,7 +121,7 @@ PageType {
     QtObject {
         id: reboot
 
-        property bool isVisible: root.isServerWithWriteAccess
+        property bool isVisible: true
         readonly property string title: qsTr("Reboot server")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed
@@ -181,7 +181,7 @@ PageType {
     QtObject {
         id: clear
 
-        property bool isVisible: root.isServerWithWriteAccess
+        property bool isVisible: true
         readonly property string title: qsTr("Clear server from Amnezia software")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed
@@ -240,7 +240,7 @@ PageType {
     QtObject {
         id: switch_to_premium
 
-        property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi") && ServersModel.processedServerIsPremium
+        property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
         readonly property string title: qsTr("Switch to the new Amnezia Premium subscription")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -161,4 +161,10 @@ PageType {
             }
         }
     }
+
+    ShareConnectionDrawer {
+        id: shareConnectionDrawer
+
+        anchors.fill: parent
+    }
 }

client/vpnconnection.cpp

@@ -32,8 +32,8 @@
 VpnConnection::VpnConnection(std::shared_ptr<Settings> settings, QObject *parent)
     : QObject(parent), m_settings(settings), m_checkTimer(new QTimer(this))
 {
-#if defined(Q_OS_IOS) || defined(MACOS_NE)
     m_checkTimer.setInterval(1000);
+#if defined(Q_OS_IOS) || defined(MACOS_NE)
     connect(IosController::Instance(), &IosController::connectionStateChanged, this, &VpnConnection::onConnectionStateChanged);
     connect(IosController::Instance(), &IosController::bytesChanged, this, &VpnConnection::onBytesChanged);
 
@@ -42,6 +42,9 @@ VpnConnection::VpnConnection(std::shared_ptr<Settings> settings, QObject *parent
 
 VpnConnection::~VpnConnection()
 {
+#if defined AMNEZIA_DESKTOP
+    disconnectFromVpn();
+#endif
 }
 
 void VpnConnection::onBytesChanged(quint64 receivedBytes, quint64 sentBytes)
@@ -52,7 +55,19 @@ void VpnConnection::onBytesChanged(quint64 receivedBytes, quint64 sentBytes)
 void VpnConnection::onKillSwitchModeChanged(bool enabled)
 {
 #ifdef AMNEZIA_DESKTOP
-    if (InterfaceReady()) {
+    if (!m_IpcClient) {
+        m_IpcClient = new IpcClient(this);
+    }
+
+    if (!m_IpcClient->isSocketConnected()) {
+        if (!IpcClient::init(m_IpcClient)) {
+            qWarning() << "Error occurred when init IPC client";
+            emit serviceIsNotReady();
+            return;
+        }
+    }
+
+    if (IpcClient::Interface()) {
         qDebug() << "Set KillSwitch Strict mode enabled " << enabled;
         IpcClient::Interface()->refreshKillSwitch(enabled);
     }
@@ -65,7 +80,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
 #ifdef AMNEZIA_DESKTOP
     auto container = m_settings->defaultContainer(m_settings->defaultServerIndex());
 
-    if (InterfaceReady()) {
+    if (IpcClient::Interface()) {
         if (state == Vpn::ConnectionState::Connected) {
             IpcClient::Interface()->resetIpStack();
             IpcClient::Interface()->flushDns();
@@ -197,41 +212,14 @@ void VpnConnection::deleteRoutes(const QStringList &ips)
 #endif
 }
 
-bool VpnConnection::InterfaceReady()
-{
-#ifdef AMNEZIA_DESKTOP
-    if (!m_IpcClient) {
-        m_IpcClient = new IpcClient(this);
-    }
-
-    if (!m_IpcClient->isSocketConnected()) {
-        if (!IpcClient::init(m_IpcClient)) {
-            qWarning() << "Error occurred when init IPC client";
-            emit serviceIsNotReady();
-            return false;
-        }
-    }
-
-    return IpcClient::Interface() != nullptr;
-#endif
-    return true;
-}
-
 void VpnConnection::flushDns()
 {
 #ifdef AMNEZIA_DESKTOP
-    if (InterfaceReady())
+    if (IpcClient::Interface())
         IpcClient::Interface()->flushDns();
 #endif
 }
 
-void VpnConnection::disconnectSlots()
-{
-    if (m_vpnProtocol) {
-        m_vpnProtocol->disconnect();
-    }
-}
-
 ErrorCode VpnConnection::lastError() const
 {
 #ifdef Q_OS_ANDROID
@@ -252,12 +240,21 @@ void VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &crede
                         .arg(serverIndex)
                         .arg(ContainerProps::containerToString(container))
              << m_settings->routeMode();
-
-    if (!InterfaceReady()) {
-        emit connectionStateChanged(Vpn::ConnectionState::Error);
-        return;
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
+    if (!m_IpcClient) {
+        m_IpcClient = new IpcClient(this);
     }
 
+    if (!m_IpcClient->isSocketConnected()) {
+        if (!IpcClient::init(m_IpcClient)) {
+            qWarning() << "Error occurred when init IPC client";
+            emit serviceIsNotReady();
+            emit connectionStateChanged(Vpn::ConnectionState::Error);
+            return;
+        }
+    }
+#endif
+
     m_remoteAddress = NetworkUtilities::getIPAddress(credentials.hostName);
     emit connectionStateChanged(Vpn::ConnectionState::Connecting);
 
@@ -443,18 +440,13 @@ QString VpnConnection::bytesPerSecToText(quint64 bytes)
 void VpnConnection::disconnectFromVpn()
 {
 #ifdef AMNEZIA_DESKTOP
-    if (InterfaceReady()) {
+    QString proto = m_settings->defaultContainerName(m_settings->defaultServerIndex());
+    if (IpcClient::Interface()) {
+        IpcClient::Interface()->flushDns();
 
-        m_vpnProtocol.data()->stop();
-        qDebug() << "Interface is ready!";
-
-        QRemoteObjectPendingReply<bool> flushDnsResp = IpcClient::Interface()->flushDns();
-        flushDnsResp.waitForFinished(1000);
-
-        qDebug() << "Flushed DNS";
         // delete cached routes
-        QRemoteObjectPendingReply<bool> clearSavedRoutesResp = IpcClient::Interface()->clearSavedRoutes();
-        clearSavedRoutesResp.waitForFinished(1000);
+        QRemoteObjectPendingReply<bool> response = IpcClient::Interface()->clearSavedRoutes();
+        response.waitForFinished(1000);
     }
 #endif
 
@@ -483,13 +475,12 @@ void VpnConnection::disconnectFromVpn()
         return;
     }
 
-#if !defined(Q_OS_ANDROID) && !defined(AMNEZIA_DESKTOP)
+#ifndef Q_OS_ANDROID
     if (m_vpnProtocol) {
         m_vpnProtocol->deleteLater();
     }
-#endif
-
     m_vpnProtocol = nullptr;
+#endif
 }
 
 Vpn::ConnectionState VpnConnection::connectionState()

client/vpnconnection.h

@@ -56,7 +56,6 @@ public slots:
     void deleteRoutes(const QStringList &ips);
     void flushDns();
     void onKillSwitchModeChanged(bool enabled);
-    void disconnectSlots();
 
 signals:
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
@@ -96,7 +95,6 @@ private:
 
    void appendSplitTunnelingConfig();
    void appendKillSwitchConfig();
-   bool InterfaceReady();
 };
 
 #endif // VPNCONNECTION_H

deploy/data/macos/pf/amn.200.allowVPN.conf

@@ -1,9 +1,11 @@
 # Exempt the tunnel interface(s) used by the VPN connection
 
-utunInterfaces = "{                                                                         \
-    utun0, utun1, utun2, utun3, utun4, utun5, utun6, utun7, utun8, utun9,   utun10,         \
-    utun11, utun12, utun13, utun14, utun15, utun16, utun17, utun18, utun19, utun20,         \
-    utun21, utun22, utun23, utun24, utun25, utun26, utun27, utun28, utun29, utun30          \
+utunInterfaces = "{                                                                               \
+    utun0, utun1, utun2, utun3, utun4, utun5, utun6, utun7, utun8, utun9,   utun10,               \
+    utun11, utun12, utun13, utun14, utun15, utun16, utun17, utun18, utun19, utun20,               \
+    utun21, utun22, utun23, utun24, utun25, utun26, utun27, utun28, utun29, utun30,               \
+    ipsec0, ipsec1, ipsec2, ipsec3, ipsec4, ipsec5, ipsec6, ipsec7, ipsec8, ipsec9,               \
+    ipsec10, ipsec11, ipsec12, ipsec13, ipsec14, ipsec15, ipsec16, ipsec17, ipsec18, ipsec19      \
 }"
 
 pass out on $utunInterfaces flags any no state

ipc/ipc_interface.rep

@@ -12,7 +12,7 @@ class IpcInterface
     SLOT( int routeAddList(const QString &gw, const QStringList &ips) );
     SLOT( bool clearSavedRoutes() );
     SLOT( bool routeDeleteList(const QString &gw, const QStringList &ip) );
-    SLOT( bool flushDns() );
+    SLOT( void flushDns() );
     SLOT( void resetIpStack() );
 
     SLOT( bool checkAndInstallDriver() );
@@ -25,8 +25,8 @@ class IpcInterface
     SLOT( bool createTun(const QString &dev, const QString &subnet) );
     SLOT( bool deleteTun(const QString &dev) );
 
-    SLOT( bool StartRoutingIpv6() );
-    SLOT( bool StopRoutingIpv6() );
+    SLOT( void StartRoutingIpv6() );
+    SLOT( void StopRoutingIpv6() );
 
     SLOT( bool disableKillSwitch() );
     SLOT( bool disableAllTraffic() );
@@ -36,5 +36,17 @@ class IpcInterface
     SLOT( bool enablePeerTraffic( const QJsonObject &configStr) );
     SLOT( bool enableKillSwitch( const QJsonObject &excludeAddr, int vpnAdapterIndex) );
     SLOT( bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers) );
+
+    SLOT( bool writeIPsecCaCert(QString cacert, QString uuid) );
+    SLOT( bool writeIPsecPrivate(QString privKey, QString uuid) );
+    SLOT( bool writeIPsecConfig(QString config) );
+    SLOT( bool writeIPsecUserCert(QString usercert, QString uuid) );
+    SLOT( bool writeIPsecPrivatePass(QString pass, QString host, QString uuid) );
+
+    SLOT( bool stopIPsec(QString tunnelName) );
+    SLOT( bool startIPsec(QString tunnelName) );
+
+    SLOT( QString getTunnelStatus(QString tunnelName) );
+
 };
 

ipc/ipcserver.cpp

@@ -4,9 +4,11 @@
 #include <QFileInfo>
 #include <QLocalSocket>
 #include <QObject>
+#include <QJsonArray>
 
-#include "logger.h"
+#include "qjsonarray.h"
 #include "router.h"
+#include "logger.h"
 
 #include "killswitch.h"
 
@@ -83,7 +85,7 @@ bool IpcServer::routeDeleteList(const QString &gw, const QStringList &ips)
     return Router::routeDeleteList(gw, ips);
 }
 
-bool IpcServer::flushDns()
+void IpcServer::flushDns()
 {
 #ifdef MZ_DEBUG
     qDebug() << "IpcServer::flushDns";
@@ -157,13 +159,14 @@ bool IpcServer::updateResolvers(const QString &ifname, const QList<QHostAddress>
     return Router::updateResolvers(ifname, resolvers);
 }
 
-bool IpcServer::StartRoutingIpv6()
+void IpcServer::StartRoutingIpv6()
 {
-    return Router::StartRoutingIpv6();
+    Router::StartRoutingIpv6();
 }
-bool IpcServer::StopRoutingIpv6()
+
+void IpcServer::StopRoutingIpv6()
 {
-    return Router::StopRoutingIpv6();
+    Router::StopRoutingIpv6();
 }
 
 void IpcServer::setLogsEnabled(bool enabled)
@@ -204,6 +207,196 @@ bool IpcServer::disableKillSwitch()
     return KillSwitch::instance()->disableKillSwitch();
 }
 
+bool IpcServer::startIPsec(QString tunnelName)
+{
+#ifdef Q_OS_LINUX
+    QProcess processSystemd;
+    QStringList commandsSystemd;
+    commandsSystemd << "systemctl" << "restart" << "ipsec";
+    processSystemd.start("sudo", commandsSystemd);
+    if (!processSystemd.waitForStarted(1000))
+    {
+        qDebug().noquote() << "Could not start ipsec tunnel!\n";
+        return false;
+    }
+    else if (!processSystemd.waitForFinished(2000))
+    {
+        qDebug().noquote() << "Could not start ipsec tunnel\n";
+        return false;
+    }
+    commandsSystemd.clear();
+
+    QThread::msleep(5000);
+
+    QProcess process;
+    QStringList commands;
+    commands << "ipsec" << "up" << QString("%1").arg(tunnelName);
+    process.start("sudo", commands);
+    if (!process.waitForStarted(1000))
+    {
+        qDebug().noquote() << "Could not start ipsec tunnel!\n";
+        return false;
+    }
+    else if (!process.waitForFinished(2000))
+    {
+        qDebug().noquote() << "Could not start ipsec tunnel\n";
+        return false;
+    }
+    commands.clear();
+#endif
+    return true;
+}
+
+bool IpcServer::stopIPsec(QString tunnelName)
+{
+#ifdef Q_OS_LINUX
+    QProcess process;
+    QStringList commands;
+    commands << "ipsec" << "down" << QString("%1").arg(tunnelName);
+    process.start("sudo", commands);
+    if (!process.waitForStarted(1000))
+    {
+        qDebug().noquote() << "Could not stop ipsec tunnel\n";
+        return false;
+    }
+    else if (!process.waitForFinished(2000))
+    {
+        qDebug().noquote() << "Could not stop ipsec tunnel\n";
+        return false;
+    }
+    commands.clear();
+#endif
+    return true;
+}
+
+bool IpcServer::writeIPsecConfig(QString config)
+{
+#ifdef Q_OS_LINUX
+    qDebug() << "IPSEC: IPSec config file";
+    QString configFile = QString("/etc/ipsec.conf");
+    QFile ipSecConfFile(configFile);
+    if (ipSecConfFile.open(QIODevice::WriteOnly)) {
+        ipSecConfFile.write(config.toUtf8());
+        ipSecConfFile.close();
+    }
+#endif
+    return true;
+}
+
+bool IpcServer::writeIPsecUserCert(QString usercert, QString uuid)
+{
+#ifdef Q_OS_LINUX
+    qDebug() << "IPSEC: Write user cert " << uuid;
+    QString certName = QString("/etc/ipsec.d/certs/%1.crt").arg(uuid);
+    QFile userCertFile(certName);
+    if (userCertFile.open(QIODevice::WriteOnly)) {
+        userCertFile.write(usercert.toUtf8());
+        userCertFile.close();
+    }
+#endif
+    return true;
+}
+
+bool IpcServer::writeIPsecCaCert(QString cacert, QString uuid)
+{
+#ifdef Q_OS_LINUX
+    qDebug() << "IPSEC: Write CA cert user " << uuid;
+    QString certName = QString("/etc/ipsec.d/cacerts/%1.crt").arg(uuid);
+    QFile caCertFile(certName);
+    if (caCertFile.open(QIODevice::WriteOnly)) {
+        caCertFile.write(cacert.toUtf8());
+        caCertFile.close();
+    }
+#endif
+    return true;
+}
+
+bool IpcServer::writeIPsecPrivate(QString privKey, QString uuid)
+{
+#ifdef Q_OS_LINUX
+    qDebug() << "IPSEC: User private key " << uuid;
+    QString privateKey = QString("/etc/ipsec.d/private/%1.p12").arg(uuid);
+    QFile pKeyFile(privateKey);
+    if (pKeyFile.open(QIODevice::WriteOnly)) {
+        pKeyFile.write(QByteArray::fromBase64(privKey.toUtf8()));
+        pKeyFile.close();
+    }
+#endif
+    return true;
+}
+
+
+bool IpcServer::writeIPsecPrivatePass(QString pass, QString host, QString uuid)
+{
+#ifdef Q_OS_LINUX
+    qDebug() << "IPSEC: User private key " << uuid;
+    const QString secretsFilename = "/etc/ipsec.secrets";
+    QStringList lines;
+
+    {
+        QFile secretsFile(secretsFilename);
+        if (secretsFile.open(QIODevice::ReadOnly | QIODevice::Text))
+        {
+            QTextStream edit(&secretsFile);
+            while (!edit.atEnd()) lines.push_back(edit.readLine());
+        }
+        secretsFile.close();
+    }
+
+    for (auto iter = lines.begin(); iter!=lines.end();)
+    {
+        if (iter->contains(host))
+        {
+            iter = lines.erase(iter);
+        }
+        else
+        {
+            ++iter;
+        }
+    }
+
+    {
+        QFile secretsFile(secretsFilename);
+        if (secretsFile.open(QIODevice::WriteOnly | QIODevice::Text))
+        {
+            QTextStream edit(&secretsFile);
+            for (int i=0; i<lines.size(); i++) edit << lines[i] << Qt::endl;
+        }
+        QString P12 = QString("%any %1 : P12 %2.p12 \"%3\" \n").arg(host, uuid, pass);
+        secretsFile.write(P12.toUtf8());
+        secretsFile.close();
+    }
+#endif
+    return true;
+}
+
+QString IpcServer::getTunnelStatus(QString tunnelName)
+{
+#ifdef Q_OS_LINUX
+    QProcess process;
+    QStringList commands;
+    commands << "ipsec" << "status" << QString("%1").arg(tunnelName);
+    process.start("sudo", commands);
+    if (!process.waitForStarted(1000))
+    {
+        qDebug().noquote() << "Could not stop ipsec tunnel\n";
+        return "";
+    }
+    else if (!process.waitForFinished(2000))
+    {
+        qDebug().noquote() << "Could not stop ipsec tunnel\n";
+        return "";
+    }
+    commands.clear();
+
+
+    QString status = process.readAll();
+    return status;
+#endif
+    return QString();
+
+}
+
 bool IpcServer::enablePeerTraffic(const QJsonObject &configStr)
 {
     return KillSwitch::instance()->enablePeerTraffic(configStr);

ipc/ipcserver.h

@@ -23,7 +23,7 @@ public:
     virtual int routeAddList(const QString &gw, const QStringList &ips) override;
     virtual bool clearSavedRoutes() override;
     virtual bool routeDeleteList(const QString &gw, const QStringList &ips) override;
-    virtual bool flushDns() override;
+    virtual void flushDns() override;
     virtual void resetIpStack() override;
     virtual bool checkAndInstallDriver() override;
     virtual QStringList getTapList() override;
@@ -32,8 +32,8 @@ public:
     virtual void setLogsEnabled(bool enabled) override;
     virtual bool createTun(const QString &dev, const QString &subnet) override;
     virtual bool deleteTun(const QString &dev) override;
-    virtual bool StartRoutingIpv6() override;
-    virtual bool StopRoutingIpv6() override;
+    virtual void StartRoutingIpv6() override;
+    virtual void StopRoutingIpv6() override;
     virtual bool disableAllTraffic() override;
     virtual bool addKillSwitchAllowedRange(QStringList ranges) override;
     virtual bool resetKillSwitchAllowedRange(QStringList ranges) override;
@@ -42,6 +42,14 @@ public:
     virtual bool disableKillSwitch() override;
     virtual bool refreshKillSwitch( bool enabled ) override;
     virtual bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers) override;
+    virtual bool writeIPsecCaCert(QString cacert, QString uuid) override;
+    virtual bool writeIPsecPrivate(QString privKey, QString uuid) override;
+    virtual bool writeIPsecConfig(QString config) override;
+    virtual bool writeIPsecUserCert(QString usercert, QString uuid) override;
+    virtual bool writeIPsecPrivatePass(QString pass, QString host, QString uuid) override;
+    virtual bool stopIPsec(QString tunnelName) override;
+    virtual bool startIPsec(QString tunnelName) override;
+    virtual QString getTunnelStatus(QString tunnelName) override;
 
 private:
     int m_localpid = 0;

service/server/killswitch.cpp

@@ -98,17 +98,6 @@ bool KillSwitch::disableKillSwitch() {
         LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("320.allowDNS"), false);
         LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("400.allowPIA"), false);
     } else {
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("000.allowLoopback"), true);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("100.blockAll"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("110.allowNets"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("120.blockNets"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("200.allowVPN"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv6, QStringLiteral("250.blockIPv6"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("290.allowDHCP"), true);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("300.allowLAN"), true);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("310.blockDNS"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("320.allowDNS"), false);
-        LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("400.allowPIA"), false);
         LinuxFirewall::uninstall();
     }
 #endif

service/server/router.cpp

@@ -42,14 +42,14 @@ int Router::routeDeleteList(const QString &gw, const QStringList &ips)
 #endif
 }
 
-bool Router::flushDns()
+void Router::flushDns()
 {
 #ifdef Q_OS_WIN
-    return RouterWin::Instance().flushDns();
+    RouterWin::Instance().flushDns();
 #elif defined (Q_OS_MAC)
-    return RouterMac::Instance().flushDns();
+    RouterMac::Instance().flushDns();
 #elif defined Q_OS_LINUX
-    return RouterLinux::Instance().flushDns();
+    RouterLinux::Instance().flushDns();
 #endif
 }
 
@@ -100,25 +100,25 @@ bool Router::updateResolvers(const QString& ifname, const QList<QHostAddress>& r
 }
 
 
-bool Router::StopRoutingIpv6()
+void Router::StopRoutingIpv6()
 {
 #ifdef Q_OS_WIN
-    return RouterWin::Instance().StopRoutingIpv6();
+    RouterWin::Instance().StopRoutingIpv6();
 #elif defined (Q_OS_MAC)
-    return true;// todo fixme
+    // todo fixme
 #elif defined Q_OS_LINUX
-    return RouterLinux::Instance().StopRoutingIpv6();
+    RouterLinux::Instance().StopRoutingIpv6();
 #endif
 }
 
-bool Router::StartRoutingIpv6()
+void Router::StartRoutingIpv6()
 {
 #ifdef Q_OS_WIN
-    return RouterWin::Instance().StartRoutingIpv6();
+    RouterWin::Instance().StartRoutingIpv6();
 #elif defined (Q_OS_MAC)
-    return true;// todo fixme
+    // todo fixme
 #elif defined Q_OS_LINUX
-    return RouterLinux::Instance().StartRoutingIpv6();
+    RouterLinux::Instance().StartRoutingIpv6();
 #endif
 }
 

service/server/router.h

@@ -19,12 +19,12 @@ public:
     static int routeAddList(const QString &gw, const QStringList &ips);
     static bool clearSavedRoutes();
     static int routeDeleteList(const QString &gw, const QStringList &ips);
-    static bool flushDns();
+    static void flushDns();
     static void resetIpStack();
     static bool createTun(const QString &dev, const QString &subnet);
     static bool deleteTun(const QString &dev);
-    static bool StartRoutingIpv6();
-    static bool StopRoutingIpv6();
+    static void StartRoutingIpv6();
+    static void StopRoutingIpv6();
     static bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);
 };
 

service/server/router_linux.cpp

@@ -160,7 +160,7 @@ bool RouterLinux::isServiceActive(const QString &serviceName) {
     return process.exitCode() == 0;
 }
 
-bool RouterLinux::flushDns()
+void RouterLinux::flushDns()
 {
     QProcess p;
     p.setProcessChannelMode(QProcess::MergedChannels);
@@ -174,7 +174,7 @@ bool RouterLinux::flushDns()
         p.start("systemctl", { "restart", "systemd-resolved" });
     } else {
         qDebug() << "No suitable DNS manager found.";
-        return false;
+        return;
     }
 
     p.waitForFinished();
@@ -183,8 +183,6 @@ bool RouterLinux::flushDns()
         qDebug().noquote() << "Flush dns completed";
     else
         qDebug().noquote() << "OUTPUT systemctl restart nscd/systemd-resolved: " + output;
-
-    return true;
 }
 
 bool RouterLinux::createTun(const QString &dev, const QString &subnet) {
@@ -281,7 +279,7 @@ bool RouterLinux::updateResolvers(const QString& ifname, const QList<QHostAddres
     return m_dnsUtil->updateResolvers(ifname, resolvers);
 }
 
-bool RouterLinux::StartRoutingIpv6()
+void RouterLinux::StartRoutingIpv6()
 {
     QProcess process;
     QStringList commands;
@@ -291,12 +289,12 @@ bool RouterLinux::StartRoutingIpv6()
     if (!process.waitForStarted(1000))
     {
         qDebug().noquote() << "Could not start activate ipv6\n";
-        return false;
+        return;
     }
     else if (!process.waitForFinished(2000))
     {
         qDebug().noquote() << "Could not activate ipv6\n";
-        return false;
+        return;
     }
     commands.clear();
 
@@ -305,20 +303,19 @@ bool RouterLinux::StartRoutingIpv6()
     if (!process.waitForStarted(1000))
     {
         qDebug().noquote() << "Could not start activate ipv6\n";
-        return false;
+        return;
     }
     else if (!process.waitForFinished(2000))
     {
         qDebug().noquote() << "Could not activate ipv6\n";
-        return false;
+        return;
     }
     commands.clear();
 
     qDebug().noquote() << "StartRoutingIpv6 OK";
-    return true;
 }
 
-bool RouterLinux::StopRoutingIpv6()
+void RouterLinux::StopRoutingIpv6()
 {
     QProcess process;
     QStringList commands;
@@ -328,12 +325,12 @@ bool RouterLinux::StopRoutingIpv6()
     if (!process.waitForStarted(1000))
     {
         qDebug().noquote() << "Could not start disable ipv6\n";
-        return false;
+        return;
     }
     else if (!process.waitForFinished(2000))
     {
         qDebug().noquote() << "Could not disable ipv6\n";
-        return false;
+        return;
     }
     commands.clear();
 
@@ -342,15 +339,14 @@ bool RouterLinux::StopRoutingIpv6()
     if (!process.waitForStarted(1000))
     {
         qDebug().noquote() << "Could not start disable ipv6\n";
-        return false;
+        return;
     }
     else if (!process.waitForFinished(2000))
     {
         qDebug().noquote() << "Could not disable ipv6\n";
-        return false;
+        return;
     }
     commands.clear();
 
     qDebug().noquote() << "StopRoutingIpv6 OK";
-    return true;
 }

service/server/router_linux.h

@@ -30,11 +30,11 @@ public:
     bool routeDelete(const QString &ip, const QString &gw, const int &sock);
     bool routeDeleteList(const QString &gw, const QStringList &ips);
     QString getgatewayandiface();
-    bool flushDns();
+    void flushDns();
     bool createTun(const QString &dev, const QString &subnet);
     bool deleteTun(const QString &dev);
-    bool StartRoutingIpv6();
-    bool StopRoutingIpv6();
+    void StartRoutingIpv6();
+    void StopRoutingIpv6();
     bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);
 public slots:
 

service/server/router_mac.cpp

@@ -166,7 +166,7 @@ bool RouterMac::deleteTun(const QString &dev)
     return true;
 }
 
-bool RouterMac::flushDns()
+void RouterMac::flushDns()
 {
     // sudo killall -HUP mDNSResponder
     QProcess p;
@@ -174,7 +174,5 @@ bool RouterMac::flushDns()
 
     p.start("killall", QStringList() << "-HUP" << "mDNSResponder");
     p.waitForFinished();
-    
     qDebug().noquote() << "OUTPUT killall -HUP mDNSResponder: " + p.readAll();
-    return true;
 }

service/server/router_mac.h

@@ -29,7 +29,7 @@ public:
     bool clearSavedRoutes();
     bool routeDelete(const QString &ip, const QString &gw);
     bool routeDeleteList(const QString &gw, const QStringList &ips);
-    bool flushDns();
+    void flushDns();
     bool createTun(const QString &dev, const QString &subnet);
     bool deleteTun(const QString &dev);
     bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);

service/server/router_win.cpp

@@ -273,7 +273,7 @@ int RouterWin::routeDeleteList(const QString &gw, const QStringList &ips)
     return success_count;
 }
 
-bool RouterWin::flushDns()
+void RouterWin::flushDns()
 {
     QProcess p;
     p.setProcessChannelMode(QProcess::MergedChannels);
@@ -281,7 +281,6 @@ bool RouterWin::flushDns()
 
     p.start(command);
     p.waitForFinished();
-    return true;
     //qDebug().noquote() << "OUTPUT ipconfig /flushdns: " + p.readAll();
 }
 
@@ -445,7 +444,7 @@ bool RouterWin::updateResolvers(const QString& ifname, const QList<QHostAddress>
 }
 
 
-bool RouterWin::StopRoutingIpv6()
+void RouterWin::StopRoutingIpv6()
 {
     {
         QProcess p;
@@ -465,10 +464,9 @@ bool RouterWin::StopRoutingIpv6()
         p.start(command);
         p.waitForFinished();
     }
-    return true;
 }
 
-bool RouterWin::StartRoutingIpv6()
+void RouterWin::StartRoutingIpv6()
 {
     {
         QProcess p;
@@ -488,6 +486,5 @@ bool RouterWin::StartRoutingIpv6()
         p.start(command);
         p.waitForFinished();
     }
-    return true;
 }
 

service/server/router_win.h

@@ -39,11 +39,11 @@ public:
     int routeAddList(const QString &gw, const QStringList &ips);
     bool clearSavedRoutes();
     int routeDeleteList(const QString &gw, const QStringList &ips);
-    bool flushDns();
+    void flushDns();
     void resetIpStack();
 
-    bool StartRoutingIpv6();
-    bool StopRoutingIpv6();
+    void StartRoutingIpv6();
+    void StopRoutingIpv6();
 
     void suspendWcmSvc(bool suspend);
     bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);