XRay Linux firewall rules

CMakeLists.txt

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

README.md

@@ -185,7 +185,7 @@ GPL v3.0
 
 Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
 
-Bitcoin: bc1qmhtgcf9637rl3kqyy22r2a8wa8laka4t9rx2mf <br>
+Bitcoin: bc1q26eevjcg9j0wuyywd2e3uc9cs2w58lpkpjxq6p <br>
 USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
 USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3 <br> 

README_RU.md

@@ -169,7 +169,7 @@ GPL v3.0
 
 Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
 
-Bitcoin: bc1qmhtgcf9637rl3kqyy22r2a8wa8laka4t9rx2mf <br>
+Bitcoin: bc1q26eevjcg9j0wuyywd2e3uc9cs2w58lpkpjxq6p <br>
 USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
 USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3 <br> 

client/CMakeLists.txt

@@ -146,7 +146,6 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/core/serialization/transfer.h
     ${CMAKE_CURRENT_LIST_DIR}/core/enums/apiEnums.h
     ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.h
-    ${CMAKE_CURRENT_LIST_DIR}/utils/qmlUtils.h
 )
 
 # Mozilla headres
@@ -198,7 +197,6 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess_new.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/utils/qmlUtils.cpp
 )
 
 # Mozilla sources

client/amnezia_application.cpp

@@ -404,9 +404,6 @@ void AmneziaApplication::initControllers()
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
-    m_focusController.reset(new FocusController(m_engine, this));
-    m_engine->rootContext()->setContextProperty("FocusController", m_focusController.get());
-
     m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel,
                                                     m_apiServicesModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());

client/amnezia_application.h

@@ -19,7 +19,6 @@
 #include "ui/controllers/exportController.h"
 #include "ui/controllers/importController.h"
 #include "ui/controllers/installController.h"
-#include "ui/controllers/focusController.h"
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/settingsController.h"
 #include "ui/controllers/sitesController.h"
@@ -125,7 +124,6 @@ private:
 #endif
 
     QScopedPointer<ConnectionController> m_connectionController;
-    QScopedPointer<FocusController> m_focusController;
     QScopedPointer<PageController> m_pageController;
     QScopedPointer<InstallController> m_installController;
     QScopedPointer<ImportController> m_importController;

client/android/AndroidManifest.xml

@@ -91,13 +91,6 @@
             android:exported="false"
             android:theme="@style/Translucent" />
 
-        <activity android:name=".TvFilePicker"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:exported="false"
-            android:theme="@style/Translucent" />
-
         <activity
             android:name=".ImportConfigActivity"
             android:excludeFromRecents="true"

client/android/res/mipmap-anydpi-v26/ic_banner.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_banner_background"/>
+    <foreground android:drawable="@mipmap/ic_banner_foreground"/>
+</adaptive-icon>

client/android/res/values-ru/strings.xml

@@ -23,6 +23,4 @@
     <string name="notificationSettingsDialogTitle">Настройки уведомлений</string>
     <string name="notificationSettingsDialogMessage">Для показа уведомлений необходимо включить уведомления в системных настройках</string>
     <string name="openNotificationSettings">Открыть настройки уведомлений</string>
-
-    <string name="tvNoFileBrowser">Пожалуйста, установите приложение для просмотра файлов</string>
 </resources>

client/android/res/values/ic_banner_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_banner_background">#1E1E1F</color>
+</resources>

client/android/res/values/strings.xml

@@ -23,6 +23,4 @@
     <string name="notificationSettingsDialogTitle">Notification settings</string>
     <string name="notificationSettingsDialogMessage">To show notifications, you must enable notifications in the system settings</string>
     <string name="openNotificationSettings">Open notification settings</string>
-
-    <string name="tvNoFileBrowser">Please install a file management utility to browse files</string>
 </resources>

client/android/src/org/amnezia/vpn/AmneziaActivity.kt

@@ -4,7 +4,6 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
-import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
@@ -13,7 +12,6 @@ import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
-import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
@@ -22,13 +20,8 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.os.ParcelFileDescriptor
-import android.os.SystemClock
-import android.provider.OpenableColumns
 import android.provider.Settings
 import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
@@ -37,7 +30,6 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
-import kotlin.coroutines.CoroutineContext
 import kotlin.text.RegexOption.IGNORE_CASE
 import AppListProvider
 import kotlinx.coroutines.CompletableDeferred
@@ -79,7 +71,6 @@ class AmneziaActivity : QtActivity() {
     private var isInBoundState = false
     private var notificationStateReceiver: BroadcastReceiver? = null
     private lateinit var vpnServiceMessenger: IpcMessenger
-    private var pfd: ParcelFileDescriptor? = null
 
     private val actionResultHandlers = mutableMapOf<Int, ActivityResultHandler>()
     private val permissionRequestHandlers = mutableMapOf<Int, PermissionRequestHandler>()
@@ -523,25 +514,21 @@ class AmneziaActivity : QtActivity() {
                 type = "text/*"
                 putExtra(Intent.EXTRA_TITLE, fileName)
             }.also {
-                try {
-                    startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
-                        onSuccess = {
-                            it?.data?.let { uri ->
-                                Log.v(TAG, "Save file to $uri")
-                                try {
-                                    contentResolver.openOutputStream(uri)?.use { os ->
-                                        os.bufferedWriter().use { it.write(data) }
-                                    }
-                                } catch (e: IOException) {
-                                    Log.e(TAG, "Failed to save file $uri: $e")
-                                    // todo: send error to Qt
+                startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
+                    onSuccess = {
+                        it?.data?.let { uri ->
+                            Log.v(TAG, "Save file to $uri")
+                            try {
+                                contentResolver.openOutputStream(uri)?.use { os ->
+                                    os.bufferedWriter().use { it.write(data) }
                                 }
+                            } catch (e: IOException) {
+                                Log.e(TAG, "Failed to save file $uri: $e")
+                                // todo: send error to Qt
                             }
                         }
-                    ))
-                } catch (_: ActivityNotFoundException) {
-                    Toast.makeText(this@AmneziaActivity, "Unsupported", Toast.LENGTH_LONG).show()
-                }
+                    }
+                ))
             }
         }
     }
@@ -550,46 +537,35 @@ class AmneziaActivity : QtActivity() {
     fun openFile(filter: String?) {
         Log.v(TAG, "Open file with filter: $filter")
         mainScope.launch {
-            val intent = if (!isOnTv()) {
-                val mimeTypes = if (!filter.isNullOrEmpty()) {
-                    val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
-                    val mime = MimeTypeMap.getSingleton()
-                    extensionRegex.findAll(filter).map {
-                        it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
-                    }.toSet()
-                } else emptySet()
+            val mimeTypes = if (!filter.isNullOrEmpty()) {
+                val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
+                val mime = MimeTypeMap.getSingleton()
+                extensionRegex.findAll(filter).map {
+                    it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
+                }.toSet()
+            } else emptySet()
 
-                Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                    addCategory(Intent.CATEGORY_OPENABLE)
-                    Log.v(TAG, "File mimyType filter: $mimeTypes")
-                    if ("*/*" in mimeTypes) {
-                        type = "*/*"
-                    } else {
-                        when (mimeTypes.size) {
-                            1 -> type = mimeTypes.first()
+            Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                Log.v(TAG, "File mimyType filter: $mimeTypes")
+                if ("*/*" in mimeTypes) {
+                    type = "*/*"
+                } else {
+                    when (mimeTypes.size) {
+                        1 -> type = mimeTypes.first()
 
-                            in 2..Int.MAX_VALUE -> {
-                                type = "*/*"
-                                putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
-                            }
-
-                            else -> type = "*/*"
+                        in 2..Int.MAX_VALUE -> {
+                            type = "*/*"
+                            putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
                         }
+
+                        else -> type = "*/*"
                     }
                 }
-            } else {
-                Intent(this@AmneziaActivity, TvFilePicker::class.java)
-            }
-
-            try {
-                startActivityForResult(intent, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
+            }.also {
+                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
                     onAny = {
-                        if (isOnTv() && it?.hasExtra("activityNotFound") == true) {
-                            showNoFileBrowserAlertDialog()
-                        }
-                        val uri = it?.data?.apply {
-                            grantUriPermission(packageName, this, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                        }?.toString() ?: ""
+                        val uri = it?.data?.toString() ?: ""
                         Log.v(TAG, "Open file: $uri")
                         mainScope.launch {
                             qtInitialized.await()
@@ -597,68 +573,10 @@ class AmneziaActivity : QtActivity() {
                         }
                     }
                 ))
-            } catch (_: ActivityNotFoundException) {
-                showNoFileBrowserAlertDialog()
-                mainScope.launch {
-                    qtInitialized.await()
-                    QtAndroidController.onFileOpened("")
-                }
             }
         }
     }
 
-    private fun showNoFileBrowserAlertDialog() {
-        AlertDialog.Builder(this)
-            .setMessage(R.string.tvNoFileBrowser)
-            .setCancelable(false)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                try {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
-                } catch (_: Throwable) {}
-            }
-            .show()
-    }
-
-    @Suppress("unused")
-    fun getFd(fileName: String): Int {
-        Log.v(TAG, "Get fd for $fileName")
-        return blockingCall {
-            try {
-                pfd = contentResolver.openFileDescriptor(Uri.parse(fileName), "r")
-                pfd?.fd ?: -1
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to get fd: $e")
-                -1
-            }
-        }
-    }
-
-    @Suppress("unused")
-    fun closeFd() {
-        Log.v(TAG, "Close fd")
-        mainScope.launch {
-            pfd?.close()
-            pfd = null
-        }
-    }
-
-    @Suppress("unused")
-    fun getFileName(uri: String): String {
-        Log.v(TAG, "Get file name for uri: $uri")
-        return blockingCall {
-            try {
-                contentResolver.query(Uri.parse(uri), arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { cursor ->
-                    if (cursor.moveToFirst() && !cursor.isNull(0)) {
-                        return@blockingCall cursor.getString(0) ?: ""
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to get file name: $e")
-            }
-            ""
-        }
-    }
-
     @Suppress("unused")
     @SuppressLint("UnsupportedChromeOsCameraSystemFeature")
     fun isCameraPresent(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
@@ -803,50 +721,6 @@ class AmneziaActivity : QtActivity() {
         }
     }
 
-    // method to workaround Qt's problem with calling the keyboard on TVs
-    @Suppress("unused")
-    fun sendTouch(x: Float, y: Float) {
-        Log.v(TAG, "Send touch: $x, $y")
-        blockingCall {
-            findQtWindow(window.decorView)?.let {
-                Log.v(TAG, "Send touch to $it")
-                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN))
-                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP))
-            }
-        }
-    }
-
-    private fun findQtWindow(view: View): View? {
-        Log.v(TAG, "findQtWindow: process $view")
-        if (view::class.simpleName == "QtWindow") return view
-        else if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val result = findQtWindow(view.getChildAt(i))
-                if (result != null) return result
-            }
-            return null
-        } else return null
-    }
-
-    private fun createEvent(x: Float, y: Float, eventTime: Long, action: Int): MotionEvent =
-        MotionEvent.obtain(
-            eventTime,
-            eventTime,
-            action,
-            1,
-            arrayOf(MotionEvent.PointerProperties().apply {
-                id = 0
-                toolType = MotionEvent.TOOL_TYPE_FINGER
-            }),
-            arrayOf(MotionEvent.PointerCoords().apply {
-                this.x = x
-                this.y = y
-                pressure = 1f
-                size = 1f
-            }),
-            0, 0, 1.0f, 1.0f, 0, 0, 0,0
-        )
-
     // workaround for a bug in Qt that causes the mouse click event not to be handled
     // also disable right-click, as it causes the application to crash
     private var lastButtonState = 0
@@ -896,7 +770,6 @@ class AmneziaActivity : QtActivity() {
     }
 
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        Log.v(TAG, "dispatchTouch: $ev")
         if (ev != null && ev.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
             return handleMouseEvent(ev) { super.dispatchTouchEvent(it) }
         }
@@ -911,13 +784,6 @@ class AmneziaActivity : QtActivity() {
     /**
      * Utils methods
      */
-    private fun <T> blockingCall(
-        context: CoroutineContext = Dispatchers.Main.immediate,
-        block: suspend () -> T
-    ) = runBlocking {
-        mainScope.async(context) { block() }.await()
-    }
-
     companion object {
         private fun actionCodeToString(actionCode: Int): String =
             when (actionCode) {

client/android/src/org/amnezia/vpn/TvFilePicker.kt

@@ -1,45 +0,0 @@
-package org.amnezia.vpn
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.result.contract.ActivityResultContracts
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "TvFilePicker"
-
-class TvFilePicker : ComponentActivity() {
-
-    private val fileChooseResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) {
-        setResult(RESULT_OK, Intent().apply { data = it })
-        finish()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.v(TAG, "onCreate")
-        getFile()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent")
-        getFile()
-    }
-
-    private fun getFile() {
-        try {
-            Log.v(TAG, "getFile")
-            fileChooseResultLauncher.launch("*/*")
-        } catch (_: ActivityNotFoundException) {
-            Log.w(TAG, "Activity not found")
-            setResult(RESULT_CANCELED, Intent().apply { putExtra("activityNotFound", true) })
-            finish()
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to get file: $e")
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-    }
-}

client/configurators/wireguard_configurator.cpp

@@ -120,7 +120,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         }
     }
 
-    QString subnetIp = containerConfig.value(m_protocolName).toObject().value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
+    QString subnetIp = containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     {
         QStringList l = subnetIp.split(".", Qt::SkipEmptyParts);
         if (l.isEmpty()) {

client/core/controllers/serverController.cpp

@@ -346,9 +346,7 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
     }
 
     if (container == DockerContainer::Awg) {
-        if ((oldProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress)
-             != newProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress))
-            || (oldProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort)
+        if ((oldProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort)
              != newProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort))
             || (oldProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount)
                 != newProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount))
@@ -372,10 +370,8 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
     }
 
     if (container == DockerContainer::WireGuard) {
-        if ((oldProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress)
-             != newProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress))
-            || (oldProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)
-            != newProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)))
+        if (oldProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)
+            != newProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort))
             return true;
     }
 
@@ -611,8 +607,6 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
     // Amnezia wireguard vars
-    vars.append({ { "$AWG_SUBNET_IP",
-                    amneziaWireguarConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress) } });
     vars.append({ { "$AWG_SERVER_PORT", amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
 
     vars.append({ { "$JUNK_PACKET_COUNT", amneziaWireguarConfig.value(config_key::junkPacketCount).toString() } });
@@ -757,6 +751,10 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
 
 ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, DockerContainer container)
 {
+    if (credentials.userName == "root") {
+        return ErrorCode::NoError;
+    }
+
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
         stdOut += data + "\n";
@@ -770,14 +768,8 @@ ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, D
     const QString scriptData = amnezia::scriptData(SharedScriptType::check_user_in_sudo);
     ErrorCode error = runScript(credentials, replaceVars(scriptData, genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
 
-    if (credentials.userName != "root" && !stdOut.contains("sudo") && !stdOut.contains("wheel"))
+    if (!stdOut.contains("sudo"))
         return ErrorCode::ServerUserNotInSudo;
-    if (credentials.userName != "root" && stdOut.contains("sudo:") && !stdOut.contains("uname:") && stdOut.contains("not found"))
-        return ErrorCode::SudoPackageIsNotPreinstalled;
-    if (stdOut.contains("sudoers"))
-        return ErrorCode::ServerUserNotAllowedInSudoers;
-    if (stdOut.contains("password is required"))
-        return ErrorCode::ServerUserPasswordRequired;
 
     return error;
 }

client/core/defs.h

@@ -56,9 +56,6 @@ namespace amnezia
         ServerCancelInstallation = 204,
         ServerUserNotInSudo = 205,
         ServerPacketManagerError = 206,
-        SudoPackageIsNotPreinstalled = 207,
-        ServerUserNotAllowedInSudoers = 208,
-        ServerUserPasswordRequired = 209,
 
         // Ssh connection errors
         SshRequestDeniedError = 300,

client/core/errorstrings.cpp

@@ -19,11 +19,8 @@ QString errorString(ErrorCode code) {
     case(ErrorCode::ServerContainerMissingError): errorMessage = QObject::tr("Server error: Docker container missing"); break;
     case(ErrorCode::ServerDockerFailedError): errorMessage = QObject::tr("Server error: Docker failed"); break;
     case(ErrorCode::ServerCancelInstallation): errorMessage = QObject::tr("Installation canceled by user"); break;
-    case(ErrorCode::ServerUserNotInSudo): errorMessage = QObject::tr("The user is not a member of the sudo group"); break;
-    case(ErrorCode::ServerPacketManagerError): errorMessage = QObject::tr("Server error: Package manager error"); break;
-    case(ErrorCode::SudoPackageIsNotPreinstalled): errorMessage = QObject::tr("The sudo package is not pre-installed"); break;
-    case(ErrorCode::ServerUserNotAllowedInSudoers): errorMessage = QObject::tr("Action not allowed in sudoers"); break;
-    case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break;
+    case(ErrorCode::ServerUserNotInSudo): errorMessage = QObject::tr("The user does not have permission to use sudo"); break;
+    case(ErrorCode::ServerPacketManagerError): errorMessage = QObject::tr("Server error: Packet manager error"); break;
 
     // Libssh errors
     case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;

client/daemon/daemon.cpp

@@ -114,23 +114,12 @@ bool Daemon::activate(const InterfaceConfig& config) {
 
   // Bring up the wireguard interface if not already done.
   if (!wgutils()->interfaceExists()) {
-    // Create the interface.
     if (!wgutils()->addInterface(config)) {
       logger.error() << "Interface creation failed.";
       return false;
     }
   }
 
-  // Bring the interface up.
-  if (supportIPUtils()) {
-    if (!iputils()->addInterfaceIPs(config)) {
-      return false;
-    }
-    if (!iputils()->setMTUAndUp(config)) {
-      return false;
-    }
-  }
-
   // Configure routing for excluded addresses.
   for (const QString& i : config.m_excludedAddresses) {
     addExclusionRoute(IPAddress(i));
@@ -146,6 +135,15 @@ bool Daemon::activate(const InterfaceConfig& config) {
     return false;
   }
 
+  if (supportIPUtils()) {
+    if (!iputils()->addInterfaceIPs(config)) {
+      return false;
+    }
+    if (!iputils()->setMTUAndUp(config)) {
+      return false;
+    }
+  }
+
   // set routing
   for (const IPAddress& ip : config.m_allowedIPAddressRanges) {
     if (!wgutils()->updateRoutePrefix(ip)) {

client/daemon/daemon.h

@@ -8,8 +8,6 @@
 #include <QDateTime>
 #include <QTimer>
 
-#include "daemon/daemonerrors.h"
-#include "daemonerrors.h"
 #include "dnsutils.h"
 #include "interfaceconfig.h"
 #include "iputils.h"
@@ -53,7 +51,7 @@ class Daemon : public QObject {
    */
   void activationFailure();
   void disconnected();
-  void backendFailure(DaemonError reason = DaemonError::ERROR_FATAL);
+  void backendFailure();
 
  private:
   bool maybeUpdateResolvers(const InterfaceConfig& config);

client/daemon/daemonerrors.h

@@ -1,17 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#pragma once
-
-#include <cstdint>
-
-enum class DaemonError : uint8_t {
-  ERROR_NONE = 0u,
-  ERROR_FATAL = 1u,
-  ERROR_SPLIT_TUNNEL_INIT_FAILURE = 2u,
-  ERROR_SPLIT_TUNNEL_START_FAILURE = 3u,
-  ERROR_SPLIT_TUNNEL_EXCLUDE_FAILURE = 4u,
-
-  DAEMON_ERROR_MAX = 5u,
-};

client/daemon/daemonlocalserverconnection.cpp

@@ -159,10 +159,9 @@ void DaemonLocalServerConnection::disconnected() {
   write(obj);
 }
 
-void DaemonLocalServerConnection::backendFailure(DaemonError err) {
+void DaemonLocalServerConnection::backendFailure() {
   QJsonObject obj;
   obj.insert("type", "backendFailure");
-  obj.insert("errorCode", static_cast<int>(err));
   write(obj);
 }
 

client/daemon/daemonlocalserverconnection.h

@@ -7,8 +7,6 @@
 
 #include <QObject>
 
-#include "daemonerrors.h"
-
 class QLocalSocket;
 
 class DaemonLocalServerConnection final : public QObject {
@@ -25,7 +23,7 @@ class DaemonLocalServerConnection final : public QObject {
 
   void connected(const QString& pubkey);
   void disconnected();
-  void backendFailure(DaemonError err);
+  void backendFailure();
 
   void write(const QJsonObject& obj);
 

client/daemon/wireguardutils.h

@@ -45,11 +45,9 @@ class WireguardUtils : public QObject {
 
   virtual bool updateRoutePrefix(const IPAddress& prefix) = 0;
   virtual bool deleteRoutePrefix(const IPAddress& prefix) = 0;
-  
+
   virtual bool addExclusionRoute(const IPAddress& prefix) = 0;
   virtual bool deleteExclusionRoute(const IPAddress& prefix) = 0;
-
-  virtual bool excludeLocalNetworks(const QList<IPAddress>& addresses) = 0;
 };
 
 #endif  // WIREGUARDUTILS_H

client/images/controls/external-link.svg

@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18 13V19C18 19.5304 17.7893 20.0391 17.4142 20.4142C17.0391 20.7893 16.5304 21 16 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V8C3 7.46957 3.21071 6.96086 3.58579 6.58579C3.96086 6.21071 4.46957 6 5 6H11" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15 3H21V9" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 14L21 3" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

client/mozilla/localsocketcontroller.cpp

@@ -1,10 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "protocols/protocols_defs.h"
 #include "localsocketcontroller.h"
 
-#include <stdint.h>
-
 #include <QDir>
 #include <QFileInfo>
 #include <QHostAddress>
@@ -18,9 +17,6 @@
 #include "leakdetector.h"
 #include "logger.h"
 #include "models/server.h"
-#include "daemon/daemonerrors.h"
-
-#include "protocols/protocols_defs.h"
 
 // How many times do we try to reconnect.
 constexpr int MAX_CONNECTION_RETRY = 10;
@@ -455,39 +451,8 @@ void LocalSocketController::parseCommand(const QByteArray& command) {
   }
 
   if (type == "backendFailure") {
-    if (!obj.contains("errorCode")) {
-      // report a generic error if we dont know what it is.
-      logger.error() << "generic backend failure error";
-      // REPORTERROR(ErrorHandler::ControllerError, "controller");
-      return;
-    }
-    auto errorCode = static_cast<uint8_t>(obj["errorCode"].toInt());
-    if (errorCode >= (uint8_t)DaemonError::DAEMON_ERROR_MAX) {
-      // Also report a generic error if the code is invalid.
-      logger.error() << "invalid backend failure error code";
-      // REPORTERROR(ErrorHandler::ControllerError, "controller");
-      return;
-    }
-    switch (static_cast<DaemonError>(errorCode)) {
-      case DaemonError::ERROR_NONE:
-        [[fallthrough]];
-      case DaemonError::ERROR_FATAL:
-        logger.error() << "generic backend failure error (fatal or error none)";
-        // REPORTERROR(ErrorHandler::ControllerError, "controller");
-        break;
-      case DaemonError::ERROR_SPLIT_TUNNEL_INIT_FAILURE:
-        [[fallthrough]];
-      case DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE:
-        [[fallthrough]];
-      case DaemonError::ERROR_SPLIT_TUNNEL_EXCLUDE_FAILURE:
-        logger.error() << "split tunnel backend failure error";
-        //REPORTERROR(ErrorHandler::SplitTunnelError, "controller");
-        break;
-      case DaemonError::DAEMON_ERROR_MAX:
-        // We should not get here.
-        Q_ASSERT(false);
-        break;
-    }
+    qCritical() << "backendFailure";
+    return;
   }
 
   if (type == "logs") {

client/platforms/android/android_controller.cpp

@@ -163,7 +163,9 @@ QString AndroidController::openFile(const QString &filter)
     QString fileName;
     connect(this, &AndroidController::fileOpened, this,
             [&fileName, &wait](const QString &uri) {
-                fileName = uri;
+                qDebug() << "Android event: file opened; uri:" << uri;
+                fileName = QQmlFile::urlToLocalFileOrQrc(uri);
+                qDebug() << "Android opened filename:" << fileName;
                 wait.quit();
             },
             static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
@@ -173,25 +175,6 @@ QString AndroidController::openFile(const QString &filter)
     return fileName;
 }
 
-int AndroidController::getFd(const QString &fileName)
-{
-    return callActivityMethod<jint>("getFd", "(Ljava/lang/String;)I",
-                                    QJniObject::fromString(fileName).object<jstring>());
-}
-
-void AndroidController::closeFd()
-{
-    callActivityMethod("closeFd", "()V");
-}
-
-QString AndroidController::getFileName(const QString &uri)
-{
-    auto fileName = callActivityMethod<jstring, jstring>("getFileName", "(Ljava/lang/String;)Ljava/lang/String;",
-                                                         QJniObject::fromString(uri).object<jstring>());
-    QJniEnvironment env;
-    return AndroidUtils::convertJString(env.jniEnv(), fileName.object<jstring>());
-}
-
 bool AndroidController::isCameraPresent()
 {
     return callActivityMethod<jboolean>("isCameraPresent", "()Z");
@@ -304,11 +287,6 @@ bool AndroidController::requestAuthentication()
     return result;
 }
 
-void AndroidController::sendTouch(float x, float y)
-{
-    callActivityMethod("sendTouch", "(FF)V", x, y);
-}
-
 // Moving log processing to the Android side
 jclass AndroidController::log;
 jmethodID AndroidController::logDebug;

client/platforms/android/android_controller.h

@@ -34,9 +34,6 @@ public:
     void resetLastServer(int serverIndex);
     void saveFile(const QString &fileName, const QString &data);
     QString openFile(const QString &filter);
-    int getFd(const QString &fileName);
-    void closeFd();
-    QString getFileName(const QString &uri);
     bool isCameraPresent();
     bool isOnTv();
     void startQrReaderActivity();
@@ -51,7 +48,6 @@ public:
     bool isNotificationPermissionGranted();
     void requestNotificationPermission();
     bool requestAuthentication();
-    void sendTouch(float x, float y);
 
     static bool initLogging();
     static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);

client/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -297,6 +297,31 @@ QList<WireguardUtils::PeerStatus> WireguardUtilsLinux::getPeerStatus() {
     return peerList;
 }
 
+
+void WireguardUtilsLinux::applyFirewallRules(FirewallParams& params)
+{
+    // double-check + ensure our firewall is installed and enabled
+    if (!LinuxFirewall::isInstalled()) LinuxFirewall::install();
+
+    // Note: rule precedence is handled inside IpTablesFirewall
+    LinuxFirewall::ensureRootAnchorPriority();
+
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("000.allowLoopback"), true);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("100.blockAll"), params.blockAll);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("110.allowNets"), params.allowNets);
+    LinuxFirewall::updateAllowNets(params.allowAddrs);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("120.blockNets"), params.blockNets);
+    LinuxFirewall::updateBlockNets(params.blockAddrs);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("200.allowVPN"), true);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv6, QStringLiteral("250.blockIPv6"), true);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("290.allowDHCP"), true);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("300.allowLAN"), true);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("310.blockDNS"), true);
+    LinuxFirewall::updateDNSServers(params.dnsServers);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("320.allowDNS"), true);
+    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("400.allowPIA"), true);
+}
+
 bool WireguardUtilsLinux::updateRoutePrefix(const IPAddress& prefix) {
     if (!m_rtmonitor) {
         return false;
@@ -352,26 +377,6 @@ bool WireguardUtilsLinux::deleteExclusionRoute(const IPAddress& prefix) {
     return m_rtmonitor->deleteExclusionRoute(prefix);
 }
 
-bool WireguardUtilsLinux::excludeLocalNetworks(const QList<IPAddress>& routes) {
-  if (!m_rtmonitor) {
-    return false;
-  }
-
-  // Explicitly discard LAN traffic that makes its way into the tunnel. This
-  // doesn't really exclude the LAN traffic, we just don't take any action to
-  // overrule the routes of other interfaces.
-  bool result = true;
-  for (const auto& prefix : routes) {
-    logger.error() << "Attempting to exclude:" << prefix.toString();
-    if (!m_rtmonitor->insertRoute(prefix)) {
-      result = false;
-    }
-  }
-
-  // TODO: A kill switch would be nice though :)
-  return result;
-}
-
 QString WireguardUtilsLinux::uapiCommand(const QString& command) {
     QLocalSocket socket;
     QTimer uapiTimeout;
@@ -445,27 +450,3 @@ QString WireguardUtilsLinux::waitForTunnelName(const QString& filename) {
 
     return QString();
 }
-
-void WireguardUtilsLinux::applyFirewallRules(FirewallParams& params)
-{
-    // double-check + ensure our firewall is installed and enabled
-    if (!LinuxFirewall::isInstalled()) LinuxFirewall::install();
-
-    // Note: rule precedence is handled inside IpTablesFirewall
-    LinuxFirewall::ensureRootAnchorPriority();
-
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("000.allowLoopback"), true);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("100.blockAll"), params.blockAll);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("110.allowNets"), params.allowNets);
-    LinuxFirewall::updateAllowNets(params.allowAddrs);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("120.blockNets"), params.blockNets);
-    LinuxFirewall::updateBlockNets(params.blockAddrs);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("200.allowVPN"), true);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv6, QStringLiteral("250.blockIPv6"), true);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("290.allowDHCP"), true);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("300.allowLAN"), true);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("310.blockDNS"), true);
-    LinuxFirewall::updateDNSServers(params.dnsServers);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("320.allowDNS"), true);
-    LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("400.allowPIA"), true);
-}

client/platforms/linux/daemon/wireguardutilslinux.h

@@ -37,9 +37,6 @@ public:
 
     bool addExclusionRoute(const IPAddress& prefix) override;
     bool deleteExclusionRoute(const IPAddress& prefix) override;
-
-    bool excludeLocalNetworks(const QList<IPAddress>& lanAddressRanges) override;
-
     void applyFirewallRules(FirewallParams& params);
 signals:
     void backendFailure();

client/platforms/macos/daemon/macosroutemonitor.cpp

@@ -358,8 +358,8 @@ void MacosRouteMonitor::rtmAppendAddr(struct rt_msghdr* rtm, size_t maxlen,
 }
 
 bool MacosRouteMonitor::rtmSendRoute(int action, const IPAddress& prefix,
-                                     unsigned int ifindex, const void* gateway,
-                                     int flags) {
+                                     unsigned int ifindex,
+                                     const void* gateway) {
   constexpr size_t rtm_max_size = sizeof(struct rt_msghdr) +
                                   sizeof(struct sockaddr_in6) * 2 +
                                   sizeof(struct sockaddr_storage);
@@ -370,7 +370,7 @@ bool MacosRouteMonitor::rtmSendRoute(int action, const IPAddress& prefix,
   rtm->rtm_version = RTM_VERSION;
   rtm->rtm_type = action;
   rtm->rtm_index = ifindex;
-  rtm->rtm_flags = flags | RTF_STATIC | RTF_UP;
+  rtm->rtm_flags = RTF_STATIC | RTF_UP;
   rtm->rtm_addrs = 0;
   rtm->rtm_pid = 0;
   rtm->rtm_seq = m_rtseq++;
@@ -490,7 +490,7 @@ bool MacosRouteMonitor::rtmFetchRoutes(int family) {
   return false;
 }
 
-bool MacosRouteMonitor::insertRoute(const IPAddress& prefix, int flags) {
+bool MacosRouteMonitor::insertRoute(const IPAddress& prefix) {
   struct sockaddr_dl datalink;
   memset(&datalink, 0, sizeof(datalink));
   datalink.sdl_family = AF_LINK;
@@ -502,11 +502,11 @@ bool MacosRouteMonitor::insertRoute(const IPAddress& prefix, int flags) {
   datalink.sdl_slen = 0;
   memcpy(&datalink.sdl_data, qPrintable(m_ifname), datalink.sdl_nlen);
 
-  return rtmSendRoute(RTM_ADD, prefix, m_ifindex, &datalink, flags);
+  return rtmSendRoute(RTM_ADD, prefix, m_ifindex, &datalink);
 }
 
-bool MacosRouteMonitor::deleteRoute(const IPAddress& prefix, int flags) {
-  return rtmSendRoute(RTM_DELETE, prefix, m_ifindex, nullptr, flags);
+bool MacosRouteMonitor::deleteRoute(const IPAddress& prefix) {
+  return rtmSendRoute(RTM_DELETE, prefix, m_ifindex, nullptr);
 }
 
 bool MacosRouteMonitor::addExclusionRoute(const IPAddress& prefix) {

client/platforms/macos/daemon/macosroutemonitor.h

@@ -24,8 +24,8 @@ class MacosRouteMonitor final : public QObject {
   MacosRouteMonitor(const QString& ifname, QObject* parent = nullptr);
   ~MacosRouteMonitor();
 
-  bool insertRoute(const IPAddress& prefix, int flags = 0);
-  bool deleteRoute(const IPAddress& prefix, int flags = 0);
+  bool insertRoute(const IPAddress& prefix);
+  bool deleteRoute(const IPAddress& prefix);
   int interfaceFlags() { return m_ifflags; }
 
   bool addExclusionRoute(const IPAddress& prefix);
@@ -37,7 +37,7 @@ class MacosRouteMonitor final : public QObject {
   void handleRtmUpdate(const struct rt_msghdr* msg, const QByteArray& payload);
   void handleIfaceInfo(const struct if_msghdr* msg, const QByteArray& payload);
   bool rtmSendRoute(int action, const IPAddress& prefix, unsigned int ifindex,
-                    const void* gateway, int flags = 0);
+                    const void* gateway);
   bool rtmFetchRoutes(int family);
   static void rtmAppendAddr(struct rt_msghdr* rtm, size_t maxlen, int rtaddr,
                             const void* sa);

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -5,7 +5,6 @@
 #include "wireguardutilsmacos.h"
 
 #include <errno.h>
-#include <net/route.h>
 
 #include <QByteArray>
 #include <QDir>
@@ -131,6 +130,7 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
   }
 
   int err = uapiErrno(uapiCommand(message));
+
   if (err != 0) {
     logger.error() << "Interface configuration failed:" << strerror(err);
   } else {
@@ -211,6 +211,7 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
     logger.warning() << "Failed to create peer with no endpoints";
     return false;
   }
+
   out << config.m_serverPort << "\n";
 
   out << "replace_allowed_ips=true\n";
@@ -322,10 +323,10 @@ bool WireguardUtilsMacos::deleteRoutePrefix(const IPAddress& prefix) {
   if (!m_rtmonitor) {
     return false;
   }
-
   if (prefix.prefixLength() > 0) {
-    return m_rtmonitor->deleteRoute(prefix);
+    return m_rtmonitor->insertRoute(prefix);
   }
+
   // Ensure that we do not replace the default route.
   if (prefix.type() == QAbstractSocket::IPv4Protocol) {
     return m_rtmonitor->deleteRoute(IPAddress("0.0.0.0/1")) &&
@@ -345,6 +346,31 @@ bool WireguardUtilsMacos::addExclusionRoute(const IPAddress& prefix) {
   return m_rtmonitor->addExclusionRoute(prefix);
 }
 
+void WireguardUtilsMacos::applyFirewallRules(FirewallParams& params)
+{
+  // double-check + ensure our firewall is installed and enabled. This is necessary as
+  // other software may disable pfctl before re-enabling with their own rules (e.g other VPNs)
+  if (!MacOSFirewall::isInstalled()) MacOSFirewall::install();
+
+  MacOSFirewall::ensureRootAnchorPriority();
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("000.allowLoopback"), true);
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("100.blockAll"), params.blockAll);
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("110.allowNets"), params.allowNets);
+  MacOSFirewall::setAnchorTable(QStringLiteral("110.allowNets"), params.allowNets,
+                                QStringLiteral("allownets"), params.allowAddrs);
+
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("120.blockNets"), params.blockNets);
+  MacOSFirewall::setAnchorTable(QStringLiteral("120.blockNets"), params.blockNets,
+                                QStringLiteral("blocknets"), params.blockAddrs);
+
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("200.allowVPN"), true);
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("250.blockIPv6"), true);
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("290.allowDHCP"), true);
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("300.allowLAN"), true);
+  MacOSFirewall::setAnchorEnabled(QStringLiteral("310.blockDNS"), true);
+  MacOSFirewall::setAnchorTable(QStringLiteral("310.blockDNS"), true, QStringLiteral("dnsaddr"), params.dnsServers);
+}
+
 bool WireguardUtilsMacos::deleteExclusionRoute(const IPAddress& prefix) {
   if (!m_rtmonitor) {
     return false;
@@ -352,26 +378,6 @@ bool WireguardUtilsMacos::deleteExclusionRoute(const IPAddress& prefix) {
   return m_rtmonitor->deleteExclusionRoute(prefix);
 }
 
-bool WireguardUtilsMacos::excludeLocalNetworks(const QList<IPAddress>& routes) {
-  if (!m_rtmonitor) {
-    return false;
-  }
-
-  // Explicitly discard LAN traffic that makes its way into the tunnel. This
-  // doesn't really exclude the LAN traffic, we just don't take any action to
-  // overrule the routes of other interfaces.
-  bool result = true;
-  for (const auto& prefix : routes) {
-    logger.error() << "Attempting to exclude:" << prefix.toString();
-    if (!m_rtmonitor->insertRoute(prefix, RTF_IFSCOPE | RTF_REJECT)) {
-      result = false;
-    }
-  }
-
-  // TODO: A kill switch would be nice though :)
-  return result;
-}
-
 QString WireguardUtilsMacos::uapiCommand(const QString& command) {
   QLocalSocket socket;
   QTimer uapiTimeout;
@@ -448,28 +454,3 @@ QString WireguardUtilsMacos::waitForTunnelName(const QString& filename) {
 
   return QString();
 }
-
-void WireguardUtilsMacos::applyFirewallRules(FirewallParams& params)
-{
-  // double-check + ensure our firewall is installed and enabled. This is necessary as
-  // other software may disable pfctl before re-enabling with their own rules (e.g other VPNs)
-  if (!MacOSFirewall::isInstalled()) MacOSFirewall::install();
-
-  MacOSFirewall::ensureRootAnchorPriority();
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("000.allowLoopback"), true);
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("100.blockAll"), params.blockAll);
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("110.allowNets"), params.allowNets);
-  MacOSFirewall::setAnchorTable(QStringLiteral("110.allowNets"), params.allowNets,
-                                QStringLiteral("allownets"), params.allowAddrs);
-
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("120.blockNets"), params.blockNets);
-  MacOSFirewall::setAnchorTable(QStringLiteral("120.blockNets"), params.blockNets,
-                                QStringLiteral("blocknets"), params.blockAddrs);
-
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("200.allowVPN"), true);
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("250.blockIPv6"), true);
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("290.allowDHCP"), true);
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("300.allowLAN"), true);
-  MacOSFirewall::setAnchorEnabled(QStringLiteral("310.blockDNS"), true);
-  MacOSFirewall::setAnchorTable(QStringLiteral("310.blockDNS"), true, QStringLiteral("dnsaddr"), params.dnsServers);
-}

client/platforms/macos/daemon/wireguardutilsmacos.h

@@ -35,9 +35,6 @@ class WireguardUtilsMacos final : public WireguardUtils {
 
   bool addExclusionRoute(const IPAddress& prefix) override;
   bool deleteExclusionRoute(const IPAddress& prefix) override;
-
-  bool excludeLocalNetworks(const QList<IPAddress>& lanAddressRanges) override;
-
   void applyFirewallRules(FirewallParams& params);
 
  signals:

client/platforms/windows/daemon/windowsdaemon.cpp

@@ -5,7 +5,6 @@
 #include "windowsdaemon.h"
 
 #include <Windows.h>
-#include <qassert.h>
 
 #include <QCoreApplication>
 #include <QJsonDocument>
@@ -16,34 +15,28 @@
 #include <QTextStream>
 #include <QtGlobal>
 
-#include "daemon/daemonerrors.h"
 #include "dnsutilswindows.h"
 #include "leakdetector.h"
 #include "logger.h"
-#include "platforms/windows/daemon/windowsfirewall.h"
-#include "platforms/windows/daemon/windowssplittunnel.h"
-#include "platforms/windows/windowscommons.h"
-#include "windowsfirewall.h"
-
 #include "core/networkUtilities.h"
+#include "platforms/windows/windowscommons.h"
+#include "platforms/windows/windowsservicemanager.h"
+#include "windowsfirewall.h"
 
 namespace {
 Logger logger("WindowsDaemon");
 }
 
-WindowsDaemon::WindowsDaemon() : Daemon(nullptr) {
+WindowsDaemon::WindowsDaemon() : Daemon(nullptr), m_splitTunnelManager(this) {
   MZ_COUNT_CTOR(WindowsDaemon);
-  m_firewallManager = WindowsFirewall::create(this);
-  Q_ASSERT(m_firewallManager != nullptr);
 
-  m_wgutils = WireguardUtilsWindows::create(m_firewallManager, this);
+  m_wgutils = new WireguardUtilsWindows(this);
   m_dnsutils = new DnsUtilsWindows(this);
-  m_splitTunnelManager = WindowsSplitTunnel::create(m_firewallManager);
 
-  connect(m_wgutils.get(), &WireguardUtilsWindows::backendFailure, this,
+  connect(m_wgutils, &WireguardUtilsWindows::backendFailure, this,
           &WindowsDaemon::monitorBackendFailure);
   connect(this, &WindowsDaemon::activationFailure,
-          [this]() { m_firewallManager->disableKillSwitch(); });
+          []() { WindowsFirewall::instance()->disableKillSwitch(); });
 }
 
 WindowsDaemon::~WindowsDaemon() {
@@ -64,42 +57,28 @@ void WindowsDaemon::prepareActivation(const InterfaceConfig& config, int inetAda
 
 void WindowsDaemon::activateSplitTunnel(const InterfaceConfig& config, int vpnAdapterIndex) {
   if (config.m_vpnDisabledApps.length() > 0) {
-      m_splitTunnelManager->start(m_inetAdapterIndex, vpnAdapterIndex);
-      m_splitTunnelManager->excludeApps(config.m_vpnDisabledApps);
+      m_splitTunnelManager.start(m_inetAdapterIndex, vpnAdapterIndex);
+      m_splitTunnelManager.setRules(config.m_vpnDisabledApps);
   } else {
-      m_splitTunnelManager->stop();
+      m_splitTunnelManager.stop();
   }
 }
 
 bool WindowsDaemon::run(Op op, const InterfaceConfig& config) {
-  if (!m_splitTunnelManager) {
-    if (config.m_vpnDisabledApps.length() > 0) {
-      // The Client has sent us a list of disabled apps, but we failed
-      // to init the the split tunnel driver.
-      // So let the client know this was not possible
-      emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_INIT_FAILURE);
-    }
+  if (op == Down) {
+    m_splitTunnelManager.stop();
     return true;
   }
 
-  if (op == Down) {
-    m_splitTunnelManager->stop();
-    return true;
-  }
-  if (config.m_vpnDisabledApps.length() > 0) {
-    if (!m_splitTunnelManager->start(m_inetAdapterIndex)) {
-      emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE);
-    };
-    if (!m_splitTunnelManager->excludeApps(config.m_vpnDisabledApps)) {
-      emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_EXCLUDE_FAILURE);
-    };
-    // Now the driver should be running (State == 4)
-    if (!m_splitTunnelManager->isRunning()) {
-      emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE);
+  if (op == Up) {
+    logger.debug() << "Tunnel UP, Starting SplitTunneling";
+    if (!WindowsSplitTunnel::isInstalled()) {
+      logger.warning() << "Split Tunnel Driver not Installed yet, fixing this.";
+      WindowsSplitTunnel::installDriver();
     }
-    return true;
   }
-  m_splitTunnelManager->stop();
+
+  activateSplitTunnel(config);
 
   return true;
 }

client/platforms/windows/daemon/windowsdaemon.h

@@ -5,11 +5,8 @@
 #ifndef WINDOWSDAEMON_H
 #define WINDOWSDAEMON_H
 
-#include <qpointer.h>
-
 #include "daemon/daemon.h"
 #include "dnsutilswindows.h"
-#include "windowsfirewall.h"
 #include "windowssplittunnel.h"
 #include "windowstunnelservice.h"
 #include "wireguardutilswindows.h"
@@ -28,7 +25,7 @@ class WindowsDaemon final : public Daemon {
 
  protected:
   bool run(Op op, const InterfaceConfig& config) override;
-  WireguardUtils* wgutils() const override { return m_wgutils.get(); }
+  WireguardUtils* wgutils() const override { return m_wgutils; }
   DnsUtils* dnsutils() override { return m_dnsutils; }
 
  private:
@@ -42,10 +39,9 @@ class WindowsDaemon final : public Daemon {
 
   int m_inetAdapterIndex = -1;
 
-  std::unique_ptr<WireguardUtilsWindows> m_wgutils;
+  WireguardUtilsWindows* m_wgutils = nullptr;
   DnsUtilsWindows* m_dnsutils = nullptr;
-  std::unique_ptr<WindowsSplitTunnel> m_splitTunnelManager;
-  QPointer<WindowsFirewall> m_firewallManager;
+  WindowsSplitTunnel m_splitTunnelManager;
 };
 
 #endif  // WINDOWSDAEMON_H

client/platforms/windows/daemon/windowsfirewall.cpp

@@ -9,12 +9,11 @@
 #include <guiddef.h>
 #include <initguid.h>
 #include <netfw.h>
-#include <qaccessible.h>
-#include <qassert.h>
+//#include <qaccessible.h>
+#include <Ws2tcpip.h>
+
 #include <stdio.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
-#include "winsock.h"
 
 #include <QApplication>
 #include <QFileInfo>
@@ -28,6 +27,7 @@
 #include "leakdetector.h"
 #include "logger.h"
 #include "platforms/windows/windowsutils.h"
+#include "winsock.h"
 
 #define IPV6_ADDRESS_SIZE 16
 
@@ -49,13 +49,18 @@ constexpr uint8_t HIGH_WEIGHT = 13;
 constexpr uint8_t MAX_WEIGHT = 15;
 }  // namespace
 
-WindowsFirewall* WindowsFirewall::create(QObject* parent) {
-  if (s_instance != nullptr) {
-    // Only one instance of the firewall is allowed
-//    Q_ASSERT(false);
-    return s_instance;
+WindowsFirewall* WindowsFirewall::instance() {
+  if (s_instance == nullptr) {
+    s_instance = new WindowsFirewall(qApp);
   }
-  HANDLE engineHandle = nullptr;
+  return s_instance;
+}
+
+WindowsFirewall::WindowsFirewall(QObject* parent) : QObject(parent) {
+  MZ_COUNT_CTOR(WindowsFirewall);
+  Q_ASSERT(s_instance == nullptr);
+
+  HANDLE engineHandle = NULL;
   DWORD result = ERROR_SUCCESS;
   // Use dynamic sessions for efficiency and safety:
   //  -> Filtering policy objects are deleted even when the application crashes/
@@ -66,24 +71,15 @@ WindowsFirewall* WindowsFirewall::create(QObject* parent) {
 
   logger.debug() << "Opening the filter engine.";
 
-  result = FwpmEngineOpen0(nullptr, RPC_C_AUTHN_WINNT, nullptr, &session,
-                           &engineHandle);
+  result =
+      FwpmEngineOpen0(NULL, RPC_C_AUTHN_WINNT, NULL, &session, &engineHandle);
 
   if (result != ERROR_SUCCESS) {
     WindowsUtils::windowsLog("FwpmEngineOpen0 failed");
-    return nullptr;
+    return;
   }
   logger.debug() << "Filter engine opened successfully.";
-  if (!initSublayer()) {
-    return nullptr;
-  }
-  s_instance = new WindowsFirewall(engineHandle, parent);
-  return s_instance;
-}
-
-WindowsFirewall::WindowsFirewall(HANDLE session, QObject* parent)
-    : QObject(parent), m_sessionHandle(session) {
-  MZ_COUNT_CTOR(WindowsFirewall);
+  m_sessionHandle = engineHandle;
 }
 
 WindowsFirewall::~WindowsFirewall() {
@@ -93,8 +89,15 @@ WindowsFirewall::~WindowsFirewall() {
   }
 }
 
-// static
-bool WindowsFirewall::initSublayer() {
+bool WindowsFirewall::init() {
+  if (m_init) {
+    logger.warning() << "Alread initialised FW_WFP layer";
+    return true;
+  }
+  if (m_sessionHandle == INVALID_HANDLE_VALUE) {
+    logger.error() << "Cant Init Sublayer with invalid wfp handle";
+    return false;
+  }
   // If we were not able to aquire a handle, this will fail anyway.
   // We need to open up another handle because of wfp rules:
   // If a wfp resource was created with SESSION_DYNAMIC,
@@ -154,10 +157,11 @@ bool WindowsFirewall::initSublayer() {
     return false;
   }
   logger.debug() << "Initialised Sublayer";
+  m_init = true;
   return true;
 }
 
-bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
+bool WindowsFirewall::enableKillSwitch(int vpnAdapterIndex) {
 // Checks if the FW_Rule was enabled succesfully,
 // disables the whole killswitch and returns false if not.
 #define FW_OK(rule)                                                       \
@@ -180,7 +184,7 @@ bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
     }                                                                     \
   }
 
-  logger.info() << "Enabling firewall Using Adapter:" << vpnAdapterIndex;
+  logger.info() << "Enabling Killswitch Using Adapter:" << vpnAdapterIndex;
   FW_OK(allowTrafficOfAdapter(vpnAdapterIndex, MED_WEIGHT,
                               "Allow usage of VPN Adapter"));
   FW_OK(allowDHCPTraffic(MED_WEIGHT, "Allow DHCP Traffic"));
@@ -196,36 +200,6 @@ bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
 #undef FW_OK
 }
 
-// Allow unprotected traffic sent to the following local address ranges.
-bool WindowsFirewall::enableLanBypass(const QList<IPAddress>& ranges) {
-  // Start the firewall transaction
-  auto result = FwpmTransactionBegin(m_sessionHandle, NULL);
-  if (result != ERROR_SUCCESS) {
-    disableKillSwitch();
-    return false;
-  }
-  auto cleanup = qScopeGuard([&] {
-    FwpmTransactionAbort0(m_sessionHandle);
-    disableKillSwitch();
-  });
-
-  // Blocking unprotected traffic
-  for (const IPAddress& prefix : ranges) {
-    if (!allowTrafficTo(prefix, LOW_WEIGHT + 1, "Allow LAN bypass traffic")) {
-      return false;
-    }
-  }
-
-  result = FwpmTransactionCommit0(m_sessionHandle);
-  if (result != ERROR_SUCCESS) {
-    logger.error() << "FwpmTransactionCommit0 failed with error:" << result;
-    return false;
-  }
-
-  cleanup.dismiss();
-  return true;
-}
-
 bool WindowsFirewall::enablePeerTraffic(const InterfaceConfig& config) {
   // Start the firewall transaction
   auto result = FwpmTransactionBegin(m_sessionHandle, NULL);
@@ -264,10 +238,10 @@ bool WindowsFirewall::enablePeerTraffic(const InterfaceConfig& config) {
 
   if (!config.m_excludedAddresses.empty()) {
     for (const QString& i : config.m_excludedAddresses) {
-      logger.debug() << "excludedAddresses range: " << i;
+      logger.debug() << "range: " << i;
 
-      if (!allowTrafficTo(i, HIGH_WEIGHT,
-                               "Allow Ecxlude route", config.m_serverPublicKey)) {
+      if (!allowTrafficToRange(i, HIGH_WEIGHT,
+                          "Allow Ecxlude route", config.m_serverPublicKey)) {
         return false;
       }
     }
@@ -447,59 +421,9 @@ bool WindowsFirewall::allowTrafficOfAdapter(int networkAdapter, uint8_t weight,
   return true;
 }
 
-bool WindowsFirewall::allowTrafficTo(const IPAddress& addr, int weight,
-                                     const QString& title,
-                                     const QString& peer) {
-  GUID layerKeyOut;
-  GUID layerKeyIn;
-  if (addr.type() == QAbstractSocket::IPv4Protocol) {
-    layerKeyOut = FWPM_LAYER_ALE_AUTH_CONNECT_V4;
-    layerKeyIn = FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4;
-  } else {
-    layerKeyOut = FWPM_LAYER_ALE_AUTH_CONNECT_V6;
-    layerKeyIn = FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6;
-  }
-
-  // Match the IP address range.
-  FWPM_FILTER_CONDITION0 cond[1] = {};
-  FWP_RANGE0 ipRange;
-  QByteArray lowIpV6Buffer;
-  QByteArray highIpV6Buffer;
-
-  importAddress(addr.address(), ipRange.valueLow, &lowIpV6Buffer);
-  importAddress(addr.broadcastAddress(), ipRange.valueHigh, &highIpV6Buffer);
-
-  cond[0].fieldKey = FWPM_CONDITION_IP_REMOTE_ADDRESS;
-  cond[0].matchType = FWP_MATCH_RANGE;
-  cond[0].conditionValue.type = FWP_RANGE_TYPE;
-  cond[0].conditionValue.rangeValue = &ipRange;
-
-  // Assemble the Filter base
-  FWPM_FILTER0 filter;
-  memset(&filter, 0, sizeof(filter));
-  filter.action.type = FWP_ACTION_PERMIT;
-  filter.weight.type = FWP_UINT8;
-  filter.weight.uint8 = weight;
-  filter.subLayerKey = ST_FW_WINFW_BASELINE_SUBLAYER_KEY;
-  filter.numFilterConditions = 1;
-  filter.filterCondition = cond;
-
-  // Send the filters down to the firewall.
-  QString description = "Permit traffic %1 " + addr.toString();
-  filter.layerKey = layerKeyOut;
-  if (!enableFilter(&filter, title, description.arg("to"), peer)) {
-    return false;
-  }
-  filter.layerKey = layerKeyIn;
-  if (!enableFilter(&filter, title, description.arg("from"), peer)) {
-    return false;
-  }
-  return true;
-}
-
 bool WindowsFirewall::allowTrafficTo(const QHostAddress& targetIP, uint port,
-                                     int weight, const QString& title,
-                                     const QString& peer) {
+                                          int weight, const QString& title,
+                                          const QString& peer) {
   bool isIPv4 = targetIP.protocol() == QAbstractSocket::IPv4Protocol;
   GUID layerOut =
       isIPv4 ? FWPM_LAYER_ALE_AUTH_CONNECT_V4 : FWPM_LAYER_ALE_AUTH_CONNECT_V6;
@@ -560,6 +484,57 @@ bool WindowsFirewall::allowTrafficTo(const QHostAddress& targetIP, uint port,
   return true;
 }
 
+bool WindowsFirewall::allowTrafficToRange(const IPAddress& addr, uint8_t weight,
+                                     const QString& title,
+                                     const QString& peer) {
+  QString description("Allow traffic %1 %2 ");
+
+  auto lower = addr.address();
+  auto upper = addr.broadcastAddress();
+
+  const bool isV4 = addr.type() == QAbstractSocket::IPv4Protocol;
+  const GUID layerKeyOut =
+      isV4 ? FWPM_LAYER_ALE_AUTH_CONNECT_V4 : FWPM_LAYER_ALE_AUTH_CONNECT_V6;
+  const GUID layerKeyIn = isV4 ? FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
+                               : FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6;
+
+  // Assemble the Filter base
+  FWPM_FILTER0 filter;
+  memset(&filter, 0, sizeof(filter));
+  filter.action.type = FWP_ACTION_PERMIT;
+  filter.weight.type = FWP_UINT8;
+  filter.weight.uint8 = weight;
+  filter.subLayerKey = ST_FW_WINFW_BASELINE_SUBLAYER_KEY;
+
+  FWPM_FILTER_CONDITION0 cond[1] = {0};
+  FWP_RANGE0 ipRange;
+  QByteArray lowIpV6Buffer;
+  QByteArray highIpV6Buffer;
+
+  importAddress(lower, ipRange.valueLow, &lowIpV6Buffer);
+  importAddress(upper, ipRange.valueHigh, &highIpV6Buffer);
+
+  cond[0].fieldKey = FWPM_CONDITION_IP_REMOTE_ADDRESS;
+  cond[0].matchType = FWP_MATCH_RANGE;
+  cond[0].conditionValue.type = FWP_RANGE_TYPE;
+  cond[0].conditionValue.rangeValue = &ipRange;
+
+  filter.numFilterConditions = 1;
+  filter.filterCondition = cond;
+
+  filter.layerKey = layerKeyOut;
+  if (!enableFilter(&filter, title, description.arg("to").arg(addr.toString()),
+                    peer)) {
+    return false;
+  }
+  filter.layerKey = layerKeyIn;
+  if (!enableFilter(&filter, title,
+                    description.arg("from").arg(addr.toString()), peer)) {
+    return false;
+  }
+  return true;
+}
+
 bool WindowsFirewall::allowDHCPTraffic(uint8_t weight, const QString& title) {
   // Allow outbound DHCPv4
   {
@@ -759,7 +734,7 @@ bool WindowsFirewall::blockTrafficTo(const IPAddress& addr, uint8_t weight,
   filter.weight.uint8 = weight;
   filter.subLayerKey = ST_FW_WINFW_BASELINE_SUBLAYER_KEY;
 
-  FWPM_FILTER_CONDITION0 cond[1] = {};
+  FWPM_FILTER_CONDITION0 cond[1] = {0};
   FWP_RANGE0 ipRange;
   QByteArray lowIpV6Buffer;
   QByteArray highIpV6Buffer;

client/platforms/windows/daemon/windowsfirewall.h

@@ -26,27 +26,18 @@ struct FWP_CONDITION_VALUE0_;
 
 class WindowsFirewall final : public QObject {
  public:
-  /**
-   * @brief Opens the Windows Filtering Platform, initializes the session,
-   * sublayer. Returns a WindowsFirewall object if successful, otherwise
-   * nullptr. If there is already a WindowsFirewall object, it will be returned.
-   *
-   * @param parent - parent QObject
-   * @return WindowsFirewall* - nullptr if failed to open the Windows Filtering
-   * Platform.
-   */
-  static WindowsFirewall* create(QObject* parent);
-  ~WindowsFirewall() override;
+  ~WindowsFirewall();
 
-  bool enableInterface(int vpnAdapterIndex);
-  bool enableLanBypass(const QList<IPAddress>& ranges);
+  static WindowsFirewall* instance();
+  bool init();
+
+  bool enableKillSwitch(int vpnAdapterIndex);
   bool enablePeerTraffic(const InterfaceConfig& config);
   bool disablePeerTraffic(const QString& pubkey);
   bool disableKillSwitch();
 
  private:
-  static bool initSublayer();
-  WindowsFirewall(HANDLE session, QObject* parent);
+  WindowsFirewall(QObject* parent);
   HANDLE m_sessionHandle;
   bool m_init = false;
   QList<uint64_t> m_activeRules;
@@ -59,10 +50,11 @@ class WindowsFirewall final : public QObject {
   bool blockTrafficTo(const IPAddress& addr, uint8_t weight,
                       const QString& title, const QString& peer = QString());
   bool blockTrafficOnPort(uint port, uint8_t weight, const QString& title);
-  bool allowTrafficTo(const IPAddress& addr, int weight, const QString& title,
-                      const QString& peer = QString());
   bool allowTrafficTo(const QHostAddress& targetIP, uint port, int weight,
                       const QString& title, const QString& peer = QString());
+  bool allowTrafficToRange(const IPAddress& addr, uint8_t weight,
+                           const QString& title,
+                           const QString& peer);
   bool allowTrafficOfAdapter(int networkAdapter, uint8_t weight,
                              const QString& title);
   bool allowDHCPTraffic(uint8_t weight, const QString& title);

client/platforms/windows/daemon/windowsroutemonitor.cpp

@@ -13,12 +13,6 @@ namespace {
 Logger logger("WindowsRouteMonitor");
 };  // namespace
 
-// Attempt to mark routing entries that we create with a relatively
-// high metric. This ensures that we can skip over routes of our own
-// creation when processing route changes, and ensures that we give
-// way to other routing entries.
-constexpr const ULONG EXCLUSION_ROUTE_METRIC = 0x5e72;
-
 // Called by the kernel on route changes - perform some basic filtering and
 // invoke the routeChanged slot to do the real work.
 static void routeChangeCallback(PVOID context, PMIB_IPFORWARD_ROW2 row,
@@ -26,17 +20,22 @@ static void routeChangeCallback(PVOID context, PMIB_IPFORWARD_ROW2 row,
   WindowsRouteMonitor* monitor = (WindowsRouteMonitor*)context;
   Q_UNUSED(type);
 
-  // Ignore route changes that we created.
-  if ((row->Protocol == MIB_IPPROTO_NETMGMT) &&
-      (row->Metric == EXCLUSION_ROUTE_METRIC)) {
-    return;
-  }
-  if (monitor->getLuid() == row->InterfaceLuid.Value) {
+  // Ignore host route changes, and unsupported protocols.
+  if (row->DestinationPrefix.Prefix.si_family == AF_INET6) {
+    if (row->DestinationPrefix.PrefixLength >= 128) {
+      return;
+    }
+  } else if (row->DestinationPrefix.Prefix.si_family == AF_INET) {
+    if (row->DestinationPrefix.PrefixLength >= 32) {
+      return;
+    }
+  } else {
     return;
   }
 
-  // Invoke the route changed signal to do the real work in Qt.
-  QMetaObject::invokeMethod(monitor, "routeChanged", Qt::QueuedConnection);
+  if (monitor->getLuid() != row->InterfaceLuid.Value) {
+    QMetaObject::invokeMethod(monitor, "routeChanged", Qt::QueuedConnection);
+  }
 }
 
 // Perform prefix matching comparison on IP addresses in host order.
@@ -58,8 +57,7 @@ static int prefixcmp(const void* a, const void* b, size_t bits) {
   return 0;
 }
 
-WindowsRouteMonitor::WindowsRouteMonitor(quint64 luid, QObject* parent)
-    : QObject(parent), m_luid(luid) {
+WindowsRouteMonitor::WindowsRouteMonitor(QObject* parent) : QObject(parent) {
   MZ_COUNT_CTOR(WindowsRouteMonitor);
   logger.debug() << "WindowsRouteMonitor created.";
 
@@ -69,13 +67,11 @@ WindowsRouteMonitor::WindowsRouteMonitor(quint64 luid, QObject* parent)
 WindowsRouteMonitor::~WindowsRouteMonitor() {
   MZ_COUNT_DTOR(WindowsRouteMonitor);
   CancelMibChangeNotify2(m_routeHandle);
-
-  flushRouteTable(m_exclusionRoutes);
-  flushRouteTable(m_clonedRoutes);
+  flushExclusionRoutes();
   logger.debug() << "WindowsRouteMonitor destroyed.";
 }
 
-void WindowsRouteMonitor::updateInterfaceMetrics(int family) {
+void WindowsRouteMonitor::updateValidInterfaces(int family) {
   PMIB_IPINTERFACE_TABLE table;
   DWORD result = GetIpInterfaceTable(family, &table);
   if (result != NO_ERROR) {
@@ -86,10 +82,10 @@ void WindowsRouteMonitor::updateInterfaceMetrics(int family) {
 
   // Flush the list of interfaces that are valid for routing.
   if ((family == AF_INET) || (family == AF_UNSPEC)) {
-    m_interfaceMetricsIpv4.clear();
+    m_validInterfacesIpv4.clear();
   }
   if ((family == AF_INET6) || (family == AF_UNSPEC)) {
-    m_interfaceMetricsIpv6.clear();
+    m_validInterfacesIpv6.clear();
   }
 
   // Rebuild the list of interfaces that are valid for routing.
@@ -105,12 +101,12 @@ void WindowsRouteMonitor::updateInterfaceMetrics(int family) {
     if (row->Family == AF_INET) {
       logger.debug() << "Interface" << row->InterfaceIndex
                      << "is valid for IPv4 routing";
-      m_interfaceMetricsIpv4[row->InterfaceLuid.Value] = row->Metric;
+      m_validInterfacesIpv4.append(row->InterfaceLuid.Value);
     }
     if (row->Family == AF_INET6) {
       logger.debug() << "Interface" << row->InterfaceIndex
                      << "is valid for IPv6 routing";
-      m_interfaceMetricsIpv6[row->InterfaceLuid.Value] = row->Metric;
+      m_validInterfacesIpv6.append(row->InterfaceLuid.Value);
     }
   }
 }
@@ -130,72 +126,72 @@ void WindowsRouteMonitor::updateExclusionRoute(MIB_IPFORWARD_ROW2* data,
     if (row->InterfaceLuid.Value == m_luid) {
       continue;
     }
-    if (row->DestinationPrefix.PrefixLength < bestMatch) {
+    // Ignore host routes, and shorter potential matches.
+    if (row->DestinationPrefix.PrefixLength >=
+        data->DestinationPrefix.PrefixLength) {
       continue;
     }
-    // Ignore routes of our own creation.
-    if ((row->Protocol == data->Protocol) && (row->Metric == data->Metric)) {
+    if (row->DestinationPrefix.PrefixLength < bestMatch) {
       continue;
     }
 
     // Check if the routing table entry matches the destination.
-    if (!routeContainsDest(&row->DestinationPrefix, &data->DestinationPrefix)) {
-      continue;
-    }
-
-    // Compute the combined interface and routing metric.
-    ULONG routeMetric = row->Metric;
     if (data->DestinationPrefix.Prefix.si_family == AF_INET6) {
-      if (!m_interfaceMetricsIpv6.contains(row->InterfaceLuid.Value)) {
+      if (row->DestinationPrefix.Prefix.Ipv6.sin6_family != AF_INET6) {
+        continue;
+      }
+      if (!m_validInterfacesIpv6.contains(row->InterfaceLuid.Value)) {
+        continue;
+      }
+      if (prefixcmp(&data->DestinationPrefix.Prefix.Ipv6.sin6_addr,
+                    &row->DestinationPrefix.Prefix.Ipv6.sin6_addr,
+                    row->DestinationPrefix.PrefixLength) != 0) {
         continue;
       }
-      routeMetric += m_interfaceMetricsIpv6[row->InterfaceLuid.Value];
     } else if (data->DestinationPrefix.Prefix.si_family == AF_INET) {
-      if (!m_interfaceMetricsIpv4.contains(row->InterfaceLuid.Value)) {
+      if (row->DestinationPrefix.Prefix.Ipv4.sin_family != AF_INET) {
+        continue;
+      }
+      if (!m_validInterfacesIpv4.contains(row->InterfaceLuid.Value)) {
+        continue;
+      }
+      if (prefixcmp(&data->DestinationPrefix.Prefix.Ipv4.sin_addr,
+                    &row->DestinationPrefix.Prefix.Ipv4.sin_addr,
+                    row->DestinationPrefix.PrefixLength) != 0) {
         continue;
       }
-      routeMetric += m_interfaceMetricsIpv4[row->InterfaceLuid.Value];
     } else {
       // Unsupported destination address family.
       continue;
     }
-    if (routeMetric < row->Metric) {
-      routeMetric = ULONG_MAX;
-    }
 
     // Prefer routes with lower metric if we find multiple matches
     // with the same prefix length.
     if ((row->DestinationPrefix.PrefixLength == bestMatch) &&
-        (routeMetric >= bestMetric)) {
+        (row->Metric >= bestMetric)) {
       continue;
     }
 
     // If we got here, then this is the longest prefix match so far.
     memcpy(&nexthop, &row->NextHop, sizeof(SOCKADDR_INET));
+    bestLuid = row->InterfaceLuid.Value;
     bestMatch = row->DestinationPrefix.PrefixLength;
-    bestMetric = routeMetric;
-    if (bestMatch == data->DestinationPrefix.PrefixLength) {
-      bestLuid = 0;  // Don't write to the table if we find an exact match.
-    } else {
-      bestLuid = row->InterfaceLuid.Value;
-    }
+    bestMetric = row->Metric;
   }
 
   // If neither the interface nor next-hop have changed, then do nothing.
-  if (data->InterfaceLuid.Value == bestLuid &&
+  if ((data->InterfaceLuid.Value) == bestLuid &&
       memcmp(&nexthop, &data->NextHop, sizeof(SOCKADDR_INET)) == 0) {
     return;
   }
 
-  // Delete the previous routing table entry, if any.
+  // Update the routing table entry.
   if (data->InterfaceLuid.Value != 0) {
     DWORD result = DeleteIpForwardEntry2(data);
     if ((result != NO_ERROR) && (result != ERROR_NOT_FOUND)) {
       logger.error() << "Failed to delete route:" << result;
     }
   }
-
-  // Update the routing table entry.
   data->InterfaceLuid.Value = bestLuid;
   memcpy(&data->NextHop, &nexthop, sizeof(SOCKADDR_INET));
   if (data->InterfaceLuid.Value != 0) {
@@ -206,178 +202,10 @@ void WindowsRouteMonitor::updateExclusionRoute(MIB_IPFORWARD_ROW2* data,
   }
 }
 
-// static
-bool WindowsRouteMonitor::routeContainsDest(const IP_ADDRESS_PREFIX* route,
-                                            const IP_ADDRESS_PREFIX* dest) {
-  if (route->Prefix.si_family != dest->Prefix.si_family) {
-    return false;
-  }
-  if (route->PrefixLength > dest->PrefixLength) {
-    return false;
-  }
-  if (route->Prefix.si_family == AF_INET) {
-    return prefixcmp(&route->Prefix.Ipv4.sin_addr, &dest->Prefix.Ipv4.sin_addr,
-                     route->PrefixLength) == 0;
-  } else if (route->Prefix.si_family == AF_INET6) {
-    return prefixcmp(&route->Prefix.Ipv6.sin6_addr,
-                     &dest->Prefix.Ipv6.sin6_addr, route->PrefixLength) == 0;
-  } else {
-    return false;
-  }
-}
-
-// static
-QHostAddress WindowsRouteMonitor::prefixToAddress(
-    const IP_ADDRESS_PREFIX* dest) {
-  if (dest->Prefix.si_family == AF_INET6) {
-    return QHostAddress(dest->Prefix.Ipv6.sin6_addr.s6_addr);
-  } else if (dest->Prefix.si_family == AF_INET) {
-    quint32 addr = htonl(dest->Prefix.Ipv4.sin_addr.s_addr);
-    return QHostAddress(addr);
-  } else {
-    return QHostAddress();
-  }
-}
-
-bool WindowsRouteMonitor::isRouteExcluded(const IP_ADDRESS_PREFIX* dest) const {
-  auto i = m_exclusionRoutes.constBegin();
-  while (i != m_exclusionRoutes.constEnd()) {
-    const MIB_IPFORWARD_ROW2* row = i.value();
-    if (routeContainsDest(&row->DestinationPrefix, dest)) {
-      return true;
-    }
-    i++;
-  }
-  return false;
-}
-
-void WindowsRouteMonitor::updateCapturedRoutes(int family) {
-  if (!m_defaultRouteCapture) {
-    return;
-  }
-
-  PMIB_IPFORWARD_TABLE2 table;
-  DWORD error = GetIpForwardTable2(family, &table);
-  if (error != NO_ERROR) {
-    updateCapturedRoutes(family, table);
-    FreeMibTable(table);
-  }
-}
-
-void WindowsRouteMonitor::updateCapturedRoutes(int family, void* ptable) {
-  PMIB_IPFORWARD_TABLE2 table = reinterpret_cast<PMIB_IPFORWARD_TABLE2>(ptable);
-  if (!m_defaultRouteCapture) {
-    return;
-  }
-
-  for (ULONG i = 0; i < table->NumEntries; i++) {
-    MIB_IPFORWARD_ROW2* row = &table->Table[i];
-    // Ignore routes into the VPN interface.
-    if (row->InterfaceLuid.Value == m_luid) {
-      continue;
-    }
-    // Ignore the default route
-    if (row->DestinationPrefix.PrefixLength == 0) {
-      continue;
-    }
-    // Ignore routes of our own creation.
-    if ((row->Protocol == MIB_IPPROTO_NETMGMT) &&
-        (row->Metric == EXCLUSION_ROUTE_METRIC)) {
-      continue;
-    }
-    // Ignore routes which should be excluded.
-    if (isRouteExcluded(&row->DestinationPrefix)) {
-      continue;
-    }
-    QHostAddress destination = prefixToAddress(&row->DestinationPrefix);
-    if (destination.isLoopback() || destination.isBroadcast() ||
-        destination.isLinkLocal() || destination.isMulticast()) {
-      continue;
-    }
-
-    // If we get here, this route should be cloned.
-    IPAddress prefix(destination, row->DestinationPrefix.PrefixLength);
-    MIB_IPFORWARD_ROW2* data = m_clonedRoutes.value(prefix, nullptr);
-    if (data != nullptr) {
-      // Count the number of matching entries in the main table.
-      data->Age++;
-      continue;
-    }
-    logger.debug() << "Capturing route to"
-                   << logger.sensitive(prefix.toString());
-
-    // Clone the route and direct it into the VPN tunnel.
-    data = new MIB_IPFORWARD_ROW2;
-    InitializeIpForwardEntry(data);
-    data->InterfaceLuid.Value = m_luid;
-    data->DestinationPrefix = row->DestinationPrefix;
-    data->NextHop.si_family = data->DestinationPrefix.Prefix.si_family;
-
-    // Set the rest of the flags for a static route.
-    data->ValidLifetime = 0xffffffff;
-    data->PreferredLifetime = 0xffffffff;
-    data->Metric = 0;
-    data->Protocol = MIB_IPPROTO_NETMGMT;
-    data->Loopback = false;
-    data->AutoconfigureAddress = false;
-    data->Publish = false;
-    data->Immortal = false;
-    data->Age = 0;
-
-    // Route this traffic into the VPN tunnel.
-    DWORD result = CreateIpForwardEntry2(data);
-    if (result != NO_ERROR) {
-      logger.error() << "Failed to update route:" << result;
-      delete data;
-    } else {
-      m_clonedRoutes.insert(prefix, data);
-      data->Age++;
-    }
-  }
-
-  // Finally scan for any routes which were removed from the table. We do this
-  // by reusing the age field to count the number of matching entries in the
-  // main table.
-  auto i = m_clonedRoutes.begin();
-  while (i != m_clonedRoutes.end()) {
-    MIB_IPFORWARD_ROW2* data = i.value();
-    if (data->Age > 0) {
-      // Entry is in use, don't delete it.
-      data->Age = 0;
-      i++;
-      continue;
-    }
-    if ((family != AF_UNSPEC) &&
-        (data->DestinationPrefix.Prefix.si_family != family)) {
-      // We are not processing updates to this address family.
-      i++;
-      continue;
-    }
-
-    logger.debug() << "Removing route capture for"
-                   << logger.sensitive(i.key().toString());
-
-    // Otherwise, this route is no longer in use.
-    DWORD result = DeleteIpForwardEntry2(data);
-    if ((result != NO_ERROR) && (result != ERROR_NOT_FOUND)) {
-      logger.error() << "Failed to delete route:" << result;
-    }
-    delete data;
-    i = m_clonedRoutes.erase(i);
-  }
-}
-
 bool WindowsRouteMonitor::addExclusionRoute(const IPAddress& prefix) {
   logger.debug() << "Adding exclusion route for"
                  << logger.sensitive(prefix.toString());
 
-  // Silently ignore non-routeable addresses.
-  QHostAddress addr = prefix.address();
-  if (addr.isLoopback() || addr.isBroadcast() || addr.isLinkLocal() ||
-      addr.isMulticast()) {
-    return true;
-  }
-
   if (m_exclusionRoutes.contains(prefix)) {
     logger.warning() << "Exclusion route already exists";
     return false;
@@ -404,7 +232,7 @@ bool WindowsRouteMonitor::addExclusionRoute(const IPAddress& prefix) {
   // Set the rest of the flags for a static route.
   data->ValidLifetime = 0xffffffff;
   data->PreferredLifetime = 0xffffffff;
-  data->Metric = EXCLUSION_ROUTE_METRIC;
+  data->Metric = 0;
   data->Protocol = MIB_IPPROTO_NETMGMT;
   data->Loopback = false;
   data->AutoconfigureAddress = false;
@@ -426,8 +254,7 @@ bool WindowsRouteMonitor::addExclusionRoute(const IPAddress& prefix) {
     delete data;
     return false;
   }
-  updateInterfaceMetrics(family);
-  updateCapturedRoutes(family, table);
+  updateValidInterfaces(family);
   updateExclusionRoute(data, table);
   FreeMibTable(table);
 
@@ -439,28 +266,26 @@ bool WindowsRouteMonitor::deleteExclusionRoute(const IPAddress& prefix) {
   logger.debug() << "Deleting exclusion route for"
                  << logger.sensitive(prefix.address().toString());
 
-  MIB_IPFORWARD_ROW2* data = m_exclusionRoutes.take(prefix);
-  if (data == nullptr) {
-    return true;
+  for (;;) {
+    MIB_IPFORWARD_ROW2* data = m_exclusionRoutes.take(prefix);
+    if (data == nullptr) {
+      break;
+    }
+
+    DWORD result = DeleteIpForwardEntry2(data);
+    if ((result != ERROR_NOT_FOUND) && (result != NO_ERROR)) {
+      logger.error() << "Failed to delete route to"
+                     << logger.sensitive(prefix.toString())
+                     << "result:" << result;
+    }
+    delete data;
   }
 
-  DWORD result = DeleteIpForwardEntry2(data);
-  if ((result != ERROR_NOT_FOUND) && (result != NO_ERROR)) {
-    logger.error() << "Failed to delete route to"
-                   << logger.sensitive(prefix.toString())
-                   << "result:" << result;
-  }
-
-  // Captured routes might have changed.
-  updateCapturedRoutes(data->DestinationPrefix.Prefix.si_family);
-
-  delete data;
   return true;
 }
 
-void WindowsRouteMonitor::flushRouteTable(
-    QHash<IPAddress, MIB_IPFORWARD_ROW2*>& table) {
-  for (auto i = table.begin(); i != table.end(); i++) {
+void WindowsRouteMonitor::flushExclusionRoutes() {
+  for (auto i = m_exclusionRoutes.begin(); i != m_exclusionRoutes.end(); i++) {
     MIB_IPFORWARD_ROW2* data = i.value();
     DWORD result = DeleteIpForwardEntry2(data);
     if ((result != ERROR_NOT_FOUND) && (result != NO_ERROR)) {
@@ -470,17 +295,7 @@ void WindowsRouteMonitor::flushRouteTable(
     }
     delete data;
   }
-  table.clear();
-}
-
-void WindowsRouteMonitor::setDetaultRouteCapture(bool enable) {
-  m_defaultRouteCapture = enable;
-
-  // Flush any captured routes when disabling the feature.
-  if (!m_defaultRouteCapture) {
-    flushRouteTable(m_clonedRoutes);
-    return;
-  }
+  m_exclusionRoutes.clear();
 }
 
 void WindowsRouteMonitor::routeChanged() {
@@ -493,8 +308,7 @@ void WindowsRouteMonitor::routeChanged() {
     return;
   }
 
-  updateInterfaceMetrics(AF_UNSPEC);
-  updateCapturedRoutes(AF_UNSPEC, table);
+  updateValidInterfaces(AF_UNSPEC);
   for (MIB_IPFORWARD_ROW2* data : m_exclusionRoutes) {
     updateExclusionRoute(data, table);
   }

client/platforms/windows/daemon/windowsroutemonitor.h

@@ -11,8 +11,6 @@
 #include <winsock2.h>
 #include <ws2ipdef.h>
 
-#include <QHash>
-#include <QMap>
 #include <QObject>
 
 #include "ipaddress.h"
@@ -21,41 +19,28 @@ class WindowsRouteMonitor final : public QObject {
   Q_OBJECT
 
  public:
-  WindowsRouteMonitor(quint64 luid, QObject* parent);
+  WindowsRouteMonitor(QObject* parent);
   ~WindowsRouteMonitor();
 
-  void setDetaultRouteCapture(bool enable);
-
   bool addExclusionRoute(const IPAddress& prefix);
   bool deleteExclusionRoute(const IPAddress& prefix);
-  void flushExclusionRoutes() { return flushRouteTable(m_exclusionRoutes); };
+  void flushExclusionRoutes();
 
-  quint64 getLuid() const { return m_luid; }
+  void setLuid(quint64 luid) { m_luid = luid; }
+  quint64 getLuid() { return m_luid; }
 
  public slots:
   void routeChanged();
 
  private:
-  bool isRouteExcluded(const IP_ADDRESS_PREFIX* dest) const;
-  static bool routeContainsDest(const IP_ADDRESS_PREFIX* route,
-                                const IP_ADDRESS_PREFIX* dest);
-  static QHostAddress prefixToAddress(const IP_ADDRESS_PREFIX* dest);
-
-  void flushRouteTable(QHash<IPAddress, MIB_IPFORWARD_ROW2*>& table);
   void updateExclusionRoute(MIB_IPFORWARD_ROW2* data, void* table);
-  void updateInterfaceMetrics(int family);
-  void updateCapturedRoutes(int family);
-  void updateCapturedRoutes(int family, void* table);
+  void updateValidInterfaces(int family);
 
   QHash<IPAddress, MIB_IPFORWARD_ROW2*> m_exclusionRoutes;
-  QMap<quint64, ULONG> m_interfaceMetricsIpv4;
-  QMap<quint64, ULONG> m_interfaceMetricsIpv6;
+  QList<quint64> m_validInterfacesIpv4;
+  QList<quint64> m_validInterfacesIpv6;
 
-  // Default route cloning
-  bool m_defaultRouteCapture = false;
-  QHash<IPAddress, MIB_IPFORWARD_ROW2*> m_clonedRoutes;
-
-  const quint64 m_luid = 0;
+  quint64 m_luid = 0;
   HANDLE m_routeHandle = INVALID_HANDLE_VALUE;
 };
 

client/platforms/windows/daemon/windowssplittunnel.cpp

@@ -4,15 +4,9 @@
 
 #include "windowssplittunnel.h"
 
-#include <qassert.h>
-
-#include <memory>
-
 #include "../windowscommons.h"
 #include "../windowsservicemanager.h"
 #include "logger.h"
-#include "platforms/windows/daemon/windowsfirewall.h"
-#include "platforms/windows/daemon/windowssplittunnel.h"
 #include "platforms/windows/windowsutils.h"
 #include "windowsfirewall.h"
 
@@ -24,252 +18,34 @@
 #include <QFileInfo>
 #include <QNetworkInterface>
 #include <QScopeGuard>
-
-#pragma region
-
-// Driver Configuration structures
-using CONFIGURATION_ENTRY = struct {
-  // Offset into buffer region that follows all entries.
-  // The image name uses the device path.
-  SIZE_T ImageNameOffset;
-  // Length of the String
-  USHORT ImageNameLength;
-};
-
-using CONFIGURATION_HEADER = struct {
-  // Number of entries immediately following the header.
-  SIZE_T NumEntries;
-
-  // Total byte length: header + entries + string buffer.
-  SIZE_T TotalLength;
-};
-
-// Used to Configure Which IP is network/vpn
-using IP_ADDRESSES_CONFIG = struct {
-  IN_ADDR TunnelIpv4;
-  IN_ADDR InternetIpv4;
-
-  IN6_ADDR TunnelIpv6;
-  IN6_ADDR InternetIpv6;
-};
-
-// Used to Define Which Processes are alive on activation
-using PROCESS_DISCOVERY_HEADER = struct {
-  SIZE_T NumEntries;
-  SIZE_T TotalLength;
-};
-
-using PROCESS_DISCOVERY_ENTRY = struct {
-  HANDLE ProcessId;
-  HANDLE ParentProcessId;
-
-  SIZE_T ImageNameOffset;
-  USHORT ImageNameLength;
-};
-
-using ProcessInfo = struct {
-  DWORD ProcessId;
-  DWORD ParentProcessId;
-  FILETIME CreationTime;
-  std::wstring DevicePath;
-};
-
-#ifndef CTL_CODE
-
-#  define FILE_ANY_ACCESS 0x0000
-
-#  define METHOD_BUFFERED 0
-#  define METHOD_IN_DIRECT 1
-#  define METHOD_NEITHER 3
-
-#  define CTL_CODE(DeviceType, Function, Method, Access) \
-    (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
-#endif
-
-// Known ControlCodes
-#define IOCTL_INITIALIZE CTL_CODE(0x8000, 1, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_DEQUEUE_EVENT \
-  CTL_CODE(0x8000, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_REGISTER_PROCESSES \
-  CTL_CODE(0x8000, 3, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_REGISTER_IP_ADDRESSES \
-  CTL_CODE(0x8000, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_GET_IP_ADDRESSES \
-  CTL_CODE(0x8000, 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SET_CONFIGURATION \
-  CTL_CODE(0x8000, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_GET_CONFIGURATION \
-  CTL_CODE(0x8000, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_CLEAR_CONFIGURATION \
-  CTL_CODE(0x8000, 8, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_GET_STATE CTL_CODE(0x8000, 9, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_QUERY_PROCESS \
-  CTL_CODE(0x8000, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_ST_RESET CTL_CODE(0x8000, 11, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-constexpr static const auto DRIVER_SYMLINK = L"\\\\.\\MULLVADSPLITTUNNEL";
-constexpr static const auto DRIVER_FILENAME = "mullvad-split-tunnel.sys";
-constexpr static const auto DRIVER_SERVICE_NAME = L"AmneziaVPNSplitTunnel";
-constexpr static const auto MV_SERVICE_NAME = L"MullvadVPN";
-
-#pragma endregion
+#include <QThread>
 
 namespace {
 Logger logger("WindowsSplitTunnel");
-
-ProcessInfo getProcessInfo(HANDLE process, const PROCESSENTRY32W& processMeta) {
-  ProcessInfo pi;
-  pi.ParentProcessId = processMeta.th32ParentProcessID;
-  pi.ProcessId = processMeta.th32ProcessID;
-  pi.CreationTime = {0, 0};
-  pi.DevicePath = L"";
-
-  FILETIME creationTime, null_time;
-  auto ok = GetProcessTimes(process, &creationTime, &null_time, &null_time,
-                            &null_time);
-  if (ok) {
-    pi.CreationTime = creationTime;
-  }
-  wchar_t imagepath[MAX_PATH + 1];
-  if (K32GetProcessImageFileNameW(
-          process, imagepath, sizeof(imagepath) / sizeof(*imagepath)) != 0) {
-    pi.DevicePath = imagepath;
-  }
-  return pi;
 }
 
-}  // namespace
-
-std::unique_ptr<WindowsSplitTunnel> WindowsSplitTunnel::create(
-    WindowsFirewall* fw) {
-  if (fw == nullptr) {
-    // Pre-Condition:
-    // Make sure the Windows Firewall has created the sublayer
-    // otherwise the driver will fail to initialize
-    logger.error() << "Failed to did not pass a WindowsFirewall obj"
-                   << "The Driver cannot work with the sublayer not created";
-    return nullptr;
-  }
-  // 00: Check if we conflict with mullvad, if so.
+WindowsSplitTunnel::WindowsSplitTunnel(QObject* parent) : QObject(parent) {
   if (detectConflict()) {
     logger.error() << "Conflict detected, abort Split-Tunnel init.";
-    return nullptr;
+    uninstallDriver();
+    return;
   }
-  // 01: Check if the driver is installed, if not do so.
+
+  m_tries = 0;
+
   if (!isInstalled()) {
     logger.debug() << "Driver is not Installed, doing so";
     auto handle = installDriver();
     if (handle == INVALID_HANDLE_VALUE) {
       WindowsUtils::windowsLog("Failed to install Driver");
-      return nullptr;
+      return;
     }
     logger.debug() << "Driver installed";
     CloseServiceHandle(handle);
   } else {
-    logger.debug() << "Driver was installed";
+    logger.debug() << "Driver is installed";
   }
-  // 02: Now check if the service is running
-  auto driver_manager =
-      WindowsServiceManager::open(QString::fromWCharArray(DRIVER_SERVICE_NAME));
-  if (Q_UNLIKELY(driver_manager == nullptr)) {
-    // Let's be fair if we end up here,
-    // after checking it exists and installing it,
-    // this is super unlikeley
-    Q_ASSERT(false);
-    logger.error()
-        << "WindowsServiceManager was unable fo find Split Tunnel service?";
-    return nullptr;
-  }
-  if (!driver_manager->isRunning()) {
-    logger.debug() << "Driver is not running, starting it";
-    // Start the service
-    if (!driver_manager->startService()) {
-      logger.error() << "Failed to start Split Tunnel Service";
-      return nullptr;
-    };
-  }
-  // 03: Open the Driver Symlink
-  auto driverFile = CreateFileW(DRIVER_SYMLINK, GENERIC_READ | GENERIC_WRITE, 0,
-                                nullptr, OPEN_EXISTING, 0, nullptr);
-  ;
-  if (driverFile == INVALID_HANDLE_VALUE) {
-    WindowsUtils::windowsLog("Failed to open Driver: ");
-    // Only once, if the opening did not work. Try to reboot it. #
-    logger.info()
-        << "Failed to open driver, attempting only once to reboot driver";
-    if (!driver_manager->stopService()) {
-      logger.error() << "Unable stop driver";
-      return nullptr;
-    };
-    logger.info() << "Stopped driver, starting it again.";
-    if (!driver_manager->startService()) {
-      logger.error() << "Unable start driver";
-      return nullptr;
-    };
-    logger.info() << "Opening again.";
-    driverFile = CreateFileW(DRIVER_SYMLINK, GENERIC_READ | GENERIC_WRITE, 0,
-                             nullptr, OPEN_EXISTING, 0, nullptr);
-    if (driverFile == INVALID_HANDLE_VALUE) {
-      logger.error() << "Opening Failed again, sorry!";
-      return nullptr;
-    }
-  }
-  if (!initDriver(driverFile)) {
-    logger.error() << "Failed to init driver";
-    return nullptr;
-  }
-  // We're ready to talk to the driver, it's alive and setup.
-  return std::make_unique<WindowsSplitTunnel>(driverFile);
-}
-
-bool WindowsSplitTunnel::initDriver(HANDLE driverIO) {
-  // We need to now check the state and init it, if required
-  auto state = getState(driverIO);
-  if (state == STATE_UNKNOWN) {
-    logger.debug() << "Cannot check if driver is initialized";
-    return false;
-  }
-  if (state >= STATE_INITIALIZED) {
-    logger.debug() << "Driver already initialized: " << state;
-    // Reset Driver as it has wfp handles probably >:(
-    resetDriver(driverIO);
-
-    auto newState = getState(driverIO);
-    logger.debug() << "New state after reset:" << newState;
-    if (newState >= STATE_INITIALIZED) {
-      logger.debug() << "Reset unsuccesfull";
-      return false;
-    }
-  }
-
-  DWORD bytesReturned;
-  auto ok = DeviceIoControl(driverIO, IOCTL_INITIALIZE, nullptr, 0, nullptr, 0,
-                            &bytesReturned, nullptr);
-  if (!ok) {
-    auto err = GetLastError();
-    logger.error() << "Driver init failed err -" << err;
-    logger.error() << "State:" << getState(driverIO);
-
-    return false;
-  }
-  logger.debug() << "Driver initialized" << getState(driverIO);
-  return true;
-}
-
-WindowsSplitTunnel::WindowsSplitTunnel(HANDLE driverIO) : m_driver(driverIO) {
-  logger.debug() << "Connected to the Driver";
-
-  Q_ASSERT(getState() == STATE_INITIALIZED);
+  initDriver();
 }
 
 WindowsSplitTunnel::~WindowsSplitTunnel() {
@@ -277,12 +53,73 @@ WindowsSplitTunnel::~WindowsSplitTunnel() {
   uninstallDriver();
 }
 
-bool WindowsSplitTunnel::excludeApps(const QStringList& appPaths) {
+void WindowsSplitTunnel::initDriver() {
+  if (detectConflict()) {
+    logger.error() << "Conflict detected, abort Split-Tunnel init.";
+    return;
+  }
+  logger.debug() << "Try to open Split Tunnel Driver";
+  // Open the Driver Symlink
+  m_driver = CreateFileW(DRIVER_SYMLINK, GENERIC_READ | GENERIC_WRITE, 0,
+                         nullptr, OPEN_EXISTING, 0, nullptr);
+  ;
+  if (m_driver == INVALID_HANDLE_VALUE && m_tries < 500) {
+    WindowsUtils::windowsLog("Failed to open Driver: ");
+    m_tries++;
+    Sleep(100);
+    // If the handle is not present, try again after the serivce has started;
+    auto driver_manager = WindowsServiceManager(DRIVER_SERVICE_NAME);
+    QObject::connect(&driver_manager, &WindowsServiceManager::serviceStarted,
+                     this, &WindowsSplitTunnel::initDriver);
+    driver_manager.startService();
+    return;
+  }
+
+  logger.debug() << "Connected to the Driver";
+  // Reset Driver as it has wfp handles probably >:(
+
+  if (!WindowsFirewall::instance()->init()) {
+    logger.error() << "Init WFP-Sublayer failed, driver won't be functional";
+    return;
+  }
+
+  // We need to now check the state and init it, if required
+
+  auto state = getState();
+  if (state == STATE_UNKNOWN) {
+    logger.debug() << "Cannot check if driver is initialized";
+  }
+  if (state >= STATE_INITIALIZED) {
+    logger.debug() << "Driver already initialized: " << state;
+    reset();
+
+    auto newState = getState();
+    logger.debug() << "New state after reset:" << newState;
+    if (newState >= STATE_INITIALIZED) {
+      logger.debug() << "Reset unsuccesfull";
+      return;
+    }
+  }
+
+  DWORD bytesReturned;
+  auto ok = DeviceIoControl(m_driver, IOCTL_INITIALIZE, nullptr, 0, nullptr, 0,
+                            &bytesReturned, nullptr);
+  if (!ok) {
+    auto err = GetLastError();
+    logger.error() << "Driver init failed err -" << err;
+    logger.error() << "State:" << getState();
+
+    return;
+  }
+  logger.debug() << "Driver initialized" << getState();
+}
+
+void WindowsSplitTunnel::setRules(const QStringList& appPaths) {
   auto state = getState();
   if (state != STATE_READY && state != STATE_RUNNING) {
     logger.warning() << "Driver is not in the right State to set Rules"
                      << state;
-    return false;
+    return;
   }
 
   logger.debug() << "Pushing new Ruleset for Split-Tunnel " << state;
@@ -296,13 +133,12 @@ bool WindowsSplitTunnel::excludeApps(const QStringList& appPaths) {
     auto err = GetLastError();
     WindowsUtils::windowsLog("Set Config Failed:");
     logger.error() << "Failed to set Config err code " << err;
-    return false;
+    return;
   }
-  logger.debug() << "New Configuration applied: " << stateString();
-  return true;
+  logger.debug() << "New Configuration applied: " << getState();
 }
 
-bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
+void WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
   // To Start we need to send 2 things:
   // Network info (what is vpn what is network)
   logger.debug() << "Starting SplitTunnel";
@@ -315,7 +151,7 @@ bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
                               0, &bytesReturned, nullptr);
     if (!ok) {
       logger.error() << "Driver init failed";
-      return false;
+      return;
     }
   }
 
@@ -328,16 +164,16 @@ bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
                               nullptr);
     if (!ok) {
       logger.error() << "Failed to set Process Config";
-      return false;
+      return;
     }
-    logger.debug() << "Set Process Config ok || new State:" << stateString();
+    logger.debug() << "Set Process Config ok || new State:" << getState();
   }
 
   if (getState() == STATE_INITIALIZED) {
     logger.warning() << "Driver is still not ready after process list send";
-    return false;
+    return;
   }
-  logger.debug() << "Driver is  ready || new State:" << stateString();
+  logger.debug() << "Driver is  ready || new State:" << getState();
 
   auto config = generateIPConfiguration(inetAdapterIndex, vpnAdapterIndex);
   auto ok = DeviceIoControl(m_driver, IOCTL_REGISTER_IP_ADDRESSES, &config[0],
@@ -345,10 +181,9 @@ bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
                             nullptr);
   if (!ok) {
     logger.error() << "Failed to set Network Config";
-    return false;
+    return;
   }
-  logger.debug() << "New Network Config Applied || new State:" << stateString();
-  return true;
+  logger.debug() << "New Network Config Applied || new State:" << getState();
 }
 
 void WindowsSplitTunnel::stop() {
@@ -362,27 +197,25 @@ void WindowsSplitTunnel::stop() {
   logger.debug() << "Stopping Split tunnel successfull";
 }
 
-bool WindowsSplitTunnel::resetDriver(HANDLE driverIO) {
+void WindowsSplitTunnel::reset() {
   DWORD bytesReturned;
-  auto ok = DeviceIoControl(driverIO, IOCTL_ST_RESET, nullptr, 0, nullptr, 0,
+  auto ok = DeviceIoControl(m_driver, IOCTL_ST_RESET, nullptr, 0, nullptr, 0,
                             &bytesReturned, nullptr);
   if (!ok) {
     logger.error() << "Reset Split tunnel not successfull";
-    return false;
+    return;
   }
   logger.debug() << "Reset Split tunnel successfull";
-  return true;
 }
 
-// static
-WindowsSplitTunnel::DRIVER_STATE WindowsSplitTunnel::getState(HANDLE driverIO) {
-  if (driverIO == INVALID_HANDLE_VALUE) {
+DRIVER_STATE WindowsSplitTunnel::getState() {
+  if (m_driver == INVALID_HANDLE_VALUE) {
     logger.debug() << "Can't query State from non Opened Driver";
     return STATE_UNKNOWN;
   }
   DWORD bytesReturned;
   SIZE_T outBuffer;
-  bool ok = DeviceIoControl(driverIO, IOCTL_GET_STATE, nullptr, 0, &outBuffer,
+  bool ok = DeviceIoControl(m_driver, IOCTL_GET_STATE, nullptr, 0, &outBuffer,
                             sizeof(outBuffer), &bytesReturned, nullptr);
   if (!ok) {
     WindowsUtils::windowsLog("getState response failure");
@@ -392,10 +225,7 @@ WindowsSplitTunnel::DRIVER_STATE WindowsSplitTunnel::getState(HANDLE driverIO) {
     WindowsUtils::windowsLog("getState response is empty");
     return STATE_UNKNOWN;
   }
-  return static_cast<WindowsSplitTunnel::DRIVER_STATE>(outBuffer);
-}
-WindowsSplitTunnel::DRIVER_STATE WindowsSplitTunnel::getState() {
-  return getState(m_driver);
+  return static_cast<DRIVER_STATE>(outBuffer);
 }
 
 std::vector<uint8_t> WindowsSplitTunnel::generateAppConfiguration(
@@ -443,59 +273,58 @@ std::vector<uint8_t> WindowsSplitTunnel::generateAppConfiguration(
   return outBuffer;
 }
 
-std::vector<std::byte> WindowsSplitTunnel::generateIPConfiguration(
+std::vector<uint8_t> WindowsSplitTunnel::generateIPConfiguration(
     int inetAdapterIndex, int vpnAdapterIndex) {
-  std::vector<std::byte> out(sizeof(IP_ADDRESSES_CONFIG));
+  std::vector<uint8_t> out(sizeof(IP_ADDRESSES_CONFIG));
 
   auto config = reinterpret_cast<IP_ADDRESSES_CONFIG*>(&out[0]);
 
   auto ifaces = QNetworkInterface::allInterfaces();
 
-    if (vpnAdapterIndex == 0) {
+  if (vpnAdapterIndex == 0) {
     vpnAdapterIndex = WindowsCommons::VPNAdapterIndex();
   }
+
   // Always the VPN
-  if (!getAddress(vpnAdapterIndex, &config->TunnelIpv4,
-                  &config->TunnelIpv6)) {
-    return {};
-  }
-  // 2nd best route is usually the internet adapter
-  if (!getAddress(inetAdapterIndex, &config->InternetIpv4,
-                  &config->InternetIpv6)) {
-    return {};
-  };
+  getAddress(vpnAdapterIndex, &config->TunnelIpv4,
+             &config->TunnelIpv6);
+  // 2nd best route
+  getAddress(inetAdapterIndex, &config->InternetIpv4, &config->InternetIpv6);
   return out;
 }
-bool WindowsSplitTunnel::getAddress(int adapterIndex, IN_ADDR* out_ipv4,
+void WindowsSplitTunnel::getAddress(int adapterIndex, IN_ADDR* out_ipv4,
                                     IN6_ADDR* out_ipv6) {
   QNetworkInterface target =
       QNetworkInterface::interfaceFromIndex(adapterIndex);
   logger.debug() << "Getting adapter info for:" << target.humanReadableName();
 
-  auto get = [&target](QAbstractSocket::NetworkLayerProtocol protocol) {
-    for (auto address : target.addressEntries()) {
-      if (address.ip().protocol() != protocol) {
-        continue;
+  // take the first v4/v6 Adress and convert to in_addr
+  for (auto address : target.addressEntries()) {
+    if (address.ip().protocol() == QAbstractSocket::IPv4Protocol) {
+      auto adrr = address.ip().toString();
+      std::wstring wstr = adrr.toStdWString();
+      logger.debug() << "IpV4" << logger.sensitive(adrr);
+      PCWSTR w_str_ip = wstr.c_str();
+      auto ok = InetPtonW(AF_INET, w_str_ip, out_ipv4);
+      if (ok != 1) {
+        logger.debug() << "Ipv4 Conversation error" << WSAGetLastError();
       }
-      return address.ip().toString().toStdWString();
+      break;
     }
-    return std::wstring{};
-  };
-  auto ipv4 = get(QAbstractSocket::IPv4Protocol);
-  auto ipv6 = get(QAbstractSocket::IPv6Protocol);
-
-  if (InetPtonW(AF_INET, ipv4.c_str(), out_ipv4) != 1) {
-    logger.debug() << "Ipv4 Conversation error" << WSAGetLastError();
-    return false;
   }
-  if (ipv6.empty()) {
-    std::memset(out_ipv6, 0x00, sizeof(IN6_ADDR));
-    return true;
+  for (auto address : target.addressEntries()) {
+    if (address.ip().protocol() == QAbstractSocket::IPv6Protocol) {
+      auto adrr = address.ip().toString();
+      std::wstring wstr = adrr.toStdWString();
+      logger.debug() << "IpV6" << logger.sensitive(adrr);
+      PCWSTR w_str_ip = wstr.c_str();
+      auto ok = InetPtonW(AF_INET6, w_str_ip, out_ipv6);
+      if (ok != 1) {
+        logger.error() << "Ipv6 Conversation error" << WSAGetLastError();
+      }
+      break;
+    }
   }
-  if (InetPtonW(AF_INET6, ipv6.c_str(), out_ipv6) != 1) {
-    logger.debug() << "Ipv6 Conversation error" << WSAGetLastError();
-  }
-  return true;
 }
 
 std::vector<uint8_t> WindowsSplitTunnel::generateProcessBlob() {
@@ -582,6 +411,33 @@ std::vector<uint8_t> WindowsSplitTunnel::generateProcessBlob() {
   return out;
 }
 
+void WindowsSplitTunnel::close() {
+  CloseHandle(m_driver);
+  m_driver = INVALID_HANDLE_VALUE;
+}
+
+ProcessInfo WindowsSplitTunnel::getProcessInfo(
+    HANDLE process, const PROCESSENTRY32W& processMeta) {
+  ProcessInfo pi;
+  pi.ParentProcessId = processMeta.th32ParentProcessID;
+  pi.ProcessId = processMeta.th32ProcessID;
+  pi.CreationTime = {0, 0};
+  pi.DevicePath = L"";
+
+  FILETIME creationTime, null_time;
+  auto ok = GetProcessTimes(process, &creationTime, &null_time, &null_time,
+                            &null_time);
+  if (ok) {
+    pi.CreationTime = creationTime;
+  }
+  wchar_t imagepath[MAX_PATH + 1];
+  if (K32GetProcessImageFileNameW(
+          process, imagepath, sizeof(imagepath) / sizeof(*imagepath)) != 0) {
+    pi.DevicePath = imagepath;
+  }
+  return pi;
+}
+
 // static
 SC_HANDLE WindowsSplitTunnel::installDriver() {
   LPCWSTR displayName = L"Amnezia Split Tunnel Service";
@@ -592,15 +448,15 @@ SC_HANDLE WindowsSplitTunnel::installDriver() {
     return (SC_HANDLE)INVALID_HANDLE_VALUE;
   }
   auto path = driver.absolutePath() + "/" + DRIVER_FILENAME;
-  auto binPath = (const wchar_t*)path.utf16();
+  LPCWSTR binPath = (const wchar_t*)path.utf16();
   auto scm_rights = SC_MANAGER_ALL_ACCESS;
-  auto serviceManager = OpenSCManager(nullptr,  // local computer
-                                      nullptr,  // servicesActive database
+  auto serviceManager = OpenSCManager(NULL,  // local computer
+                                      NULL,  // servicesActive database
                                       scm_rights);
-  auto service = CreateService(
-      serviceManager, DRIVER_SERVICE_NAME, displayName, SERVICE_ALL_ACCESS,
-      SERVICE_KERNEL_DRIVER, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, binPath,
-      nullptr, nullptr, nullptr, nullptr, nullptr);
+  auto service = CreateService(serviceManager, DRIVER_SERVICE_NAME, displayName,
+                               SERVICE_ALL_ACCESS, SERVICE_KERNEL_DRIVER,
+                               SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
+                               binPath, nullptr, 0, nullptr, nullptr, nullptr);
   CloseServiceHandle(serviceManager);
   return service;
 }
@@ -698,25 +554,3 @@ bool WindowsSplitTunnel::detectConflict() {
   CloseServiceHandle(servicehandle);
   return err == ERROR_SERVICE_DOES_NOT_EXIST;
 }
-
-bool WindowsSplitTunnel::isRunning() { return getState() == STATE_RUNNING; }
-QString WindowsSplitTunnel::stateString() {
-  switch (getState()) {
-    case STATE_UNKNOWN:
-      return "STATE_UNKNOWN";
-    case STATE_NONE:
-      return "STATE_NONE";
-    case STATE_STARTED:
-      return "STATE_STARTED";
-    case STATE_INITIALIZED:
-      return "STATE_INITIALIZED";
-    case STATE_READY:
-      return "STATE_READY";
-    case STATE_RUNNING:
-      return "STATE_RUNNING";
-    case STATE_ZOMBIE:
-      return "STATE_ZOMBIE";
-      break;
-  }
-  return {};
-}

client/platforms/windows/daemon/windowssplittunnel.h

@@ -8,7 +8,6 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <memory>
 
 // Note: the ws2tcpip.h import must come before the others.
 // clang-format off
@@ -19,78 +18,160 @@
 #include <tlhelp32.h>
 #include <windows.h>
 
-class WindowsFirewall;
+// States for GetState
+enum DRIVER_STATE {
+  STATE_UNKNOWN = -1,
+  STATE_NONE = 0,
+  STATE_STARTED = 1,
+  STATE_INITIALIZED = 2,
+  STATE_READY = 3,
+  STATE_RUNNING = 4,
+  STATE_ZOMBIE = 5,
+};
 
-class WindowsSplitTunnel final {
+#ifndef CTL_CODE
+
+#  define FILE_ANY_ACCESS 0x0000
+
+#  define METHOD_BUFFERED 0
+#  define METHOD_IN_DIRECT 1
+#  define METHOD_NEITHER 3
+
+#  define CTL_CODE(DeviceType, Function, Method, Access) \
+    (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
+#endif
+
+// Known ControlCodes
+#define IOCTL_INITIALIZE CTL_CODE(0x8000, 1, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_DEQUEUE_EVENT \
+  CTL_CODE(0x8000, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_REGISTER_PROCESSES \
+  CTL_CODE(0x8000, 3, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_REGISTER_IP_ADDRESSES \
+  CTL_CODE(0x8000, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_GET_IP_ADDRESSES \
+  CTL_CODE(0x8000, 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_SET_CONFIGURATION \
+  CTL_CODE(0x8000, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_GET_CONFIGURATION \
+  CTL_CODE(0x8000, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_CLEAR_CONFIGURATION \
+  CTL_CODE(0x8000, 8, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_GET_STATE CTL_CODE(0x8000, 9, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_QUERY_PROCESS \
+  CTL_CODE(0x8000, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_ST_RESET CTL_CODE(0x8000, 11, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+// Driver Configuration structures
+
+typedef struct {
+  // Offset into buffer region that follows all entries.
+  // The image name uses the device path.
+  SIZE_T ImageNameOffset;
+  // Length of the String
+  USHORT ImageNameLength;
+} CONFIGURATION_ENTRY;
+
+typedef struct {
+  // Number of entries immediately following the header.
+  SIZE_T NumEntries;
+
+  // Total byte length: header + entries + string buffer.
+  SIZE_T TotalLength;
+} CONFIGURATION_HEADER;
+
+// Used to Configure Which IP is network/vpn
+typedef struct {
+  IN_ADDR TunnelIpv4;
+  IN_ADDR InternetIpv4;
+
+  IN6_ADDR TunnelIpv6;
+  IN6_ADDR InternetIpv6;
+} IP_ADDRESSES_CONFIG;
+
+// Used to Define Which Processes are alive on activation
+typedef struct {
+  SIZE_T NumEntries;
+  SIZE_T TotalLength;
+} PROCESS_DISCOVERY_HEADER;
+
+typedef struct {
+  HANDLE ProcessId;
+  HANDLE ParentProcessId;
+
+  SIZE_T ImageNameOffset;
+  USHORT ImageNameLength;
+} PROCESS_DISCOVERY_ENTRY;
+
+typedef struct {
+  DWORD ProcessId;
+  DWORD ParentProcessId;
+  FILETIME CreationTime;
+  std::wstring DevicePath;
+} ProcessInfo;
+
+class WindowsSplitTunnel final : public QObject {
+  Q_OBJECT
+  Q_DISABLE_COPY_MOVE(WindowsSplitTunnel)
  public:
-  /**
-   * @brief Installs and Initializes the Split Tunnel Driver.
-   *
-   * @param fw -
-   * @return std::unique_ptr<WindowsSplitTunnel> - Is null on failure.
-   */
-  static std::unique_ptr<WindowsSplitTunnel> create(WindowsFirewall* fw);
-
-  /**
-   * @brief Construct a new Windows Split Tunnel object
-   *
-   * @param driverIO - The Handle to the Driver's IO file, it assumes the driver
-   * is in STATE_INITIALIZED and the Firewall has been setup.
-   * Prefer using create() to get to this state.
-   */
-  WindowsSplitTunnel(HANDLE driverIO);
-  /**
-   * @brief Destroy the Windows Split Tunnel object and uninstalls the Driver.
-   */
+  explicit WindowsSplitTunnel(QObject* parent);
   ~WindowsSplitTunnel();
 
   // void excludeApps(const QStringList& paths);
   // Excludes an Application from the VPN
-  bool excludeApps(const QStringList& appPaths);
+  void setRules(const QStringList& appPaths);
 
   // Fetches and Pushed needed info to move to engaged mode
-  bool start(int inetAdapterIndex, int vpnAdapterIndex = 0);
+  void start(int inetAdapterIndex, int vpnAdapterIndex = 0);
   // Deletes Rules and puts the driver into passive mode
   void stop();
+  // Resets the Whole Driver
+  void reset();
 
-  // Returns true if the split-tunnel driver is now up and running.
-  bool isRunning();
+  // Just close connection, leave state as is
+  void close();
 
-  static bool detectConflict();
-
-  // States for GetState
-  enum DRIVER_STATE {
-    STATE_UNKNOWN = -1,
-    STATE_NONE = 0,
-    STATE_STARTED = 1,
-    STATE_INITIALIZED = 2,
-    STATE_READY = 3,
-    STATE_RUNNING = 4,
-    STATE_ZOMBIE = 5,
-  };
-
- private:
   // Installes the Kernel Driver as Driver Service
   static SC_HANDLE installDriver();
   static bool uninstallDriver();
   static bool isInstalled();
-  static bool initDriver(HANDLE driverIO);
-  static DRIVER_STATE getState(HANDLE driverIO);
-  static bool resetDriver(HANDLE driverIO);
+  static bool detectConflict();
 
+ private slots:
+  void initDriver();
+
+ private:
   HANDLE m_driver = INVALID_HANDLE_VALUE;
+  constexpr static const auto DRIVER_SYMLINK = L"\\\\.\\MULLVADSPLITTUNNEL";
+  constexpr static const auto DRIVER_FILENAME = "mullvad-split-tunnel.sys";
+  constexpr static const auto DRIVER_SERVICE_NAME = L"AmneziaVPNSplitTunnel";
+  constexpr static const auto MV_SERVICE_NAME = L"MullvadVPN";
   DRIVER_STATE getState();
-  QString stateString();
+
+  int m_tries;
+  // Initializes the WFP Sublayer
+  bool initSublayer();
 
   // Generates a Configuration for Each APP
   std::vector<uint8_t> generateAppConfiguration(const QStringList& appPaths);
   // Generates a Configuration which IP's are VPN and which network
-  std::vector<std::byte> generateIPConfiguration(int inetAdapterIndex, int vpnAdapterIndex = 0);
+  std::vector<uint8_t> generateIPConfiguration(int inetAdapterIndex, int vpnAdapterIndex = 0);
   std::vector<uint8_t> generateProcessBlob();
 
-  [[nodiscard]] bool getAddress(int adapterIndex, IN_ADDR* out_ipv4,
-                                IN6_ADDR* out_ipv6);
+  void getAddress(int adapterIndex, IN_ADDR* out_ipv4, IN6_ADDR* out_ipv6);
   // Collects info about an Opened Process
+  ProcessInfo getProcessInfo(HANDLE process,
+                             const PROCESSENTRY32W& processMeta);
 
   // Converts a path to a Dos Path:
   // e.g C:/a.exe -> /harddisk0/a.exe

client/platforms/windows/daemon/wireguardutilswindows.cpp

@@ -24,20 +24,8 @@ namespace {
 Logger logger("WireguardUtilsWindows");
 };  // namespace
 
-std::unique_ptr<WireguardUtilsWindows> WireguardUtilsWindows::create(
-    WindowsFirewall* fw, QObject* parent) {
-  if (!fw) {
-    logger.error() << "WireguardUtilsWindows::create: no wfp handle";
-    return {};
-  }
-
-  // Can't use make_unique here as the Constructor is private :(
-  auto utils = new WireguardUtilsWindows(parent, fw);
-  return std::unique_ptr<WireguardUtilsWindows>(utils);
-}
-
-WireguardUtilsWindows::WireguardUtilsWindows(QObject* parent, WindowsFirewall* fw)
-    : WireguardUtils(parent), m_tunnel(this), m_firewall(fw) {
+WireguardUtilsWindows::WireguardUtilsWindows(QObject* parent)
+    : WireguardUtils(parent), m_tunnel(this), m_routeMonitor(this) {
   MZ_COUNT_CTOR(WireguardUtilsWindows);
   logger.debug() << "WireguardUtilsWindows created.";
 
@@ -126,13 +114,13 @@ bool WireguardUtilsWindows::addInterface(const InterfaceConfig& config) {
     return false;
   }
   m_luid = luid.Value;
-  m_routeMonitor = new WindowsRouteMonitor(luid.Value, this);
+  m_routeMonitor.setLuid(luid.Value);
 
   if (config.m_killSwitchEnabled) {
     // Enable the windows firewall
     NET_IFINDEX ifindex;
     ConvertInterfaceLuidToIndex(&luid, &ifindex);
-    m_firewall->enableInterface(ifindex);
+    WindowsFirewall::instance()->enableKillSwitch(ifindex);
   }
 
   logger.debug() << "Registration completed";
@@ -140,11 +128,7 @@ bool WireguardUtilsWindows::addInterface(const InterfaceConfig& config) {
 }
 
 bool WireguardUtilsWindows::deleteInterface() {
-  if (m_routeMonitor) {
-    m_routeMonitor->deleteLater();
-  }
-
-  m_firewall->disableKillSwitch();
+  WindowsFirewall::instance()->disableKillSwitch();
   m_tunnel.stop();
   return true;
 }
@@ -157,7 +141,7 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
 
   if (config.m_killSwitchEnabled) {
     // Enable the windows firewall for this peer.
-    m_firewall->enablePeerTraffic(config);
+    WindowsFirewall::instance()->enablePeerTraffic(config);
   }
   logger.debug() << "Configuring peer" << publicKey.toHex()
                  << "via" << config.m_serverIpv4AddrIn;
@@ -187,9 +171,9 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
   }
 
   // Exclude the server address, except for multihop exit servers.
-  if (m_routeMonitor && config.m_hopType != InterfaceConfig::MultiHopExit) {
-    m_routeMonitor->addExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));
-    m_routeMonitor->addExclusionRoute(IPAddress(config.m_serverIpv6AddrIn));
+  if (config.m_hopType != InterfaceConfig::MultiHopExit) {
+    m_routeMonitor.addExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));
+    m_routeMonitor.addExclusionRoute(IPAddress(config.m_serverIpv6AddrIn));
   }
 
   QString reply = m_tunnel.uapiCommand(message);
@@ -202,13 +186,13 @@ bool WireguardUtilsWindows::deletePeer(const InterfaceConfig& config) {
       QByteArray::fromBase64(qPrintable(config.m_serverPublicKey));
 
   // Clear exclustion routes for this peer.
-  if (m_routeMonitor && config.m_hopType != InterfaceConfig::MultiHopExit) {
-    m_routeMonitor->deleteExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));
-    m_routeMonitor->deleteExclusionRoute(IPAddress(config.m_serverIpv6AddrIn));
+  if (config.m_hopType != InterfaceConfig::MultiHopExit) {
+    m_routeMonitor.deleteExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));
+    m_routeMonitor.deleteExclusionRoute(IPAddress(config.m_serverIpv6AddrIn));
   }
 
   // Disable the windows firewall for this peer.
-  m_firewall->disablePeerTraffic(config.m_serverPublicKey);
+  WindowsFirewall::instance()->disablePeerTraffic(config.m_serverPublicKey);
 
   QString message;
   QTextStream out(&message);
@@ -254,13 +238,6 @@ void WireguardUtilsWindows::buildMibForwardRow(const IPAddress& prefix,
 }
 
 bool WireguardUtilsWindows::updateRoutePrefix(const IPAddress& prefix) {
-  if (m_routeMonitor && (prefix.prefixLength() == 0)) {
-    // If we are setting up a default route, instruct the route monitor to
-    // capture traffic to all non-excluded destinations
-    m_routeMonitor->setDetaultRouteCapture(true);
-  }
-  // Build the route
-  
   MIB_IPFORWARD_ROW2 entry;
   buildMibForwardRow(prefix, &entry);
 
@@ -278,12 +255,6 @@ bool WireguardUtilsWindows::updateRoutePrefix(const IPAddress& prefix) {
 }
 
 bool WireguardUtilsWindows::deleteRoutePrefix(const IPAddress& prefix) {
-  if (m_routeMonitor && (prefix.prefixLength() == 0)) {
-    // Deactivate the route capture feature.
-    m_routeMonitor->setDetaultRouteCapture(false);
-  }
-  // Build the route
-  
   MIB_IPFORWARD_ROW2 entry;
   buildMibForwardRow(prefix, &entry);
 
@@ -301,28 +272,9 @@ bool WireguardUtilsWindows::deleteRoutePrefix(const IPAddress& prefix) {
 }
 
 bool WireguardUtilsWindows::addExclusionRoute(const IPAddress& prefix) {
-  return m_routeMonitor->addExclusionRoute(prefix);
+  return m_routeMonitor.addExclusionRoute(prefix);
 }
 
 bool WireguardUtilsWindows::deleteExclusionRoute(const IPAddress& prefix) {
-  return m_routeMonitor->deleteExclusionRoute(prefix);
-}
-
-bool WireguardUtilsWindows::excludeLocalNetworks(
-    const QList<IPAddress>& addresses) {
-  // If the interface isn't up then something went horribly wrong.
-  Q_ASSERT(m_routeMonitor);
-  // For each destination - attempt to exclude it from the VPN tunnel.
-  bool result = true;
-  for (const IPAddress& prefix : addresses) {
-    if (!m_routeMonitor->addExclusionRoute(prefix)) {
-      result = false;
-    }
-  }
-  // Permit LAN traffic through the firewall.
-  if (!m_firewall->enableLanBypass(addresses)) {
-    result = false;
-  }
-
-  return result;
+  return m_routeMonitor.deleteExclusionRoute(prefix);
 }

client/platforms/windows/daemon/wireguardutilswindows.h

@@ -9,21 +9,16 @@
 
 #include <QHostAddress>
 #include <QObject>
-#include <QPointer>
 
 #include "daemon/wireguardutils.h"
 #include "windowsroutemonitor.h"
 #include "windowstunnelservice.h"
 
-class WindowsFirewall;
-class WindowsRouteMonitor;
-
 class WireguardUtilsWindows final : public WireguardUtils {
   Q_OBJECT
 
  public:
-  static std::unique_ptr<WireguardUtilsWindows> create(WindowsFirewall* fw,
-                                                       QObject* parent);
+  WireguardUtilsWindows(QObject* parent);
   ~WireguardUtilsWindows();
 
   bool interfaceExists() override { return m_tunnel.isRunning(); }
@@ -44,19 +39,15 @@ class WireguardUtilsWindows final : public WireguardUtils {
   bool addExclusionRoute(const IPAddress& prefix) override;
   bool deleteExclusionRoute(const IPAddress& prefix) override;
 
-  bool WireguardUtilsWindows::excludeLocalNetworks(const QList<IPAddress>& addresses) override;
-
  signals:
   void backendFailure();
 
  private:
-  WireguardUtilsWindows(QObject* parent, WindowsFirewall* fw);
   void buildMibForwardRow(const IPAddress& prefix, void* row);
 
   quint64 m_luid = 0;
   WindowsTunnelService m_tunnel;
-  QPointer<WindowsRouteMonitor> m_routeMonitor;
-  QPointer<WindowsFirewall> m_firewall;
+  WindowsRouteMonitor m_routeMonitor;
 };
 
 #endif  // WIREGUARDUTILSWINDOWS_H

client/platforms/windows/windowsservicemanager.cpp

@@ -4,7 +4,6 @@
 
 #include "windowsservicemanager.h"
 
-#include <QApplication>
 #include <QTimer>
 
 #include "Windows.h"
@@ -17,44 +16,35 @@ namespace {
 Logger logger("WindowsServiceManager");
 }
 
-WindowsServiceManager::WindowsServiceManager(SC_HANDLE serviceManager,
-                                             SC_HANDLE service)
-    : QObject(qApp), m_serviceManager(serviceManager), m_service(service) {
-  m_timer.setSingleShot(false);
-}
-
-std::unique_ptr<WindowsServiceManager> WindowsServiceManager::open(
-    const QString serviceName) {
-  LPCWSTR service = (const wchar_t*)serviceName.utf16();
-
+WindowsServiceManager::WindowsServiceManager(LPCWSTR serviceName) {
   DWORD err = NULL;
   auto scm_rights = SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE |
                     SC_MANAGER_QUERY_LOCK_STATUS | STANDARD_RIGHTS_READ;
-  auto manager = OpenSCManager(NULL,  // local computer
-                               NULL,  // servicesActive database
-                               scm_rights);
+  m_serviceManager = OpenSCManager(NULL,  // local computer
+                                   NULL,  // servicesActive database
+                                   scm_rights);
   err = GetLastError();
   if (err != NULL) {
     logger.error() << " OpenSCManager failed code: " << err;
-    return {};
+    return;
   }
   logger.debug() << "OpenSCManager access given - " << err;
 
-  logger.debug() << "Opening Service - " << serviceName;
+  logger.debug() << "Opening Service - "
+                 << QString::fromWCharArray(serviceName);
   // Try to get an elevated handle
-  auto serviceHandle =
-      OpenService(manager,  // SCM database
-                  service,  // name of service
-                  (GENERIC_READ | SERVICE_START | SERVICE_STOP));
+  m_service = OpenService(m_serviceManager,  // SCM database
+                          serviceName,       // name of service
+                          (GENERIC_READ | SERVICE_START | SERVICE_STOP));
   err = GetLastError();
   if (err != NULL) {
-    CloseServiceHandle(manager);
     WindowsUtils::windowsLog("OpenService failed");
-    return {};
+    return;
   }
+  m_has_access = true;
+  m_timer.setSingleShot(false);
 
   logger.debug() << "Service manager execute access granted";
-  return std::make_unique<WindowsServiceManager>(manager, serviceHandle);
 }
 
 WindowsServiceManager::~WindowsServiceManager() {
@@ -95,6 +85,10 @@ bool WindowsServiceManager::startPolling(DWORD goal_state, int max_wait_sec) {
 
 SERVICE_STATUS_PROCESS WindowsServiceManager::getStatus() {
   SERVICE_STATUS_PROCESS serviceStatus;
+  if (!m_has_access) {
+    logger.debug() << "Need read access to get service state";
+    return serviceStatus;
+  }
   DWORD dwBytesNeeded;  // Contains missing bytes if struct is too small?
   QueryServiceStatusEx(m_service,                       // handle to service
                        SC_STATUS_PROCESS_INFO,          // information level
@@ -125,6 +119,10 @@ bool WindowsServiceManager::startService() {
 }
 
 bool WindowsServiceManager::stopService() {
+  if (!m_has_access) {
+    logger.error() << "Need execute access to stop services";
+    return false;
+  }
   auto state = getStatus().dwCurrentState;
   if (state != SERVICE_RUNNING && state != SERVICE_START_PENDING) {
     logger.warning() << ("Service stop not possible, as its not running");

client/platforms/windows/windowsservicemanager.h

@@ -12,7 +12,7 @@
 #include "Winsvc.h"
 
 /**
- * @brief The WindowsServiceManager provides control over the a
+ * @brief The WindowsServiceManager provides control over the MozillaVPNBroker
  * service via SCM
  */
 class WindowsServiceManager : public QObject {
@@ -20,10 +20,7 @@ class WindowsServiceManager : public QObject {
   Q_DISABLE_COPY_MOVE(WindowsServiceManager)
 
  public:
-  // Creates a WindowsServiceManager for the Named service.
-  // returns nullptr if
-  static std::unique_ptr<WindowsServiceManager> open(const QString serviceName);
-  WindowsServiceManager(SC_HANDLE serviceManager, SC_HANDLE service);
+  WindowsServiceManager(LPCWSTR serviceName);
   ~WindowsServiceManager();
 
   // true if the Service is running
@@ -48,6 +45,8 @@ class WindowsServiceManager : public QObject {
   // See
   // SERVICE_STOPPED,SERVICE_STOP_PENDING,SERVICE_START_PENDING,SERVICE_RUNNING
   SERVICE_STATUS_PROCESS getStatus();
+  bool m_has_access = false;
+  LPWSTR m_serviceName;
   SC_HANDLE m_serviceManager;
   SC_HANDLE m_service;  // Service handle with r/w priv.
   DWORD m_state_target;

client/protocols/xrayprotocol.cpp

@@ -1,6 +1,7 @@
 #include "xrayprotocol.h"
 
 #include "utilities.h"
+#include "containers/containers_defs.h"
 #include "core/networkUtilities.h"
 
 #include <QCryptographicHash>
@@ -21,8 +22,9 @@ XrayProtocol::XrayProtocol(const QJsonObject &configuration, QObject *parent):
 
 XrayProtocol::~XrayProtocol()
 {
-    qDebug() << "XrayProtocol::~XrayProtocol()";
     XrayProtocol::stop();
+    QThread::msleep(200);
+    m_xrayProcess.close();
 }
 
 ErrorCode XrayProtocol::start()
@@ -34,6 +36,10 @@ ErrorCode XrayProtocol::start()
         return lastError();
     }
 
+    if (Utils::processIsRunning(Utils::executable(xrayExecPath(), true))) {
+        Utils::killProcessByName(Utils::executable(xrayExecPath(), true));
+    }
+
 #ifdef QT_DEBUG
     m_xrayCfgFile.setAutoRemove(false);
 #endif
@@ -48,16 +54,9 @@ ErrorCode XrayProtocol::start()
     qDebug().noquote() << "XrayProtocol::start()"
                        << xrayExecPath() << args.join(" ");
 
-
-
     m_xrayProcess.setProcessChannelMode(QProcess::MergedChannels);
+
     m_xrayProcess.setProgram(xrayExecPath());
-
-    if (Utils::processIsRunning(Utils::executable("xray", false))) {
-        qDebug().noquote() << "kill previos xray";
-        Utils::killProcessByName(Utils::executable("xray", false));
-    }
-
     m_xrayProcess.setArguments(args);
 
     connect(&m_xrayProcess, &QProcess::readyReadStandardOutput, this, [this]() {
@@ -69,9 +68,13 @@ ErrorCode XrayProtocol::start()
     connect(&m_xrayProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus) {
         qDebug().noquote() << "XrayProtocol finished, exitCode, exitStatus" << exitCode << exitStatus;
         setConnectionState(Vpn::ConnectionState::Disconnected);
-        if ((exitStatus != QProcess::NormalExit) || (exitCode != 0)) {
-                emit protocolError(amnezia::ErrorCode::XrayExecutableCrashed);
-                emit setConnectionState(Vpn::ConnectionState::Error);
+        if (exitStatus != QProcess::NormalExit) {
+            emit protocolError(amnezia::ErrorCode::XrayExecutableCrashed);
+            stop();
+        }
+        if (exitCode != 0) {
+            emit protocolError(amnezia::ErrorCode::InternalError);
+            stop();
         }
     });
 
@@ -174,14 +177,14 @@ void XrayProtocol::stop()
     IpcClient::Interface()->StartRoutingIpv6();
 #endif
     qDebug() << "XrayProtocol::stop()";
-    m_xrayProcess.disconnect();
-    m_xrayProcess.kill();
-    m_xrayProcess.waitForFinished(3000);
+    m_xrayProcess.terminate();
     if (m_t2sProcess) {
         m_t2sProcess->stop();
     }
 
-    setConnectionState(Vpn::ConnectionState::Disconnected);
+#ifdef Q_OS_WIN
+    Utils::signalCtrl(m_xrayProcess.processId(), CTRL_C_EVENT);
+#endif
 }
 
 QString XrayProtocol::xrayExecPath()

client/resources.qrc

@@ -1,229 +1,225 @@
 <RCC>
     <qresource prefix="/">
-        <file>fonts/pt-root-ui_vf.ttf</file>
-        <file>images/amneziaBigLogo.png</file>
-        <file>images/AmneziaVPN.png</file>
-        <file>images/controls/alert-circle.svg</file>
-        <file>images/controls/amnezia.svg</file>
-        <file>images/controls/app.svg</file>
-        <file>images/controls/archive-restore.svg</file>
-        <file>images/controls/arrow-left.svg</file>
-        <file>images/controls/arrow-right.svg</file>
-        <file>images/controls/bug.svg</file>
-        <file>images/controls/check.svg</file>
-        <file>images/controls/chevron-down.svg</file>
-        <file>images/controls/chevron-right.svg</file>
-        <file>images/controls/chevron-up.svg</file>
-        <file>images/controls/close.svg</file>
-        <file>images/controls/copy.svg</file>
-        <file>images/controls/delete.svg</file>
-        <file>images/controls/download.svg</file>
-        <file>images/controls/edit-3.svg</file>
-        <file>images/controls/eye-off.svg</file>
-        <file>images/controls/eye.svg</file>
-        <file>images/controls/external-link.svg</file>
-        <file>images/controls/file-check-2.svg</file>
-        <file>images/controls/file-cog-2.svg</file>
-        <file>images/controls/folder-open.svg</file>
-        <file>images/controls/folder-search-2.svg</file>
-        <file>images/controls/gauge.svg</file>
-        <file>images/controls/github.svg</file>
-        <file>images/controls/help-circle.svg</file>
-        <file>images/controls/history.svg</file>
-        <file>images/controls/home.svg</file>
-        <file>images/controls/info.svg</file>
-        <file>images/controls/mail.svg</file>
-        <file>images/controls/map-pin.svg</file>
-        <file>images/controls/more-vertical.svg</file>
-        <file>images/controls/plus.svg</file>
-        <file>images/controls/qr-code.svg</file>
-        <file>images/controls/radio-button-inner-circle-pressed.png</file>
-        <file>images/controls/radio-button-inner-circle.png</file>
-        <file>images/controls/radio-button-pressed.svg</file>
-        <file>images/controls/radio-button.svg</file>
-        <file>images/controls/radio.svg</file>
-        <file>images/controls/refresh-cw.svg</file>
-        <file>images/controls/save.svg</file>
-        <file>images/controls/scan-line.svg</file>
-        <file>images/controls/search.svg</file>
-        <file>images/controls/server.svg</file>
-        <file>images/controls/settings-2.svg</file>
-        <file>images/controls/settings.svg</file>
-        <file>images/controls/share-2.svg</file>
-        <file>images/controls/split-tunneling.svg</file>
-        <file>images/controls/tag.svg</file>
-        <file>images/controls/telegram.svg</file>
-        <file>images/controls/text-cursor.svg</file>
-        <file>images/controls/trash.svg</file>
-        <file>images/controls/x-circle.svg</file>
         <file>images/tray/active.png</file>
         <file>images/tray/default.png</file>
         <file>images/tray/error.png</file>
-        <file>server_scripts/awg/configure_container.sh</file>
-        <file>server_scripts/awg/Dockerfile</file>
-        <file>server_scripts/awg/run_container.sh</file>
-        <file>server_scripts/awg/start.sh</file>
-        <file>server_scripts/awg/template.conf</file>
-        <file>server_scripts/build_container.sh</file>
-        <file>server_scripts/check_connection.sh</file>
-        <file>server_scripts/check_server_is_busy.sh</file>
-        <file>server_scripts/check_user_in_sudo.sh</file>
-        <file>server_scripts/dns/configure_container.sh</file>
-        <file>server_scripts/dns/Dockerfile</file>
-        <file>server_scripts/dns/run_container.sh</file>
-        <file>server_scripts/install_docker.sh</file>
-        <file>server_scripts/ipsec/configure_container.sh</file>
-        <file>server_scripts/ipsec/Dockerfile</file>
-        <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/strongswan.profile</file>
-        <file>server_scripts/openvpn_cloak/configure_container.sh</file>
+        <file>images/AmneziaVPN.png</file>
+        <file>server_scripts/remove_container.sh</file>
+        <file>server_scripts/setup_host_firewall.sh</file>
         <file>server_scripts/openvpn_cloak/Dockerfile</file>
-        <file>server_scripts/openvpn_cloak/run_container.sh</file>
+        <file>server_scripts/openvpn_cloak/configure_container.sh</file>
         <file>server_scripts/openvpn_cloak/start.sh</file>
         <file>server_scripts/openvpn_cloak/template.ovpn</file>
+        <file>server_scripts/install_docker.sh</file>
+        <file>server_scripts/build_container.sh</file>
+        <file>server_scripts/prepare_host.sh</file>
+        <file>server_scripts/check_connection.sh</file>
+        <file>server_scripts/remove_all_containers.sh</file>
+        <file>server_scripts/openvpn_cloak/run_container.sh</file>
+        <file>server_scripts/openvpn/configure_container.sh</file>
+        <file>server_scripts/openvpn/run_container.sh</file>
+        <file>server_scripts/openvpn/template.ovpn</file>
+        <file>server_scripts/openvpn/Dockerfile</file>
+        <file>server_scripts/openvpn/start.sh</file>
         <file>server_scripts/openvpn_shadowsocks/configure_container.sh</file>
         <file>server_scripts/openvpn_shadowsocks/Dockerfile</file>
         <file>server_scripts/openvpn_shadowsocks/run_container.sh</file>
         <file>server_scripts/openvpn_shadowsocks/start.sh</file>
         <file>server_scripts/openvpn_shadowsocks/template.ovpn</file>
-        <file>server_scripts/openvpn/configure_container.sh</file>
-        <file>server_scripts/openvpn/Dockerfile</file>
-        <file>server_scripts/openvpn/run_container.sh</file>
-        <file>server_scripts/openvpn/start.sh</file>
-        <file>server_scripts/openvpn/template.ovpn</file>
-        <file>server_scripts/prepare_host.sh</file>
-        <file>server_scripts/remove_all_containers.sh</file>
-        <file>server_scripts/remove_container.sh</file>
-        <file>server_scripts/setup_host_firewall.sh</file>
-        <file>server_scripts/sftp/configure_container.sh</file>
-        <file>server_scripts/sftp/Dockerfile</file>
-        <file>server_scripts/sftp/run_container.sh</file>
-        <file>server_scripts/socks5_proxy/configure_container.sh</file>
-        <file>server_scripts/socks5_proxy/Dockerfile</file>
-        <file>server_scripts/socks5_proxy/run_container.sh</file>
-        <file>server_scripts/socks5_proxy/start.sh</file>
-        <file>server_scripts/website_tor/configure_container.sh</file>
-        <file>server_scripts/website_tor/Dockerfile</file>
-        <file>server_scripts/website_tor/run_container.sh</file>
         <file>server_scripts/wireguard/configure_container.sh</file>
         <file>server_scripts/wireguard/Dockerfile</file>
         <file>server_scripts/wireguard/run_container.sh</file>
         <file>server_scripts/wireguard/start.sh</file>
         <file>server_scripts/wireguard/template.conf</file>
+        <file>server_scripts/website_tor/configure_container.sh</file>
+        <file>server_scripts/website_tor/run_container.sh</file>
+        <file>ui/qml/Config/GlobalConfig.qml</file>
+        <file>ui/qml/Config/qmldir</file>
+        <file>server_scripts/check_server_is_busy.sh</file>
+        <file>server_scripts/dns/configure_container.sh</file>
+        <file>server_scripts/dns/Dockerfile</file>
+        <file>server_scripts/dns/run_container.sh</file>
+        <file>server_scripts/sftp/configure_container.sh</file>
+        <file>server_scripts/sftp/Dockerfile</file>
+        <file>server_scripts/sftp/run_container.sh</file>
+        <file>server_scripts/ipsec/configure_container.sh</file>
+        <file>server_scripts/ipsec/Dockerfile</file>
+        <file>server_scripts/ipsec/run_container.sh</file>
+        <file>server_scripts/ipsec/start.sh</file>
+        <file>server_scripts/ipsec/mobileconfig.plist</file>
+        <file>server_scripts/ipsec/strongswan.profile</file>
+        <file>server_scripts/website_tor/Dockerfile</file>
+        <file>server_scripts/check_user_in_sudo.sh</file>
+        <file>ui/qml/Controls2/BasicButtonType.qml</file>
+        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
+        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
+        <file>images/controls/arrow-right.svg</file>
+        <file>images/controls/chevron-right.svg</file>
+        <file>ui/qml/Controls2/ImageButtonType.qml</file>
+        <file>ui/qml/Controls2/CardType.qml</file>
+        <file>ui/qml/Controls2/CheckBoxType.qml</file>
+        <file>images/controls/check.svg</file>
+        <file>ui/qml/Controls2/DropDownType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
+        <file>ui/qml/main2.qml</file>
+        <file>images/amneziaBigLogo.png</file>
+        <file>ui/qml/Controls2/FlickableType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
+        <file>ui/qml/Controls2/HeaderType.qml</file>
+        <file>images/controls/arrow-left.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
+        <file>images/controls/chevron-down.svg</file>
+        <file>images/controls/chevron-up.svg</file>
+        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
+        <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
+        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
+        <file>ui/qml/Controls2/SwitcherType.qml</file>
+        <file>ui/qml/Controls2/TabButtonType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
+        <file>images/controls/folder-open.svg</file>
+        <file>images/controls/qr-code.svg</file>
+        <file>images/controls/text-cursor.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
+        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/Controls2/TabImageButtonType.qml</file>
+        <file>images/controls/home.svg</file>
+        <file>images/controls/settings-2.svg</file>
+        <file>images/controls/share-2.svg</file>
+        <file>ui/qml/Pages2/PageHome.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
+        <file>ui/qml/Pages2/PageShare.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
+        <file>ui/qml/Controls2/Header2Type.qml</file>
+        <file>images/controls/plus.svg</file>
+        <file>ui/qml/Components/ConnectButton.qml</file>
+        <file>images/controls/download.svg</file>
+        <file>ui/qml/Controls2/ProgressBarType.qml</file>
+        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
+        <file>ui/qml/Components/HomeContainersListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
+        <file>images/controls/settings.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
+        <file>ui/qml/Controls2/PageType.qml</file>
+        <file>ui/qml/Controls2/PopupType.qml</file>
+        <file>images/controls/edit-3.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
+        <file>ui/qml/Components/SettingsContainersListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
+        <file>ui/qml/Controls2/DividerType.qml</file>
+        <file>ui/qml/Controls2/StackViewType.qml</file>
+        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>images/controls/amnezia.svg</file>
+        <file>images/controls/app.svg</file>
+        <file>images/controls/radio.svg</file>
+        <file>images/controls/save.svg</file>
+        <file>images/controls/server.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
+        <file>images/controls/file-cog-2.svg</file>
+        <file>ui/qml/Components/QuestionDrawer.qml</file>
+        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
+        <file>ui/qml/Controls2/BackButtonType.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
+        <file>ui/qml/Components/TransportProtoSelector.qml</file>
+        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
+        <file>images/controls/radio-button.svg</file>
+        <file>images/controls/radio-button-inner-circle.png</file>
+        <file>images/controls/radio-button-pressed.svg</file>
+        <file>images/controls/radio-button-inner-circle-pressed.png</file>
+        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
+        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
+        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
+        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
+        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
+        <file>images/controls/delete.svg</file>
+        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
+        <file>images/controls/github.svg</file>
+        <file>images/controls/mail.svg</file>
+        <file>images/controls/telegram.svg</file>
+        <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
+        <file>ui/qml/Filters/ContainersModelFilters.qml</file>
+        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
+        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
+        <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
+        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
+        <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
+        <file>images/controls/copy.svg</file>
+        <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
+        <file>images/controls/eye.svg</file>
+        <file>images/controls/eye-off.svg</file>
+        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
+        <file>ui/qml/Controls2/ContextMenuType.qml</file>
+        <file>ui/qml/Controls2/TextAreaType.qml</file>
+        <file>images/controls/trash.svg</file>
+        <file>images/controls/more-vertical.svg</file>
+        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
+        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
+        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
+        <file>images/controls/x-circle.svg</file>
+        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
+        <file>server_scripts/awg/template.conf</file>
+        <file>server_scripts/awg/start.sh</file>
+        <file>server_scripts/awg/configure_container.sh</file>
+        <file>server_scripts/awg/run_container.sh</file>
+        <file>server_scripts/awg/Dockerfile</file>
+        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
+        <file>images/controls/close.svg</file>
+        <file>images/controls/search.svg</file>
         <file>server_scripts/xray/configure_container.sh</file>
         <file>server_scripts/xray/Dockerfile</file>
         <file>server_scripts/xray/run_container.sh</file>
         <file>server_scripts/xray/start.sh</file>
         <file>server_scripts/xray/template.json</file>
-        <file>ui/qml/Components/AdLabel.qml</file>
-        <file>ui/qml/Components/ConnectButton.qml</file>
-        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
-        <file>ui/qml/Components/HomeContainersListView.qml</file>
-        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
-        <file>ui/qml/Components/InstalledAppsDrawer.qml</file>
-        <file>ui/qml/Components/QuestionDrawer.qml</file>
-        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
-        <file>ui/qml/Components/ServersListView.qml</file>
-        <file>ui/qml/Components/SettingsContainersListView.qml</file>
-        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
-        <file>ui/qml/Components/TransportProtoSelector.qml</file>
-        <file>ui/qml/Config/GlobalConfig.qml</file>
-        <file>ui/qml/Config/qmldir</file>
-        <file>ui/qml/Controls2/BackButtonType.qml</file>
-        <file>ui/qml/Controls2/BasicButtonType.qml</file>
-        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
-        <file>ui/qml/Controls2/CardType.qml</file>
-        <file>ui/qml/Controls2/CardWithIconsType.qml</file>
-        <file>ui/qml/Controls2/CheckBoxType.qml</file>
-        <file>ui/qml/Controls2/ContextMenuType.qml</file>
-        <file>ui/qml/Controls2/DividerType.qml</file>
-        <file>ui/qml/Controls2/DrawerType2.qml</file>
-        <file>ui/qml/Controls2/DropDownType.qml</file>
-        <file>ui/qml/Controls2/FlickableType.qml</file>
-        <file>ui/qml/Controls2/Header2Type.qml</file>
-        <file>ui/qml/Controls2/HeaderType.qml</file>
-        <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
-        <file>ui/qml/Controls2/ImageButtonType.qml</file>
-        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
-        <file>ui/qml/Controls2/LabelWithImageType.qml</file>
-        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
-        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
-        <file>ui/qml/Controls2/PageType.qml</file>
-        <file>ui/qml/Controls2/PopupType.qml</file>
-        <file>ui/qml/Controls2/ProgressBarType.qml</file>
-        <file>ui/qml/Controls2/ScrollBarType.qml</file>
-        <file>ui/qml/Controls2/StackViewType.qml</file>
-        <file>ui/qml/Controls2/SwitcherType.qml</file>
-        <file>ui/qml/Controls2/TabButtonType.qml</file>
-        <file>ui/qml/Controls2/TabImageButtonType.qml</file>
-        <file>ui/qml/Controls2/TextAreaType.qml</file>
-        <file>ui/qml/Controls2/TextAreaWithFooterType.qml</file>
-        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
-        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
-        <file>ui/qml/Controls2/WarningType.qml</file>
-        <file>ui/qml/Filters/ContainersModelFilters.qml</file>
-        <file>ui/qml/main2.qml</file>
-        <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
-        <file>ui/qml/Modules/Style/qmldir</file>
-        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
-        <file>ui/qml/Pages2/PageDevMenu.qml</file>
-        <file>ui/qml/Pages2/PageHome.qml</file>
-        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
-        <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolWireGuardSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
-        <file>ui/qml/Pages2/PageSettings.qml</file>
-        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApiLanguageList.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApiServerInfo.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
+        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
+        <file>images/controls/split-tunneling.svg</file>
+        <file>ui/qml/Controls2/DrawerType2.qml</file>
         <file>ui/qml/Pages2/PageSettingsAppSplitTunneling.qml</file>
-        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
-        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
-        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
-        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
-        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
+        <file>ui/qml/Components/InstalledAppsDrawer.qml</file>
+        <file>images/controls/alert-circle.svg</file>
+        <file>images/controls/file-check-2.svg</file>
+        <file>ui/qml/Controls2/WarningType.qml</file>
+        <file>fonts/pt-root-ui_vf.ttf</file>
+        <file>ui/qml/Modules/Style/qmldir</file>
+        <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
+        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
+        <file>server_scripts/socks5_proxy/run_container.sh</file>
+        <file>server_scripts/socks5_proxy/Dockerfile</file>
+        <file>server_scripts/socks5_proxy/configure_container.sh</file>
+        <file>server_scripts/socks5_proxy/start.sh</file>
         <file>ui/qml/Pages2/PageProtocolAwgClientSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardApiServicesList.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
-        <file>ui/qml/Pages2/PageShare.qml</file>
-        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
-        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml</file>
+        <file>ui/qml/Controls2/CardWithIconsType.qml</file>
+        <file>images/controls/tag.svg</file>
+        <file>images/controls/history.svg</file>
+        <file>images/controls/gauge.svg</file>
+        <file>images/controls/map-pin.svg</file>
+        <file>ui/qml/Controls2/LabelWithImageType.qml</file>
+        <file>images/controls/info.svg</file>
+        <file>ui/qml/Controls2/TextAreaWithFooterType.qml</file>
+        <file>images/controls/scan-line.svg</file>
+        <file>images/controls/folder-search-2.svg</file>
+        <file>ui/qml/Pages2/PageSettingsApiServerInfo.qml</file>
+        <file>images/controls/bug.svg</file>
+        <file>ui/qml/Pages2/PageDevMenu.qml</file>
+        <file>images/controls/refresh-cw.svg</file>
+        <file>ui/qml/Pages2/PageSettingsApiLanguageList.qml</file>
+        <file>images/controls/archive-restore.svg</file>
+        <file>images/controls/help-circle.svg</file>
     </qresource>
     <qresource prefix="/countriesFlags">
         <file>images/flagKit/ZW.svg</file>

client/server_scripts/awg/configure_container.sh

@@ -12,7 +12,7 @@ echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key
 cat > /opt/amnezia/awg/wg0.conf <<EOF
 [Interface]
 PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-Address = $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
 ListenPort = $AWG_SERVER_PORT
 Jc = $JUNK_PACKET_COUNT
 Jmin = $JUNK_PACKET_MIN_SIZE

client/server_scripts/awg/start.sh

@@ -17,12 +17,12 @@ iptables -A FORWARD -i wg0 -j ACCEPT
 iptables -A OUTPUT -o wg0 -j ACCEPT
 
 # Allow forwarding traffic only from the VPN.
-iptables -A FORWARD -i wg0 -o eth0 -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
-iptables -A FORWARD -i wg0 -o eth1 -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
+iptables -A FORWARD -i wg0 -o eth0 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
+iptables -A FORWARD -i wg0 -o eth1 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
 
 iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
 
-iptables -t nat -A POSTROUTING -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth0 -j MASQUERADE
-iptables -t nat -A POSTROUTING -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth1 -j MASQUERADE
+iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth0 -j MASQUERADE
+iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth1 -j MASQUERADE
 
 tail -f /dev/null

client/server_scripts/check_user_in_sudo.sh

@@ -1,11 +1,2 @@
-if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); opt="--version";\
-elif which dnf > /dev/null 2>&1; then pm=$(which dnf); opt="--version";\
-elif which yum > /dev/null 2>&1; then pm=$(which yum); opt="--version";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); opt="--version";\
-else pm="uname"; opt="-a";\
-fi;\
-CUR_USER=$(whoami 2> /dev/null || echo ~ | sed 's/.*\///');\
-echo $LANG | grep -qE '^(en_US.UTF-8|C.UTF-8|C)$' || export LC_ALL=C;\
-if [ "$CUR_USER" = "root" ] || ( groups "$CUR_USER" | grep -E '\<(sudo|wheel)\>' ); then \
-  sudo -K && sudo -nu $CUR_USER $pm $opt > /dev/null && sudo -n $pm $opt > /dev/null;\
-fi
+CUR_USER=$(whoami);\
+groups $CUR_USER

client/server_scripts/prepare_host.sh

@@ -1,4 +1,4 @@
-CUR_USER=$(whoami 2> /dev/null || echo ~ | sed 's/.*\///');\
+CUR_USER=$(whoami);\
 sudo mkdir -p $DOCKERFILE_FOLDER;\
 sudo chown $CUR_USER $DOCKERFILE_FOLDER;\
 if ! sudo docker network ls | grep -q amnezia-dns-net; then sudo docker network create \

client/settings.cpp

@@ -538,13 +538,3 @@ void Settings::toggleDevGatewayEnv(bool enabled)
 {
     m_isDevGatewayEnv = enabled;
 }
-
-bool Settings::isHomeAdLabelVisible()
-{
-    return value("Conf/homeAdLabelVisible", true).toBool();
-}
-
-void Settings::disableHomeAdLabel()
-{
-    setValue("Conf/homeAdLabelVisible", false);
-}

client/settings.h

@@ -222,9 +222,6 @@ public:
     bool isDevGatewayEnv();
     void toggleDevGatewayEnv(bool enabled);
 
-    bool isHomeAdLabelVisible();
-    void disableHomeAdLabel();
-
 signals:
     void saveLogsChanged(bool enabled);
     void screenshotsEnabledChanged(bool enabled);

client/ui/controllers/focusController.cpp

@@ -1,209 +0,0 @@
-#include "focusController.h"
-#include "utils/qmlUtils.h"
-
-#include <QQmlApplicationEngine>
-#include <QQuickWindow>
-
-FocusController::FocusController(QQmlApplicationEngine *engine, QObject *parent)
-    : QObject { parent },
-      m_engine { engine },
-      m_focusChain {},
-      m_focusedItem { nullptr },
-      m_rootObjects {},
-      m_defaultFocusItem { nullptr },
-      m_lvfc { nullptr }
-{
-    QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated, this, [this](QObject *object, const QUrl &url) {
-        QQuickItem *newDefaultFocusItem = object->findChild<QQuickItem *>("defaultFocusItem");
-        if (newDefaultFocusItem && m_defaultFocusItem != newDefaultFocusItem) {
-            m_defaultFocusItem = newDefaultFocusItem;
-        }
-    });
-
-    QObject::connect(this, &FocusController::focusedItemChanged, this,
-                     [this]() { m_focusedItem->forceActiveFocus(Qt::TabFocusReason); });
-}
-
-void FocusController::nextKeyTabItem()
-{
-    nextItem(Direction::Forward);
-}
-
-void FocusController::previousKeyTabItem()
-{
-    nextItem(Direction::Backward);
-}
-
-void FocusController::nextKeyUpItem()
-{
-    nextItem(Direction::Backward);
-}
-
-void FocusController::nextKeyDownItem()
-{
-    nextItem(Direction::Forward);
-}
-
-void FocusController::nextKeyLeftItem()
-{
-    nextItem(Direction::Backward);
-}
-
-void FocusController::nextKeyRightItem()
-{
-    nextItem(Direction::Forward);
-}
-
-void FocusController::setFocusItem(QQuickItem *item)
-{
-    if (m_focusedItem != item) {
-        m_focusedItem = item;
-    }
-    emit focusedItemChanged();
-}
-
-void FocusController::setFocusOnDefaultItem()
-{
-    setFocusItem(m_defaultFocusItem);
-}
-
-void FocusController::pushRootObject(QObject *object)
-{
-    m_rootObjects.push(object);
-    dropListView();
-    // setFocusOnDefaultItem();
-}
-
-void FocusController::dropRootObject(QObject *object)
-{
-    if (m_rootObjects.empty()) {
-        return;
-    }
-
-    if (m_rootObjects.top() == object) {
-        m_rootObjects.pop();
-        dropListView();
-        setFocusOnDefaultItem();
-    } else {
-        qWarning() << "===>> TRY TO DROP WRONG ROOT OBJECT: " << m_rootObjects.top() << " SHOULD BE: " << object;
-    }
-}
-
-void FocusController::resetRootObject()
-{
-    m_rootObjects.clear();
-}
-
-void FocusController::reload(Direction direction)
-{
-    m_focusChain.clear();
-
-    QObject *rootObject = (m_rootObjects.empty() ? m_engine->rootObjects().value(0) : m_rootObjects.top());
-
-    if (!rootObject) {
-        qCritical() << "No ROOT OBJECT found!";
-        resetRootObject();
-        dropListView();
-        return;
-    }
-
-    m_focusChain.append(FocusControl::getSubChain(rootObject));
-
-    std::sort(m_focusChain.begin(), m_focusChain.end(),
-              direction == Direction::Forward ? FocusControl::isLess : FocusControl::isMore);
-
-    if (m_focusChain.empty()) {
-        qWarning() << "Focus chain is empty!";
-        resetRootObject();
-        dropListView();
-        return;
-    }
-}
-
-void FocusController::nextItem(Direction direction)
-{
-    reload(direction);
-
-    if (m_lvfc && FocusControl::isListView(m_focusedItem)) {
-        direction == Direction::Forward ? focusNextListViewItem() : focusPreviousListViewItem();
-
-        return;
-    }
-
-    if (m_focusChain.empty()) {
-        qWarning() << "There are no items to navigate";
-        setFocusOnDefaultItem();
-        return;
-    }
-
-    auto focusedItemIndex = m_focusChain.indexOf(m_focusedItem);
-
-    if (focusedItemIndex == -1) {
-        focusedItemIndex = 0;
-    } else if (focusedItemIndex == (m_focusChain.size() - 1)) {
-        focusedItemIndex = 0;
-    } else {
-        focusedItemIndex++;
-    }
-
-    const auto focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(focusedItemIndex));
-
-    if (focusedItem == nullptr) {
-        qWarning() << "Failed to get item to focus on. Setting focus on default";
-        setFocusOnDefaultItem();
-        return;
-    }
-
-    if (FocusControl::isListView(focusedItem)) {
-        m_lvfc = new ListViewFocusController(focusedItem, this);
-        m_focusedItem = focusedItem;
-        if (direction == Direction::Forward) {
-            m_lvfc->nextDelegate();
-            focusNextListViewItem();
-        } else {
-            m_lvfc->previousDelegate();
-            focusPreviousListViewItem();
-        }
-        return;
-    }
-
-    setFocusItem(focusedItem);
-}
-
-void FocusController::focusNextListViewItem()
-{
-    m_lvfc->reloadFocusChain();
-    if (m_lvfc->isLastFocusItemInListView() || m_lvfc->isReturnNeeded()) {
-        dropListView();
-        nextItem(Direction::Forward);
-        return;
-    } else if (m_lvfc->isLastFocusItemInDelegate()) {
-        m_lvfc->resetFocusChain();
-        m_lvfc->nextDelegate();
-    }
-
-    m_lvfc->focusNextItem();
-}
-
-void FocusController::focusPreviousListViewItem()
-{
-    m_lvfc->reloadFocusChain();
-    if (m_lvfc->isFirstFocusItemInListView() || m_lvfc->isReturnNeeded()) {
-        dropListView();
-        nextItem(Direction::Backward);
-        return;
-    } else if (m_lvfc->isFirstFocusItemInDelegate()) {
-        m_lvfc->resetFocusChain();
-        m_lvfc->previousDelegate();
-    }
-
-    m_lvfc->focusPreviousItem();
-}
-
-void FocusController::dropListView()
-{
-    if (m_lvfc) {
-        delete m_lvfc;
-        m_lvfc = nullptr;
-    }
-}

client/ui/controllers/focusController.h

@@ -1,57 +0,0 @@
-#ifndef FOCUSCONTROLLER_H
-#define FOCUSCONTROLLER_H
-
-#include "ui/controllers/listViewFocusController.h"
-
-#include <QQmlApplicationEngine>
-
-/*!
- * \brief The FocusController class makes focus control more straightforward
- * \details Focus is handled only for visible and enabled items which have
- *          `isFocused` property from top left to bottom right.
- * \note There are items handled differently (e.g. ListView)
- */
-class FocusController : public QObject
-{
-    Q_OBJECT
-public:
-    explicit FocusController(QQmlApplicationEngine *engine, QObject *parent = nullptr);
-    ~FocusController() override = default;
-
-    Q_INVOKABLE void nextKeyTabItem();
-    Q_INVOKABLE void previousKeyTabItem();
-    Q_INVOKABLE void nextKeyUpItem();
-    Q_INVOKABLE void nextKeyDownItem();
-    Q_INVOKABLE void nextKeyLeftItem();
-    Q_INVOKABLE void nextKeyRightItem();
-    Q_INVOKABLE void setFocusItem(QQuickItem *item);
-    Q_INVOKABLE void setFocusOnDefaultItem();
-    Q_INVOKABLE void pushRootObject(QObject *object);
-    Q_INVOKABLE void dropRootObject(QObject *object);
-    Q_INVOKABLE void resetRootObject();
-
-private:
-    enum class Direction {
-        Forward,
-        Backward,
-    };
-
-    void reload(Direction direction);
-    void nextItem(Direction direction);
-    void focusNextListViewItem();
-    void focusPreviousListViewItem();
-    void dropListView();
-
-    QQmlApplicationEngine *m_engine; // Pointer to engine to get root object
-    QList<QObject *> m_focusChain;   // List of current objects to be focused
-    QQuickItem *m_focusedItem;       // Pointer to the active focus item
-    QStack<QObject *> m_rootObjects; // Pointer to stack of roots for focus chain
-    QQuickItem *m_defaultFocusItem;
-
-    ListViewFocusController *m_lvfc; // ListView focus manager
-
-signals:
-    void focusedItemChanged();
-};
-
-#endif // FOCUSCONTROLLER_H

client/ui/controllers/importController.cpp

@@ -9,7 +9,6 @@
 
 #include "core/errorstrings.h"
 #include "core/serialization/serialization.h"
-#include "systemController.h"
 #include "utilities.h"
 
 #ifdef Q_OS_ANDROID
@@ -77,18 +76,17 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 bool ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QString data;
-    if (!SystemController::readFile(fileName, data)) {
-        emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
-        return false;
+    QFile file(fileName);
+
+    if (file.open(QIODevice::ReadOnly)) {
+        QString data = file.readAll();
+
+        m_configFileName = QFileInfo(file.fileName()).fileName();
+        return extractConfigFromData(data);
     }
-    m_configFileName = QFileInfo(QFile(fileName).fileName()).fileName();
-#ifdef Q_OS_ANDROID
-    if (m_configFileName.isEmpty()) {
-        m_configFileName = AndroidController::instance()->getFileName(fileName);
-    }
-#endif
-    return extractConfigFromData(data);
+
+    emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
+    return false;
 }
 
 bool ImportController::extractConfigFromData(QString data)

client/ui/controllers/listViewFocusController.cpp

@@ -1,309 +0,0 @@
-#include "listViewFocusController.h"
-#include "utils/qmlUtils.h"
-
-#include <QQuickWindow>
-
-ListViewFocusController::ListViewFocusController(QQuickItem *listView, QObject *parent)
-    : QObject { parent },
-      m_listView { listView },
-      m_focusChain {},
-      m_currentSection { Section::Default },
-      m_header { nullptr },
-      m_footer { nullptr },
-      m_focusedItem { nullptr },
-      m_focusedItemIndex { -1 },
-      m_delegateIndex { 0 },
-      m_isReturnNeeded { false },
-      m_currentSectionString { "Default", "Header", "Delegate", "Footer" }
-{
-    QVariant headerItemProperty = m_listView->property("headerItem");
-    m_header = headerItemProperty.canConvert<QQuickItem *>() ? headerItemProperty.value<QQuickItem *>() : nullptr;
-
-    QVariant footerItemProperty = m_listView->property("footerItem");
-    m_footer = footerItemProperty.canConvert<QQuickItem *>() ? footerItemProperty.value<QQuickItem *>() : nullptr;
-}
-
-ListViewFocusController::~ListViewFocusController()
-{
-}
-
-void ListViewFocusController::viewAtCurrentIndex() const
-{
-    switch (m_currentSection) {
-    case Section::Default: [[fallthrough]];
-    case Section::Header: {
-        QMetaObject::invokeMethod(m_listView, "positionViewAtBeginning");
-        break;
-    }
-    case Section::Delegate: {
-        QMetaObject::invokeMethod(m_listView, "positionViewAtIndex", Q_ARG(int, m_delegateIndex), // Index
-                                  Q_ARG(int, 2)); // PositionMode (0 = Visible)
-        break;
-    }
-    case Section::Footer: {
-        QMetaObject::invokeMethod(m_listView, "positionViewAtEnd");
-        break;
-    }
-    }
-}
-
-int ListViewFocusController::size() const
-{
-    return m_listView->property("count").toInt();
-}
-
-int ListViewFocusController::currentIndex() const
-{
-    return m_delegateIndex;
-}
-
-void ListViewFocusController::setDelegateIndex(int index)
-{
-    m_delegateIndex = index;
-    m_listView->setProperty("currentIndex", index);
-}
-
-void ListViewFocusController::nextDelegate()
-{
-    switch (m_currentSection) {
-    case Section::Default: {
-        if (hasHeader()) {
-            m_currentSection = Section::Header;
-            viewAtCurrentIndex();
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Header: {
-        if (size() > 0) {
-            m_currentSection = Section::Delegate;
-            viewAtCurrentIndex();
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Delegate:
-        if (m_delegateIndex < (size() - 1)) {
-            setDelegateIndex(m_delegateIndex + 1);
-            viewAtCurrentIndex();
-            break;
-        } else if (hasFooter()) {
-            m_currentSection = Section::Footer;
-            viewAtCurrentIndex();
-            break;
-        }
-        [[fallthrough]];
-    case Section::Footer: {
-        m_isReturnNeeded = true;
-        m_currentSection = Section::Default;
-        viewAtCurrentIndex();
-        break;
-    }
-    default: {
-        qCritical() << "Current section is invalid!";
-        break;
-    }
-    }
-}
-
-void ListViewFocusController::previousDelegate()
-{
-    switch (m_currentSection) {
-    case Section::Default: {
-        if (hasFooter()) {
-            m_currentSection = Section::Footer;
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Footer: {
-        if (size() > 0) {
-            m_currentSection = Section::Delegate;
-            setDelegateIndex(size() - 1);
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Delegate: {
-        if (m_delegateIndex > 0) {
-            setDelegateIndex(m_delegateIndex - 1);
-            break;
-        } else if (hasHeader()) {
-            m_currentSection = Section::Header;
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Header: {
-        m_isReturnNeeded = true;
-        m_currentSection = Section::Default;
-        break;
-    }
-    default: {
-        qCritical() << "Current section is invalid!";
-        break;
-    }
-    }
-}
-
-void ListViewFocusController::decrementIndex()
-{
-    m_delegateIndex--;
-}
-
-QQuickItem *ListViewFocusController::itemAtIndex(const int index) const
-{
-    QQuickItem *item { nullptr };
-
-    QMetaObject::invokeMethod(m_listView, "itemAtIndex", Q_RETURN_ARG(QQuickItem *, item), Q_ARG(int, index));
-
-    return item;
-}
-
-QQuickItem *ListViewFocusController::currentDelegate() const
-{
-    QQuickItem *result { nullptr };
-
-    switch (m_currentSection) {
-    case Section::Default: {
-        qWarning() << "No elements...";
-        break;
-    }
-    case Section::Header: {
-        result = m_header;
-        break;
-    }
-    case Section::Delegate: {
-        result = itemAtIndex(m_delegateIndex);
-        break;
-    }
-    case Section::Footer: {
-        result = m_footer;
-        break;
-    }
-    }
-    return result;
-}
-
-QQuickItem *ListViewFocusController::focusedItem() const
-{
-    return m_focusedItem;
-}
-
-void ListViewFocusController::focusNextItem()
-{
-    if (m_isReturnNeeded) {
-        return;
-    }
-
-    reloadFocusChain();
-
-    if (m_focusChain.empty()) {
-        qWarning() << "No elements found in the delegate. Going to next delegate...";
-        nextDelegate();
-        focusNextItem();
-        return;
-    }
-    m_focusedItemIndex++;
-    m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
-    m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
-}
-
-void ListViewFocusController::focusPreviousItem()
-{
-    if (m_isReturnNeeded) {
-        return;
-    }
-
-    if (m_focusChain.empty()) {
-        qInfo() << "Empty focusChain with current delegate: " << currentDelegate() << "Scanning for elements...";
-        reloadFocusChain();
-    }
-    if (m_focusChain.empty()) {
-        qWarning() << "No elements found in the delegate. Going to next delegate...";
-        previousDelegate();
-        focusPreviousItem();
-        return;
-    }
-    if (m_focusedItemIndex == -1) {
-        m_focusedItemIndex = m_focusChain.size();
-    }
-    m_focusedItemIndex--;
-    m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
-    m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
-}
-
-void ListViewFocusController::resetFocusChain()
-{
-    m_focusChain.clear();
-    m_focusedItem = nullptr;
-    m_focusedItemIndex = -1;
-}
-
-void ListViewFocusController::reloadFocusChain()
-{
-    m_focusChain = FocusControl::getItemsChain(currentDelegate());
-}
-
-bool ListViewFocusController::isFirstFocusItemInDelegate() const
-{
-    return m_focusedItem && (m_focusedItem == m_focusChain.first());
-}
-
-bool ListViewFocusController::isLastFocusItemInDelegate() const
-{
-    return m_focusedItem && (m_focusedItem == m_focusChain.last());
-}
-
-bool ListViewFocusController::hasHeader() const
-{
-    return m_header && !FocusControl::getItemsChain(m_header).isEmpty();
-}
-
-bool ListViewFocusController::hasFooter() const
-{
-    return m_footer && !FocusControl::getItemsChain(m_footer).isEmpty();
-}
-
-bool ListViewFocusController::isFirstFocusItemInListView() const
-{
-    switch (m_currentSection) {
-    case Section::Footer: {
-        return isFirstFocusItemInDelegate() && !hasHeader() && (size() == 0);
-    }
-    case Section::Delegate: {
-        return isFirstFocusItemInDelegate() && (m_delegateIndex == 0) && !hasHeader();
-    }
-    case Section::Header: {
-        isFirstFocusItemInDelegate();
-    }
-    case Section::Default: {
-        return true;
-    }
-    default: qWarning() << "Wrong section"; return true;
-    }
-}
-
-bool ListViewFocusController::isLastFocusItemInListView() const
-{
-    switch (m_currentSection) {
-    case Section::Default: {
-        return !hasHeader() && (size() == 0) && !hasFooter();
-    }
-    case Section::Header: {
-        return isLastFocusItemInDelegate() && (size() == 0) && !hasFooter();
-    }
-    case Section::Delegate: {
-        return isLastFocusItemInDelegate() && (m_delegateIndex == size() - 1) && !hasFooter();
-    }
-    case Section::Footer: {
-        return isLastFocusItemInDelegate();
-    }
-    default: qWarning() << "Wrong section"; return true;
-    }
-}
-
-bool ListViewFocusController::isReturnNeeded() const
-{
-    return m_isReturnNeeded;
-}

client/ui/controllers/listViewFocusController.h

@@ -1,70 +0,0 @@
-#ifndef LISTVIEWFOCUSCONTROLLER_H
-#define LISTVIEWFOCUSCONTROLLER_H
-
-#include <QList>
-#include <QObject>
-#include <QQuickItem>
-#include <QSharedPointer>
-#include <QStack>
-
-/*!
- * \brief The ListViewFocusController class manages the focus of elements in ListView
- * \details This class object moving focus to ListView's controls since ListView stores
- *          it's data implicitly and it could be got one by one.
- *
- *          This class was made to store as less as possible data getting it from QML
- *          when it's needed.
- */
-class ListViewFocusController : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ListViewFocusController(QQuickItem *listView, QObject *parent = nullptr);
-    ~ListViewFocusController();
-
-    void nextDelegate();
-    void previousDelegate();
-    void decrementIndex();
-    void focusNextItem();
-    void focusPreviousItem();
-    void resetFocusChain();
-    void reloadFocusChain();
-    bool isFirstFocusItemInListView() const;
-    bool isFirstFocusItemInDelegate() const;
-    bool isLastFocusItemInListView() const;
-    bool isLastFocusItemInDelegate() const;
-    bool isReturnNeeded() const;
-
-private:
-    enum class Section {
-        Default,
-        Header,
-        Delegate,
-        Footer,
-    };
-
-    int size() const;
-    int currentIndex() const;
-    void setDelegateIndex(int index);
-    void viewAtCurrentIndex() const;
-    QQuickItem *itemAtIndex(const int index) const;
-    QQuickItem *currentDelegate() const;
-    QQuickItem *focusedItem() const;
-
-    bool hasHeader() const;
-    bool hasFooter() const;
-
-    QQuickItem *m_listView;
-    QList<QObject *> m_focusChain;
-    Section m_currentSection;
-    QQuickItem *m_header;
-    QQuickItem *m_footer;
-    QQuickItem *m_focusedItem; // Pointer to focused item on Delegate
-    qsizetype m_focusedItemIndex;
-    qsizetype m_delegateIndex;
-    bool m_isReturnNeeded;
-
-    QList<QString> m_currentSectionString;
-};
-
-#endif // LISTVIEWFOCUSCONTROLLER_H

client/ui/controllers/pageController.cpp

@@ -81,7 +81,7 @@ void PageController::keyPressEvent(Qt::Key key)
     case Qt::Key_Escape: {
         if (m_drawerDepth) {
             emit closeTopDrawer();
-            decrementDrawerDepth();
+            setDrawerDepth(getDrawerDepth() - 1);
         } else {
             emit escapePressed();
         }
@@ -142,25 +142,11 @@ void PageController::setDrawerDepth(const int depth)
     }
 }
 
-int PageController::getDrawerDepth() const
+int PageController::getDrawerDepth()
 {
     return m_drawerDepth;
 }
 
-int PageController::incrementDrawerDepth()
-{
-    return ++m_drawerDepth;
-}
-
-int PageController::decrementDrawerDepth()
-{
-    if (m_drawerDepth == 0) {
-        return m_drawerDepth;
-    } else {
-        return --m_drawerDepth;
-    }
-}
-
 void PageController::onShowErrorMessage(ErrorCode errorCode)
 {
     const auto fullErrorMessage = errorString(errorCode);

client/ui/controllers/pageController.h

@@ -100,9 +100,7 @@ public slots:
     void closeApplication();
 
     void setDrawerDepth(const int depth);
-    int getDrawerDepth() const;
-    int incrementDrawerDepth();
-    int decrementDrawerDepth();
+    int getDrawerDepth();
 
   private slots:
     void onShowErrorMessage(amnezia::ErrorCode errorCode);
@@ -137,6 +135,9 @@ signals:
     void escapePressed();
     void closeTopDrawer();
 
+    void forceTabBarActiveFocus();
+    void forceStackActiveFocus();
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
 

client/ui/controllers/settingsController.cpp

@@ -131,8 +131,12 @@ void SettingsController::backupAppConfig(const QString &fileName)
 
 void SettingsController::restoreAppConfig(const QString &fileName)
 {
-    QByteArray data;
-    SystemController::readFile(fileName, data);
+    QFile file(fileName);
+
+    file.open(QIODevice::ReadOnly);
+
+    QByteArray data = file.readAll();
+
     restoreAppConfigFromData(data);
 }
 
@@ -320,15 +324,4 @@ bool SettingsController::isOnTv()
 #else
     return false;
 #endif
-}
-
-bool SettingsController::isHomeAdLabelVisible()
-{
-    return m_settings->isHomeAdLabelVisible();
-}
-
-void SettingsController::disableHomeAdLabel()
-{
-    m_settings->disableHomeAdLabel();
-    emit isHomeAdLabelVisibleChanged(false);
-}
+}

client/ui/controllers/settingsController.h

@@ -29,8 +29,6 @@ public:
     Q_PROPERTY(QString gatewayEndpoint READ getGatewayEndpoint WRITE setGatewayEndpoint NOTIFY gatewayEndpointChanged)
     Q_PROPERTY(bool isDevGatewayEnv READ isDevGatewayEnv WRITE toggleDevGatewayEnv NOTIFY devGatewayEnvChanged)
 
-    Q_PROPERTY(bool isHomeAdLabelVisible READ isHomeAdLabelVisible NOTIFY isHomeAdLabelVisibleChanged)
-
 public slots:
     void toggleAmneziaDns(bool enable);
     bool isAmneziaDnsEnabled();
@@ -91,9 +89,6 @@ public slots:
 
     bool isOnTv();
 
-    bool isHomeAdLabelVisible();
-    void disableHomeAdLabel();
-
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
@@ -117,8 +112,6 @@ signals:
     void gatewayEndpointChanged(const QString &endpoint);
     void devGatewayEnvChanged(bool enabled);
 
-    void isHomeAdLabelVisibleChanged(bool visible);
-
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;

client/ui/controllers/sitesController.cpp

@@ -82,12 +82,14 @@ void SitesController::removeSite(int index)
 
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
 {
-    QByteArray jsonData;
-    if (!SystemController::readFile(fileName, jsonData)) {
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly)) {
         emit errorOccurred(tr("Can't open file: %1").arg(fileName));
         return;
     }
 
+    QByteArray jsonData = file.readAll();
     QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
     if (jsonDocument.isNull()) {
         emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));

client/ui/controllers/systemController.cpp

@@ -24,7 +24,7 @@ SystemController::SystemController(const std::shared_ptr<Settings> &settings, QO
 {
 }
 
-void SystemController::saveFile(const QString &fileName, const QString &data)
+void SystemController::saveFile(QString fileName, const QString &data)
 {
 #if defined Q_OS_ANDROID
     AndroidController::instance()->saveFile(fileName, data);
@@ -62,31 +62,6 @@ void SystemController::saveFile(const QString &fileName, const QString &data)
 #endif
 }
 
-bool SystemController::readFile(const QString &fileName, QByteArray &data)
-{
-#ifdef Q_OS_ANDROID
-    int fd = AndroidController::instance()->getFd(fileName);
-    if (fd == -1) return false;
-    QFile file;
-    if(!file.open(fd, QIODevice::ReadOnly)) return false;
-    data = file.readAll();
-    AndroidController::instance()->closeFd();
-#else
-    QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly)) return false;
-    data = file.readAll();
-#endif
-    return true;
-}
-
-bool SystemController::readFile(const QString &fileName, QString &data)
-{
-    QByteArray byteArray;
-    if(!readFile(fileName, byteArray)) return false;
-    data = byteArray;
-    return true;
-}
-
 QString SystemController::getFileName(const QString &acceptLabel, const QString &nameFilter,
                                       const QString &selectedFile, const bool isSaveMode, const QString &defaultSuffix)
 {
@@ -159,10 +134,3 @@ bool SystemController::isAuthenticated()
     return true;
 #endif
 }
-
-void SystemController::sendTouch(float x, float y)
-{
-#ifdef Q_OS_ANDROID
-    AndroidController::instance()->sendTouch(x, y);
-#endif
-}

client/ui/controllers/systemController.h

@@ -11,9 +11,7 @@ class SystemController : public QObject
 public:
     explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
 
-    static void saveFile(const QString &fileName, const QString &data);
-    static bool readFile(const QString &fileName, QByteArray &data);
-    static bool readFile(const QString &fileName, QString &data);
+    static void saveFile(QString fileName, const QString &data);
 
 public slots:
     QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",
@@ -22,8 +20,6 @@ public slots:
     void setQmlRoot(QObject *qmlRoot);
 
     bool isAuthenticated();
-    void sendTouch(float x, float y);
-
 signals:
     void fileDialogClosed(const bool isAccepted);
 

client/ui/models/apiServicesModel.cpp

@@ -68,19 +68,17 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
             return tr("Classic VPN for comfortable work, downloading large files and watching videos. "
                       "Works for any sites. Speed up to %1 MBit/s")
                     .arg(speed);
-        } else if (serviceType == serviceType::amneziaFree) {
+        } else if (serviceType == serviceType::amneziaFree){
             QString description = tr("VPN to access blocked sites in regions with high levels of Internet censorship. ");
-            if (!isServiceAvailable) {
-                description += tr("<p><a style=\"color: #EB5757;\">Not available in your region. If you have VPN enabled, disable it, "
-                                  "return to the previous screen, and try again.</a>");
+            if (isServiceAvailable) {
+                description += tr("<p><a style=\"color: #EB5757;\">Not available in your region. If you have VPN enabled, disable it, return to the previous screen, and try again.</a>");
             }
             return description;
         }
     }
     case ServiceDescriptionRole: {
         if (serviceType == serviceType::amneziaPremium) {
-            return tr("Amnezia Premium - A classic VPN for comfortable work, downloading large files, and watching videos in high "
-                      "resolution. "
+            return tr("Amnezia Premium - A classic VPN for comfortable work, downloading large files, and watching videos in high resolution. "
                       "It works for all websites, even in countries with the highest level of internet censorship.");
         } else {
             return tr("Amnezia Free is a free VPN to bypass blocking in countries with high levels of internet censorship");
@@ -88,7 +86,7 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     }
     case IsServiceAvailableRole: {
         if (serviceType == serviceType::amneziaFree) {
-            if (!isServiceAvailable) {
+            if (isServiceAvailable) {
                 return false;
             }
         }
@@ -145,15 +143,7 @@ void ApiServicesModel::updateModel(const QJsonObject &data)
         m_selectedServiceIndex = 0;
     } else {
         for (const auto &service : services) {
-            auto serviceObject = service.toObject();
-
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-            if (serviceObject.value(configKey::serviceType).toString() == serviceType::amneziaPremium) {
-                continue;
-            }
-#endif
-
-            m_services.push_back(getApiServicesData(serviceObject));
+            m_services.push_back(getApiServicesData(service.toObject()));
         }
     }
 
@@ -238,7 +228,7 @@ QHash<int, QByteArray> ApiServicesModel::roleNames() const
 
 ApiServicesModel::ApiServicesData ApiServicesModel::getApiServicesData(const QJsonObject &data)
 {
-    auto serviceInfo = data.value(configKey::serviceInfo).toObject();
+    auto serviceInfo =  data.value(configKey::serviceInfo).toObject();
     auto serviceType = data.value(configKey::serviceType).toString();
     auto serviceProtocol = data.value(configKey::serviceProtocol).toString();
     auto availableCountries = data.value(configKey::availableCountries).toArray();
@@ -257,7 +247,7 @@ ApiServicesModel::ApiServicesData ApiServicesModel::getApiServicesData(const QJs
 
     serviceData.storeEndpoint = serviceInfo.value(configKey::storeEndpoint).toString();
 
-    if (data.value(configKey::isAvailable).isBool()) {
+    if (serviceInfo.value(configKey::isAvailable).isBool()) {
         serviceData.isServiceAvailable = data.value(configKey::isAvailable).toBool();
     } else {
         serviceData.isServiceAvailable = true;

client/ui/models/protocols/awgConfigModel.cpp

@@ -21,7 +21,6 @@ bool AwgConfigModel::setData(const QModelIndex &index, const QVariant &value, in
     }
 
     switch (role) {
-    case Roles::SubnetAddressRole: m_serverProtocolConfig.insert(config_key::subnet_address, value.toString()); break;
     case Roles::PortRole: m_serverProtocolConfig.insert(config_key::port, value.toString()); break;
 
     case Roles::ClientMtuRole: m_clientProtocolConfig.insert(config_key::mtu, value.toString()); break;
@@ -59,7 +58,6 @@ QVariant AwgConfigModel::data(const QModelIndex &index, int role) const
     }
 
     switch (role) {
-    case Roles::SubnetAddressRole: return m_serverProtocolConfig.value(config_key::subnet_address).toString();
     case Roles::PortRole: return m_serverProtocolConfig.value(config_key::port).toString();
 
     case Roles::ClientMtuRole: return m_clientProtocolConfig.value(config_key::mtu);
@@ -94,7 +92,6 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
     m_serverProtocolConfig.insert(config_key::transport_proto,
                                   serverProtocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
     m_serverProtocolConfig[config_key::last_config] = serverProtocolConfig.value(config_key::last_config);
-    m_serverProtocolConfig[config_key::subnet_address] = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     m_serverProtocolConfig[config_key::port] = serverProtocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     m_serverProtocolConfig[config_key::junkPacketCount] =
             serverProtocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
@@ -171,7 +168,6 @@ QHash<int, QByteArray> AwgConfigModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
-    roles[SubnetAddressRole] = "subnetAddress";
     roles[PortRole] = "port";
 
     roles[ClientMtuRole] = "clientMtu";
@@ -201,7 +197,6 @@ AwgConfig::AwgConfig(const QJsonObject &serverProtocolConfig)
     clientJunkPacketMinSize = clientProtocolConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
     clientJunkPacketMaxSize = clientProtocolConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize);
 
-    subnetAddress = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     port = serverProtocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     serverJunkPacketCount = serverProtocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
     serverJunkPacketMinSize = serverProtocolConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
@@ -221,7 +216,7 @@ AwgConfig::AwgConfig(const QJsonObject &serverProtocolConfig)
 
 bool AwgConfig::hasEqualServerSettings(const AwgConfig &other) const
 {
-    if (subnetAddress != other.subnetAddress || port != other.port || serverJunkPacketCount != other.serverJunkPacketCount
+    if (port != other.port || serverJunkPacketCount != other.serverJunkPacketCount
         || serverJunkPacketMinSize != other.serverJunkPacketMinSize || serverJunkPacketMaxSize != other.serverJunkPacketMaxSize
         || serverInitPacketJunkSize != other.serverInitPacketJunkSize || serverResponsePacketJunkSize != other.serverResponsePacketJunkSize
         || serverInitPacketMagicHeader != other.serverInitPacketMagicHeader

client/ui/models/protocols/awgConfigModel.h

@@ -15,7 +15,6 @@ struct AwgConfig
 {
     AwgConfig(const QJsonObject &jsonConfig);
 
-    QString subnetAddress;
     QString port;
 
     QString clientMtu;
@@ -44,8 +43,7 @@ class AwgConfigModel : public QAbstractListModel
 
 public:
     enum Roles {
-        SubnetAddressRole = Qt::UserRole + 1,
-        PortRole,
+        PortRole = Qt::UserRole + 1,
 
         ClientMtuRole,
         ClientJunkPacketCountRole,

client/ui/models/protocols/wireguardConfigModel.cpp

@@ -21,7 +21,6 @@ bool WireGuardConfigModel::setData(const QModelIndex &index, const QVariant &val
     }
 
     switch (role) {
-    case Roles::SubnetAddressRole: m_serverProtocolConfig.insert(config_key::subnet_address, value.toString()); break;
     case Roles::PortRole: m_serverProtocolConfig.insert(config_key::port, value.toString()); break;
     case Roles::ClientMtuRole: m_clientProtocolConfig.insert(config_key::mtu, value.toString()); break;
     }
@@ -37,7 +36,6 @@ QVariant WireGuardConfigModel::data(const QModelIndex &index, int role) const
     }
 
     switch (role) {
-    case Roles::SubnetAddressRole: return m_serverProtocolConfig.value(config_key::subnet_address).toString();
     case Roles::PortRole: return m_serverProtocolConfig.value(config_key::port).toString();
     case Roles::ClientMtuRole: return m_clientProtocolConfig.value(config_key::mtu);
     }
@@ -58,7 +56,6 @@ void WireGuardConfigModel::updateModel(const QJsonObject &config)
     m_serverProtocolConfig.insert(config_key::transport_proto,
                                   serverProtocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
     m_serverProtocolConfig[config_key::last_config] = serverProtocolConfig.value(config_key::last_config);
-    m_serverProtocolConfig[config_key::subnet_address] = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     m_serverProtocolConfig[config_key::port] = serverProtocolConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
 
     auto lastConfig = m_serverProtocolConfig.value(config_key::last_config).toString();
@@ -99,7 +96,6 @@ QHash<int, QByteArray> WireGuardConfigModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
-    roles[SubnetAddressRole] = "subnetAddress";
     roles[PortRole] = "port";
     roles[ClientMtuRole] = "clientMtu";
 
@@ -112,13 +108,12 @@ WgConfig::WgConfig(const QJsonObject &serverProtocolConfig)
     QJsonObject clientProtocolConfig = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
     clientMtu = clientProtocolConfig[config_key::mtu].toString(protocols::wireguard::defaultMtu);
 
-    subnetAddress = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     port = serverProtocolConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
 }
 
 bool WgConfig::hasEqualServerSettings(const WgConfig &other) const
 {
-    if (subnetAddress != other.subnetAddress || port != other.port) {
+    if (port != other.port) {
         return false;
     }
     return true;

client/ui/models/protocols/wireguardConfigModel.h

@@ -10,7 +10,6 @@ struct WgConfig
 {
     WgConfig(const QJsonObject &jsonConfig);
 
-    QString subnetAddress;
     QString port;
     QString clientMtu;
 
@@ -25,8 +24,7 @@ class WireGuardConfigModel : public QAbstractListModel
 
 public:
     enum Roles {
-        SubnetAddressRole = Qt::UserRole + 1,
-        PortRole,
+        PortRole = Qt::UserRole + 1,
         ClientMtuRole
     };
 

client/ui/qml/Components/AdLabel.qml

@@ -1,73 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Shapes
-import Qt5Compat.GraphicalEffects
-
-import Style 1.0
-
-import "../Config"
-import "../Controls2"
-import "../Controls2/TextTypes"
-
-Rectangle {
-    id: root
-
-    property real contentHeight: ad.implicitHeight + ad.anchors.topMargin + ad.anchors.bottomMargin
-
-    border.width: 1
-    border.color: AmneziaStyle.color.goldenApricot
-    color: AmneziaStyle.color.transparent
-    radius: 13
-
-    visible: false
-    // visible: GC.isDesktop() && ServersModel.isDefaultServerFromApi
-    //          && ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && SettingsController.isHomeAdLabelVisible
-
-    MouseArea {
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-
-        onClicked: function() {
-            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl() + "/premium")
-        }
-    }
-
-    RowLayout {
-        id: ad
-        anchors.fill: parent
-        anchors.margins: 16
-
-        Image {
-            source: "qrc:/images/controls/amnezia.svg"
-            sourceSize: Qt.size(36, 36)
-
-            layer {
-                effect: ColorOverlay {
-                    color: AmneziaStyle.color.paleGray
-                }
-            }
-        }
-
-        CaptionTextType {
-            Layout.fillWidth: true
-            Layout.rightMargin: 10
-            Layout.leftMargin: 10
-
-            text: qsTr("Amnezia Premium - for access to any website")
-            color: AmneziaStyle.color.pearlGray
-
-            lineHeight: 18
-            font.pixelSize: 15
-        }
-
-        ImageButtonType {
-            image: "qrc:/images/controls/close.svg"
-            imageColor: AmneziaStyle.color.paleGray
-
-            onClicked: function() {
-                SettingsController.disableHomeAdLabel()
-            }
-        }
-    }
-}

client/ui/qml/Components/ConnectButton.qml

@@ -16,32 +16,6 @@ Button {
     property string connectedButtonColor: AmneziaStyle.color.goldenApricot
     property bool buttonActiveFocus: activeFocus && (Qt.platform.os !== "android" || SettingsController.isOnTv())
 
-    property bool isFocusable: true
-    
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-        
     implicitWidth: 190
     implicitHeight: 190
 

client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml

@@ -14,7 +14,7 @@ DrawerType2 {
     width: parent.width
     height: parent.height
 
-    expandedStateContent: ColumnLayout {
+    expandedContent: ColumnLayout {
         id: content
 
         anchors.top: parent.top
@@ -26,6 +26,14 @@ DrawerType2 {
             root.expandedHeight = content.implicitHeight + 32
         }
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
         Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
@@ -36,6 +44,11 @@ DrawerType2 {
             headerText: qsTr("Add new connection")
         }
 
+        Item {
+            id: focusItem
+            KeyNavigation.tab: ip.rightButton
+        }
+
         LabelWithButtonType {
             id: ip
             Layout.fillWidth: true
@@ -46,8 +59,10 @@ DrawerType2 {
 
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSetupWizardCredentials)
-                root.closeTriggered()
+                root.close()
             }
+
+            KeyNavigation.tab: qrCode.rightButton
         }
 
         DividerType {}
@@ -61,8 +76,10 @@ DrawerType2 {
 
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                root.closeTriggered()
+                root.close()
             }
+
+            KeyNavigation.tab: focusItem
         }
 
         DividerType {}

client/ui/qml/Components/HomeContainersListView.qml

@@ -17,15 +17,55 @@ ListView {
     property var rootWidth
     property var selectedText
 
+    property bool a: true
+
     width: rootWidth
-    height: contentItem.height
+    height: menuContent.contentItem.height
 
     clip: true
-    snapMode: ListView.SnapToItem
+    interactive: false
 
-    ScrollBar.vertical: ScrollBarType {}
+    property FlickableType parentFlickable
+    property var lastItemTabClicked
 
-    property bool isFocusable: true
+    property int currentFocusIndex: 0
+
+    activeFocusOnTab: true
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            this.currentFocusIndex = 0
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        }
+    }
+
+    Keys.onTabPressed: {
+        if (currentFocusIndex < this.count - 1) {
+            currentFocusIndex += 1
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        } else {
+            currentFocusIndex = 0
+            if (lastItemTabClicked && typeof lastItemTabClicked === "function") {
+                lastItemTabClicked()
+            }
+        }
+    }
+
+    onVisibleChanged: {
+         if (visible) {
+             currentFocusIndex = 0
+             focusItem.forceActiveFocus()
+         }
+     }
+
+    Item {
+        id: focusItem
+    }
+
+    onCurrentFocusIndexChanged: {
+        if (parentFlickable) {
+            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
+        }
+    }
 
     ButtonGroup {
         id: containersRadioButtonGroup
@@ -35,6 +75,12 @@ ListView {
         implicitWidth: rootWidth
         implicitHeight: content.implicitHeight
 
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                containerRadioButton.forceActiveFocus()
+            }
+        }
+
         ColumnLayout {
             id: content
 
@@ -65,13 +111,13 @@ ListView {
                     }
 
                     if (checked) {
-                        containersDropDown.closeTriggered()
+                        containersDropDown.close()
                         ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyDefaultServerContainersModel.mapToSource(index))
                     } else {
                         ContainersModel.setProcessedContainerIndex(proxyDefaultServerContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
                         PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                        containersDropDown.closeTriggered()
+                        containersDropDown.close()
                     }
                 }
 

client/ui/qml/Components/HomeSplitTunnelingDrawer.qml

@@ -16,7 +16,7 @@ DrawerType2 {
     anchors.fill: parent
     expandedHeight: parent.height * 0.9
 
-    expandedStateContent: ColumnLayout {
+    expandedContent: ColumnLayout {
         id: content
 
         anchors.top: parent.top
@@ -24,6 +24,14 @@ DrawerType2 {
         anchors.right: parent.right
         spacing: 0
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
         Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
@@ -35,6 +43,11 @@ DrawerType2 {
             descriptionText:  qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others")
         }
 
+        Item {
+            id: focusItem
+            KeyNavigation.tab: splitTunnelingSwitch.visible ? splitTunnelingSwitch : siteBasedSplitTunnelingSwitch.rightButton
+        }
+
         LabelWithButtonType {
             id: splitTunnelingSwitch
             Layout.fillWidth: true
@@ -46,9 +59,11 @@ DrawerType2 {
             descriptionText: qsTr("Enabled \nCan't be disabled for current server")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+            KeyNavigation.tab: siteBasedSplitTunnelingSwitch.visible ? siteBasedSplitTunnelingSwitch.rightButton : focusItem
+
             clickedFunction: function() {
-               PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-               root.closeTriggered()
+//                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
+//                root.close()
             }
         }
 
@@ -65,9 +80,13 @@ DrawerType2 {
             descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+            KeyNavigation.tab: appSplitTunnelingSwitch.visible ?
+                                   appSplitTunnelingSwitch.rightButton :
+                                   focusItem
+
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-                root.closeTriggered()
+                root.close()
             }
         }
 
@@ -84,9 +103,11 @@ DrawerType2 {
             descriptionText: AppSplitTunnelingModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+            KeyNavigation.tab: focusItem
+
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSettingsAppSplitTunneling)
-                root.closeTriggered()
+                root.close()
             }
         }
 

client/ui/qml/Components/InstalledAppsDrawer.qml

@@ -26,7 +26,7 @@ DrawerType2 {
         id: installedAppsModel
     }
 
-    expandedStateContent: Item {
+    expandedContent: Item {
         id: container
 
         implicitHeight: expandedHeight
@@ -43,7 +43,7 @@ DrawerType2 {
             BackButtonType {
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
                 backButtonFunction: function() {
-                    root.closeTriggered()
+                    root.close()
                 }
             }
 
@@ -69,8 +69,6 @@ DrawerType2 {
                 clip: true
                 interactive: true
 
-                property bool isFocusable: true
-
                 model: SortFilterProxyModel {
                     id: proxyInstalledAppsModel
                     sourceModel: installedAppsModel
@@ -81,7 +79,10 @@ DrawerType2 {
                     }
                 }
 
-                ScrollBar.vertical: ScrollBarType {}
+                ScrollBar.vertical: ScrollBar {
+                    id: scrollBar
+                    policy: ScrollBar.AlwaysOn
+                }
 
                 ButtonGroup {
                     id: buttonGroup
@@ -154,7 +155,7 @@ DrawerType2 {
                 PageController.showBusyIndicator(true)
                 AppSplitTunnelingController.addApps(installedAppsModel.getSelectedAppsInfo())
                 PageController.showBusyIndicator(false)
-                root.closeTriggered()
+                root.close()
             }
         }
     }

client/ui/qml/Components/QuestionDrawer.qml

@@ -20,7 +20,7 @@ DrawerType2 {
     property var yesButtonFunction
     property var noButtonFunction
 
-    expandedStateContent: ColumnLayout {
+    expandedContent: ColumnLayout {
         id: content
 
         anchors.top: parent.top
@@ -33,6 +33,14 @@ DrawerType2 {
             root.expandedHeight = content.implicitHeight + 32
         }
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
         Header2TextType {
             Layout.fillWidth: true
             Layout.topMargin: 16
@@ -51,6 +59,11 @@ DrawerType2 {
             text: descriptionText
         }
 
+        Item {
+            id: focusItem
+            KeyNavigation.tab: yesButton
+        }
+
         BasicButtonType {
             id: yesButton
             Layout.fillWidth: true
@@ -65,6 +78,8 @@ DrawerType2 {
                     yesButtonFunction()
                 }
             }
+
+            KeyNavigation.tab: noButton
         }
 
         BasicButtonType {
@@ -87,6 +102,8 @@ DrawerType2 {
                     noButtonFunction()
                 }
             }
+
+            KeyNavigation.tab: focusItem
         }
     }
 }

client/ui/qml/Components/SelectLanguageDrawer.qml

@@ -11,7 +11,7 @@ import "../Config"
 DrawerType2 {
     id: root
 
-    expandedStateContent: Item {
+    expandedContent: Item {
         id: container
 
         implicitHeight: root.height * 0.9
@@ -20,6 +20,19 @@ DrawerType2 {
             root.expandedHeight = container.implicitHeight
         }
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
+        Item {
+            id: focusItem
+            KeyNavigation.tab: backButton
+        }
+
         ColumnLayout {
             id: backButtonLayout
 
@@ -30,148 +43,167 @@ DrawerType2 {
 
             BackButtonType {
                 id: backButton
-
-                Layout.fillWidth: true
-
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                backButtonFunction: function() { root.closeTriggered() }
-            }
-
-            Header2Type {
-                id: header
-
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-
-                headerText: qsTr("Choose language")
+                backButtonFunction: function() { root.close() }
+                KeyNavigation.tab: listView
             }
         }
 
-        ListView {
-            id: listView
-
+        FlickableType {
             anchors.top: backButtonLayout.bottom
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
+            contentHeight: content.implicitHeight
 
-            property bool isFocusable: true
-            property int selectedIndex: LanguageModel.currentLanguageIndex
+            ColumnLayout {
+                id: content
 
-            clip: true
-            reuseItems: true
+                anchors.fill: parent
 
-            ScrollBar.vertical: ScrollBarType {}
+                Header2Type {
+                    id: header
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
+                    Layout.rightMargin: 16
+                    Layout.leftMargin: 16
 
-            model: LanguageModel
-
-            ButtonGroup {
-                id: buttonGroup
-            }
-
-            delegate: Item {
-                implicitWidth: root.width
-                implicitHeight: delegateContent.implicitHeight
-
-                ColumnLayout {
-                    id: delegateContent
-
-                    anchors.fill: parent
-
-                    RadioButton {
-                        id: radioButton
-
-                        implicitWidth: parent.width
-                        implicitHeight: radioButtonContent.implicitHeight
-
-                        hoverEnabled: true
-
-                        property bool isFocusable: true
-
-                        Keys.onTabPressed: {
-                            FocusController.nextKeyTabItem()
-                        }
-
-                        Keys.onBacktabPressed: {
-                            FocusController.previousKeyTabItem()
-                        }
-
-                        Keys.onUpPressed: {
-                            FocusController.nextKeyUpItem()
-                        }
-
-                        Keys.onDownPressed: {
-                            FocusController.nextKeyDownItem()
-                        }
-
-                        Keys.onLeftPressed: {
-                            FocusController.nextKeyLeftItem()
-                        }
-
-                        Keys.onRightPressed: {
-                            FocusController.nextKeyRightItem()
-                        }
-
-                        indicator: Rectangle {
-                            width: parent.width - 1
-                            height: parent.height
-                            color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
-                            border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
-                            border.width: radioButton.focus ? 1 : 0
-
-                            Behavior on color {
-                                PropertyAnimation { duration: 200 }
-                            }
-                            Behavior on border.color {
-                                PropertyAnimation { duration: 200 }
-                            }
-                        }
-
-                        RowLayout {
-                            id: radioButtonContent
-                            anchors.fill: parent
-
-                            anchors.rightMargin: 16
-                            anchors.leftMargin: 16
-
-                            spacing: 0
-
-                            z: 1
-
-                            ParagraphTextType {
-                                Layout.fillWidth: true
-                                Layout.topMargin: 20
-                                Layout.bottomMargin: 20
-
-                                text: languageName
-                            }
-
-                            Image {
-                                source: "qrc:/images/controls/check.svg"
-                                visible: radioButton.checked
-
-                                width: 24
-                                height: 24
-
-                                Layout.rightMargin: 8
-                            }
-                        }
-
-                        ButtonGroup.group: buttonGroup
-                        checked: listView.selectedIndex === index
-
-                        onClicked: {
-                            listView.selectedIndex = index
-                            LanguageModel.changeLanguage(languageIndex)
-                            root.closeTriggered()
-                        }
-                    }
+                    headerText: qsTr("Choose language")
                 }
 
-                Keys.onEnterPressed: radioButton.clicked()
-                Keys.onReturnPressed: radioButton.clicked()
+                ListView {
+                    id: listView
+
+                    Layout.fillWidth: true
+                    height: listView.contentItem.height
+
+                    clip: true
+                    interactive: false
+
+                    model: LanguageModel
+                    currentIndex: LanguageModel.currentLanguageIndex
+
+                    ButtonGroup {
+                        id: buttonGroup
+                    }
+
+                    property int currentFocusIndex: 0
+
+                    activeFocusOnTab: true
+                    onActiveFocusChanged: {
+                        if (activeFocus) {
+                            this.currentFocusIndex = 0
+                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+                        }
+                    }
+
+                    Keys.onTabPressed: {
+                        if (currentFocusIndex < this.count - 1) {
+                            currentFocusIndex += 1
+                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+                        } else {
+                            listViewFocusItem.forceActiveFocus()
+                            focusItem.forceActiveFocus()
+                        }
+                    }
+
+                    Item {
+                        id: listViewFocusItem
+                        Keys.onTabPressed: {
+                            root.forceActiveFocus()
+                        }
+                    }
+
+                    onVisibleChanged: {
+                        if (visible) {
+                            listViewFocusItem.forceActiveFocus()
+                            focusItem.forceActiveFocus()
+                        }
+                    }
+
+                    delegate: Item {
+                        implicitWidth: root.width
+                        implicitHeight: delegateContent.implicitHeight
+
+                        onActiveFocusChanged: {
+                            if (activeFocus) {
+                                radioButton.forceActiveFocus()
+                            }
+                        }
+
+                        ColumnLayout {
+                            id: delegateContent
+
+                            anchors.fill: parent
+
+                            RadioButton {
+                                id: radioButton
+
+                                implicitWidth: parent.width
+                                implicitHeight: radioButtonContent.implicitHeight
+
+                                hoverEnabled: true
+
+                                indicator: Rectangle {
+                                    width: parent.width - 1
+                                    height: parent.height
+                                    color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
+                                    border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
+                                    border.width: radioButton.focus ? 1 : 0
+
+                                    Behavior on color {
+                                        PropertyAnimation { duration: 200 }
+                                    }
+                                    Behavior on border.color {
+                                        PropertyAnimation { duration: 200 }
+                                    }
+                                }
+
+                                RowLayout {
+                                    id: radioButtonContent
+                                    anchors.fill: parent
+
+                                    anchors.rightMargin: 16
+                                    anchors.leftMargin: 16
+
+                                    spacing: 0
+
+                                    z: 1
+
+                                    ParagraphTextType {
+                                        Layout.fillWidth: true
+                                        Layout.topMargin: 20
+                                        Layout.bottomMargin: 20
+
+                                        text: languageName
+                                    }
+
+                                    Image {
+                                        source: "qrc:/images/controls/check.svg"
+                                        visible: radioButton.checked
+
+                                        width: 24
+                                        height: 24
+
+                                        Layout.rightMargin: 8
+                                    }
+                                }
+
+                                ButtonGroup.group: buttonGroup
+                                checked: listView.currentIndex === index
+
+                                onClicked: {
+                                    listView.currentIndex = index
+                                    LanguageModel.changeLanguage(languageIndex)
+                                    root.close()
+                                }
+                            }
+                        }
+
+                        Keys.onEnterPressed: radioButton.clicked()
+                        Keys.onReturnPressed: radioButton.clicked()
+                    }
+                }
             }
         }
     }

client/ui/qml/Components/ServersListView.qml

@@ -1,126 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import SortFilterProxyModel 0.2
-
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import ContainerProps 1.0
-import ContainersModelFilters 1.0
-import Style 1.0
-
-import "./"
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-
-ListView {
-    id: root
-
-    property int selectedIndex: ServersModel.defaultIndex
-
-    anchors.top: serversMenuHeader.bottom
-    anchors.right: parent.right
-    anchors.left: parent.left
-    anchors.bottom: parent.bottom
-    anchors.topMargin: 16
-
-    model: ServersModel
-
-    ScrollBar.vertical: ScrollBarType {}
-
-    property bool isFocusable: true
-
-    Connections {
-        target: ServersModel
-        function onDefaultServerIndexChanged(serverIndex) {
-            root.selectedIndex = serverIndex
-        }
-    }
-
-    clip: true
-    reuseItems: true
-
-    delegate: Item {
-        id: menuContentDelegate
-        objectName: "menuContentDelegate"
-
-        property variant delegateData: model
-        property VerticalRadioButton serverRadioButtonProperty: serverRadioButton
-
-        implicitWidth: root.width
-        implicitHeight: serverRadioButtonContent.implicitHeight
-
-        ColumnLayout {
-            id: serverRadioButtonContent
-            objectName: "serverRadioButtonContent"
-
-            anchors.fill: parent
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
-
-            spacing: 0
-
-            RowLayout {
-                objectName: "serverRadioButtonRowLayout"
-
-                Layout.fillWidth: true
-
-                VerticalRadioButton {
-                    id: serverRadioButton
-                    objectName: "serverRadioButton"
-
-                    Layout.fillWidth: true
-
-                    text: name
-                    descriptionText: serverDescription
-
-                    checked: index === root.selectedIndex
-                    checkable: !ConnectionController.isConnected
-
-                    ButtonGroup.group: serversRadioButtonGroup
-
-                    onClicked: {
-                        if (ConnectionController.isConnected) {
-                            PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
-                            return
-                        }
-
-                        root.selectedIndex = index
-
-                        ServersModel.defaultIndex = index
-                    }
-
-                    Keys.onEnterPressed: serverRadioButton.clicked()
-                    Keys.onReturnPressed: serverRadioButton.clicked()
-                }
-
-                ImageButtonType {
-                    id: serverInfoButton
-                    objectName: "serverInfoButton"
-
-                    image: "qrc:/images/controls/settings.svg"
-                    imageColor: AmneziaStyle.color.paleGray
-
-                    implicitWidth: 56
-                    implicitHeight: 56
-
-                    z: 1
-
-                    onClicked: function() {
-                        ServersModel.processedIndex = index
-                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                        drawer.closeTriggered()
-                    }
-                }
-            }
-
-            DividerType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 0
-                Layout.rightMargin: 0
-            }
-        }
-    }
-}

client/ui/qml/Components/SettingsContainersListView.qml

@@ -20,14 +20,47 @@ ListView {
     height: root.contentItem.height
 
     clip: true
-    reuseItems: true
+    interactive: false
 
-    property bool isFocusable: false
+    activeFocusOnTab: true
+    Keys.onTabPressed: {
+        if (currentIndex < this.count - 1) {
+            this.incrementCurrentIndex()
+        } else {
+            currentIndex = 0
+            lastItemTabClickedSignal()
+        }
+    }
+
+    onCurrentIndexChanged: {
+        if (visible) {
+            if (fl.contentHeight > fl.height) {
+                var item = this.currentItem
+                if (item.y < fl.height) {
+                    fl.contentY = item.y
+                } else if (item.y + item.height > fl.contentY + fl.height) {
+                    fl.contentY = item.y + item.height - fl.height
+                }
+            }
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            this.currentIndex = 0
+        }
+    }
 
     delegate: Item {
         implicitWidth: root.width
         implicitHeight: delegateContent.implicitHeight
 
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                containerRadioButton.rightButton.forceActiveFocus()
+            }
+        }
+
         ColumnLayout {
             id: delegateContent
 

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -36,9 +36,17 @@ DrawerType2 {
         configFileName = "amnezia_config"
     }
 
-    expandedStateContent: Item {
+    expandedContent: Item {
         implicitHeight: root.expandedHeight
 
+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                header.forceActiveFocus()
+            }
+        }
+
         Header2Type {
             id: header
             anchors.top: parent.top
@@ -49,27 +57,24 @@ DrawerType2 {
             anchors.rightMargin: 16
 
             headerText: root.headerText
+
+            KeyNavigation.tab: shareButton
         }
 
-        ListView {
-            id: listView
-
+        FlickableType {
             anchors.top: header.bottom
             anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
+            contentHeight: content.height + 32
 
-            property bool isFocusable: true
+            ColumnLayout {
+                id: content
 
-            ScrollBar.vertical: ScrollBarType {}
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
 
-            model: 1
-
-            clip: true
-            reuseItems: true
-
-            header: ColumnLayout {
-                width: listView.width
+                anchors.leftMargin: 16
+                anchors.rightMargin: 16
 
                 visible: root.contentVisible
 
@@ -77,12 +82,12 @@ DrawerType2 {
                     id: shareButton
                     Layout.fillWidth: true
                     Layout.topMargin: 16
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
 
                     text: qsTr("Share")
                     leftImageSource: "qrc:/images/controls/share-2.svg"
 
+                    KeyNavigation.tab: copyConfigTextButton
+
                     clickedFunc: function() {
                         var fileName = ""
                         if (GC.isMobile()) {
@@ -106,8 +111,6 @@ DrawerType2 {
                     id: copyConfigTextButton
                     Layout.fillWidth: true
                     Layout.topMargin: 8
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
 
                     defaultColor: AmneziaStyle.color.transparent
                     hoveredColor: AmneziaStyle.color.translucentWhite
@@ -121,14 +124,14 @@ DrawerType2 {
 
                     Keys.onReturnPressed: { copyConfigTextButton.clicked() }
                     Keys.onEnterPressed: { copyConfigTextButton.clicked() }
+
+                    KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
                 }
 
                 BasicButtonType {
                     id: copyNativeConfigStringButton
                     Layout.fillWidth: true
                     Layout.topMargin: 8
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
 
                     visible: false
 
@@ -150,8 +153,6 @@ DrawerType2 {
 
                     Layout.fillWidth: true
                     Layout.topMargin: 24
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
 
                     defaultColor: AmneziaStyle.color.transparent
                     hoveredColor: AmneziaStyle.color.translucentWhite
@@ -163,8 +164,10 @@ DrawerType2 {
                     text: qsTr("Show connection settings")
 
                     clickedFunc: function() {
-                        configContentDrawer.openTriggered()
+                        configContentDrawer.open()
                     }
+
+                    KeyNavigation.tab: header
                 }
 
                 DrawerType2 {
@@ -175,11 +178,30 @@ DrawerType2 {
                     anchors.fill: parent
                     expandedHeight: parent.height * 0.9
 
-                    expandedStateContent: Item {
+                    onClosed: {
+                        if (!GC.isMobile()) {
+                            header.forceActiveFocus()
+                        }
+                    }
+
+                    expandedContent: Item {
                         id: configContentContainer
 
                         implicitHeight: configContentDrawer.expandedHeight
 
+                        Connections {
+                            target: configContentDrawer
+                            enabled: !GC.isMobile()
+                            function onOpened() {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
+
+                        Item {
+                            id: focusItem
+                            KeyNavigation.tab: backButton
+                        }
+
                         Connections {
                             target: copyNativeConfigStringButton
                             function onClicked() {
@@ -209,7 +231,9 @@ DrawerType2 {
                             anchors.right: parent.right
                             anchors.topMargin: 16
 
-                            backButtonFunction: function() { configContentDrawer.closeTriggered() }
+                            backButtonFunction: function() { configContentDrawer.close() }
+
+                            KeyNavigation.tab: focusItem
                         }
 
                         FlickableType {
@@ -278,10 +302,6 @@ DrawerType2 {
                         }
                     }
                 }
-            }
-
-            delegate: ColumnLayout {
-                width: listView.width
 
                 Rectangle {
                     id: qrCodeContainer
@@ -289,8 +309,6 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.preferredHeight: width
                     Layout.topMargin: 20
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
 
                     visible: ExportController.qrCodesCount > 0
 
@@ -302,32 +320,6 @@ DrawerType2 {
 
                         source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""
 
-                        property bool isFocusable: true
-
-                        Keys.onTabPressed: {
-                            FocusController.nextKeyTabItem()
-                        }
-
-                        Keys.onBacktabPressed: {
-                            FocusController.previousKeyTabItem()
-                        }
-
-                        Keys.onUpPressed: {
-                            FocusController.nextKeyUpItem()
-                        }
-
-                        Keys.onDownPressed: {
-                            FocusController.nextKeyDownItem()
-                        }
-
-                        Keys.onLeftPressed: {
-                            FocusController.nextKeyLeftItem()
-                        }
-
-                        Keys.onRightPressed: {
-                            FocusController.nextKeyRightItem()
-                        }
-
                         Timer {
                             property int index: 0
                             interval: 1000
@@ -354,8 +346,6 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.topMargin: 24
                     Layout.bottomMargin: 32
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
 
                     visible: ExportController.qrCodesCount > 0
 

client/ui/qml/Components/TransportProtoSelector.qml

@@ -39,6 +39,8 @@ Rectangle {
             implicitWidth: (rootWidth - 32) / 2
             text: "UDP"
 
+            KeyNavigation.tab: tcpButton
+
             onClicked: {
                 root.currentIndex = 0
             }

client/ui/qml/Controls2/BackButtonType.qml

@@ -4,7 +4,7 @@ import Qt5Compat.GraphicalEffects
 
 import Style 1.0
 
-FocusScope {
+Item {
     id: root
 
     property string backButtonImage: "qrc:/images/controls/arrow-left.svg"
@@ -15,6 +15,12 @@ FocusScope {
 
     visible: backButtonImage !== ""
 
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            backButton.forceActiveFocus()
+        }
+    }
+
     RowLayout {
         id: content
 

client/ui/qml/Controls2/BasicButtonType.qml

@@ -35,35 +35,10 @@ Button {
 
     property alias buttonTextLabel: buttonText
 
-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-    
     implicitHeight: 56
 
     hoverEnabled: true
+    focusPolicy: Qt.TabFocus
 
     onFocusChanged: {
         if (root.activeFocus) {
@@ -175,7 +150,7 @@ Button {
             ButtonTextType {
                 id: buttonText
 
-                color: root.textColor
+                color: textColor
                 text: root.text
                 visible: root.text === "" ? false : true
 

client/ui/qml/Controls2/CardType.qml

@@ -22,7 +22,6 @@ RadioButton {
     property string pressedBorderColor: AmneziaStyle.color.softGoldenApricot
     property string selectedBorderColor: AmneziaStyle.color.goldenApricot
     property string defaultBodredColor: AmneziaStyle.color.transparent
-    property string focusBorderColor: AmneziaStyle.color.paleGray
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -30,32 +29,6 @@ RadioButton {
 
     hoverEnabled: true
 
-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
     indicator: Rectangle {
         anchors.fill: parent
         radius: 16
@@ -79,8 +52,6 @@ RadioButton {
                     return pressedBorderColor
                 } else if (root.checked) {
                     return selectedBorderColor
-                } else if (root.activeFocus) {
-                    return focusBorderColor
                 }
             }
             return defaultBodredColor
@@ -88,7 +59,7 @@ RadioButton {
 
         border.width: {
             if (root.enabled) {
-                if(root.checked || root.activeFocus) {
+                if(root.checked) {
                     return 1
                 }
                 return root.pressed ? 1 : 0

client/ui/qml/Controls2/CardWithIconsType.qml

@@ -25,15 +25,10 @@ Button {
 
     property real textOpacity: 1.0
 
-    property alias focusItem: rightImage
-
-    property FlickableType parentFlickable
-
     hoverEnabled: true
 
     background: Rectangle {
         id: backgroundRect
-
         anchors.fill: parent
         radius: 16
 
@@ -44,31 +39,13 @@ Button {
         }
     }
 
-    function ensureVisible(item) {
-        if (item.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
-    onFocusChanged: {
-        ensureVisible(root)
-    }
-
-    focusItem.onFocusChanged: {
-        root.ensureVisible(focusItem)
-    }
-
     contentItem: Item {
         anchors.left: parent.left
         anchors.right: parent.right
 
         implicitHeight: content.implicitHeight
-
         RowLayout {
             id: content
-
             anchors.fill: parent
 
             Image {
@@ -84,7 +61,6 @@ Button {
             }
 
             ColumnLayout {
-
                 ListItemTitleType {
                     text: root.headerText
                     visible: text !== ""
@@ -147,7 +123,6 @@ Button {
 
                 Rectangle {
                     id: rightImageBackground
-
                     anchors.fill: parent
                     radius: 12
                     color: "transparent"
@@ -156,9 +131,10 @@ Button {
                         PropertyAnimation { duration: 200 }
                     }
                 }
-
                 onClicked: {
-                    root.clicked()
+                    if (clickedFunction && typeof clickedFunction === "function") {
+                        clickedFunction()
+                    }
                 }
             }
         }

client/ui/qml/Controls2/DrawerType2.qml

@@ -9,14 +9,17 @@ import "TextTypes"
 Item {
     id: root
 
-    readonly property string drawerExpandedStateName: "expanded"
-    readonly property string drawerCollapsedStateName: "collapsed"
+    readonly property string drawerExpanded: "expanded"
+    readonly property string drawerCollapsed: "collapsed"
 
-    readonly property bool isOpened: isExpandedStateActive() || (isCollapsedStateActive() && (dragArea.drag.active === true))
-    readonly property bool isClosed: isCollapsedStateActive() && (dragArea.drag.active === false)
+    readonly property bool isOpened: drawerContent.state === root.drawerExpanded || (drawerContent.state === root.drawerCollapsed && dragArea.drag.active === true)
+    readonly property bool isClosed: drawerContent.state === root.drawerCollapsed && dragArea.drag.active === false
 
-    property Component collapsedStateContent
-    property Component expandedStateContent
+    readonly property bool isExpanded: drawerContent.state === root.drawerExpanded
+    readonly property bool isCollapsed: drawerContent.state === root.drawerCollapsed
+
+    property Component collapsedContent
+    property Component expandedContent
 
     property string defaultColor: AmneziaStyle.color.onyxBlack
     property string borderColor: AmneziaStyle.color.slateGray
@@ -26,41 +29,29 @@ Item {
 
     property int depthIndex: 0
 
-    signal cursorEntered
-    signal cursorExited
+    signal entered
+    signal exited
     signal pressed(bool pressed, bool entered)
 
     signal aboutToHide
     signal aboutToShow
-    signal closeTriggered
-    signal openTriggered
+    signal close
+    signal open
     signal closed
     signal opened
 
-    function isExpandedStateActive() {
-        return isStateActive(drawerExpandedStateName)
-    }
-
-    function isCollapsedStateActive() {
-        return isStateActive(drawerCollapsedStateName)
-    }
-
-    function isStateActive(stateName) {
-        return drawerContent.state === stateName
-    }
-
     Connections {
         target: PageController
 
         function onCloseTopDrawer() {
             if (depthIndex === PageController.getDrawerDepth()) {
-                if (isCollapsedStateActive()) {
+                if (isCollapsed) {
                     return
                 }
 
                 aboutToHide()
 
-                drawerContent.state = root.drawerCollapsedStateName
+                drawerContent.state = root.drawerCollapsed
                 depthIndex = 0
                 closed()
             }
@@ -70,52 +61,30 @@ Item {
     Connections {
         target: root
 
-        function onCloseTriggered() {
-            if (isCollapsedStateActive()) {
+        function onClose() {
+            if (isCollapsed) {
                 return
             }
 
             aboutToHide()
 
+            drawerContent.state = root.drawerCollapsed
+            depthIndex = 0
+            PageController.setDrawerDepth(PageController.getDrawerDepth() - 1)
             closed()
         }
 
-        function onClosed() {
-            drawerContent.state = root.drawerCollapsedStateName
-            
-            if (root.isCollapsedStateActive()) {
-                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
-                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
-                }
-            }
-
-            depthIndex = 0
-            PageController.decrementDrawerDepth()
-            FocusController.dropRootObject(root)
-        }
-
-        function onOpenTriggered() {
-            if (root.isExpandedStateActive()) {
+        function onOpen() {
+            if (isExpanded) {
                 return
             }
 
-            root.aboutToShow()
+            aboutToShow()
 
-            root.opened()
-        }
-
-        function onOpened() {
-            drawerContent.state = root.drawerExpandedStateName
-
-            if (isExpandedStateActive()) {
-                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(0xFF1C1D21)
-                }
-            }
-
-            depthIndex = PageController.incrementDrawerDepth()
-            FocusController.pushRootObject(root)
+            drawerContent.state = root.drawerExpanded
+            depthIndex = PageController.getDrawerDepth() + 1
+            PageController.setDrawerDepth(depthIndex)
+            opened()
         }
     }
 
@@ -123,7 +92,7 @@ Item {
         id: background
 
         anchors.fill: parent
-        color: root.isCollapsedStateActive() ? AmneziaStyle.color.transparent : AmneziaStyle.color.translucentMidnightBlack
+        color: root.isCollapsed ? AmneziaStyle.color.transparent : AmneziaStyle.color.translucentMidnightBlack
 
         Behavior on color {
             PropertyAnimation { duration: 200 }
@@ -133,17 +102,18 @@ Item {
     MouseArea {
         id: emptyArea
         anchors.fill: parent
-
+        enabled: root.isExpanded
+        visible: enabled
         onClicked: {
-            root.closeTriggered()
+            root.close()
         }
     }
 
     MouseArea {
         id: dragArea
-        objectName: "dragArea"
 
         anchors.fill: drawerContentBackground
+        cursorShape: root.isCollapsed ? Qt.PointingHandCursor : Qt.ArrowCursor
         hoverEnabled: true
 
         enabled: drawerContent.implicitHeight > 0
@@ -155,36 +125,35 @@ Item {
 
         /** If drag area is released at any point other than min or max y, transition to the other state */
         onReleased: {
-            if (isCollapsedStateActive() && drawerContent.y < dragArea.drag.maximumY) {
-                root.openTriggered()
+            if (root.isCollapsed && drawerContent.y < dragArea.drag.maximumY) {
+                root.open()
                 return
             }
-            if (isExpandedStateActive() && drawerContent.y > dragArea.drag.minimumY) {
-                root.closeTriggered()
+            if (root.isExpanded && drawerContent.y > dragArea.drag.minimumY) {
+                root.close()
                 return
             }
         }
 
         onEntered: {
-            root.cursorEntered()
+            root.entered()
         }
         onExited: {
-            root.cursorExited()
+            root.exited()
         }
         onPressedChanged: {
             root.pressed(pressed, entered)
         }
 
         onClicked: {
-            if (isCollapsedStateActive()) {
-                root.openTriggered()
+            if (root.isCollapsed) {
+                root.open()
             }
         }
     }
 
     Rectangle {
         id: drawerContentBackground
-        objectName: "drawerContentBackground"
 
         anchors { left: drawerContent.left; right: drawerContent.right; top: drawerContent.top }
         height: root.height
@@ -205,80 +174,53 @@ Item {
 
     Item {
         id: drawerContent
-        objectName: "drawerContent"
 
         Drag.active: dragArea.drag.active
         anchors.right: root.right
         anchors.left: root.left
+        y: root.height - drawerContent.height
+        state: root.drawerCollapsed
 
-        state: root.drawerCollapsedStateName
+        implicitHeight: root.isCollapsed ? collapsedHeight : expandedHeight
+
+        onStateChanged: {
+            if (root.isCollapsed) {
+                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+                }
+                return
+            }
+            if (root.isExpanded) {
+                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(0xFF1C1D21)
+                }
+                return
+            }
+        }
 
         states: [
             State {
-                name: root.drawerCollapsedStateName
+                name: root.drawerCollapsed
                 PropertyChanges {
                     target: drawerContent
-                    implicitHeight: collapsedHeight
                     y: root.height - root.collapsedHeight
                 }
-                PropertyChanges {
-                    target: background
-                    color: AmneziaStyle.color.transparent
-                }
-                PropertyChanges {
-                    target: dragArea
-                    cursorShape: Qt.PointingHandCursor
-                }
-                PropertyChanges {
-                    target: emptyArea
-                    enabled: false
-                    visible: false
-                }
-                PropertyChanges {
-                    target: collapsedLoader
-                    // visible: true
-                }
-                PropertyChanges {
-                    target: expandedLoader
-                    visible: false
-
-                }
             },
             State {
-                name: root.drawerExpandedStateName
+                name: root.drawerExpanded
                 PropertyChanges {
                     target: drawerContent
-                    implicitHeight: expandedHeight
                     y: dragArea.drag.minimumY
-                }
-                PropertyChanges {
-                    target: background
-                    color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-                }
-                PropertyChanges {
-                    target: dragArea
-                    cursorShape: Qt.ArrowCursor
-                }
-                PropertyChanges {
-                    target: emptyArea
-                    enabled: true
-                    visible: true
-                }
-                PropertyChanges {
-                    target: collapsedLoader
-                    // visible: false
-                }
-                PropertyChanges {
-                    target: expandedLoader
-                    visible: true
+
                 }
             }
         ]
 
         transitions: [
             Transition {
-                from: root.drawerCollapsedStateName
-                to: root.drawerExpandedStateName
+                from: root.drawerCollapsed
+                to: root.drawerExpanded
                 PropertyAnimation {
                     target: drawerContent
                     properties: "y"
@@ -286,8 +228,8 @@ Item {
                 }
             },
             Transition {
-                from: root.drawerExpandedStateName
-                to: root.drawerCollapsedStateName
+                from: root.drawerExpanded
+                to: root.drawerCollapsed
                 PropertyAnimation {
                     target: drawerContent
                     properties: "y"
@@ -299,7 +241,7 @@ Item {
         Loader {
             id: collapsedLoader
 
-            sourceComponent: root.collapsedStateContent
+            sourceComponent: root.collapsedContent
 
             anchors.right: parent.right
             anchors.left: parent.left
@@ -308,7 +250,8 @@ Item {
         Loader {
             id: expandedLoader
 
-            sourceComponent: root.expandedStateContent
+            visible: root.isExpanded
+            sourceComponent: root.expandedContent
 
             anchors.right: parent.right
             anchors.left: parent.left

client/ui/qml/Controls2/DropDownType.qml

@@ -45,56 +45,33 @@ Item {
     property Item drawerParent
     property Component listView
 
-    signal openTriggered
-    signal closeTriggered
+    signal open
+    signal close
 
-    readonly property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
+    function popupClosedFunc() {
+        if (!GC.isMobile()) {
+            this.forceActiveFocus()
+        }
     }
 
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
+    property var parentFlickable
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
     }
 
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
-    onOpenTriggered: {
-        menu.openTriggered()
+    onOpen: {
+        menu.open()
     }
 
-    onCloseTriggered: {
-        menu.closeTriggered()
-    }
-
-    Keys.onEnterPressed: {
-        if (menu.isClosed) {
-            menu.openTriggered()
-        }
-    }
-
-    Keys.onReturnPressed: {
-        if (menu.isClosed) {
-            menu.openTriggered()
-        }
+    onClose: {
+        menu.close()
     }
 
     Rectangle {
@@ -196,7 +173,7 @@ Item {
             if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                 rootButtonClickedFunction()
             } else {
-                menu.openTriggered()
+                menu.open()
             }
         }
     }
@@ -209,38 +186,93 @@ Item {
         anchors.fill: parent
         expandedHeight: drawerParent.height * drawerHeight
 
-        expandedStateContent: Item {
+        onClosed: {
+            root.popupClosedFunc()
+        }
+
+        expandedContent: Item {
             id: container
             implicitHeight: menu.expandedHeight
 
+            Connections {
+                target: menu
+                enabled: !GC.isMobile()
+                function onOpened() {
+                    focusItem.forceActiveFocus()
+                }
+            }
+
+            Item {
+                id: focusItem
+                KeyNavigation.tab: backButton
+            }
+
             ColumnLayout {
                 id: header
 
-                anchors.fill: parent
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
                 anchors.topMargin: 16
 
                 BackButtonType {
                     id: backButton
                     backButtonImage: root.headerBackButtonImage
-                    backButtonFunction: function() { menu.closeTriggered() }
+                    backButtonFunction: function() { menu.close() }
+                    KeyNavigation.tab: listViewLoader.item
                 }
+            }
 
-                Header2Type {
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-                    Layout.bottomMargin: 16
-                    Layout.fillWidth: true
+            FlickableType {
+                id: flickable
+                anchors.top: header.bottom
+                anchors.topMargin: 16
+                contentHeight: col.implicitHeight
 
-                    headerText: root.headerText
-                }
+                Column {
+                    id: col
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
 
-                Loader {
-                    id: listViewLoader
-                    sourceComponent: root.listView
+                    spacing: 16
 
-                    Layout.fillHeight: true
+                    Header2Type {
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        headerText: root.headerText
+
+                        width: parent.width
+                    }
+
+                    Loader {
+                        id: listViewLoader
+                        sourceComponent: root.listView
+
+                        onLoaded: {
+                            listViewLoader.item.parentFlickable = flickable
+                            listViewLoader.item.lastItemTabClicked = function() {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
+                    }
                 }
             }
         }
     }
+
+    Keys.onEnterPressed: {
+        if (menu.isClosed) {
+            menu.open()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (menu.isClosed) {
+            menu.open()
+        }
+    }
 }

client/ui/qml/Controls2/FlickableType.qml

@@ -7,11 +7,10 @@ Flickable {
 
     function ensureVisible(item) {
         if (item.y < fl.contentY) {
-            fl.contentY = item.y - 40 // 40 is a top margin
+            fl.contentY = item.y
         } else if (item.y + item.height > fl.contentY + fl.height) {
             fl.contentY = item.y + item.height - fl.height + 40 // 40 is a bottom margin
         }
-        fl.returnToBounds()
     }
 
     clip: true
@@ -25,7 +24,7 @@ Flickable {
     Keys.onUpPressed: scrollBar.decrease()
     Keys.onDownPressed: scrollBar.increase()
 
-    ScrollBar.vertical: ScrollBarType {
+    ScrollBar.vertical: ScrollBar {
         id: scrollBar
         policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
     }