fix: teardown xray fast fix

- Added a check in XrayController::stop() to skip the stop operation if Xray is not currently running, with a debug log for clarity.

.github/workflows/deploy.yml

@@ -88,7 +88,7 @@ jobs:
         host: 'linux'
         target: 'desktop'
         arch: 'linux_gcc_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools'
+        modules: 'qtremoteobjects qt5compat qtshadertools qthttpserver qtwebsockets'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -201,7 +201,7 @@ jobs:
         host: 'windows'
         target: 'desktop'
         arch: 'win64_msvc2022_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools'
+        modules: 'qtremoteobjects qt5compat qtshadertools qthttpserver qtwebsockets'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -365,7 +365,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'mac'
         target: 'desktop'
-        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
+        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia qthttpserver qtwebsockets'
         arch: 'clang_64'
         dir: ${{ runner.temp }}
         set-env: 'true'
@@ -377,7 +377,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'mac'
         target: 'ios'
-        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
+        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia qthttpserver qtwebsockets'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'
@@ -414,10 +414,6 @@ jobs:
       matrix:
         xcode-version: [16.2, 16.4, 26.4]
         include:
-          - xcode-version: 16.2
-            os: macos-15
-          - xcode-version: 16.4
-            os: macos-15
           - xcode-version: 26.4
             os: macos-26
 
@@ -454,7 +450,7 @@ jobs:
 # ------------------------------------------------------
 
   Build-MacOS:
-    runs-on: macos-15
+    runs-on: macos-latest
 
     needs: Bake-Prebuilts-MacOS
     if: ${{ always() }}
@@ -501,7 +497,7 @@ jobs:
     - name: 'Setup xcode'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '26.3.0'
+        xcode-version: '16.2.0'
 
     - name: 'Install Qt'
       uses: jurplel/install-qt-action@v4
@@ -510,7 +506,7 @@ jobs:
         host: 'mac'
         target: 'desktop'
         arch: 'clang_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools'
+        modules: 'qtremoteobjects qt5compat qtshadertools qthttpserver qtwebsockets'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'
@@ -554,10 +550,6 @@ jobs:
       matrix:
         xcode-version: [16.2, 16.4, 26.4]
         include:
-          - xcode-version: 16.2
-            os: macos-15
-          - xcode-version: 16.4
-            os: macos-15
           - xcode-version: 26.4
             os: macos-26
 
@@ -594,7 +586,7 @@ jobs:
 # ------------------------------------------------------
 
   Build-MacOS-NE:
-    runs-on: macos-26
+    runs-on: macos-latest
 
     needs: Bake-Prebuilts-MacOS-NE
     if: ${{ always() }}
@@ -618,12 +610,6 @@ jobs:
       PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}
 
     steps:
-    - name: 'Get sources'
-      uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-        fetch-depth: 10
-
     - uses: ./.github/actions/apple-setup-provisioning-profile
       with:
         provisioning_profile_base64: ${{ secrets.MAC_APP_PROVISIONING_PROFILE }}
@@ -661,6 +647,12 @@ jobs:
           go install golang.org/x/mobile/cmd/gomobile@latest
           gomobile init
 
+    - name: 'Get sources'
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+        fetch-depth: 10
+
     - name: 'Setup python'
       uses: actions/setup-python@v6
       with:
@@ -747,7 +739,7 @@ jobs:
       ANDROID_PLATFORM: android-28
       NDK_VERSION: 27.0.11718014
       QT_VERSION: 6.10.3
-      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools qthttpserver qtwebsockets'
       PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
       PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
       FALLBACK_S3_ENDPOINT: ${{ secrets.FALLBACK_S3_ENDPOINT }}

.gitignore

@@ -10,7 +10,9 @@ deploy/build_64/*
 winbuild*.bat
 .cache/
 .vscode/
-
+.cursorignore
+.cursor/
+.venv/
 
 # Qt-es
 /.qmake.cache

.gitmodules

@@ -7,6 +7,9 @@
 [submodule "client/3rd/amneziawg-apple"]
 	path = client/3rd/amneziawg-apple
 	url = https://github.com/amnezia-vpn/amneziawg-apple
+[submodule "client/3rd/QSimpleCrypto"]
+	path = client/3rd/QSimpleCrypto
+	url = https://github.com/amnezia-vpn/QSimpleCrypto.git
 [submodule "client/3rd/qtgamepad"]
 	path = client/3rd/qtgamepad
 	url = https://github.com/amnezia-vpn/qtgamepad.git

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 4.9.0.4)
+set(AMNEZIAVPN_VERSION 4.9.0.3)
 
 set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES
@@ -28,7 +28,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 2133)
+set(APP_ANDROID_VERSION_CODE 2126)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

README_RU.md

@@ -28,7 +28,7 @@
 
 - Простой в использовании — введите IP-адрес, SSH-логин и пароль, и Amnezia автоматически установит VPN-контейнеры Docker на ваш сервер и подключится к VPN.
 - Классические VPN-протоколы: OpenVPN, WireGuard и IKEv2.
-- Протоколы с маскировкой трафика (обфускацией): OpenVPN с плагином [Cloak](https://github.com/cbeuw/Cloak), Shadowsocks (OpenVPN over Shadowsocks), [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) и XRay.
+- Протоколы с маскировкой трафика (обфускацией): OpenVPN с плагином [Cloak](https://github.com/cbeuw/Cloak), Shadowsocks (OpenVPN over Shadowsocks), [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) and XRay.
 - Поддержка Split Tunneling — добавляйте любые сайты или приложения в список, чтобы включить VPN только для них.
 - Поддерживает платформы: Windows, macOS, Linux, Android, iOS.
 - Поддержка конфигурации протокола AmneziaWG на [бета-прошивке Keenetic](https://docs.keenetic.com/ua/air/kn-1611/en/6319-latest-development-release.html#UUID-186c4108-5afd-c10b-f38a-cdff6c17fab3_section-idm33192196168192-improved).

client/CMakeLists.txt

@@ -14,6 +14,10 @@ set(PACKAGES
     Core5Compat Concurrent LinguistTools
 )
 
+if(NOT ANDROID AND NOT IOS)
+    list(APPEND PACKAGES HttpServer)
+endif()
+
 execute_process(
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
   COMMAND git rev-parse --short HEAD
@@ -47,6 +51,10 @@ set(LIBS ${LIBS}
     Qt6::Core5Compat Qt6::Concurrent
 )
 
+if(NOT ANDROID AND NOT IOS)
+    list(APPEND LIBS Qt6::HttpServer)
+endif()
+
 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
     set(LIBS ${LIBS} Qt6::Widgets)
 endif()
@@ -103,7 +111,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/sources.cmake)
 include_directories(
     ${CMAKE_CURRENT_LIST_DIR}/../ipc
     ${CMAKE_CURRENT_LIST_DIR}/../common/logger
-    ${CMAKE_CURRENT_LIST_DIR}/../common/crypto
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
 )
@@ -258,10 +265,6 @@ install(SCRIPT ${QT_DEPLOY_SCRIPT}
 
 if (APPLE AND NOT IOS AND NOT MACOS_NE)
     list(APPEND OVPN_SCRIPTS "${CMAKE_SOURCE_DIR}/deploy/data/macos/update-resolv-conf.sh")
-    set_target_properties(${PROJECT} PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
-        XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
-    )
 endif()
 if (LINUX AND NOT ANDROID)
     list(APPEND OVPN_SCRIPTS "${CMAKE_SOURCE_DIR}/deploy/data/linux/update-resolv-conf.sh")

client/amneziaApplication.cpp

@@ -22,7 +22,6 @@
 #include "logger.h"
 #include "ui/controllers/qml/pageController.h"
 #include "ui/models/installedAppsModel.h"
-#include "ui/utils/mtProxyPublicHostInput.h"
 #include "version.h"
 
 #include "platforms/ios/QRCodeReaderBase.h"
@@ -222,9 +221,6 @@ void AmneziaApplication::registerTypes()
 
     qmlRegisterType<InstalledAppsModel>("InstalledAppsModel", 1, 0, "InstalledAppsModel");
 
-    qmlRegisterType<PublicHostInputValidator>("MtProxyConfig", 1, 0, "PublicHostInputValidator");
-    qmlRegisterType<PublicHostInputValidator>("TelemtConfig", 1, 0, "PublicHostInputValidator");
-
     amnezia::declareQmlProtocolEnum();
     Vpn::declareQmlVpnConnectionStateEnum();
     PageLoader::declareQmlPageEnum();

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

@@ -42,7 +42,6 @@ import androidx.core.view.OnApplyWindowInsetsListener
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
-import java.io.File
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlin.coroutines.CoroutineContext
@@ -764,13 +763,7 @@ class AmneziaActivity : QtActivity() {
     fun openFile(filter: String?) {
         Log.v(TAG, "Open file with filter: $filter")
         mainScope.launch {
-            val systemPickerPackage = listOf("com.google.android.documentsui", "com.android.documentsui")
-                .firstOrNull { pkg ->
-                    try { packageManager.getPackageInfo(pkg, 0); true }
-                    catch (_: PackageManager.NameNotFoundException) { false }
-                }
-
-            val intent = if (!isOnTv() && systemPickerPackage != null) {
+            val intent = if (!isOnTv()) {
                 val mimeTypes = if (!filter.isNullOrEmpty()) {
                     val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
                     val mime = MimeTypeMap.getSingleton()
@@ -796,7 +789,6 @@ class AmneziaActivity : QtActivity() {
                             else -> type = "*/*"
                         }
                     }
-                    `package` = systemPickerPackage
                 }
             } else {
                 Intent(this@AmneziaActivity, TvFilePicker::class.java)
@@ -808,11 +800,8 @@ class AmneziaActivity : QtActivity() {
                         if (isOnTv() && it?.hasExtra("activityNotFound") == true) {
                             showNoFileBrowserAlertDialog()
                         }
-                        val uri = it?.data?.let { u ->
-                            if (u.scheme == "content") {
-                                try { grantUriPermission(packageName, u, Intent.FLAG_GRANT_READ_URI_PERMISSION) } catch (_: Exception) {}
-                            }
-                            u
+                        val uri = it?.data?.apply {
+                            grantUriPermission(packageName, this, Intent.FLAG_GRANT_READ_URI_PERMISSION)
                         }?.toString() ?: ""
                         Log.v(TAG, "Open file: $uri")
                         if (uri.isNotEmpty()) {
@@ -852,12 +841,7 @@ class AmneziaActivity : QtActivity() {
         Log.v(TAG, "Get fd for $fileName")
         return blockingCall(Dispatchers.IO) {
             try {
-                val uri = Uri.parse(fileName)
-                pfd = if (uri.scheme == "file") {
-                    ParcelFileDescriptor.open(File(uri.path!!), ParcelFileDescriptor.MODE_READ_ONLY)
-                } else {
-                    contentResolver.openFileDescriptor(uri, "r")
-                }
+                pfd = contentResolver.openFileDescriptor(Uri.parse(fileName), "r")
                 pfd?.fd ?: -1
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to get fd: $e")
@@ -1077,10 +1061,12 @@ class AmneziaActivity : QtActivity() {
     @Suppress("unused")
     fun sendTouch(x: Float, y: Float) {
         Log.v(TAG, "Send touch: $x, $y")
-        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))
+        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))
+            }
         }
     }
 

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

@@ -1,36 +1,30 @@
 package org.amnezia.vpn
 
-import android.Manifest
-import android.app.AlertDialog
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
 import org.amnezia.vpn.util.Log
-import java.io.File
 
 private const val TAG = "TvFilePicker"
-private const val READ_STORAGE_REQUEST_CODE = 1001
 
 class TvFilePicker : ComponentActivity() {
 
-    // SAF launcher for Android 10+ where File API is blocked by scoped storage
-    private val safLauncher = registerForActivityResult(object : ActivityResultContracts.OpenDocument() {
+    private val fileChooseResultLauncher = registerForActivityResult(object : ActivityResultContracts.OpenDocument() {
         override fun createIntent(context: Context, input: Array<String>): Intent {
             val intent = super.createIntent(context, input)
-            val activities = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+
+            val activitiesToResolveIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 context.packageManager.queryIntentActivities(intent, PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY.toLong()))
             } else {
                 @Suppress("DEPRECATION")
                 context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
             }
-            if (activities.all {
+            if (activitiesToResolveIntent.all {
                     val name = it.activityInfo.packageName
                     name.startsWith("com.google.android.tv.frameworkpackagestubs") || name.startsWith("com.android.tv.frameworkpackagestubs")
                 }) {
@@ -38,140 +32,38 @@ class TvFilePicker : ComponentActivity() {
             }
             return intent
         }
-    }) { uri ->
+    }) {
         setResult(RESULT_OK, Intent().apply {
-            data = uri
+            data = it
             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         })
         finish()
     }
 
-    private val directoryStack = ArrayDeque<File>()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.v(TAG, "onCreate")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            launchSaf()
-        } else {
-            checkPermissionAndBrowse()
-        }
+        getFile()
     }
 
-    @Deprecated("Deprecated in Java")
-    override fun onBackPressed() {
-        navigateBack()
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        Log.v(TAG, "onNewIntent")
+        getFile()
     }
 
-    private fun launchSaf() {
+    private fun getFile() {
         try {
-            safLauncher.launch(arrayOf("*/*"))
+            Log.v(TAG, "getFile")
+            fileChooseResultLauncher.launch(arrayOf("*/*"))
         } catch (_: ActivityNotFoundException) {
-            Log.w(TAG, "No SAF activity found")
+            Log.w(TAG, "Activity not found")
             setResult(RESULT_CANCELED, Intent().apply { putExtra("activityNotFound", true) })
             finish()
         } catch (e: Exception) {
-            Log.e(TAG, "SAF launch failed: $e")
+            Log.e(TAG, "Failed to get file: $e")
             setResult(RESULT_CANCELED)
             finish()
         }
     }
-
-    private fun checkPermissionAndBrowse() {
-        if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), READ_STORAGE_REQUEST_CODE)
-        } else {
-            showRootDirectory()
-        }
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == READ_STORAGE_REQUEST_CODE &&
-            grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
-            showRootDirectory()
-        } else {
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-    }
-
-    private fun showRootDirectory() {
-        @Suppress("DEPRECATION")
-        val primaryExternal = Environment.getExternalStorageDirectory()
-        val storageDir = File("/storage")
-        // Pre-seed stack with /storage so Back from primary storage goes there (USB drives etc.)
-        if (storageDir.exists() && storageDir.canonicalPath != primaryExternal.canonicalPath) {
-            directoryStack.addLast(storageDir)
-        }
-        showDirectory(primaryExternal)
-    }
-
-    private fun navigateBack() {
-        if (directoryStack.size > 1) {
-            directoryStack.removeLast()
-            val parent = directoryStack.removeLast()
-            showDirectory(parent)
-        } else {
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-    }
-
-    private fun showDirectory(dir: File) {
-        directoryStack.addLast(dir)
-        Log.v(TAG, "Showing directory: ${dir.absolutePath}")
-
-        val entries = try {
-            dir.listFiles()
-                ?.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() }))
-                ?: emptyList()
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to list directory: $e")
-            emptyList()
-        }
-
-        val names = entries.map { if (it.isDirectory) "[${it.name}]" else it.name }.toTypedArray()
-
-        val builder = AlertDialog.Builder(this)
-            .setTitle(dir.absolutePath)
-
-        if (entries.isEmpty()) {
-            builder.setMessage("No files available")
-        } else {
-            builder.setItems(names) { dialog, which ->
-                dialog.dismiss()
-                val selected = entries[which]
-                if (selected.isDirectory) {
-                    showDirectory(selected)
-                } else {
-                    Log.v(TAG, "Selected file: ${selected.absolutePath}")
-                    setResult(RESULT_OK, Intent().apply {
-                        data = Uri.fromFile(selected)
-                        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                    })
-                    finish()
-                }
-            }
-        }
-
-        if (directoryStack.size > 1) {
-            builder.setNegativeButton("↑ Back") { dialog, _ ->
-                dialog.dismiss()
-                navigateBack()
-            }
-        } else {
-            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
-                setResult(RESULT_CANCELED)
-                finish()
-            }
-        }
-
-        builder.setOnCancelListener {
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-
-        builder.show()
-    }
 }

client/cmake/3rdparty.cmake

@@ -2,8 +2,9 @@ set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules;${CMAKE_MODULE_PATH}")
 
-add_subdirectory(${CLIENT_ROOT_DIR}/3rd/SortFilterProxyModel ${CMAKE_BINARY_DIR}/3rd/SortFilterProxyModel)
+add_subdirectory(${CLIENT_ROOT_DIR}/3rd/SortFilterProxyModel)
 set(LIBS ${LIBS} SortFilterProxyModel)
+include(${CLIENT_ROOT_DIR}/cmake/QSimpleCrypto.cmake)
 
 include(${CLIENT_ROOT_DIR}/3rd/qrcodegen/qrcodegen.cmake)
 
@@ -11,24 +12,20 @@ add_compile_definitions(_WINSOCKAPI_)
 
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 set(BUILD_WITH_QT6 ON)
-add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain ${CMAKE_BINARY_DIR}/3rd/qtkeychain EXCLUDE_FROM_ALL)
+add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain EXCLUDE_FROM_ALL)
 
 if(ANDROID)
     # Use qtgamepad from amnezia-vpn/qtgamepad repository
     # Only if Qt6CorePrivate is available (required by qtgamepad)
     find_package(Qt6CorePrivate CONFIG QUIET)
     if(Qt6CorePrivate_FOUND)
-        add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtgamepad ${CMAKE_BINARY_DIR}/3rd/qtgamepad)
+        add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtgamepad)
         # Link both the C++ module and QML plugin
-        if(TARGET ${PROJECT})
+        if(TARGET GamepadLegacy)
             target_link_libraries(${PROJECT} PRIVATE GamepadLegacy)
-        else()
-            list(APPEND LIBS GamepadLegacy)
         endif()
-        if(TARGET ${PROJECT})
+        if(TARGET GamepadLegacyQuickPrivate)
             target_link_libraries(${PROJECT} PRIVATE GamepadLegacyQuickPrivate)
-        else()
-            list(APPEND LIBS GamepadLegacyQuickPrivate)
         endif()
         message(STATUS "Gamepad support enabled for Android")
     else()
@@ -39,6 +36,7 @@ endif()
 set(LIBS ${LIBS} qt6keychain)
 
 include_directories(
+    ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/src/include
     ${CLIENT_ROOT_DIR}/3rd/qtkeychain/qtkeychain
     ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain
 )

client/cmake/QSimpleCrypto.cmake

@@ -0,0 +1,21 @@
+set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
+set(QSIMPLECRYPTO_DIR ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/src)
+
+include_directories(${QSIMPLECRYPTO_DIR})
+
+set(HEADERS ${HEADERS}
+    ${QSIMPLECRYPTO_DIR}/include/QAead.h
+    ${QSIMPLECRYPTO_DIR}/include/QBlockCipher.h
+    ${QSIMPLECRYPTO_DIR}/include/QRsa.h
+    ${QSIMPLECRYPTO_DIR}/include/QSimpleCrypto_global.h
+    ${QSIMPLECRYPTO_DIR}/include/QX509.h
+    ${QSIMPLECRYPTO_DIR}/include/QX509Store.h
+)
+
+set(SOURCES ${SOURCES}
+    ${QSIMPLECRYPTO_DIR}/sources/QAead.cpp
+    ${QSIMPLECRYPTO_DIR}/sources/QBlockCipher.cpp
+    ${QSIMPLECRYPTO_DIR}/sources/QRsa.cpp
+    ${QSIMPLECRYPTO_DIR}/sources/QX509.cpp
+    ${QSIMPLECRYPTO_DIR}/sources/QX509Store.cpp
+)

client/cmake/ios.cmake

@@ -121,11 +121,6 @@ target_sources(${PROJECT} PRIVATE
     ${CLIENT_ROOT_DIR}/platforms/ios/StoreKit2Helper.swift
 )
 
-set_source_files_properties(
-    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets
-    PROPERTIES MACOSX_PACKAGE_LOCATION Resources
-)
-
 target_sources(${PROJECT} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard
     ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets

client/cmake/sources.cmake

@@ -52,16 +52,13 @@ set(HEADERS ${HEADERS}
     ${CLIENT_ROOT_DIR}/core/protocols/qmlRegisterProtocols.h
     ${CLIENT_ROOT_DIR}/ui/utils/pages.h
     ${CLIENT_ROOT_DIR}/ui/utils/qAutoStart.h
-    ${CLIENT_ROOT_DIR}/ui/utils/mtProxyPublicHostInput.h
     ${CLIENT_ROOT_DIR}/core/protocols/vpnProtocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h
     ${CLIENT_ROOT_DIR}/core/utils/selfhosted/sshClient.h
     ${CLIENT_ROOT_DIR}/core/utils/networkUtilities.h
-    ${CLIENT_ROOT_DIR}/core/utils/payloadSender.h
     ${CLIENT_ROOT_DIR}/core/utils/serialization/serialization.h
     ${CLIENT_ROOT_DIR}/core/utils/serialization/transfer.h
     ${CLIENT_ROOT_DIR}/../common/logger/logger.h
-    ${CLIENT_ROOT_DIR}/../common/crypto/cryptoUtils.h
     ${CLIENT_ROOT_DIR}/ui/utils/qmlUtils.h
     ${CLIENT_ROOT_DIR}/core/utils/api/apiUtils.h
     ${CLIENT_ROOT_DIR}/core/utils/osSignalHandler.h
@@ -130,11 +127,9 @@ set(SOURCES ${SOURCES}
     ${CLIENT_ROOT_DIR}/core/repositories/secureServersRepository.cpp
     ${CLIENT_ROOT_DIR}/core/repositories/secureAppSettingsRepository.cpp
     ${CLIENT_ROOT_DIR}/ui/utils/qAutoStart.cpp
-    ${CLIENT_ROOT_DIR}/ui/utils/mtProxyPublicHostInput.cpp
     ${CLIENT_ROOT_DIR}/core/protocols/vpnProtocol.cpp
     ${CLIENT_ROOT_DIR}/core/utils/selfhosted/sshClient.cpp
     ${CLIENT_ROOT_DIR}/core/utils/networkUtilities.cpp
-    ${CLIENT_ROOT_DIR}/core/utils/payloadSender.cpp
     ${CLIENT_ROOT_DIR}/core/utils/serialization/outbound.cpp
     ${CLIENT_ROOT_DIR}/core/utils/serialization/inbound.cpp
     ${CLIENT_ROOT_DIR}/core/utils/serialization/ss.cpp
@@ -144,7 +139,6 @@ set(SOURCES ${SOURCES}
     ${CLIENT_ROOT_DIR}/core/utils/serialization/vmess.cpp
     ${CLIENT_ROOT_DIR}/core/utils/serialization/vmess_new.cpp
     ${CLIENT_ROOT_DIR}/../common/logger/logger.cpp
-    ${CLIENT_ROOT_DIR}/../common/crypto/cryptoUtils.cpp
     ${CLIENT_ROOT_DIR}/ui/utils/qmlUtils.cpp
     ${CLIENT_ROOT_DIR}/core/utils/api/apiUtils.cpp
     ${CLIENT_ROOT_DIR}/core/utils/serverConfigUtils.cpp
@@ -207,6 +201,11 @@ file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/configurat
 file(GLOB_RECURSE CORE_MODELS_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/models/*.h)
 file(GLOB_RECURSE CORE_MODELS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/models/*.cpp)
 
+if(NOT ANDROID AND NOT IOS)
+    file(GLOB LOCAL_PROXY_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.h)
+    file(GLOB LOCAL_PROXY_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.cpp)
+endif()
+
 file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
     ${CLIENT_ROOT_DIR}/ui/models/*.h
     ${CLIENT_ROOT_DIR}/ui/models/protocols/*.h
@@ -252,6 +251,11 @@ set(SOURCES ${SOURCES}
     ${UI_CONTROLLERS_CPP}
 )
 
+if(NOT ANDROID AND NOT IOS)
+    list(APPEND HEADERS ${LOCAL_PROXY_H})
+    list(APPEND SOURCES ${LOCAL_PROXY_CPP})
+endif()
+
 if(WIN32)
     set(HEADERS ${HEADERS}
         ${CLIENT_ROOT_DIR}/core/protocols/ikev2VpnProtocolWindows.h

client/core/controllers/api/newsController.cpp

@@ -78,8 +78,7 @@ QFuture<QPair<ErrorCode, QJsonArray>> NewsController::fetchNews()
             m_appSettingsRepository->getGatewayEndpoint(),
             m_appSettingsRepository->isDevGatewayEnv(),
             apiDefs::requestTimeoutMsecs,
-            m_appSettingsRepository->isStrictKillSwitchEnabled(),
-            m_appSettingsRepository);
+            m_appSettingsRepository->isStrictKillSwitchEnabled());
 
     QJsonObject payload;
     payload.insert("locale", m_appSettingsRepository->getAppLanguage().name().split("_").first());

client/core/controllers/api/servicesCatalogController.cpp

@@ -242,7 +242,7 @@ ErrorCode ServicesCatalogController::fillAvailableServices(QJsonObject &services
 ErrorCode ServicesCatalogController::executeRequest(const QString &endpoint, const QJsonObject &apiPayload, QByteArray &responseBody)
 {
     GatewayController gatewayController(m_appSettingsRepository->getGatewayEndpoint(), m_appSettingsRepository->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                        m_appSettingsRepository->isStrictKillSwitchEnabled(), m_appSettingsRepository);
+                                        m_appSettingsRepository->isStrictKillSwitchEnabled());
     return gatewayController.post(endpoint, apiPayload, responseBody);
 }
 

client/core/controllers/api/subscriptionController.cpp

@@ -56,38 +56,6 @@ QString getSubscriptionStatusForRenewal(const ApiConfig &apiConfig)
 
     return QStringLiteral("active");
 }
-
-QString normalizeCaptchaSolution(const QString &captchaSolution)
-{
-    QString normalizedSolution;
-    normalizedSolution.reserve(captchaSolution.size());
-    for (const QChar &ch : captchaSolution) {
-        const ushort u = ch.unicode();
-        if (u >= '0' && u <= '9') {
-            normalizedSolution += ch;
-        } else if (u >= 0xFF10 && u <= 0xFF19) {
-            normalizedSolution += QChar(static_cast<char16_t>(u - 0xFF10 + '0'));
-        }
-    }
-    return normalizedSolution.isEmpty() ? captchaSolution.trimmed() : normalizedSolution;
-}
-
-bool fillCaptchaInfoFromResponse(const QByteArray &responseBody, SubscriptionController::CaptchaInfo &captchaInfo)
-{
-    const QJsonDocument jsonDoc = QJsonDocument::fromJson(responseBody);
-    if (!jsonDoc.isObject()) {
-        return false;
-    }
-    const QJsonObject jsonObj = jsonDoc.object();
-    if (!jsonObj.contains(QStringLiteral("captcha_id")) || !jsonObj.contains(QStringLiteral("captcha_image"))) {
-        return false;
-    }
-    captchaInfo.captchaId = jsonObj.value(QStringLiteral("captcha_id")).toString();
-    captchaInfo.captchaImageBase64 = jsonObj.value(QStringLiteral("captcha_image")).toString();
-    captchaInfo.hint = jsonObj.value(QStringLiteral("hint")).toString();
-    captchaInfo.isRequired = true;
-    return true;
-}
 }
 
 
@@ -230,6 +198,9 @@ void SubscriptionController::updateApiConfigInJson(QJsonObject &serverConfigJson
     
     if (serverConfigJson.value(configKey::configVersion).toInt() == serverConfigUtils::ConfigSource::AmneziaGateway) {
         QJsonObject responseObj = QJsonDocument::fromJson(apiResponseBody).object();
+        if (responseObj.contains(apiDefs::key::supportedProtocols)) {
+            apiConfig.insert(apiDefs::key::supportedProtocols, responseObj.value(apiDefs::key::supportedProtocols).toArray());
+        }
         if (responseObj.contains(apiDefs::key::serviceInfo)) {
             apiConfig.insert(apiDefs::key::serviceInfo, responseObj.value(apiDefs::key::serviceInfo).toObject());
         }
@@ -241,7 +212,7 @@ void SubscriptionController::updateApiConfigInJson(QJsonObject &serverConfigJson
 ErrorCode SubscriptionController::executeRequest(const QString &endpoint, const QJsonObject &apiPayload, QByteArray &responseBody, bool isTestPurchase)
 {
     GatewayController gatewayController(m_appSettingsRepository->getGatewayEndpoint(isTestPurchase), m_appSettingsRepository->isDevGatewayEnv(isTestPurchase), apiDefs::requestTimeoutMsecs,
-                                        m_appSettingsRepository->isStrictKillSwitchEnabled(), m_appSettingsRepository);
+                                        m_appSettingsRepository->isStrictKillSwitchEnabled());
     return gatewayController.post(endpoint, apiPayload, responseBody);
 }
 
@@ -266,7 +237,14 @@ ErrorCode SubscriptionController::importServiceFromGateway(const QString &userCo
     ErrorCode errorCode = executeRequest(QString("%1v1/config"), apiPayload, responseBody);
 
     if (errorCode == ErrorCode::ApiCaptchaRequiredError) {
-        fillCaptchaInfoFromResponse(responseBody, captchaInfo);
+        QJsonDocument jsonDoc = QJsonDocument::fromJson(responseBody);
+        if (jsonDoc.isObject()) {
+            QJsonObject jsonObj = jsonDoc.object();
+            captchaInfo.captchaId = jsonObj.value("captcha_id").toString();
+            captchaInfo.captchaImageBase64 = jsonObj.value("captcha_image").toString();
+            captchaInfo.hint = jsonObj.value("hint").toString();
+            captchaInfo.isRequired = true;
+        }
         return errorCode;
     }
 
@@ -432,8 +410,7 @@ ErrorCode SubscriptionController::importServiceFromAppStore(const QString &userC
     return ErrorCode::NoError;
 }
 
-ErrorCode SubscriptionController::updateServiceFromGateway(const QString &serverId, const QString &newCountryCode, bool isConnectEvent,
-                                                           CaptchaInfo *captchaInfoOut, ProtocolData *usedProtocolDataOut)
+ErrorCode SubscriptionController::updateServiceFromGateway(const QString &serverId, const QString &newCountryCode, bool isConnectEvent)
 {
     auto apiV2 = m_serversRepository->apiV2Config(serverId);
     if (!apiV2.has_value()) {
@@ -441,25 +418,8 @@ ErrorCode SubscriptionController::updateServiceFromGateway(const QString &server
     }
     const bool isTestPurchase = apiV2->apiConfig.isTestPurchase;
     QString serviceProtocol = apiV2->serviceProtocol();
-
-    if (!newCountryCode.isEmpty()) {
-        const auto availableCountries = apiV2->apiConfig.availableCountries;
-        for (const auto &country : availableCountries) {
-            const auto countryObject = country.toObject();
-            if (countryObject.value(apiDefs::key::serverCountryCode).toString() != newCountryCode) {
-                continue;
-            }
-
-            const auto availableProtocols = countryObject.value(apiDefs::key::availableProtocols).toArray();
-            if (!availableProtocols.isEmpty() && !availableProtocols.contains(serviceProtocol)) {
-                serviceProtocol = availableProtocols.first().toString();
-            }
-            break;
-        }
-    }
-
     ProtocolData protocolData = generateProtocolData(serviceProtocol);
-
+    
     QJsonObject authDataJson = apiV2->authData.toJson();
     GatewayRequestData gatewayRequestData { QSysInfo::productType(),
                                             QString(APP_VERSION),
@@ -481,11 +441,6 @@ ErrorCode SubscriptionController::updateServiceFromGateway(const QString &server
     QByteArray responseBody;
     ErrorCode errorCode = executeRequest(QString("%1v1/config"), apiPayload, responseBody, isTestPurchase);
     if (errorCode != ErrorCode::NoError) {
-        if (errorCode == ErrorCode::ApiCaptchaRequiredError && captchaInfoOut) {
-            if (fillCaptchaInfoFromResponse(responseBody, *captchaInfoOut) && usedProtocolDataOut) {
-                *usedProtocolDataOut = protocolData;
-            }
-        }
         if (errorCode == ErrorCode::ApiSubscriptionExpiredError && !apiV2->apiConfig.isInAppPurchase) {
             ApiV2ServerConfig expiredApiV2 = *apiV2;
             expiredApiV2.apiConfig.subscriptionExpiredByServer = true;
@@ -495,40 +450,29 @@ ErrorCode SubscriptionController::updateServiceFromGateway(const QString &server
         return errorCode;
     }
 
-    return applyUpdatedServiceConfig(serverId, serviceProtocol, protocolData, responseBody);
-}
-
-ErrorCode SubscriptionController::applyUpdatedServiceConfig(const QString &serverId, const QString &serviceProtocol,
-                                                           const ProtocolData &protocolData, const QByteArray &responseBody)
-{
-    auto apiV2 = m_serversRepository->apiV2Config(serverId);
-    if (!apiV2.has_value()) {
-        return ErrorCode::InternalError;
-    }
-
     QJsonObject serverConfigJson;
-    ErrorCode errorCode = extractServerConfigJsonFromResponse(responseBody, serviceProtocol, protocolData, serverConfigJson);
+    errorCode = extractServerConfigJsonFromResponse(responseBody, serviceProtocol, protocolData, serverConfigJson);
     if (errorCode != ErrorCode::NoError) {
         return errorCode;
     }
-
+    
     updateApiConfigInJson(serverConfigJson, apiV2->apiConfig.serviceType, serviceProtocol, apiV2->apiConfig.userCountryCode, responseBody);
-
+    
     if (serverConfigJson.value(configKey::configVersion).toInt() != serverConfigUtils::ConfigSource::AmneziaGateway) {
         return ErrorCode::InternalError;
     }
 
     ApiV2ServerConfig newApiV2Config = ApiV2ServerConfig::fromJson(serverConfigJson);
     ApiV2ServerConfig* newApiV2 = &newApiV2Config;
-
+    
     newApiV2->apiConfig.vpnKey = apiV2->apiConfig.vpnKey;
     newApiV2->apiConfig.isTestPurchase = apiV2->apiConfig.isTestPurchase;
     newApiV2->apiConfig.isInAppPurchase = apiV2->apiConfig.isInAppPurchase;
     newApiV2->apiConfig.subscriptionExpiredByServer = false;
-
+    
     newApiV2->authData = apiV2->authData;
     newApiV2->crc = apiV2->crc;
-
+    
     if (apiV2->nameOverriddenByUser) {
         newApiV2->name = apiV2->name;
         newApiV2->displayName = apiV2->displayName;
@@ -540,59 +484,6 @@ ErrorCode SubscriptionController::applyUpdatedServiceConfig(const QString &serve
     return ErrorCode::NoError;
 }
 
-ErrorCode SubscriptionController::resolveUpdateServiceCaptcha(const QString &serverId, const QString &newCountryCode,
-                                                              bool isConnectEvent, const ProtocolData &protocolData,
-                                                              const QString &captchaId, const QString &captchaSolution,
-                                                              CaptchaInfo *retryCaptchaOut)
-{
-    auto apiV2 = m_serversRepository->apiV2Config(serverId);
-    if (!apiV2.has_value()) {
-        return ErrorCode::InternalError;
-    }
-    const bool isTestPurchase = apiV2->apiConfig.isTestPurchase;
-    QString serviceProtocol = apiV2->serviceProtocol();
-
-    QJsonObject authDataJson = apiV2->authData.toJson();
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            m_appSettingsRepository->getAppLanguage().name().split("_").first(),
-                                            m_appSettingsRepository->getInstallationUuid(true),
-                                            apiV2->apiConfig.userCountryCode,
-                                            newCountryCode,
-                                            apiV2->serviceType(),
-                                            serviceProtocol,
-                                            authDataJson };
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-    appendProtocolDataToApiPayload(serviceProtocol, protocolData, apiPayload);
-
-    if (isConnectEvent) {
-        apiPayload[apiDefs::key::isConnectEvent] = true;
-    }
-
-    apiPayload["captcha_id"] = captchaId;
-    apiPayload["captcha_solution"] = normalizeCaptchaSolution(captchaSolution);
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/config"), apiPayload, responseBody, isTestPurchase);
-    if (errorCode != ErrorCode::NoError) {
-        if (retryCaptchaOut
-            && (errorCode == ErrorCode::ApiCaptchaInvalidError || errorCode == ErrorCode::ApiCaptchaRefreshError
-                || errorCode == ErrorCode::ApiCaptchaRequiredError)) {
-            fillCaptchaInfoFromResponse(responseBody, *retryCaptchaOut);
-        }
-        if (errorCode == ErrorCode::ApiSubscriptionExpiredError && !apiV2->apiConfig.isInAppPurchase) {
-            ApiV2ServerConfig expiredApiV2 = *apiV2;
-            expiredApiV2.apiConfig.subscriptionExpiredByServer = true;
-            m_serversRepository->editServer(serverId, expiredApiV2.toJson(),
-                                           serverConfigUtils::configTypeFromJson(expiredApiV2.toJson()));
-        }
-        return errorCode;
-    }
-
-    return applyUpdatedServiceConfig(serverId, serviceProtocol, protocolData, responseBody);
-}
-
 ErrorCode SubscriptionController::deactivateDevice(const QString &serverId)
 {
     auto apiV2 = m_serversRepository->apiV2Config(serverId);
@@ -757,20 +648,19 @@ ErrorCode SubscriptionController::prepareVpnKeyExport(const QString &serverId, Q
     return ErrorCode::NoError;
 }
 
-ErrorCode SubscriptionController::validateAndUpdateConfig(const QString &serverId, bool hasInstalledContainers,
-                                                         CaptchaInfo *captchaInfoOut, ProtocolData *usedProtocolDataOut)
+ErrorCode SubscriptionController::validateAndUpdateConfig(const QString &serverId, bool hasInstalledContainers)
 {
     if (!m_serversRepository->apiV2Config(serverId).has_value()) {
         return ErrorCode::NoError;
     }
 
     if (!hasInstalledContainers) {
-        return updateServiceFromGateway(serverId, "", true, captchaInfoOut, usedProtocolDataOut);
+        return updateServiceFromGateway(serverId, "", true);
     }
 
     if (isApiKeyExpired(serverId)) {
         qDebug() << "attempt to update api config by expires_at event";
-        return updateServiceFromGateway(serverId, "", true, captchaInfoOut, usedProtocolDataOut);
+        return updateServiceFromGateway(serverId, "", true);
     }
 
     return ErrorCode::NoError;
@@ -862,36 +752,6 @@ bool SubscriptionController::isVlessProtocol(const QString &serverId) const
     return apiV2.has_value() && apiV2->serviceProtocol() == "vless";
 }
 
-QString SubscriptionController::currentProtocol(const QString &serverId) const
-{
-    auto apiV2 = m_serversRepository->apiV2Config(serverId);
-    return apiV2.has_value() ? apiV2->serviceProtocol() : QString();
-}
-
-QStringList SubscriptionController::availableProtocols(const QString &serverId) const
-{
-    auto apiV2 = m_serversRepository->apiV2Config(serverId);
-    if (!apiV2.has_value()) {
-        return {};
-    }
-
-    const auto currentCountryCode = apiV2->apiConfig.serverCountryCode;
-    const auto availableCountries = apiV2->apiConfig.availableCountries;
-
-    QStringList protocols;
-    for (const auto &country : availableCountries) {
-        const auto countryObject = country.toObject();
-        if (countryObject.value(apiDefs::key::serverCountryCode).toString() != currentCountryCode) {
-            continue;
-        }
-        for (const auto &protocol : countryObject.value(apiDefs::key::availableProtocols).toArray()) {
-            protocols.push_back(protocol.toString());
-        }
-        break;
-    }
-    return protocols;
-}
-
 ErrorCode SubscriptionController::processAppStorePurchase(const QString &userCountryCode, const QString &serviceType,
                                                           const QString &serviceProtocol, const QString &productId,
                                                           int *duplicateServerIndex)
@@ -1089,8 +949,7 @@ QFuture<QPair<ErrorCode, QString>> SubscriptionController::getRenewalLink(const
     auto gatewayController = QSharedPointer<GatewayController>::create(m_appSettingsRepository->getGatewayEndpoint(isTestPurchase),
                                                                        m_appSettingsRepository->isDevGatewayEnv(isTestPurchase),
                                                                        apiDefs::requestTimeoutMsecs,
-                                                                       m_appSettingsRepository->isStrictKillSwitchEnabled(),
-                                                                       m_appSettingsRepository);
+                                                                       m_appSettingsRepository->isStrictKillSwitchEnabled());
     auto postFuture = gatewayController->postAsync(QString("%1v1/renewal_link"), apiPayload);
     auto *watcher = new QFutureWatcher<QPair<ErrorCode, QByteArray>>();
     QObject::connect(watcher, &QFutureWatcher<QPair<ErrorCode, QByteArray>>::finished,
@@ -1134,7 +993,17 @@ ErrorCode SubscriptionController::resolveImportServiceCaptcha(const QString &use
     appendProtocolDataToApiPayload(serviceProtocol, protocolData, apiPayload);
 
     apiPayload["captcha_id"] = captchaId;
-    apiPayload["captcha_solution"] = normalizeCaptchaSolution(captchaSolution);
+    QString normalizedSolution;
+    normalizedSolution.reserve(captchaSolution.size());
+    for (const QChar &ch : captchaSolution) {
+        const ushort u = ch.unicode();
+        if (u >= '0' && u <= '9') {
+            normalizedSolution += ch;
+        } else if (u >= 0xFF10 && u <= 0xFF19) {
+            normalizedSolution += QChar(static_cast<char16_t>(u - 0xFF10 + '0'));
+        }
+    }
+    apiPayload["captcha_solution"] = normalizedSolution.isEmpty() ? captchaSolution.trimmed() : normalizedSolution;
 
     QByteArray responseBody;
     ErrorCode errorCode = executeRequest(QString("%1v1/config"), apiPayload, responseBody);
@@ -1142,7 +1011,16 @@ ErrorCode SubscriptionController::resolveImportServiceCaptcha(const QString &use
         if (retryCaptchaOut
             && (errorCode == ErrorCode::ApiCaptchaInvalidError || errorCode == ErrorCode::ApiCaptchaRefreshError
                 || errorCode == ErrorCode::ApiCaptchaRequiredError)) {
-            fillCaptchaInfoFromResponse(responseBody, *retryCaptchaOut);
+            const QJsonDocument jsonDoc = QJsonDocument::fromJson(responseBody);
+            if (jsonDoc.isObject()) {
+                const QJsonObject jsonObj = jsonDoc.object();
+                if (jsonObj.contains(QStringLiteral("captcha_id")) && jsonObj.contains(QStringLiteral("captcha_image"))) {
+                    retryCaptchaOut->captchaId = jsonObj.value(QStringLiteral("captcha_id")).toString();
+                    retryCaptchaOut->captchaImageBase64 = jsonObj.value(QStringLiteral("captcha_image")).toString();
+                    retryCaptchaOut->hint = jsonObj.value(QStringLiteral("hint")).toString();
+                    retryCaptchaOut->isRequired = true;
+                }
+            }
         }
         return errorCode;
     }

client/core/controllers/api/subscriptionController.h

@@ -66,12 +66,7 @@ public:
                                         const QString &transactionId, bool isTestPurchase,
                                         int *duplicateServerIndex = nullptr);
 
-    ErrorCode updateServiceFromGateway(const QString &serverId, const QString &newCountryCode, bool isConnectEvent,
-                                       CaptchaInfo *captchaInfoOut = nullptr, ProtocolData *usedProtocolDataOut = nullptr);
-
-    ErrorCode resolveUpdateServiceCaptcha(const QString &serverId, const QString &newCountryCode, bool isConnectEvent,
-                                          const ProtocolData &protocolData, const QString &captchaId,
-                                          const QString &captchaSolution, CaptchaInfo *retryCaptchaOut = nullptr);
+    ErrorCode updateServiceFromGateway(const QString &serverId, const QString &newCountryCode, bool isConnectEvent);
 
     ErrorCode deactivateDevice(const QString &serverId);
 
@@ -83,8 +78,7 @@ public:
 
     ErrorCode prepareVpnKeyExport(const QString &serverId, QString &vpnKey);
 
-    ErrorCode validateAndUpdateConfig(const QString &serverId, bool hasInstalledContainers,
-                                      CaptchaInfo *captchaInfoOut = nullptr, ProtocolData *usedProtocolDataOut = nullptr);
+    ErrorCode validateAndUpdateConfig(const QString &serverId, bool hasInstalledContainers);
 
     void removeApiConfig(const QString &serverId);
 
@@ -92,8 +86,6 @@ public:
 
     void setCurrentProtocol(const QString &serverId, const QString &protocolName);
     bool isVlessProtocol(const QString &serverId) const;
-    QString currentProtocol(const QString &serverId) const;
-    QStringList availableProtocols(const QString &serverId) const;
 
     ErrorCode getAccountInfo(const QString &serverId, QJsonObject &accountInfo);
     QFuture<QPair<ErrorCode, QString>> getRenewalLink(const QString &serverId);
@@ -123,10 +115,8 @@ private:
     ErrorCode executeRequest(const QString &endpoint, const QJsonObject &apiPayload, QByteArray &responseBody, bool isTestPurchase = false);
     bool isApiKeyExpired(const QString &serverId) const;
     
-    ErrorCode extractServerConfigJsonFromResponse(const QByteArray &apiResponseBody, const QString &protocol,
+    ErrorCode extractServerConfigJsonFromResponse(const QByteArray &apiResponseBody, const QString &protocol, 
                                                    const ProtocolData &protocolData, QJsonObject &serverConfigJson);
-    ErrorCode applyUpdatedServiceConfig(const QString &serverId, const QString &serviceProtocol,
-                                        const ProtocolData &protocolData, const QByteArray &responseBody);
     void updateApiConfigInJson(QJsonObject &serverConfigJson, const QString &serviceType, 
                                 const QString &serviceProtocol, const QString &userCountryCode,
                                 const QByteArray &apiResponseBody);

client/core/controllers/connectionController.cpp

@@ -6,7 +6,6 @@
 #include "core/utils/protocolEnum.h"
 #include "core/protocols/protocolUtils.h"
 #include "core/utils/constants/configKeys.h"
-#include "core/utils/payloadSender.h"
 #include "core/utils/utilities.h"
 #include "core/utils/serverConfigUtils.h"
 #include "version.h"
@@ -219,10 +218,12 @@ ErrorCode ConnectionController::openConnection(const QString &serverId)
         return errorCode;
     }
 
-    const auto apiV2 = m_serversRepository->apiV2Config(serverId);
-    if (apiV2.has_value() && !apiV2->sendPayload.isEmpty()) {
-        PayloadSender::sendAll(apiV2->sendPayload);
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    if (m_appSettingsRepository && m_appSettingsRepository->isLocalProxyHttpEnabled()) {
+        m_appSettingsRepository->setLocalProxyHttpEnabled(false);
+        emit localProxyStoppedBecauseVpnTurnedOn(tr("Local proxy stopped because VPN was turned on"));
     }
+#endif
 
     emit openConnectionRequested(serverId, container, vpnConfiguration);
     return ErrorCode::NoError;

client/core/controllers/connectionController.h

@@ -69,6 +69,7 @@ signals:
     void closeConnectionRequested();
     void setConnectionStateRequested(Vpn::ConnectionState state);
     void killSwitchModeChangedRequested(bool enabled);
+    void localProxyStoppedBecauseVpnTurnedOn(const QString &message);
 
 #ifdef Q_OS_ANDROID
     void restoreConnectionRequested();

client/core/controllers/coreController.cpp

@@ -1,7 +1,10 @@
 #include "coreController.h"
 
+#include <QCoreApplication>
 #include <QDirIterator>
+#include <QDebug>
 #include <QTranslator>
+#include <QStandardPaths>
 #include <QTimer>
 
 #include "core/utils/selfhosted/sshSession.h"
@@ -22,8 +25,7 @@
 #endif
 
 CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnection, SecureQSettings* settings,
-                               QQmlApplicationEngine *engine, QObject *parent,
-                               bool skipPlatformControllerInit)
+                               QQmlApplicationEngine *engine, QObject *parent)
     : QObject(parent), m_vpnConnection(vpnConnection), m_settings(settings), m_engine(engine)
 {
     initRepositories();
@@ -32,12 +34,14 @@ CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnectio
     initControllers();
     initSignalHandlers();
 
-    if (!skipPlatformControllerInit) {
-        initAndroidController();
-        initAppleController();
-    }
+    initAndroidController();
+    initAppleController();
     initLogging();
 
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    initLocalProxy();
+#endif
+
     m_translator = new QTranslator(this);
     if (m_appSettingsRepository) {
         updateTranslator(m_appSettingsRepository->getAppLanguage());
@@ -51,6 +55,69 @@ void CoreController::setQmlContextProperty(const QString &name, QObject *value)
     }
 }
 
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+void CoreController::initLocalProxy()
+{
+    constexpr quint16 kLocalProxyApiPort = 49490;
+
+    m_proxyServer.reset(new ProxyServer(m_serversRepository, m_appSettingsRepository, this));
+
+    QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, [this]() {
+        if (m_appSettingsRepository && m_appSettingsRepository->isLocalProxyHttpEnabled()) {
+            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
+        }
+    });
+
+    auto syncLocalProxy = [this]() {
+        if (!m_proxyServer) {
+            return;
+        }
+
+        const bool httpEnabled = m_appSettingsRepository->isLocalProxyHttpEnabled();
+
+        if (!httpEnabled) {
+            qInfo() << "Local proxy: HTTP API disabled";
+            m_proxyServer->stop();
+            return;
+        }
+
+        if (!m_proxyServer->start(kLocalProxyApiPort)) {
+            qWarning() << "Local proxy: failed to start on port" << kLocalProxyApiPort;
+            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
+            emit m_appSettingsRepository->localProxyStartFailed(tr("Local proxy failed to start. Check if the port is available."));
+            return;
+        }
+
+        if (!m_proxyServer->syncSettings()) {
+            qWarning() << "Local proxy: failed to start proxy core (Xray)";
+            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
+            emit m_appSettingsRepository->localProxyStartFailed(tr("Couldn’t start the proxy due to an internal error. Try restarting the app."));
+            return;
+        }
+
+        qInfo() << "Local proxy: running on 127.0.0.1:" << kLocalProxyApiPort;
+    };
+
+    syncLocalProxy();
+
+    connect(m_appSettingsRepository, &SecureAppSettingsRepository::localProxySettingsChanged, this, syncLocalProxy);
+
+    connect(m_serversRepository, &SecureServersRepository::serverEdited, this, [this](const QString &serverId) {
+        if (m_appSettingsRepository && m_appSettingsRepository->isLocalProxyHttpEnabled()
+            && m_appSettingsRepository->localProxyOwnerId() == serverId) {
+            m_appSettingsRepository->bumpLocalProxyRestartToken();
+        }
+    });
+
+    connect(m_serversRepository, &SecureServersRepository::serverRemoved, this, [this](const QString &serverId, int) {
+        if (m_appSettingsRepository && m_appSettingsRepository->localProxyOwnerId() == serverId) {
+            m_appSettingsRepository->setLocalProxyOwnerId(QString());
+            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
+        }
+    });
+}
+#endif
+
 void CoreController::initModels()
 {
     m_containersModel = new ContainersModel(this);
@@ -200,6 +267,11 @@ void CoreController::initControllers()
     m_pageController = new PageController(m_serversController, m_settingsController, this);
     setQmlContextProperty("PageController", m_pageController);
 
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    connect(m_connectionController, &ConnectionController::localProxyStoppedBecauseVpnTurnedOn, m_pageController,
+            &PageController::showNotificationMessage);
+#endif
+
     m_serversUiController = new ServersUiController(m_serversController, m_settingsController, m_serversModel, m_containersModel, m_defaultServerContainersModel, this);
     setQmlContextProperty("ServersUiController", m_serversUiController);
 

client/core/controllers/coreController.h

@@ -78,6 +78,7 @@
 #include "ui/models/newsModel.h"
 
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    #include "core/local-proxy/proxyserver.h"
     #include "ui/utils/notificationHandler.h"
 #endif
 
@@ -90,8 +91,7 @@ class CoreController : public QObject
 
 public:
     explicit CoreController(const QSharedPointer<VpnConnection> &vpnConnection, SecureQSettings* settings,
-                            QQmlApplicationEngine *engine, QObject *parent = nullptr,
-                            bool skipPlatformControllerInit = false);
+                            QQmlApplicationEngine *engine, QObject *parent = nullptr);
 
     PageController* pageController() const;
     void setQmlRoot();
@@ -115,7 +115,7 @@ protected:
     AppSplitTunnelingModel* appSplitTunnelingModelProtected() const { return m_appSplitTunnelingModel; }
     IpSplitTunnelingModel* ipSplitTunnelingModelProtected() const { return m_ipSplitTunnelingModel; }
     LanguageModel* languageModelProtected() const { return m_languageModel; }
-    ConnectionUiController* connectionUiControllerProtected() const { return m_connectionUiController; }
+
     InstallUiController* installUiControllerProtected() const { return m_installUiController; }
     ImportController* importCoreControllerProtected() const { return m_importCoreController; }
     ExportController* exportControllerProtected() const { return m_exportController; }
@@ -143,6 +143,9 @@ private:
     void initAppleController();
     void initLogging();
     void initSignalHandlers();
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    void initLocalProxy();
+#endif
     void setQmlContextProperty(const QString &name, QObject *value);
 
     QQmlApplicationEngine *m_engine {}; // TODO use parent child system here?
@@ -228,6 +231,10 @@ private:
     TelemtConfigModel* m_telemtConfigModel;
 
     CoreSignalHandlers* m_signalHandlers;
+
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    QScopedPointer<ProxyServer> m_proxyServer;
+#endif
 };
 
 #endif // CORECONTROLLER_H

client/core/controllers/coreSignalHandlers.cpp

@@ -205,8 +205,10 @@ void CoreSignalHandlers::initAdminConfigRevokedHandler()
 {
     connect(m_coreController->m_installController, &InstallController::clientRevocationRequested, this,
             [this](const QString &serverId, const ContainerConfig &containerConfig, DockerContainer container) {
-                m_coreController->m_usersController->revokeClient(serverId, containerConfig, container);
-            }, Qt::DirectConnection);
+                QtConcurrent::run([this, serverId, containerConfig, container]() {
+                    m_coreController->m_usersController->revokeClient(serverId, containerConfig, container);
+                });
+            });
 
     connect(m_coreController->m_installController, &InstallController::clientAppendRequested, this,
             [this](const QString &serverId, const QString &clientId, const QString &clientName, DockerContainer container) {

client/core/controllers/gatewayController.cpp

@@ -12,14 +12,14 @@
 #include <QPromise>
 #include <QUrl>
 
-#include <openssl/rsa.h>
+#include "QBlockCipher.h"
+#include "QRsa.h"
 
 #include "amneziaApplication.h"
-#include "core/repositories/secureAppSettingsRepository.h"
 #include "core/utils/api/apiUtils.h"
 #include "core/utils/constants/apiKeys.h"
 #include "core/utils/networkUtilities.h"
-#include "cryptoUtils.h"
+#include "core/utils/utilities.h"
 
 #ifdef AMNEZIA_DESKTOP
     #include "core/utils/ipcClient.h"
@@ -45,75 +45,15 @@ namespace
     constexpr QLatin1String unprocessableSubscriptionMessage("Failed to retrieve subscription information. Is it activated?");
 
     constexpr int proxyStorageRequestTimeoutMsecs = 3000;
-
-    QStringList shuffledProxyUrls(const QStringList &proxyUrls)
-    {
-        QStringList shuffled = proxyUrls;
-        std::random_device randomDevice;
-        std::mt19937 generator(randomDevice());
-        std::shuffle(shuffled.begin(), shuffled.end(), generator);
-        return shuffled;
-    }
-
-    QString getProxyUrlsCacheKey(const QString &serviceType, const QString &userCountryCode)
-    {
-        return QStringLiteral("service_%1_country_%2").arg(serviceType, userCountryCode);
-    }
-
-    bool decryptProxyUrlsPayload(const QByteArray &encryptedPayload, bool isDevEnvironment, QByteArray &decryptedPayload)
-    {
-        QByteArray key = isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
-        if (!isDevEnvironment) {
-            QCryptographicHash hash(QCryptographicHash::Sha512);
-            hash.addData(key);
-            QByteArray h = hash.result().toHex();
-
-            QByteArray decKey = QByteArray::fromHex(h.left(64));
-            QByteArray iv = QByteArray::fromHex(h.mid(64, 32));
-            QByteArray ba = QByteArray::fromBase64(encryptedPayload);
-
-            decryptedPayload = CryptoUtils::decryptAes256Cbc(ba, decKey, iv);
-            if (decryptedPayload.isEmpty()) {
-                return false;
-            }
-        } else {
-            decryptedPayload = encryptedPayload;
-        }
-        return true;
-    }
-
-    QStringList readCachedProxyUrls(const QByteArray &cachedProxyUrlsEncrypted, bool isDevEnvironment)
-    {
-        if (cachedProxyUrlsEncrypted.isEmpty()) {
-            return {};
-        }
-
-        QByteArray cachedProxyUrlsDecrypted;
-        if (!decryptProxyUrlsPayload(cachedProxyUrlsEncrypted, isDevEnvironment, cachedProxyUrlsDecrypted)) {
-            qCritical() << "error decrypting cached proxy urls payload";
-            return {};
-        }
-
-        QJsonArray endpointsArray = QJsonDocument::fromJson(cachedProxyUrlsDecrypted).array();
-        QStringList endpoints;
-        endpoints.reserve(endpointsArray.size());
-        for (const QJsonValue &endpoint : endpointsArray) {
-            endpoints.push_back(endpoint.toString());
-        }
-
-        return endpoints;
-    }
 }
 
 GatewayController::GatewayController(const QString &gatewayEndpoint, const bool isDevEnvironment, const int requestTimeoutMsecs,
-                                     const bool isStrictKillSwitchEnabled, SecureAppSettingsRepository *appSettingsRepository,
-                                     QObject *parent)
+                                     const bool isStrictKillSwitchEnabled, QObject *parent)
     : QObject(parent),
       m_gatewayEndpoint(gatewayEndpoint),
       m_isDevEnvironment(isDevEnvironment),
       m_requestTimeoutMsecs(requestTimeoutMsecs),
-      m_isStrictKillSwitchEnabled(isStrictKillSwitchEnabled),
-      m_appSettingsRepository(appSettingsRepository)
+      m_isStrictKillSwitchEnabled(isStrictKillSwitchEnabled)
 {
 }
 
@@ -147,29 +87,40 @@ GatewayController::EncryptedRequestData GatewayController::prepareRequest(const
     }
 #endif
 
-    encRequestData.key = CryptoUtils::generateRandomBytes(32);
-    encRequestData.iv = CryptoUtils::generateRandomBytes(32);
-    encRequestData.salt = CryptoUtils::generateRandomBytes(8);
+    QSimpleCrypto::QBlockCipher blockCipher;
+    encRequestData.key = blockCipher.generatePrivateSalt(32);
+    encRequestData.iv = blockCipher.generatePrivateSalt(32);
+    encRequestData.salt = blockCipher.generatePrivateSalt(8);
 
     QJsonObject keyPayload;
     keyPayload[apiDefs::key::aesKey] = QString(encRequestData.key.toBase64());
     keyPayload[apiDefs::key::aesIv] = QString(encRequestData.iv.toBase64());
     keyPayload[apiDefs::key::aesSalt] = QString(encRequestData.salt.toBase64());
 
-    QByteArray rsaKey = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
-    EVP_PKEY *publicKey = CryptoUtils::loadPublicKeyFromPem(rsaKey);
-    if (publicKey == nullptr) {
-        qCritical() << "error loading public key from environment variables";
-        encRequestData.errorCode = ErrorCode::ApiMissingAgwPublicKey;
-        return encRequestData;
-    }
+    QByteArray encryptedKeyPayload;
+    QByteArray encryptedApiPayload;
+    try {
+        QSimpleCrypto::QRsa rsa;
 
-    QByteArray encryptedKeyPayload = CryptoUtils::rsaEncrypt(QJsonDocument(keyPayload).toJson(), publicKey, RSA_PKCS1_PADDING);
-    EVP_PKEY_free(publicKey);
+        EVP_PKEY *publicKey = nullptr;
+        try {
+            QByteArray rsaKey = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
+            QSimpleCrypto::QRsa rsa;
+            publicKey = rsa.getPublicKeyFromByteArray(rsaKey);
+        } catch (...) {
+            Utils::logException();
+            qCritical() << "error loading public key from environment variables";
+            encRequestData.errorCode = ErrorCode::ApiMissingAgwPublicKey;
+            return encRequestData;
+        }
 
-    QByteArray encryptedApiPayload = CryptoUtils::encryptAes256Cbc(QJsonDocument(apiPayload).toJson(), encRequestData.key, encRequestData.iv);
+        encryptedKeyPayload = rsa.encrypt(QJsonDocument(keyPayload).toJson(), publicKey, RSA_PKCS1_PADDING);
+        EVP_PKEY_free(publicKey);
 
-    if (encryptedKeyPayload.isEmpty() || encryptedApiPayload.isEmpty()) {
+        encryptedApiPayload = blockCipher.encryptAesBlockCipher(QJsonDocument(apiPayload).toJson(), encRequestData.key, encRequestData.iv,
+                                                                "", encRequestData.salt);
+    } catch (...) {
+        Utils::logException();
         qCritical() << "error when encrypting the request body";
         encRequestData.errorCode = ErrorCode::ApiConfigDecryptionError;
         return encRequestData;
@@ -191,11 +142,11 @@ GatewayController::DecryptionResult GatewayController::tryDecryptResponseBody(co
     result.decryptedBody = encryptedResponseBody;
     result.isDecryptionSuccessful = false;
 
-    QByteArray decrypted = CryptoUtils::decryptAes256Cbc(encryptedResponseBody, key, iv);
-    if (!decrypted.isEmpty()) {
-        result.decryptedBody = decrypted;
+    try {
+        QSimpleCrypto::QBlockCipher blockCipher;
+        result.decryptedBody = blockCipher.decryptAesBlockCipher(encryptedResponseBody, key, iv, "", salt);
         result.isDecryptionSuccessful = true;
-    } else {
+    } catch (...) {
         result.decryptedBody = encryptedResponseBody;
         result.isDecryptionSuccessful = false;
     }
@@ -314,6 +265,7 @@ QFuture<QPair<ErrorCode, QByteArray>> GatewayController::postAsync(const QString
             }
 
             if (!decryptionResult.isDecryptionSuccessful) {
+                Utils::logException();
                 qCritical() << "error when decrypting the request body";
                 promise->addResult(qMakePair(ErrorCode::ApiConfigDecryptionError, QByteArray()));
                 promise->finish();
@@ -356,9 +308,8 @@ QFuture<QPair<ErrorCode, QByteArray>> GatewayController::postAsync(const QString
             QStringList proxyStorageUrls;
             appendStorageUrls(primaryBaseUrls, proxyStorageUrls);
             appendStorageUrls(fallbackBaseUrls, proxyStorageUrls);
-            const QString proxyUrlsCacheKey = getProxyUrlsCacheKey(serviceType, userCountryCode);
 
-            getProxyUrlsAsync(proxyStorageUrls, 0, proxyUrlsCacheKey, [this, encRequestData, endpoint, processResponse](const QStringList &proxyUrls) {
+            getProxyUrlsAsync(proxyStorageUrls, 0, [this, encRequestData, endpoint, processResponse](const QStringList &proxyUrls) {
                 getProxyUrlAsync(proxyUrls, 0, [this, encRequestData, endpoint, processResponse](const QString &proxyUrl) {
                     bypassProxyAsync(endpoint, proxyUrl, encRequestData,
                                      [processResponse, this](const QByteArray &decryptedBody, bool isDecryptionSuccessful,
@@ -404,6 +355,8 @@ QStringList GatewayController::getProxyUrls(const QString &serviceType, const QS
     std::shuffle(primaryBaseUrls.begin(), primaryBaseUrls.end(), generator);
     std::shuffle(fallbackBaseUrls.begin(), fallbackBaseUrls.end(), generator);
 
+    QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
+
     auto appendStorageUrls = [&serviceType, &userCountryCode](const QStringList &baseUrls, QStringList &target) {
         if (!serviceType.isEmpty()) {
             for (const auto &baseUrl : baseUrls) {
@@ -419,12 +372,10 @@ QStringList GatewayController::getProxyUrls(const QString &serviceType, const QS
     QStringList proxyStorageUrls;
     appendStorageUrls(primaryBaseUrls, proxyStorageUrls);
     appendStorageUrls(fallbackBaseUrls, proxyStorageUrls);
-    const QString proxyUrlsCacheKey = getProxyUrlsCacheKey(serviceType, userCountryCode);
-    const QByteArray cachedProxyUrlsEncrypted = m_appSettingsRepository->readGatewayProxyUrls(proxyUrlsCacheKey);
 
     if (proxyStorageUrls.empty()) {
         qDebug() << "empty storage endpoint list";
-        return readCachedProxyUrls(cachedProxyUrlsEncrypted, m_isDevEnvironment);
+        return {};
     }
 
     for (const auto &proxyStorageUrl : proxyStorageUrls) {
@@ -439,8 +390,26 @@ QStringList GatewayController::getProxyUrls(const QString &serviceType, const QS
             auto encryptedResponseBody = reply->readAll();
             reply->deleteLater();
 
+            EVP_PKEY *privateKey = nullptr;
             QByteArray responseBody;
-            if (!decryptProxyUrlsPayload(encryptedResponseBody, m_isDevEnvironment, responseBody)) {
+            try {
+                if (!m_isDevEnvironment) {
+                    QCryptographicHash hash(QCryptographicHash::Sha512);
+                    hash.addData(key);
+                    QByteArray hashResult = hash.result().toHex();
+
+                    QByteArray key = QByteArray::fromHex(hashResult.left(64));
+                    QByteArray iv = QByteArray::fromHex(hashResult.mid(64, 32));
+
+                    QByteArray ba = QByteArray::fromBase64(encryptedResponseBody);
+
+                    QSimpleCrypto::QBlockCipher blockCipher;
+                    responseBody = blockCipher.decryptAesBlockCipher(ba, key, iv);
+                } else {
+                    responseBody = encryptedResponseBody;
+                }
+            } catch (...) {
+                Utils::logException();
                 qCritical() << "error loading private key from environment variables or decrypting payload" << encryptedResponseBody;
                 continue;
             }
@@ -451,8 +420,6 @@ QStringList GatewayController::getProxyUrls(const QString &serviceType, const QS
             for (const auto &endpoint : endpointsArray) {
                 endpoints.push_back(endpoint.toString());
             }
-            m_appSettingsRepository->writeGatewayProxyUrls(proxyUrlsCacheKey, encryptedResponseBody);
-
             return endpoints;
         } else {
             auto replyError = reply->error();
@@ -464,7 +431,7 @@ QStringList GatewayController::getProxyUrls(const QString &serviceType, const QS
             reply->deleteLater();
         }
     }
-    return readCachedProxyUrls(cachedProxyUrlsEncrypted, m_isDevEnvironment);
+    return {};
 }
 
 bool GatewayController::shouldBypassProxy(const QNetworkReply::NetworkError &replyError, const QByteArray &decryptedResponseBody,
@@ -606,12 +573,10 @@ void GatewayController::bypassProxy(const QString &endpoint, const QString &serv
 }
 
 void GatewayController::getProxyUrlsAsync(const QStringList proxyStorageUrls, const int currentProxyStorageIndex,
-                                          const QString &proxyUrlsCacheKey, std::function<void(const QStringList &)> onComplete)
+                                          std::function<void(const QStringList &)> onComplete)
 {
-    const QByteArray cachedProxyUrlsEncrypted = m_appSettingsRepository->readGatewayProxyUrls(proxyUrlsCacheKey);
-
     if (currentProxyStorageIndex >= proxyStorageUrls.size()) {
-        onComplete(shuffledProxyUrls(readCachedProxyUrls(cachedProxyUrlsEncrypted, m_isDevEnvironment)));
+        onComplete({});
         return;
     }
 
@@ -624,17 +589,33 @@ void GatewayController::getProxyUrlsAsync(const QStringList proxyStorageUrls, co
 
     // connect(reply, &QNetworkReply::sslErrors, this, [state](const QList<QSslError> &e) { *(state->sslErrors) = e; });
 
-    connect(reply, &QNetworkReply::finished, this,
-            [this, proxyStorageUrls, currentProxyStorageIndex, proxyUrlsCacheKey, onComplete, reply]() {
+    connect(reply, &QNetworkReply::finished, this, [this, proxyStorageUrls, currentProxyStorageIndex, onComplete, reply]() {
         if (reply->error() == QNetworkReply::NoError) {
             QByteArray encrypted = reply->readAll();
             reply->deleteLater();
 
             QByteArray responseBody;
-            if (!decryptProxyUrlsPayload(encrypted, m_isDevEnvironment, responseBody)) {
+            try {
+                QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
+                if (!m_isDevEnvironment) {
+                    QCryptographicHash hash(QCryptographicHash::Sha512);
+                    hash.addData(key);
+                    QByteArray h = hash.result().toHex();
+
+                    QByteArray decKey = QByteArray::fromHex(h.left(64));
+                    QByteArray iv = QByteArray::fromHex(h.mid(64, 32));
+                    QByteArray ba = QByteArray::fromBase64(encrypted);
+
+                    QSimpleCrypto::QBlockCipher cipher;
+                    responseBody = cipher.decryptAesBlockCipher(ba, decKey, iv);
+                } else {
+                    responseBody = encrypted;
+                }
+            } catch (...) {
+                Utils::logException();
                 qCritical() << "error decrypting payload";
                 QMetaObject::invokeMethod(
-                        this, [=]() { getProxyUrlsAsync(proxyStorageUrls, currentProxyStorageIndex + 1, proxyUrlsCacheKey, onComplete); }, Qt::QueuedConnection);
+                        this, [=]() { getProxyUrlsAsync(proxyStorageUrls, currentProxyStorageIndex + 1, onComplete); }, Qt::QueuedConnection);
                 return;
             }
 
@@ -642,9 +623,13 @@ void GatewayController::getProxyUrlsAsync(const QStringList proxyStorageUrls, co
             QStringList endpoints;
             for (const QJsonValue &endpoint : endpointsArray)
                 endpoints.push_back(endpoint.toString());
-            m_appSettingsRepository->writeGatewayProxyUrls(proxyUrlsCacheKey, encrypted);
 
-            onComplete(shuffledProxyUrls(endpoints));
+            QStringList shuffled = endpoints;
+            std::random_device randomDevice;
+            std::mt19937 generator(randomDevice());
+            std::shuffle(shuffled.begin(), shuffled.end(), generator);
+
+            onComplete(shuffled);
             return;
         }
 
@@ -653,7 +638,7 @@ void GatewayController::getProxyUrlsAsync(const QStringList proxyStorageUrls, co
         qDebug() << "go to the next storage endpoint";
         reply->deleteLater();
         QMetaObject::invokeMethod(
-                this, [=]() { getProxyUrlsAsync(proxyStorageUrls, currentProxyStorageIndex + 1, proxyUrlsCacheKey, onComplete); }, Qt::QueuedConnection);
+                this, [=]() { getProxyUrlsAsync(proxyStorageUrls, currentProxyStorageIndex + 1, onComplete); }, Qt::QueuedConnection);
     });
 }
 

client/core/controllers/gatewayController.h

@@ -16,16 +16,13 @@
     #include "platforms/ios/ios_controller.h"
 #endif
 
-class SecureAppSettingsRepository;
-
 class GatewayController : public QObject
 {
     Q_OBJECT
 
 public:
     explicit GatewayController(const QString &gatewayEndpoint, const bool isDevEnvironment, const int requestTimeoutMsecs,
-                               const bool isStrictKillSwitchEnabled, SecureAppSettingsRepository *appSettingsRepository,
-                               QObject *parent = nullptr);
+                               const bool isStrictKillSwitchEnabled, QObject *parent = nullptr);
 
     amnezia::ErrorCode post(const QString &endpoint, const QJsonObject apiPayload, QByteArray &responseBody);
     QFuture<QPair<amnezia::ErrorCode, QByteArray>> postAsync(const QString &endpoint, const QJsonObject apiPayload);
@@ -58,7 +55,7 @@ private:
                      std::function<bool(QNetworkReply *reply, const QList<QSslError> &sslErrors)> replyProcessingFunction);
 
     void getProxyUrlsAsync(const QStringList proxyStorageUrls, const int currentProxyStorageIndex,
-                           const QString &proxyUrlsCacheKey, std::function<void(const QStringList &)> onComplete);
+                           std::function<void(const QStringList &)> onComplete);
     void getProxyUrlAsync(const QStringList proxyUrls, const int currentProxyIndex, std::function<void(const QString &)> onComplete);
     void bypassProxyAsync(
             const QString &endpoint, const QString &proxyUrl, EncryptedRequestData encRequestData,
@@ -68,7 +65,6 @@ private:
     QString m_gatewayEndpoint;
     bool m_isDevEnvironment = false;
     bool m_isStrictKillSwitchEnabled = false;
-    SecureAppSettingsRepository *m_appSettingsRepository = nullptr;
 
     inline static QString m_proxyUrl;
 };

client/core/controllers/selfhosted/installController.cpp

@@ -2,7 +2,6 @@
 
 #include "core/models/protocolConfig.h"
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QEventLoop>
 #include <QFutureWatcher>
@@ -21,6 +20,7 @@
 #include "core/installers/sftpInstaller.h"
 #include "core/installers/socks5Installer.h"
 #include "core/installers/mtProxyInstaller.h"
+#include "core/configurators/xrayConfigurator.h"
 #include "core/installers/telemtInstaller.h"
 #include "core/installers/torInstaller.h"
 #include "core/installers/wireguardInstaller.h"
@@ -103,7 +103,7 @@ ErrorCode InstallController::setupContainer(const ServerCredentials &credentials
                                             bool isUpdate)
 {
     qDebug().noquote() << "InstallController::setupContainer" << ContainerUtils::containerToString(container);
-    SshSession sshSession;
+    SshSession sshSession(this);
     ErrorCode e = ErrorCode::NoError;
 
     e = isUserInSudo(credentials, sshSession);
@@ -168,11 +168,11 @@ ErrorCode InstallController::updateServerConfig(const QString &serverId, DockerC
         }
         if (container == DockerContainer::MtProxy) {
             ServerCredentials credentials = adminConfig->credentials();
-            SshSession sshSession;
+            SshSession sshSession(this);
             MtProxyInstaller::uploadClientSettingsSnapshot(sshSession, credentials, container, newConfig);
         } else if (container == DockerContainer::Telemt) {
             ServerCredentials credentials = adminConfig->credentials();
-            SshSession sshSession;
+            SshSession sshSession(this);
             TelemtInstaller::uploadClientSettingsSnapshot(sshSession, credentials, container, newConfig);
         }
         adminConfig->updateContainerConfig(container, newConfig);
@@ -188,11 +188,21 @@ ErrorCode InstallController::updateServerConfig(const QString &serverId, DockerC
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
 
     bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
     qDebug() << "InstallController::updateServerConfig for container" << container << "reinstall required is" << reinstallRequired;
 
+    bool xrayServerSettingsChanged = false;
+    if (container == DockerContainer::Xray || container == DockerContainer::SSXray) {
+        const auto *oldXrayConfig = oldConfig.getXrayProtocolConfig();
+        const auto *newXrayConfig = newConfig.getXrayProtocolConfig();
+        if (oldXrayConfig && newXrayConfig) {
+            xrayServerSettingsChanged =
+                    !oldXrayConfig->serverConfig.hasEqualServerSettings(newXrayConfig->serverConfig);
+        }
+    }
+
     ErrorCode errorCode = ErrorCode::NoError;
     if (reinstallRequired) {
         errorCode = setupContainer(credentials, container, newConfig, true);
@@ -201,11 +211,20 @@ ErrorCode InstallController::updateServerConfig(const QString &serverId, DockerC
         if (errorCode == ErrorCode::NoError) {
             errorCode = startupContainerWorker(credentials, container, newConfig, sshSession);
         }
+    }
 
-        if (errorCode == ErrorCode::NoError
-            && (container == DockerContainer::MtProxy || container == DockerContainer::Telemt)) {
-            const QString containerName = ContainerUtils::containerToString(container);
-            errorCode = sshSession.runScript(credentials, "sudo docker restart " + containerName);
+    const bool skipXrayInboundSync =
+            newConfig.getXrayProtocolConfig() && newConfig.getXrayProtocolConfig()->serverConfig.isThirdPartyConfig;
+
+    if (errorCode == ErrorCode::NoError && xrayServerSettingsChanged && !skipXrayInboundSync) {
+        DnsSettings dnsSettings = { m_appSettingsRepository->primaryDns(), m_appSettingsRepository->secondaryDns() };
+        XrayConfigurator xrayConfigurator(&sshSession);
+        qDebug() << "InstallController::updateServerConfig applying Xray server inbound sync, reinstall="
+                 << reinstallRequired;
+        errorCode = xrayConfigurator.applyServerSettingsToRemote(credentials, container, newConfig, dnsSettings, false);
+        if (errorCode != ErrorCode::NoError) {
+            qDebug() << "InstallController::updateServerConfig Xray inbound sync failed, error="
+                     << static_cast<int>(errorCode);
         }
     }
 
@@ -697,7 +716,13 @@ bool InstallController::isReinstallContainerRequired(DockerContainer container,
         const auto *newXrayConfig = newConfig.getXrayProtocolConfig();
 
         if (oldXrayConfig && newXrayConfig) {
-            if (!oldXrayConfig->serverConfig.hasEqualServerSettings(newXrayConfig->serverConfig)) {
+            const QString oldPort = oldXrayConfig->serverConfig.port.isEmpty()
+                    ? QString(protocols::xray::defaultPort)
+                    : oldXrayConfig->serverConfig.port;
+            const QString newPort = newXrayConfig->serverConfig.port.isEmpty()
+                    ? QString(protocols::xray::defaultPort)
+                    : newXrayConfig->serverConfig.port;
+            if (oldPort != newPort) {
                 return true;
             }
         }
@@ -714,6 +739,18 @@ bool InstallController::isReinstallContainerRequired(DockerContainer container,
             if (oldPort != newPort) {
                 return true;
             }
+            const QString oldTransport = oldMt->transportMode.isEmpty() ? QString(
+                    protocols::mtProxy::transportModeStandard)
+                                                                        : oldMt->transportMode;
+            const QString newTransport = newMt->transportMode.isEmpty() ? QString(
+                    protocols::mtProxy::transportModeStandard)
+                                                                        : newMt->transportMode;
+            if (oldTransport != newTransport) {
+                return true;
+            }
+            if (oldMt->tlsDomain != newMt->tlsDomain) {
+                return true;
+            }
         }
     }
 
@@ -728,6 +765,39 @@ bool InstallController::isReinstallContainerRequired(DockerContainer container,
             if (oldPort != newPort) {
                 return true;
             }
+            const QString oldTransport = oldT->transportMode.isEmpty()
+                    ? QString(protocols::telemt::transportModeStandard)
+                    : oldT->transportMode;
+            const QString newTransport = newT->transportMode.isEmpty()
+                    ? QString(protocols::telemt::transportModeStandard)
+                    : newT->transportMode;
+            if (oldTransport != newTransport) {
+                return true;
+            }
+            if (oldT->tlsDomain != newT->tlsDomain) {
+                return true;
+            }
+            if (oldT->maskEnabled != newT->maskEnabled) {
+                return true;
+            }
+            if (oldT->tlsEmulation != newT->tlsEmulation) {
+                return true;
+            }
+            if (oldT->useMiddleProxy != newT->useMiddleProxy) {
+                return true;
+            }
+            if (oldT->tag != newT->tag) {
+                return true;
+            }
+            const QString oldUser = oldT->userName.isEmpty()
+                    ? QString::fromUtf8(protocols::telemt::defaultUserName)
+                    : oldT->userName;
+            const QString newUser = newT->userName.isEmpty()
+                    ? QString::fromUtf8(protocols::telemt::defaultUserName)
+                    : newT->userName;
+            if (oldUser != newUser) {
+                return true;
+            }
         }
     }
 
@@ -767,20 +837,6 @@ ErrorCode InstallController::installDockerWorker(const ServerCredentials &creden
 
     qDebug().noquote() << "InstallController::installDockerWorker" << stdOut;
 
-    if (container == DockerContainer::MtProxy || container == DockerContainer::Telemt) {
-        QString conntrackOut;
-        auto cbConntrack = [&](const QString &data, libssh::Client &) {
-            conntrackOut += data + "\n";
-            return ErrorCode::NoError;
-        };
-        sshSession.runScript(
-                credentials,
-                sshSession.replaceVars(amnezia::scriptData(SharedScriptType::install_conntrack),
-                                       amnezia::genBaseVars(credentials, DockerContainer::None, QString(), QString())),
-                cbConntrack, cbConntrack);
-        qDebug().noquote() << "InstallController::installDockerWorker install_conntrack:" << conntrackOut;
-    }
-
     if (container == DockerContainer::Awg2) {
         QRegularExpression kernelVersionRegex(R"(Linux\s+(\d+)\.(\d+)[^\d]*)");
         QRegularExpressionMatch match = kernelVersionRegex.match(stdOut);
@@ -927,7 +983,7 @@ ErrorCode InstallController::rebootServer(const QString &serverId)
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
 
     QString script = QString("sudo reboot");
 
@@ -955,7 +1011,7 @@ ErrorCode InstallController::removeAllContainers(const QString &serverId)
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
     ErrorCode errorCode = sshSession.runScript(credentials, amnezia::scriptData(SharedScriptType::remove_all_containers));
 
     if (errorCode == ErrorCode::NoError) {
@@ -977,7 +1033,7 @@ ErrorCode InstallController::removeContainer(const QString &serverId, DockerCont
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
     const amnezia::ScriptVars removeContainerVars =
             amnezia::genBaseVars(credentials, container, QString(), QString());
     const bool removeDataVolume = (container == DockerContainer::MtProxy || container == DockerContainer::Telemt);
@@ -1086,7 +1142,7 @@ ErrorCode InstallController::scanServerForInstalledContainers(const QString &ser
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
 
     QMap<DockerContainer, ContainerConfig> installedContainers;
     ErrorCode errorCode = getAlreadyInstalledContainers(credentials, installedContainers, sshSession);
@@ -1129,7 +1185,7 @@ ErrorCode InstallController::scanServerForInstalledContainers(const QString &ser
 ErrorCode InstallController::installServer(const ServerCredentials &credentials, DockerContainer container, int port,
                                            TransportProto transportProto, bool &wasContainerInstalled)
 {
-    SshSession sshSession;
+    SshSession sshSession(this);
     QMap<DockerContainer, ContainerConfig> installedContainers;
     ErrorCode errorCode = getAlreadyInstalledContainers(credentials, installedContainers, sshSession);
     if (errorCode) {
@@ -1198,7 +1254,7 @@ ErrorCode InstallController::installContainer(const QString &serverId, DockerCon
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
     
     QMap<DockerContainer, ContainerConfig> installedContainers;
     ErrorCode errorCode = getAlreadyInstalledContainers(credentials, installedContainers, sshSession);
@@ -1240,7 +1296,7 @@ ErrorCode InstallController::installContainer(const QString &serverId, DockerCon
 ErrorCode InstallController::checkSshConnection(ServerCredentials &credentials, QString &output,
                                                 std::function<QString()> passphraseCallback)
 {
-    SshSession sshSession;
+    SshSession sshSession(this);
     ErrorCode errorCode = ErrorCode::NoError;
 
     if (credentials.secretData.contains("BEGIN") && credentials.secretData.contains("PRIVATE KEY")) {
@@ -1521,7 +1577,7 @@ ErrorCode InstallController::setDockerContainerEnabledState(const QString &serve
         return ErrorCode::InternalError;
     }
     const QString containerName = ContainerUtils::containerToString(container);
-    SshSession sshSession;
+    SshSession sshSession(this);
     const QString script = enabled ? QStringLiteral("sudo docker start %1").arg(containerName)
                                    : QStringLiteral("sudo docker stop %1").arg(containerName);
     const ErrorCode runError = sshSession.runScript(credentials, script);
@@ -1561,7 +1617,7 @@ ErrorCode InstallController::queryDockerContainerStatus(const QString &serverId,
         stdOut += data;
         return ErrorCode::NoError;
     };
-    SshSession sshSession;
+    SshSession sshSession(this);
     const QString script = QStringLiteral(
             "sudo docker inspect --format '{{.State.Status}}' %1 2>/dev/null || echo 'not_found'")
             .arg(containerName);
@@ -1595,7 +1651,7 @@ ErrorCode InstallController::queryMtProxyDiagnostics(const QString &serverId, Do
     if (!credentials.isValid()) {
         return ErrorCode::InternalError;
     }
-    SshSession sshSession;
+    SshSession sshSession(this);
     return MtProxyInstaller::queryDiagnostics(sshSession, credentials, container, listenPort, out);
 }
 
@@ -1618,7 +1674,7 @@ QString InstallController::fetchDockerContainerSecret(const QString &serverId, D
         stdOut += data;
         return ErrorCode::NoError;
     };
-    SshSession sshSession;
+    SshSession sshSession(this);
     const QString path = QStringLiteral("/data/secret");
     const QString cmd = QStringLiteral("sudo docker exec %1 cat %2").arg(containerName, path);
     const ErrorCode errorCode = sshSession.runScript(credentials, cmd, cbReadStdOut);

client/core/controllers/settingsController.cpp

@@ -8,10 +8,19 @@
 #include "version.h"
 #include "ui/utils/qAutoStart.h"
 #include "logger.h"
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    #include "core/local-proxy/portavailabilityhelper.h"
+#endif
 #ifdef Q_OS_ANDROID
     #include "platforms/android/android_controller.h"
 #endif
 
+namespace {
+constexpr int kDefaultProxyPort = 10808;
+constexpr int kLocalProxyPortMin = 1024;
+constexpr int kLocalProxyPortMax = 65535;
+}
+
 QString getPlatformName()
 {
 #if defined(Q_OS_WINDOWS)
@@ -38,6 +47,11 @@ SettingsController::SettingsController(SecureServersRepository* serversRepositor
 {
     m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
     m_isDevModeEnabled = m_appSettingsRepository->isDevGatewayEnv();
+
+    connect(m_appSettingsRepository, &SecureAppSettingsRepository::localProxySettingsChanged, this,
+            &SettingsController::localProxySettingsUpdated);
+    connect(m_appSettingsRepository, &SecureAppSettingsRepository::localProxyStartFailed, this,
+            &SettingsController::localProxyStartFailed);
 }
 
 void SettingsController::toggleAmneziaDns(bool enable)
@@ -366,3 +380,114 @@ QString SettingsController::nextAvailableServerName() const
     return m_serversRepository->nextAvailableServerName();
 }
 
+bool SettingsController::isLocalProxySupported() const
+{
+#ifdef AMNEZIA_DESKTOP
+    return true;
+#else
+    return false;
+#endif
+}
+
+bool SettingsController::isLocalProxyHttpEnabled() const
+{
+    return m_appSettingsRepository->isLocalProxyHttpEnabled();
+}
+
+int SettingsController::localProxyPort() const
+{
+    return static_cast<int>(m_appSettingsRepository->localProxyPort());
+}
+
+QString SettingsController::localProxyOwnerId() const
+{
+    return m_appSettingsRepository->localProxyOwnerId();
+}
+
+bool SettingsController::isLocalProxyPortUserDefined() const
+{
+    return m_appSettingsRepository->isLocalProxyPortUserDefined();
+}
+
+bool SettingsController::setLocalProxyPort(int port)
+{
+    if (port < kLocalProxyPortMin || port > kLocalProxyPortMax) {
+        return false;
+    }
+
+    if (m_appSettingsRepository->localProxyPort() == static_cast<quint16>(port)) {
+        m_appSettingsRepository->setLocalProxyPortUserDefined(true);
+        return true;
+    }
+
+    m_appSettingsRepository->setLocalProxyPort(static_cast<quint16>(port));
+    m_appSettingsRepository->setLocalProxyPortUserDefined(true);
+    return true;
+}
+
+bool SettingsController::isLocalProxyPortBusy(int port) const
+{
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    return !PortAvailabilityHelper::isPortAvailable(port);
+#else
+    Q_UNUSED(port);
+    return false;
+#endif
+}
+
+int SettingsController::findFirstAvailableLocalProxyPort(int startPort) const
+{
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    const auto port = PortAvailabilityHelper::findFirstAvailablePort(startPort, kLocalProxyPortMax);
+    return port ? *port : -1;
+#else
+    Q_UNUSED(startPort);
+    return -1;
+#endif
+}
+
+bool SettingsController::enableLocalProxy(const QString &ownerId, int port)
+{
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    Q_UNUSED(ownerId);
+    Q_UNUSED(port);
+    return false;
+#else
+    if (port < kLocalProxyPortMin || port > kLocalProxyPortMax || ownerId.isEmpty()) {
+        return false;
+    }
+
+    if (m_appSettingsRepository->isLocalProxyHttpEnabled() && m_appSettingsRepository->localProxyOwnerId() != ownerId) {
+        return false;
+    }
+
+    int selectedPort = port;
+
+    const bool isUserDefinedPort = m_appSettingsRepository->isLocalProxyPortUserDefined();
+    if (isUserDefinedPort) {
+        if (!PortAvailabilityHelper::isPortAvailable(selectedPort)) {
+            return false;
+        }
+    } else if (selectedPort != kDefaultProxyPort && !PortAvailabilityHelper::isPortAvailable(selectedPort)) {
+        return false;
+    }
+
+    if (m_appSettingsRepository->localProxyPort() != static_cast<quint16>(selectedPort)) {
+        m_appSettingsRepository->setLocalProxyPort(static_cast<quint16>(selectedPort));
+    }
+    m_appSettingsRepository->setLocalProxyPortUserDefined(isUserDefinedPort);
+
+    m_appSettingsRepository->setLocalProxyOwnerId(ownerId);
+    m_appSettingsRepository->setLocalProxyHttpEnabled(true);
+
+    return true;
+#endif
+}
+
+void SettingsController::disableLocalProxy()
+{
+    if (m_appSettingsRepository->isLocalProxyHttpEnabled()) {
+        m_appSettingsRepository->setLocalProxyHttpEnabled(false);
+    }
+}
+

client/core/controllers/settingsController.h

@@ -89,6 +89,18 @@ public:
     QLocale getAppLanguage() const;
     void setAppLanguage(const QLocale &locale);
 
+    // Local proxy
+    bool isLocalProxySupported() const;
+    bool isLocalProxyHttpEnabled() const;
+    int localProxyPort() const;
+    QString localProxyOwnerId() const;
+    bool isLocalProxyPortUserDefined() const;
+    bool setLocalProxyPort(int port);
+    bool isLocalProxyPortBusy(int port) const;
+    int findFirstAvailableLocalProxyPort(int startPort) const;
+    bool enableLocalProxy(const QString &ownerId, int port);
+    void disableLocalProxy();
+
 signals:
     void siteSplitTunnelingRouteModeChanged(RouteMode mode);
     void siteSplitTunnelingToggled(bool enabled);
@@ -96,6 +108,9 @@ signals:
     void appSplitTunnelingToggled(bool enabled);
     void appSplitTunnelingClearAppsList();
 
+    void localProxySettingsUpdated();
+    void localProxyStartFailed(const QString &message);
+
 private:
     QString getPlatform() const;
 

client/core/controllers/updateController.cpp

@@ -95,8 +95,7 @@ void UpdateController::fetchGatewayUrl()
     auto gatewayController = QSharedPointer<GatewayController>::create(m_appSettingsRepository->getGatewayEndpoint(),
                                                                        m_appSettingsRepository->isDevGatewayEnv(),
                                                                        7000,
-                                                                       m_appSettingsRepository->isStrictKillSwitchEnabled(),
-                                                                       m_appSettingsRepository);
+                                                                       m_appSettingsRepository->isStrictKillSwitchEnabled());
 
     QJsonObject apiPayload;
     apiPayload[apiDefs::key::cliVersion] = QString(APP_VERSION);

client/core/installers/mtProxyInstaller.cpp

@@ -71,62 +71,48 @@ ErrorCode MtProxyInstaller::queryDiagnostics(SshSession &sshSession, const Serve
                                              DockerContainer container, int listenPort,
                                              MtProxyContainerDiagnostics &out)
 {
-    out = { };
-    if (container == DockerContainer::MtProxy || container == DockerContainer::Telemt) {
-        const QString containerName = ContainerUtils::containerToString(container);
-        const bool isTelemt = container == DockerContainer::Telemt;
-
-        const QString sportFilter = QString::number(listenPort);
-        const QString peersCmd = QStringLiteral("sudo conntrack -L -p tcp --dport ") + sportFilter
-                + QStringLiteral(" 2>/dev/null | grep ESTABLISHED | awk '{for(i=1;i<=NF;i++) if($i ~ /^src=/){print "
-                                 "substr($i,5); break}}'");
-        const QString publicFilter = QStringLiteral(" | grep -vE "
-                                                    "'^(10\\.|127\\.|169\\.254\\.|192\\.168\\.|172\\.(1[6-9]|2[0-9]|3["
-                                                    "01])\\.|::1$|fe80:|f[cd][0-9a-f][0-9a-f]:)'");
-        const QString clientsCmd =
-                QStringLiteral("CLIENTS=$(") + peersCmd + publicFilter + QStringLiteral(" | sort -u | grep -c .); ");
-        const QString confFile =
-                isTelemt ? QStringLiteral("/data/config.toml") : QStringLiteral("/data/proxy-multi.conf");
-        const QString statsUrl = QString();
-
-        const QString script = QStringLiteral("CN=") + containerName + QStringLiteral("; ")
-                + QStringLiteral("PORT_OK=$(sudo ss -tlnp 2>/dev/null | grep -q :") + QString::number(listenPort)
-                + QStringLiteral(" && echo yes || echo no); ")
-                + QStringLiteral("TG_OK=$(curl -s --max-time 5 -o /dev/null -w '%{http_code}' "
-                                 "https://core.telegram.org/getProxySecret 2>/dev/null | grep -q '200' && echo yes || "
-                                 "echo no); ")
-                + clientsCmd + QStringLiteral("CONF_TIME=$(sudo docker exec \"$CN\" sh -c 'stat -c \"%y\" ") + confFile
-                + QStringLiteral(" 2>/dev/null | cut -d. -f1' 2>/dev/null || echo unknown); ")
-                + QStringLiteral("echo \"PORT_OK=${PORT_OK}\"; ") + QStringLiteral("echo \"TG_OK=${TG_OK}\"; ")
-                + QStringLiteral("echo \"CLIENTS=${CLIENTS:-0}\"; ") + QStringLiteral("echo \"CONF_TIME=${CONF_TIME}\"; ")
-                + QStringLiteral("echo \"STATS=") + statsUrl + QStringLiteral("\";");
-
-        QString stdOut;
-        auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-            stdOut += data;
-            return ErrorCode::NoError;
-        };
-        const ErrorCode errorCode = sshSession.runScript(credentials, script, cbReadStdOut);
-        if (errorCode != ErrorCode::NoError) {
-            return errorCode;
-        }
-        for (const QString &line : stdOut.split('\n', Qt::SkipEmptyParts)) {
-            if (line.startsWith(QLatin1String("PORT_OK="))) {
-                out.portReachable = line.mid(8).trimmed() == QLatin1String("yes");
-            } else if (line.startsWith(QLatin1String("TG_OK="))) {
-                out.upstreamReachable = line.mid(6).trimmed() == QLatin1String("yes");
-            } else if (line.startsWith(QLatin1String("CLIENTS="))) {
-                out.clientsConnected = line.mid(8).trimmed().toInt();
-            } else if (line.startsWith(QLatin1String("CONF_TIME="))) {
-                out.lastConfigRefresh = line.mid(10).trimmed();
-            } else if (line.startsWith(QLatin1String("STATS="))) {
-                out.statsEndpoint = line.mid(6).trimmed();
-            }
-        }
-        return ErrorCode::NoError;
+    out = {};
+    if (container != DockerContainer::MtProxy && container != DockerContainer::Telemt) {
+        return ErrorCode::InternalError;
     }
+    const QString containerName = ContainerUtils::containerToString(container);
+    const QString script =
+            QStringLiteral(
+                    "PORT_OK=$(sudo docker exec %1 sh -c 'ss -tlnp 2>/dev/null | grep -q :%2 && echo yes || echo no' 2>/dev/null || echo no); "
+                    "TG_OK=$(curl -s --max-time 5 -o /dev/null -w '%%{http_code}' https://core.telegram.org/getProxySecret 2>/dev/null | grep -q '200' && echo yes || echo no); "
+                    "CLIENTS=$(sudo docker exec amnezia-mtproxy sh -c 'curl -s --max-time 3 http://localhost:2398/stats 2>/dev/null | grep -o \"total_special_connections:[0-9]*\" | cut -d: -f2' 2>/dev/null); "
+                    "CONF_TIME=$(sudo docker exec amnezia-mtproxy sh -c 'stat -c \"%%y\" /data/proxy-multi.conf 2>/dev/null | cut -d. -f1' 2>/dev/null || echo unknown); "
+                    "echo \"PORT_OK=${PORT_OK}\"; "
+                    "echo \"TG_OK=${TG_OK}\"; "
+                    "echo \"CLIENTS=${CLIENTS:-0}\"; "
+                    "echo \"CONF_TIME=${CONF_TIME}\"; "
+                    "echo \"STATS=http://localhost:2398/stats\";")
+                    .arg(containerName)
+                    .arg(listenPort);
 
-    return ErrorCode::InternalError;
+    QString stdOut;
+    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
+        stdOut += data;
+        return ErrorCode::NoError;
+    };
+    const ErrorCode errorCode = sshSession.runScript(credentials, script, cbReadStdOut);
+    if (errorCode != ErrorCode::NoError) {
+        return errorCode;
+    }
+    for (const QString &line : stdOut.split('\n', Qt::SkipEmptyParts)) {
+        if (line.startsWith(QLatin1String("PORT_OK="))) {
+            out.portReachable = line.mid(8).trimmed() == QLatin1String("yes");
+        } else if (line.startsWith(QLatin1String("TG_OK="))) {
+            out.upstreamReachable = line.mid(6).trimmed() == QLatin1String("yes");
+        } else if (line.startsWith(QLatin1String("CLIENTS="))) {
+            out.clientsConnected = line.mid(8).trimmed().toInt();
+        } else if (line.startsWith(QLatin1String("CONF_TIME="))) {
+            out.lastConfigRefresh = line.mid(10).trimmed();
+        } else if (line.startsWith(QLatin1String("STATS="))) {
+            out.statsEndpoint = line.mid(6).trimmed();
+        }
+    }
+    return ErrorCode::NoError;
 }
 
 void MtProxyInstaller::uploadClientSettingsSnapshot(SshSession &sshSession, const ServerCredentials &credentials,

client/core/local-proxy/configmanager.cpp

@@ -0,0 +1,444 @@
+#include "configmanager.h"
+
+#include "core/controllers/gatewayController.h"
+#include "core/repositories/secureAppSettingsRepository.h"
+#include "core/repositories/secureServersRepository.h"
+#include "core/utils/api/apiUtils.h"
+#include "core/utils/constants/apiConstants.h"
+#include "core/utils/constants/apiKeys.h"
+#include "core/utils/constants/configKeys.h"
+#include "core/utils/containers/containerUtils.h"
+#include "portavailabilityhelper.h"
+#include "proxylogger.h"
+#include "version.h"
+
+#include <QDir>
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonParseError>
+#include <QSaveFile>
+#include <QSysInfo>
+#include <QStandardPaths>
+#include <QUuid>
+
+using namespace amnezia;
+
+ConfigManager::ConfigManager(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository)
+    : m_serversRepository(serversRepository), m_appSettingsRepository(appSettingsRepository)
+{
+    ProxyLogger::getInstance().debug("ConfigManager initialized (repository-backed)");
+}
+
+namespace {
+namespace gateway_key {
+constexpr char vless[] = "vless";
+} // namespace gateway_key
+
+constexpr quint16 kDefaultProxyPort = 10808;
+constexpr int kProxyPortMin = 1024;
+constexpr int kProxyPortMax = 65535;
+
+int resolveProxyPort(SecureAppSettingsRepository *appSettings)
+{
+    if (!appSettings) {
+        return kDefaultProxyPort;
+    }
+
+    const quint16 port = appSettings->localProxyPort();
+    if (port < kProxyPortMin || port > kProxyPortMax) {
+        return kDefaultProxyPort;
+    }
+
+    return static_cast<int>(port);
+}
+
+} // namespace
+
+bool ConfigManager::applyProxyPortToConfig(QJsonObject &config, int port) const
+{
+    if (!config.contains("inbounds") || !config.value("inbounds").isArray()) {
+        return false;
+    }
+
+    QJsonArray inbounds = config.value("inbounds").toArray();
+    if (inbounds.isEmpty() || !inbounds.at(0).isObject()) {
+        return false;
+    }
+
+    QJsonObject firstInbound = inbounds.at(0).toObject();
+    firstInbound.insert("port", port);
+    inbounds[0] = firstInbound;
+    config.insert("inbounds", inbounds);
+    return true;
+}
+
+QString ConfigManager::serializeConfig(const QJsonObject &config) const
+{
+    return QString::fromUtf8(QJsonDocument(config).toJson(QJsonDocument::Compact));
+}
+
+std::optional<ConfigManager::ConfigData> ConfigManager::buildConfig(QString &errorDescription) const
+{
+    errorDescription.clear();
+
+    if (!m_serversRepository || !m_appSettingsRepository) {
+        const QString message = QStringLiteral("Local proxy repositories are not available");
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const QString ownerId = m_appSettingsRepository->localProxyOwnerId();
+    if (ownerId.isEmpty()) {
+        const QString message = QStringLiteral("Local proxy owner server id is not configured");
+        ProxyLogger::getInstance().warning(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const auto ownerServer = m_serversRepository->serverJsonById(ownerId);
+    if (!ownerServer) {
+        const QString message = QStringLiteral("Owner server with id %1 not found").arg(ownerId);
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    if (!apiUtils::isPremiumServer(*ownerServer)) {
+        const QString message = QStringLiteral("Server %1 is not premium, local proxy is unavailable")
+                                        .arg(ownerServer->value(configKey::name).toString());
+        ProxyLogger::getInstance().warning(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const auto serializedConfig = extractSerializedXrayConfig(*ownerServer);
+    if (!serializedConfig || serializedConfig->isEmpty()) {
+        const QString message = QStringLiteral("Server %1 lacks Xray last_config payload")
+                                        .arg(ownerServer->value(configKey::name).toString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    QJsonParseError parseError;
+    const QJsonDocument doc = QJsonDocument::fromJson(serializedConfig->toUtf8(), &parseError);
+    if (parseError.error != QJsonParseError::NoError || !doc.isObject()) {
+        const QString message = QStringLiteral("Failed to parse Xray config JSON: %1").arg(parseError.errorString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    ConfigData data;
+    data.ownerId = ownerId;
+    data.serverName = ownerServer->value(configKey::name).toString();
+    data.parsedConfig = doc.object();
+    const int proxyPort = resolveProxyPort(m_appSettingsRepository);
+    if (applyProxyPortToConfig(data.parsedConfig, proxyPort)) {
+        data.serializedConfig = serializeConfig(data.parsedConfig);
+    } else {
+        ProxyLogger::getInstance().warning(QStringLiteral("Failed to override local proxy inbound port; using original config"));
+        data.serializedConfig = *serializedConfig;
+    }
+
+    return data;
+}
+
+std::optional<ConfigManager::ConfigData> ConfigManager::buildConfigWithFetch(QString &errorDescription) const
+{
+    errorDescription.clear();
+
+    if (!m_serversRepository || !m_appSettingsRepository) {
+        const QString message = QStringLiteral("Local proxy repositories are not available");
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const QString ownerId = m_appSettingsRepository->localProxyOwnerId();
+    if (ownerId.isEmpty()) {
+        const QString message = QStringLiteral("Local proxy owner server id is not configured");
+        ProxyLogger::getInstance().warning(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const auto ownerServer = m_serversRepository->serverJsonById(ownerId);
+    if (!ownerServer) {
+        const QString message = QStringLiteral("Owner server with id %1 not found").arg(ownerId);
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    if (!apiUtils::isPremiumServer(*ownerServer)) {
+        const QString message = QStringLiteral("Server %1 is not premium, local proxy is unavailable")
+                                        .arg(ownerServer->value(configKey::name).toString());
+        ProxyLogger::getInstance().warning(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    auto serializedConfig = extractSerializedXrayConfig(*ownerServer);
+    if (!serializedConfig || serializedConfig->isEmpty()) {
+        auto fetchedConfig = fetchSerializedXrayConfigFromGateway(*ownerServer, errorDescription);
+        if (!fetchedConfig || fetchedConfig->isEmpty()) {
+            return std::nullopt;
+        }
+        serializedConfig = fetchedConfig;
+    }
+
+    QJsonParseError parseError;
+    const QJsonDocument doc = QJsonDocument::fromJson(serializedConfig->toUtf8(), &parseError);
+    if (parseError.error != QJsonParseError::NoError || !doc.isObject()) {
+        const QString message = QStringLiteral("Failed to parse Xray config JSON: %1").arg(parseError.errorString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    ConfigData data;
+    data.ownerId = ownerId;
+    data.serverName = ownerServer->value(configKey::name).toString();
+    data.parsedConfig = doc.object();
+
+    int selectedPort = resolveProxyPort(m_appSettingsRepository);
+    const bool isUserDefinedPort = m_appSettingsRepository->isLocalProxyPortUserDefined();
+
+    if (!PortAvailabilityHelper::isPortAvailable(selectedPort)) {
+        const bool canAutoSelect = !isUserDefinedPort && selectedPort == kDefaultProxyPort;
+        if (canAutoSelect) {
+            const auto freePort = PortAvailabilityHelper::findFirstAvailablePort(kDefaultProxyPort + 1, kProxyPortMax);
+            if (!freePort) {
+                errorDescription = QStringLiteral("No available local proxy port in range %1-%2")
+                                       .arg(kDefaultProxyPort + 1)
+                                       .arg(kProxyPortMax);
+                ProxyLogger::getInstance().error(errorDescription);
+                return std::nullopt;
+            }
+            selectedPort = *freePort;
+        } else {
+            errorDescription = QStringLiteral("Local proxy port %1 is already in use")
+                                   .arg(selectedPort);
+            ProxyLogger::getInstance().error(errorDescription);
+            return std::nullopt;
+        }
+    }
+
+    if (applyProxyPortToConfig(data.parsedConfig, selectedPort)) {
+        data.serializedConfig = serializeConfig(data.parsedConfig);
+    } else {
+        ProxyLogger::getInstance().warning(QStringLiteral("Failed to override local proxy inbound port; using original config"));
+        data.serializedConfig = *serializedConfig;
+    }
+
+    return data;
+}
+
+bool ConfigManager::writeTempConfig(const QString &serializedConfig, QString &configPath, QString &errorDescription) const
+{
+    errorDescription.clear();
+    configPath.clear();
+
+    const QString directory = tempDirectory();
+    if (!QDir().mkpath(directory)) {
+        const QString message = QStringLiteral("Failed to create temp config directory: %1").arg(directory);
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return false;
+    }
+
+    const QString path = tempConfigPath();
+    QSaveFile file(path);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        const QString message = QStringLiteral("Failed to open temp config file %1: %2").arg(path, file.errorString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return false;
+    }
+
+    if (file.write(serializedConfig.toUtf8()) == -1) {
+        const QString message = QStringLiteral("Failed to write temp config file %1: %2").arg(path, file.errorString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return false;
+    }
+
+    if (!file.commit()) {
+        const QString message = QStringLiteral("Failed to commit temp config file %1").arg(path);
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return false;
+    }
+
+    ProxyLogger::getInstance().info(QStringLiteral("Xray config saved to %1").arg(path));
+    configPath = path;
+    return true;
+}
+
+bool ConfigManager::removeTempConfig() const
+{
+    const QString path = tempConfigPath();
+    QFile file(path);
+    if (!file.exists()) {
+        return true;
+    }
+
+    if (!file.remove()) {
+        ProxyLogger::getInstance().warning(QStringLiteral("Failed to remove temp config file %1: %2").arg(path, file.errorString()));
+        return false;
+    }
+
+    ProxyLogger::getInstance().debug(QStringLiteral("Removed temp config file %1").arg(path));
+    return true;
+}
+
+QString ConfigManager::tempConfigPath() const
+{
+    return QDir(tempDirectory()).filePath(QStringLiteral("xray_active.json"));
+}
+
+std::optional<QString> ConfigManager::extractSerializedXrayConfig(const QJsonObject &server) const
+{
+    const QJsonArray containers = server.value(configKey::containers).toArray();
+    const QString targetContainer = ContainerUtils::containerToString(DockerContainer::Xray);
+    const QString protoKey = QString(configKey::xray);
+
+    for (const QJsonValue &value : containers) {
+        const QJsonObject container = value.toObject();
+        if (container.value(configKey::container).toString() != targetContainer) {
+            continue;
+        }
+
+        const QJsonObject proto = container.value(protoKey).toObject();
+        const QString serialized = proto.value(configKey::lastConfig).toString();
+        if (!serialized.isEmpty()) {
+            return serialized;
+        }
+    }
+
+    return std::nullopt;
+}
+
+std::optional<QString> ConfigManager::fetchSerializedXrayConfigFromGateway(const QJsonObject &server, QString &errorDescription) const
+{
+    errorDescription.clear();
+
+    if (!m_appSettingsRepository) {
+        const QString message = QStringLiteral("App settings repository is not available");
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const QJsonObject apiConfig = server.value(apiDefs::key::apiConfig).toObject();
+    if (apiConfig.isEmpty()) {
+        const QString message = QStringLiteral("Server API config is missing");
+        ProxyLogger::getInstance().warning(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const QString userCountryCode = apiConfig.value(apiDefs::key::userCountryCode).toString();
+    const QString serviceType = apiConfig.value(apiDefs::key::serviceType).toString();
+    if (userCountryCode.isEmpty() || serviceType.isEmpty()) {
+        const QString message = QStringLiteral("Server API config lacks service identifiers");
+        ProxyLogger::getInstance().warning(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    QJsonObject apiPayload;
+    apiPayload[apiDefs::key::osVersion] = QSysInfo::productType();
+    apiPayload[apiDefs::key::appVersion] = QString(APP_VERSION);
+
+    const QString appLanguage = m_appSettingsRepository->getAppLanguage().name().split("_").first();
+    if (!appLanguage.isEmpty()) {
+        apiPayload[apiDefs::key::appLanguage] = appLanguage;
+    }
+
+    apiPayload[apiDefs::key::uuid] = m_appSettingsRepository->getInstallationUuid(true);
+    apiPayload[apiDefs::key::userCountryCode] = userCountryCode;
+    apiPayload[apiDefs::key::serviceType] = serviceType;
+    apiPayload[apiDefs::key::serviceProtocol] = QString(gateway_key::vless);
+    apiPayload[apiDefs::key::publicKey] = QUuid::createUuid().toString(QUuid::WithoutBraces);
+
+    const QJsonObject authData = server.value(apiDefs::key::authData).toObject();
+    if (!authData.isEmpty()) {
+        apiPayload[apiDefs::key::authData] = authData;
+    }
+
+    GatewayController gatewayController(m_appSettingsRepository->getGatewayEndpoint(), m_appSettingsRepository->isDevGatewayEnv(),
+                                        apiDefs::requestTimeoutMsecs, m_appSettingsRepository->isStrictKillSwitchEnabled());
+
+    QByteArray responseBody;
+    const amnezia::ErrorCode errorCode = gatewayController.post(QString("%1v1/config"), apiPayload, responseBody);
+    if (errorCode != amnezia::ErrorCode::NoError) {
+        const QString message = QStringLiteral("Gateway request failed with error code %1").arg(static_cast<int>(errorCode));
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    QJsonParseError responseError;
+    const QJsonDocument responseDoc = QJsonDocument::fromJson(responseBody, &responseError);
+    if (responseError.error != QJsonParseError::NoError || !responseDoc.isObject()) {
+        const QString message = QStringLiteral("Failed to parse gateway response: %1").arg(responseError.errorString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    QString data = responseDoc.object().value(configKey::config).toString();
+    if (data.isEmpty()) {
+        const QString message = QStringLiteral("Gateway response lacks config payload");
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    data.replace("vpn://", "");
+    QByteArray decoded = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+    if (decoded.isEmpty()) {
+        const QString message = QStringLiteral("Gateway config payload is empty");
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const QByteArray uncompressed = qUncompress(decoded);
+    if (!uncompressed.isEmpty()) {
+        decoded = uncompressed;
+    }
+
+    QJsonParseError configError;
+    const QJsonDocument configDoc = QJsonDocument::fromJson(decoded, &configError);
+    if (configError.error != QJsonParseError::NoError || !configDoc.isObject()) {
+        const QString message = QStringLiteral("Failed to parse gateway config JSON: %1").arg(configError.errorString());
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    const auto serializedConfig = extractSerializedXrayConfig(configDoc.object());
+    if (!serializedConfig || serializedConfig->isEmpty()) {
+        const QString message = QStringLiteral("Gateway response lacks Xray last_config payload");
+        ProxyLogger::getInstance().error(message);
+        errorDescription = message;
+        return std::nullopt;
+    }
+
+    ProxyLogger::getInstance().info("Fetched Xray config from gateway");
+    return serializedConfig;
+}
+
+QString ConfigManager::tempDirectory() const
+{
+    const QString baseDir = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
+    if (baseDir.isEmpty()) {
+        return QDir::temp().filePath(QStringLiteral("amnezia_local_proxy"));
+    }
+    return QDir(baseDir).filePath(QStringLiteral("local_proxy"));
+}

client/core/local-proxy/configmanager.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <optional>
+
+#include <QJsonObject>
+#include <QString>
+
+class SecureServersRepository;
+class SecureAppSettingsRepository;
+
+class ConfigManager {
+public:
+    struct ConfigData {
+        QString ownerId;
+        QString serverName;
+        QString serializedConfig;
+        QJsonObject parsedConfig;
+    };
+
+    ConfigManager(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository);
+
+    std::optional<ConfigData> buildConfig(QString &errorDescription) const;
+    std::optional<ConfigData> buildConfigWithFetch(QString &errorDescription) const;
+    bool writeTempConfig(const QString &serializedConfig, QString &configPath, QString &errorDescription) const;
+    bool removeTempConfig() const;
+    QString tempConfigPath() const;
+
+private:
+    std::optional<QString> extractSerializedXrayConfig(const QJsonObject &server) const;
+    std::optional<QString> fetchSerializedXrayConfigFromGateway(const QJsonObject &server, QString &errorDescription) const;
+    QString tempDirectory() const;
+    bool applyProxyPortToConfig(QJsonObject &config, int port) const;
+    QString serializeConfig(const QJsonObject &config) const;
+
+    SecureServersRepository *m_serversRepository;
+    SecureAppSettingsRepository *m_appSettingsRepository;
+};

client/core/local-proxy/httpapi.cpp

@@ -0,0 +1,190 @@
+#include "httpapi.h"
+#include "proxylogger.h"
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QHostAddress>
+#include <optional>
+
+namespace {
+
+std::optional<int> extractInboundPort(const QJsonObject &config)
+{
+    if (!config.contains("inbounds") || !config["inbounds"].isArray()) {
+        return std::nullopt;
+    }
+
+    const QJsonArray inbounds = config["inbounds"].toArray();
+    if (inbounds.isEmpty() || !inbounds.at(0).isObject()) {
+        return std::nullopt;
+    }
+
+    const QJsonObject firstInbound = inbounds.at(0).toObject();
+    if (!firstInbound.contains("port")) {
+        return std::nullopt;
+    }
+
+    return firstInbound.value("port").toInt();
+}
+
+QJsonValue proxyPortValue(const std::optional<int> &port)
+{
+    if (port.has_value()) {
+        return QJsonValue(*port);
+    }
+    return QJsonValue::Null;
+}
+
+QHttpServerResponse makeServiceUnavailablePingResponse()
+{
+    QJsonObject payload{
+        {"status", "error"},
+        {"proxyPort", QJsonValue::Null}
+    };
+    return QHttpServerResponse(payload, QHttpServerResponse::StatusCode::ServiceUnavailable);
+}
+
+QHttpServerResponse makeServiceUnavailableStatusResponse()
+{
+    QJsonObject payload{
+        {"status", "error"}
+    };
+    return QHttpServerResponse(payload, QHttpServerResponse::StatusCode::ServiceUnavailable);
+}
+
+} // namespace
+
+HttpApi::HttpApi(QWeakPointer<IProxyService> service, QObject* parent)
+    : QObject(parent)
+    , m_tcpServer(new QTcpServer(this))
+    , m_service(service)
+{
+    ProxyLogger::getInstance().debug("HttpApi initialized");
+}
+
+HttpApi::~HttpApi()
+{
+    stop();
+}
+
+bool HttpApi::start(quint16 port)
+{
+    ProxyLogger::getInstance().info(QString("Starting HTTP API server on port %1").arg(port));
+    
+    if (!m_tcpServer->listen(QHostAddress::LocalHost, port)) {
+        ProxyLogger::getInstance().error(QString("Failed to start HTTP API server on port %1").arg(port));
+        return false;
+    }
+
+    setupRoutes();
+    m_server.bind(m_tcpServer.data());
+    
+    ProxyLogger::getInstance().info(QString("HTTP API server is running on localhost:%1").arg(m_tcpServer->serverPort()));
+    ProxyLogger::getInstance().debug("Available endpoints:\n"
+                              "  POST   /api/v1/up\n"
+                              "  POST   /api/v1/down\n"
+                              "  GET    /api/v1/ping");
+    return true;
+}
+
+void HttpApi::stop()
+{
+    ProxyLogger::getInstance().info("Stopping HTTP API server");
+    if (m_tcpServer) {
+        m_tcpServer->close();
+    }
+}
+
+void HttpApi::setupRoutes()
+{
+    ProxyLogger::getInstance().debug("Setting up HTTP API routes");
+
+    m_server.route("/api/v1/up", QHttpServerRequest::Method::Post,
+        [this] {
+            ProxyLogger::getInstance().debug("Handling POST /api/v1/up request");
+            return handlePostUp();
+        });
+
+    m_server.route("/api/v1/down", QHttpServerRequest::Method::Post,
+        [this] {
+            ProxyLogger::getInstance().debug("Handling POST /api/v1/down request");
+            return handlePostDown();
+        });
+
+    m_server.route("/api/v1/ping", QHttpServerRequest::Method::Get,
+        [this] {
+            ProxyLogger::getInstance().debug("Handling GET /api/v1/ping request");
+            return handleGetPing();
+        });
+}
+
+QHttpServerResponse HttpApi::handlePostUp()
+{
+    if (auto service = m_service.lock()) {
+        const bool started = service->startXray();
+        QJsonObject response;
+        response["status"] = started ? "ok" : "error";
+
+        const auto port = started ? extractInboundPort(service->getConfig()) : std::optional<int>{};
+        response["proxyPort"] = proxyPortValue(port);
+
+        if (started) {
+            if (port.has_value()) {
+                ProxyLogger::getInstance().info(QString("Xray process started on port %1").arg(*port));
+            } else {
+                ProxyLogger::getInstance().warning("Xray started but inbound port is unknown (local proxy owner may be missing)");
+            }
+        } else {
+            ProxyLogger::getInstance().warning("Failed to start Xray process via HTTP API");
+        }
+
+        return QHttpServerResponse(response);
+    }
+
+    ProxyLogger::getInstance().error("Service unavailable: proxy backend is not initialized");
+    return makeServiceUnavailablePingResponse();
+}
+
+QHttpServerResponse HttpApi::handlePostDown()
+{
+    if (auto service = m_service.lock()) {
+        const bool stopped = service->stopXray();
+        QJsonObject response;
+        response["status"] = stopped ? "ok" : "error";
+        if (!stopped) {
+            ProxyLogger::getInstance().warning("Failed to stop Xray process via HTTP API");
+        } else {
+            ProxyLogger::getInstance().info("Xray process stopped via HTTP API");
+        }
+
+        return QHttpServerResponse(response);
+    }
+
+    ProxyLogger::getInstance().error("Service unavailable: proxy backend is not initialized");
+    return makeServiceUnavailableStatusResponse();
+}
+
+QHttpServerResponse HttpApi::handleGetPing() const
+{
+    if (auto service = m_service.lock()) {
+        QJsonObject response;
+        response["status"] = "ok";
+        const bool isRunning = service->isXrayRunning();
+        if (isRunning) {
+            const auto port = extractInboundPort(service->getConfig());
+            response["proxyPort"] = proxyPortValue(port);
+            if (port.has_value()) {
+                ProxyLogger::getInstance().debug(QString("Xray port: %1").arg(*port));
+            } else {
+                ProxyLogger::getInstance().warning("Unable to detect inbound port while Xray is running");
+            }
+        } else {
+            response["proxyPort"] = QJsonValue::Null;
+            ProxyLogger::getInstance().debug("Xray is not running");
+        }
+
+        return QHttpServerResponse(response);
+    }
+
+    ProxyLogger::getInstance().error("Service unavailable: proxy backend is not initialized");
+    return makeServiceUnavailablePingResponse();
+}

client/core/local-proxy/httpapi.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QHttpServer>
+#include <QHttpServerRequest>
+#include <QHttpServerResponse>
+#include <QTcpServer>
+#include <QWeakPointer>
+#include "iproxyservice.h"
+
+class HttpApi : public QObject {
+    Q_OBJECT
+
+public:
+    explicit HttpApi(QWeakPointer<IProxyService> service, QObject* parent = nullptr);
+    ~HttpApi();
+
+    bool start(quint16 port);
+    void stop();
+
+private:
+    void setupRoutes();
+
+    QHttpServerResponse handlePostUp();
+    QHttpServerResponse handlePostDown();
+    QHttpServerResponse handleGetPing() const;
+
+    QHttpServer m_server;
+    QScopedPointer<QTcpServer> m_tcpServer;
+    QWeakPointer<IProxyService> m_service;
+}; 

client/core/local-proxy/iproxyservice.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <QJsonObject>
+#include <QString>
+
+class IProxyService {
+public:
+    virtual ~IProxyService() = default;
+
+    virtual QJsonObject getConfig() = 0;
+
+    virtual bool startXray() = 0;
+    virtual bool stopXray() = 0;
+    virtual bool isXrayRunning() const = 0;
+    virtual qint64 getXrayProcessId() const = 0;
+    virtual QString getXrayError() const = 0;
+}; 

client/core/local-proxy/portavailabilityhelper.cpp

@@ -0,0 +1,43 @@
+#include "portavailabilityhelper.h"
+
+#include <QHostAddress>
+#include <QTcpServer>
+
+namespace {
+constexpr int kProxyPortMin = 1024;
+constexpr int kProxyPortMax = 65535;
+}
+
+bool PortAvailabilityHelper::isPortAvailable(int port)
+{
+    if (port < kProxyPortMin || port > kProxyPortMax) {
+        return false;
+    }
+
+    QTcpServer server;
+    const bool success = server.listen(QHostAddress::LocalHost, static_cast<quint16>(port));
+    server.close();
+    return success;
+}
+
+std::optional<int> PortAvailabilityHelper::findFirstAvailablePort(int startPort, int endPort)
+{
+    if (startPort < kProxyPortMin) {
+        startPort = kProxyPortMin;
+    }
+    if (endPort > kProxyPortMax) {
+        endPort = kProxyPortMax;
+    }
+    if (startPort > endPort) {
+        return std::nullopt;
+    }
+
+    for (int port = startPort; port <= endPort; ++port) {
+        if (isPortAvailable(port)) {
+            return port;
+        }
+    }
+
+    return std::nullopt;
+}
+

client/core/local-proxy/portavailabilityhelper.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <optional>
+
+class PortAvailabilityHelper
+{
+public:
+    static bool isPortAvailable(int port);
+    static std::optional<int> findFirstAvailablePort(int startPort, int endPort);
+};
+

client/core/local-proxy/proxylogger.cpp

@@ -0,0 +1,133 @@
+#include "proxylogger.h"
+#include <QDir>
+#include <QTextStream>
+
+ProxyLogger::ProxyLogger() : m_maxFileSize(0), m_currentLevel(LogLevel::Info)
+{
+}
+
+ProxyLogger::~ProxyLogger()
+{
+}
+
+ProxyLogger& ProxyLogger::getInstance()
+{
+    static ProxyLogger instance;
+    return instance;
+}
+
+void ProxyLogger::init(const QString& logPath, qint64 maxFileSize)
+{
+    QMutexLocker locker(&m_mutex);
+    m_logPath = logPath;
+    m_maxFileSize = maxFileSize;
+    
+    // Create logs directory if it doesn't exist
+    QDir dir = QFileInfo(m_logPath).dir();
+    if (!dir.exists()) {
+        dir.mkpath(".");
+    }
+}
+
+void ProxyLogger::setLogLevel(LogLevel level)
+{
+    m_currentLevel = level;
+}
+
+void ProxyLogger::log(LogLevel level, const QString& message)
+{
+    logInternal(level, message);
+}
+
+void ProxyLogger::debug(const QString& message)
+{
+    logInternal(LogLevel::Debug, message);
+}
+
+void ProxyLogger::info(const QString& message)
+{
+    logInternal(LogLevel::Info, message);
+}
+
+void ProxyLogger::warning(const QString& message)
+{
+    logInternal(LogLevel::Warning, message);
+}
+
+void ProxyLogger::error(const QString& message)
+{
+    logInternal(LogLevel::Error, message);
+}
+
+void ProxyLogger::logInternal(LogLevel level, const QString& message)
+{
+    if (m_logPath.isEmpty()) {
+        return;
+    }
+    
+    if (level < m_currentLevel) {
+        return;
+    }
+
+    QMutexLocker locker(&m_mutex);
+    
+    checkRotation();
+
+    QFile file(m_logPath);
+    if (!openLogFile(file)) {
+        return;
+    }
+
+    QTextStream stream(&file);
+    QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz");
+    stream << QString("[%1] [%2] %3\n").arg(timestamp, levelToString(level), message);
+    stream.flush();
+    file.close();
+}
+
+QString ProxyLogger::levelToString(LogLevel level)
+{
+    switch (level) {
+        case LogLevel::Debug:   return "DEBUG";
+        case LogLevel::Info:    return "INFO";
+        case LogLevel::Warning: return "WARNING";
+        case LogLevel::Error:   return "ERROR";
+        default:               return "UNKNOWN";
+    }
+}
+
+qint64 ProxyLogger::getCurrentFileSize() const
+{
+    QFile file(m_logPath);
+    if (file.exists()) {
+        return file.size();
+    }
+    return -1;
+}
+
+void ProxyLogger::checkRotation()
+{
+    if (m_maxFileSize > 0 && getCurrentFileSize() >= m_maxFileSize) {
+        // Delete the oldest file
+        QFile::remove(QString("%1.%2").arg(m_logPath).arg(MAX_BACKUP_FILES));
+
+        // Shift existing files
+        for (int i = MAX_BACKUP_FILES - 1; i >= 1; --i) {
+            QString oldName = QString("%1.%2").arg(m_logPath).arg(i);
+            QString newName = QString("%1.%2").arg(m_logPath).arg(i + 1);
+            QFile::rename(oldName, newName);
+        }
+
+        // Rename current file
+        QFile::rename(m_logPath, m_logPath + ".1");
+    }
+}
+
+bool ProxyLogger::openLogFile(QFile& file)
+{
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) {
+        qDebug() << "Failed to open log file:" << m_logPath;
+        return false;
+    }
+    return true;
+} 

client/core/local-proxy/proxylogger.h

@@ -0,0 +1,54 @@
+#ifndef LOCAL_PROXY_LOGGER_H
+#define LOCAL_PROXY_LOGGER_H
+
+#include <QObject>
+#include <QFile>
+#include <QDateTime>
+#include <QMutex>
+#include <QString>
+
+class ProxyLogger
+{
+
+public:
+    enum class LogLevel {
+        Debug,
+        Info,
+        Warning,
+        Error
+    };
+
+    static ProxyLogger& getInstance();
+
+    void init(const QString& logPath, qint64 maxFileSize = 1024 * 1024 * 10); // 10MB by default
+    void setLogLevel(LogLevel level);
+
+    // Main logging method
+    void log(LogLevel level, const QString& message);
+
+    // Helper methods for convenience
+    void debug(const QString& message);
+    void info(const QString& message);
+    void warning(const QString& message);
+    void error(const QString& message);
+
+private:
+    ProxyLogger();
+    ~ProxyLogger();
+    ProxyLogger(const ProxyLogger&) = delete;
+    ProxyLogger& operator=(const ProxyLogger&) = delete;
+
+    void logInternal(LogLevel level, const QString& message);
+    void checkRotation();
+    QString levelToString(LogLevel level);
+    bool openLogFile(QFile& file);
+    qint64 getCurrentFileSize() const;
+
+    QString m_logPath;
+    qint64 m_maxFileSize;
+    LogLevel m_currentLevel;
+    QMutex m_mutex;
+    static const int MAX_BACKUP_FILES = 3;
+};
+
+#endif // LOCAL_PROXY_LOGGER_H 

client/core/local-proxy/proxyserver.cpp

@@ -0,0 +1,114 @@
+#include "proxyserver.h"
+
+#include "core/repositories/secureAppSettingsRepository.h"
+#include "core/repositories/secureServersRepository.h"
+
+#include <QDebug>
+
+ProxyServer::ProxyServer(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
+                         QObject *parent)
+    : QObject(parent)
+    , m_appSettingsRepository(appSettingsRepository)
+    , m_service(new ProxyService(serversRepository, appSettingsRepository, this))
+{
+    m_lastRestartToken = m_appSettingsRepository ? m_appSettingsRepository->localProxyRestartToken() : 0;
+}
+
+ProxyServer::~ProxyServer()
+{
+    stop();
+}
+
+bool ProxyServer::start(quint16 port)
+{
+    if (m_isRunning) {
+        if (m_currentApiPort == port) {
+            qInfo() << "Local proxy: already running on port" << port;
+            return true;
+        }
+
+        qInfo() << "Local proxy: restarting on new port" << port;
+        stop();
+    }
+
+    m_api.reset(new HttpApi(m_service.toWeakRef()));
+    const bool apiStarted = m_api->start(port);
+    if (!apiStarted) {
+        qWarning() << "Local proxy: port is busy:" << port;
+        m_api.reset();
+        m_isRunning = false;
+        m_currentApiPort = 0;
+        return false;
+    }
+
+    m_isRunning = true;
+    m_currentApiPort = port;
+
+    return true;
+}
+
+void ProxyServer::stop()
+{
+    stopXrayProcess();
+    if (m_api) {
+        m_api->stop();
+        m_api.reset();
+    }
+    m_isRunning = false;
+    m_currentApiPort = 0;
+    m_currentProxyPort = 0;
+}
+
+bool ProxyServer::startXrayProcess()
+{
+    return m_service->startXray();
+}
+
+void ProxyServer::stopXrayProcess()
+{
+    m_service->stopXray();
+}
+
+bool ProxyServer::syncSettings()
+{
+    if (!m_isRunning) {
+        qDebug() << "Local proxy: syncSettings called but server is not running";
+        return false;
+    }
+
+    const quint16 newProxyPort = m_appSettingsRepository ? m_appSettingsRepository->localProxyPort() : 0;
+    const int restartToken = m_appSettingsRepository ? m_appSettingsRepository->localProxyRestartToken() : 0;
+    const bool xrayRunning = m_service->isXrayRunning();
+
+    if (!xrayRunning) {
+        qInfo() << "Local proxy: starting Xray on port" << newProxyPort;
+        const bool started = startXrayProcess();
+        if (started) {
+            m_currentProxyPort = newProxyPort;
+            m_lastRestartToken = restartToken;
+        }
+        return started;
+    }
+
+    if (m_lastRestartToken != restartToken) {
+        qInfo() << "Local proxy: restarting Xray due to config change token";
+        const bool restarted = m_service->restartXray();
+        if (restarted) {
+            m_currentProxyPort = newProxyPort;
+            m_lastRestartToken = restartToken;
+        }
+        return restarted;
+    }
+
+    if (m_currentProxyPort != newProxyPort) {
+        qInfo() << "Local proxy: proxy port changed from" << m_currentProxyPort << "to" << newProxyPort;
+        const bool restarted = m_service->restartXray();
+        if (restarted) {
+            m_currentProxyPort = newProxyPort;
+            m_lastRestartToken = restartToken;
+        }
+        return restarted;
+    }
+
+    return true;
+}

client/core/local-proxy/proxyserver.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QSharedPointer>
+
+#include "httpapi.h"
+#include "proxyservice.h"
+
+class SecureServersRepository;
+class SecureAppSettingsRepository;
+
+class ProxyServer : public QObject
+{
+    Q_OBJECT
+
+public:
+    ProxyServer(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
+                QObject *parent = nullptr);
+    ~ProxyServer();
+
+    bool start(quint16 port = 49490);
+    void stop();
+    bool syncSettings();
+
+private:
+    bool startXrayProcess();
+    void stopXrayProcess();
+
+    SecureAppSettingsRepository *m_appSettingsRepository;
+    QScopedPointer<HttpApi> m_api;
+    QSharedPointer<ProxyService> m_service;
+    bool m_isRunning {false};
+    quint16 m_currentApiPort {0};
+    quint16 m_currentProxyPort {0};
+    int m_lastRestartToken {0};
+};

client/core/local-proxy/proxyservice.cpp

@@ -0,0 +1,118 @@
+#include "proxyservice.h"
+
+#include "proxylogger.h"
+
+namespace {
+
+void logConfigError(const QString &errorMessage)
+{
+    if (!errorMessage.isEmpty()) {
+        ProxyLogger::getInstance().error(errorMessage);
+    }
+}
+
+} // namespace
+
+ProxyService::ProxyService(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
+                           QObject *parent)
+    : QObject(parent)
+    , m_configManager(new ConfigManager(serversRepository, appSettingsRepository))
+    , m_xrayController(new XrayController())
+{
+    ProxyLogger::getInstance().debug("ProxyService initialized");
+}
+
+QJsonObject ProxyService::getConfig()
+{
+    if (!m_cachedConfig.isEmpty()) {
+        return m_cachedConfig;
+    }
+
+    QString error;
+    const auto configData = m_configManager->buildConfigWithFetch(error);
+    if (!configData) {
+        logConfigError(error);
+        return {};
+    }
+
+    m_cachedConfig = configData->parsedConfig;
+    return m_cachedConfig;
+}
+
+bool ProxyService::startXray()
+{
+    ProxyLogger::getInstance().info("Starting Xray");
+
+    if (m_xrayController->isXrayRunning()) {
+        ProxyLogger::getInstance().info("Xray is already running");
+        return true;
+    }
+
+    QString error;
+    const auto configData = m_configManager->buildConfigWithFetch(error);
+    if (!configData) {
+        logConfigError(error);
+        return false;
+    }
+
+    const bool success = m_xrayController->start(configData->serializedConfig);
+    if (success) {
+        m_cachedConfig = configData->parsedConfig;
+        ProxyLogger::getInstance().info("Xray started successfully");
+        emit xrayStatusChanged(true);
+        return true;
+    }
+
+    ProxyLogger::getInstance().error(QStringLiteral("Failed to start Xray: %1").arg(m_xrayController->getError()));
+    return false;
+}
+
+bool ProxyService::stopXray()
+{
+    ProxyLogger::getInstance().info("Stopping Xray");
+    const bool stopped = m_xrayController->stop();
+    if (stopped) {
+        ProxyLogger::getInstance().info("Xray stopped");
+        emit xrayStatusChanged(false);
+        return true;
+    }
+
+    ProxyLogger::getInstance().warning(QStringLiteral("Failed to stop Xray: %1").arg(m_xrayController->getError()));
+    return false;
+}
+
+bool ProxyService::isXrayRunning() const
+{
+    return m_xrayController->isXrayRunning();
+}
+
+qint64 ProxyService::getXrayProcessId() const
+{
+    return m_xrayController->getProcessId();
+}
+
+QString ProxyService::getXrayError() const
+{
+    return m_xrayController->getError();
+}
+
+void ProxyService::clearCache()
+{
+    m_cachedConfig = QJsonObject();
+    ProxyLogger::getInstance().debug("ProxyService cache cleared");
+}
+
+bool ProxyService::restartXray()
+{
+    ProxyLogger::getInstance().info("Restarting Xray with updated config");
+    clearCache();
+
+    if (m_xrayController->isXrayRunning()) {
+        if (!stopXray()) {
+            ProxyLogger::getInstance().error("Failed to stop Xray during restart, aborting");
+            return false;
+        }
+    }
+
+    return startXray();
+}

client/core/local-proxy/proxyservice.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "configmanager.h"
+#include "iproxyservice.h"
+#include "xraycontroller.h"
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QJsonObject>
+
+class SecureServersRepository;
+class SecureAppSettingsRepository;
+
+class ProxyService : public QObject, public IProxyService {
+    Q_OBJECT
+
+public:
+    ProxyService(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
+                 QObject *parent = nullptr);
+    ~ProxyService() = default;
+
+    QJsonObject getConfig() override;
+    bool startXray() override;
+    bool stopXray() override;
+    bool isXrayRunning() const override;
+    qint64 getXrayProcessId() const override;
+    QString getXrayError() const override;
+
+    void clearCache();
+    bool restartXray();
+
+signals:
+    void xrayStatusChanged(bool running);
+
+private:
+    QScopedPointer<ConfigManager> m_configManager;
+    QScopedPointer<XrayController> m_xrayController;
+    QJsonObject m_cachedConfig;
+}; 

client/core/local-proxy/xraycontroller.cpp

@@ -0,0 +1,105 @@
+#include "xraycontroller.h"
+
+#include "proxylogger.h"
+#include "core/utils/ipcClient.h"
+
+namespace {
+const QString kIpcUnavailableError = QStringLiteral("Failed to communicate with IPC service");
+}
+
+XrayController::XrayController(QObject *parent)
+    : QObject(parent)
+{
+    ProxyLogger::getInstance().debug("XrayController initialized");
+}
+
+XrayController::~XrayController()
+{
+    stop();
+}
+
+bool XrayController::start(const QString &configJson)
+{
+    if (m_isRunning) {
+        ProxyLogger::getInstance().info("Xray is already running");
+        return true;
+    }
+
+    ProxyLogger::getInstance().info("Request to start Xray via IPC");
+
+    m_lastError.clear();
+
+    if (configJson.trimmed().isEmpty()) {
+        m_lastError = QStringLiteral("Config content is empty");
+        ProxyLogger::getInstance().error(m_lastError);
+        return false;
+    }
+
+    const bool ipcResult = IpcClient::withInterface([&](QSharedPointer<IpcInterfaceReplica> iface) {
+        auto xrayStart = iface->xrayStart(configJson);
+        if (!xrayStart.waitForFinished() || !xrayStart.returnValue()) {
+            ProxyLogger::getInstance().warning("Failed to start Xray via IPC");
+            return false;
+        }
+
+        return true;
+    }, []() {
+        return false;
+    });
+
+    if (!ipcResult) {
+        m_lastError = kIpcUnavailableError;
+        ProxyLogger::getInstance().error(m_lastError);
+        return false;
+    }
+
+    ProxyLogger::getInstance().info("Xray start command sent to IPC service");
+    m_isRunning = true;
+    return true;
+}
+
+bool XrayController::stop()
+{
+    if (!m_isRunning) {
+        ProxyLogger::getInstance().debug("Skipping Xray stop via IPC: local proxy Xray is not running");
+        return true;
+    }
+
+    ProxyLogger::getInstance().info("Stopping Xray via IPC");
+
+    const bool ipcResult = IpcClient::withInterface([](QSharedPointer<IpcInterfaceReplica> iface) {
+        auto xrayStop = iface->xrayStop();
+        if (!xrayStop.waitForFinished() || !xrayStop.returnValue()) {
+            ProxyLogger::getInstance().warning("Failed to stop Xray via IPC");
+            return false;
+        }
+
+        return true;
+    }, []() {
+        return false;
+    });
+
+    if (!ipcResult) {
+        m_lastError = kIpcUnavailableError;
+        ProxyLogger::getInstance().warning(m_lastError);
+        return false;
+    }
+
+    m_isRunning = false;
+    return true;
+}
+
+bool XrayController::isXrayRunning() const
+{
+    return m_isRunning;
+}
+
+qint64 XrayController::getProcessId() const
+{
+    return -1;
+}
+
+QString XrayController::getError() const
+{
+    return m_lastError;
+}

client/core/local-proxy/xraycontroller.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <QObject>
+#include <QString>
+
+class XrayController : public QObject {
+    Q_OBJECT
+
+public:
+    explicit XrayController(QObject* parent = nullptr);
+    ~XrayController();
+
+    bool start(const QString& configJson);
+    bool stop();
+    bool isXrayRunning() const;
+    qint64 getProcessId() const;
+    QString getError() const;
+
+private:
+    bool m_isRunning {false};
+    QString m_lastError;
+}; 

client/core/models/api/apiConfig.cpp

@@ -144,6 +144,10 @@ QJsonObject ApiConfig::toJson() const
         obj[apiDefs::key::availableCountries] = availableCountries;
     }
     
+    if (!supportedProtocols.isEmpty()) {
+        obj[apiDefs::key::supportedProtocols] = supportedProtocols;
+    }
+    
     QJsonObject serviceInfoObj = serviceInfo.toJson();
     if (!serviceInfoObj.isEmpty()) {
         obj[apiDefs::key::serviceInfo] = serviceInfoObj;
@@ -194,6 +198,7 @@ ApiConfig ApiConfig::fromJson(const QJsonObject& json)
     config.issuedConfigs = json.value(apiDefs::key::issuedConfigs).toInt(0);
     
     config.availableCountries = json.value(apiDefs::key::availableCountries).toArray();
+    config.supportedProtocols = json.value(apiDefs::key::supportedProtocols).toArray();
     
     QJsonObject serviceInfoObj = json.value(apiDefs::key::serviceInfo).toObject();
     if (!serviceInfoObj.isEmpty()) {

client/core/models/api/apiConfig.h

@@ -34,6 +34,7 @@ struct ApiConfig
     int maxDeviceCount;
     int issuedConfigs;
     QJsonArray availableCountries;
+    QJsonArray supportedProtocols;
     
     struct ServiceInfo {
         bool isAdVisible = false;

client/core/models/api/apiV2ServerConfig.cpp

@@ -121,11 +121,7 @@ QJsonObject ApiV2ServerConfig::toJson() const
     if (!dns2.isEmpty()) {
         obj[configKey::dns2] = dns2;
     }
-
-    if (!sendPayload.isEmpty()) {
-        obj[configKey::sendPayload] = sendPayload;
-    }
-
+    
     if (crc > 0) {
         obj[configKey::crc] = crc;
     }
@@ -169,7 +165,6 @@ ApiV2ServerConfig ApiV2ServerConfig::fromJson(const QJsonObject& json)
     
     config.dns1 = json.value(configKey::dns1).toString();
     config.dns2 = json.value(configKey::dns2).toString();
-    config.sendPayload = json.value(configKey::sendPayload).toArray();
     
     config.crc = json.value(configKey::crc).toInt(0);
     

client/core/models/api/apiV2ServerConfig.h

@@ -1,7 +1,6 @@
 #ifndef APIV2SERVERCONFIG_H
 #define APIV2SERVERCONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
 #include <QMap>
 #include <QPair>
@@ -29,7 +28,6 @@ struct ApiV2ServerConfig {
     DockerContainer defaultContainer;
     QString dns1;
     QString dns2;
-    QJsonArray sendPayload;
     
     QString name;
     bool nameOverriddenByUser = false;

client/core/models/protocols/awgProtocolConfig.cpp

@@ -196,21 +196,11 @@ QJsonObject AwgClientConfig::toJson() const
         obj[configKey::transportPacketMagicHeader] = transportPacketMagicHeader;
     }
     
-    if (!specialJunk1.isEmpty()) {
-        obj[configKey::specialJunk1] = specialJunk1;
-    }
-    if (!specialJunk2.isEmpty()) {
-        obj[configKey::specialJunk2] = specialJunk2;
-    }
-    if (!specialJunk3.isEmpty()) {
-        obj[configKey::specialJunk3] = specialJunk3;
-    }
-    if (!specialJunk4.isEmpty()) {
-        obj[configKey::specialJunk4] = specialJunk4;
-    }
-    if (!specialJunk5.isEmpty()) {
-        obj[configKey::specialJunk5] = specialJunk5;
-    }
+    obj[configKey::specialJunk1] = specialJunk1;
+    obj[configKey::specialJunk2] = specialJunk2;
+    obj[configKey::specialJunk3] = specialJunk3;
+    obj[configKey::specialJunk4] = specialJunk4;
+    obj[configKey::specialJunk5] = specialJunk5;
     
     if (isObfuscationEnabled) {
         obj[configKey::isObfuscationEnabled] = isObfuscationEnabled;

client/core/protocols/xrayProtocol.cpp

@@ -68,6 +68,8 @@ ErrorCode XrayProtocol::start()
 {
     qDebug() << "XrayProtocol::start()";
 
+    m_teardownDone = false;
+
     // Inject SOCKS5 auth into the inbound before starting xray.
     // Re-uses existing credentials if the config already has them (e.g. imported config).
     amnezia::serialization::inbounds::InboundCredentials creds;
@@ -120,6 +122,17 @@ void XrayProtocol::stop()
 {
     qDebug() << "XrayProtocol::stop()";
 
+    // The destructor calls stop() as a safety net, but stop() is also called
+    // explicitly on disconnect. Because stop() spins the event loop via
+    // waitForFinished(), the local proxy may start its own xray on the shared
+    // global engine in between. Running the teardown (xrayStop) twice would then
+    // kill the proxy's just-started xray. Run the engine teardown only once.
+    if (m_teardownDone) {
+        qDebug() << "XrayProtocol::stop() teardown already done, skipping";
+        return;
+    }
+    m_teardownDone = true;
+
     IpcClient::withInterface([](QSharedPointer<IpcInterfaceReplica> iface) {
         auto disableKillSwitch = iface->disableKillSwitch();
         if (!disableKillSwitch.waitForFinished() || !disableKillSwitch.returnValue())

client/core/protocols/xrayProtocol.h

@@ -38,6 +38,11 @@ private:
     int m_tun2socksRetryCount = 0;
     static constexpr int maxTun2SocksRetries = 5;
     static constexpr int tun2socksRetryDelayMs = 400;
+
+    // Guards against tearing down the shared xray engine more than once.
+    // The destructor also calls stop(); without this the second stop() would
+    // call xrayStop() on the global engine that the local proxy may already own.
+    bool m_teardownDone = false;
 };
 
 #endif // XRAYPROTOCOL_H

client/core/repositories/secureAppSettingsRepository.cpp

@@ -5,6 +5,8 @@
 #include <QJsonObject>
 #include <QUuid>
 
+#include <limits>
+
 #include "core/utils/errorCodes.h"
 #include "core/utils/routeModes.h"
 #include "core/utils/commonStructs.h"
@@ -280,24 +282,6 @@ void SecureAppSettingsRepository::toggleDevGatewayEnv(bool enabled)
     setValue("Conf/devGatewayEnv", enabled);
 }
 
-QByteArray SecureAppSettingsRepository::readGatewayProxyUrls(const QString &cacheKey) const
-{
-    if (cacheKey.isEmpty()) {
-        return {};
-    }
-
-    return value(QStringLiteral("Conf/proxyUrls/") + cacheKey).toByteArray();
-}
-
-void SecureAppSettingsRepository::writeGatewayProxyUrls(const QString &cacheKey, const QByteArray &proxyUrlsEncrypted)
-{
-    if (cacheKey.isEmpty()) {
-        return;
-    }
-
-    setValue(QStringLiteral("Conf/proxyUrls/") + cacheKey, proxyUrlsEncrypted);
-}
-
 bool SecureAppSettingsRepository::isKillSwitchEnabled() const
 {
     return value("Conf/killSwitchEnabled", true).toBool();
@@ -458,3 +442,59 @@ void SecureAppSettingsRepository::setXraySavedConfigs(const QByteArray &data)
 {
     setValue("Xray/savedConfigs", data);
 }
+
+QString SecureAppSettingsRepository::localProxyOwnerId() const
+{
+    return value("Conf/localProxyOwnerId", "").toString();
+}
+
+void SecureAppSettingsRepository::setLocalProxyOwnerId(const QString &serverId)
+{
+    setValue("Conf/localProxyOwnerId", serverId);
+    emit localProxySettingsChanged();
+}
+
+quint16 SecureAppSettingsRepository::localProxyPort() const
+{
+    return static_cast<quint16>(value("Conf/localProxyPort", 10808).toUInt());
+}
+
+void SecureAppSettingsRepository::setLocalProxyPort(quint16 port)
+{
+    setValue("Conf/localProxyPort", port);
+    emit localProxySettingsChanged();
+}
+
+bool SecureAppSettingsRepository::isLocalProxyPortUserDefined() const
+{
+    return value("Conf/localProxyPortUserDefined", false).toBool();
+}
+
+void SecureAppSettingsRepository::setLocalProxyPortUserDefined(bool userDefined)
+{
+    setValue("Conf/localProxyPortUserDefined", userDefined);
+}
+
+bool SecureAppSettingsRepository::isLocalProxyHttpEnabled() const
+{
+    return value("Conf/localProxyHttpEnabled", false).toBool();
+}
+
+void SecureAppSettingsRepository::setLocalProxyHttpEnabled(bool enabled)
+{
+    setValue("Conf/localProxyHttpEnabled", enabled);
+    emit localProxySettingsChanged();
+}
+
+int SecureAppSettingsRepository::localProxyRestartToken() const
+{
+    return value("Conf/localProxyRestartToken", 0).toInt();
+}
+
+void SecureAppSettingsRepository::bumpLocalProxyRestartToken()
+{
+    const int current = localProxyRestartToken();
+    const int next = (current == std::numeric_limits<int>::max()) ? 0 : (current + 1);
+    setValue("Conf/localProxyRestartToken", next);
+    emit localProxySettingsChanged();
+}

client/core/repositories/secureAppSettingsRepository.h

@@ -59,9 +59,7 @@ public:
     void setDevGatewayEndpoint();
     bool isDevGatewayEnv(bool isTestPurchase = false) const;
     void toggleDevGatewayEnv(bool enabled);
-    QByteArray readGatewayProxyUrls(const QString &cacheKey) const;
-    void writeGatewayProxyUrls(const QString &cacheKey, const QByteArray &proxyUrlsEncrypted);
-
+    
     bool isKillSwitchEnabled() const;
     void setKillSwitchEnabled(bool enabled);
     bool isStrictKillSwitchEnabled() const;
@@ -95,6 +93,18 @@ public:
     QByteArray xraySavedConfigs() const;
     void setXraySavedConfigs(const QByteArray &data);
 
+    // Local proxy
+    QString localProxyOwnerId() const;
+    void setLocalProxyOwnerId(const QString &serverId);
+    quint16 localProxyPort() const;
+    void setLocalProxyPort(quint16 port);
+    bool isLocalProxyPortUserDefined() const;
+    void setLocalProxyPortUserDefined(bool userDefined);
+    bool isLocalProxyHttpEnabled() const;
+    void setLocalProxyHttpEnabled(bool enabled);
+    int localProxyRestartToken() const;
+    void bumpLocalProxyRestartToken();
+
 signals:
     void appLanguageChanged(QLocale locale);
     void allowedDnsServersChanged(const QStringList &servers);
@@ -108,6 +118,8 @@ signals:
     void saveLogsChanged(bool enabled);
     void screenshotsEnabledChanged(bool enabled);
     void settingsCleared();
+    void localProxySettingsChanged();
+    void localProxyStartFailed(const QString &message);
 
 private:
     void setVpnSites(RouteMode mode, const QVariantMap &sites);

client/core/repositories/secureServersRepository.cpp

@@ -309,6 +309,15 @@ serverConfigUtils::ConfigType SecureServersRepository::serverKind(const QString
     return serverConfigUtils::configTypeFromJson(withoutStorageServerId(it.value()));
 }
 
+std::optional<QJsonObject> SecureServersRepository::serverJsonById(const QString &serverId) const
+{
+    const auto it = m_serverJsonById.constFind(serverId);
+    if (it == m_serverJsonById.constEnd()) {
+        return std::nullopt;
+    }
+    return it.value();
+}
+
 std::optional<SelfHostedAdminServerConfig> SecureServersRepository::selfHostedAdminConfig(const QString &serverId) const
 {
     const auto it = m_serverJsonById.constFind(serverId);

client/core/repositories/secureServersRepository.h

@@ -31,6 +31,8 @@ public:
     void removeServer(const QString &serverId);
     serverConfigUtils::ConfigType serverKind(const QString &serverId) const;
 
+    std::optional<QJsonObject> serverJsonById(const QString &serverId) const;
+
     std::optional<SelfHostedAdminServerConfig> selfHostedAdminConfig(const QString &serverId) const;
     std::optional<SelfHostedUserServerConfig> selfHostedUserConfig(const QString &serverId) const;
     std::optional<NativeServerConfig> nativeConfig(const QString &serverId) const;

client/core/utils/constants/apiKeys.h

@@ -18,8 +18,8 @@ namespace apiDefs
         constexpr QLatin1String stackType("stack_type");
         constexpr QLatin1String cliVersion("cli_version");
         constexpr QLatin1String cliName("cli_name");
+        constexpr QLatin1String supportedProtocols("supported_protocols");
         constexpr QLatin1String availableCountries("available_countries");
-        constexpr QLatin1String availableProtocols("available_protocols");
         constexpr QLatin1String installationUuid("installation_uuid");
         constexpr QLatin1String uuid("installation_uuid");
         constexpr QLatin1String osVersion("os_version");

client/core/utils/constants/configKeys.h

@@ -25,13 +25,6 @@ namespace amnezia
         constexpr QLatin1String config("config");
         constexpr QLatin1String configVersion("config_version");
 
-        constexpr QLatin1String sendPayload("send_payload");
-        constexpr QLatin1String sendPayloadEndpoint("endpoint");
-        constexpr QLatin1String sendPayloadTimeoutMs("timeout_ms");
-        constexpr QLatin1String sendPayloadProtocol("protocol");
-        constexpr QLatin1String sendPayloadData("payload");
-        constexpr QLatin1String sendPayloadExpectedResponse("expected_response");
-
         constexpr QLatin1String containers("containers");
         constexpr QLatin1String container("container");
         constexpr QLatin1String defaultContainer("defaultContainer");

client/core/utils/constants/protocolConstants.h

@@ -271,7 +271,6 @@ namespace amnezia
             constexpr char workersModeAuto[]       = "auto";
             constexpr char workersModeManual[]     = "manual";
             constexpr int  maxWorkers              = 32;
-            constexpr int  botTagHexLength         = 32;
         }
 
     } // namespace protocols

client/core/utils/payloadSender.cpp

@@ -1,193 +0,0 @@
-#include "payloadSender.h"
-
-#include <QDebug>
-#include <QEventLoop>
-#include <QHostAddress>
-#include <QJsonObject>
-#include <QRandomGenerator>
-#include <QRegularExpression>
-#include <QTcpSocket>
-#include <QTimer>
-#include <QUdpSocket>
-
-#include "core/utils/constants/configKeys.h"
-#include "core/utils/networkUtilities.h"
-
-using namespace amnezia;
-
-namespace
-{
-    constexpr char protoUdp[] = "udp";
-    constexpr char protoTcp[] = "tcp";
-
-    QByteArray randomBytes(int count)
-    {
-        if (count <= 0) {
-            return {};
-        }
-        QByteArray bytes(count, Qt::Uninitialized);
-        for (int i = 0; i < count; ++i) {
-            bytes[i] = static_cast<char>(QRandomGenerator::global()->bounded(256));
-        }
-        return bytes;
-    }
-
-    bool parseEndpoint(const QString &endpoint, QString &host, quint16 &port)
-    {
-        const int separatorIndex = endpoint.lastIndexOf(QLatin1Char(':'));
-        if (separatorIndex <= 0 || separatorIndex == endpoint.size() - 1) {
-            return false;
-        }
-        host = endpoint.left(separatorIndex);
-        bool ok = false;
-        const uint parsedPort = endpoint.mid(separatorIndex + 1).toUInt(&ok);
-        if (!ok || parsedPort == 0 || parsedPort > 65535) {
-            return false;
-        }
-        port = static_cast<quint16>(parsedPort);
-        return true;
-    }
-
-    enum class ExchangeResult { Sent, Matched, Mismatch, Timeout };
-
-    ExchangeResult waitForResponse(QAbstractSocket &socket, const QByteArray &expectedResponse, int timeoutMs)
-    {
-        if (expectedResponse.isEmpty()) {
-            return ExchangeResult::Sent;
-        }
-
-        QByteArray response;
-        QEventLoop loop;
-        QTimer timer;
-        timer.setSingleShot(true);
-        QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
-        QObject::connect(&socket, &QIODevice::readyRead, &loop, [&]() {
-            response.append(socket.readAll());
-            if (response.size() >= expectedResponse.size()) {
-                loop.quit();
-            }
-        });
-
-        timer.start(timeoutMs);
-        loop.exec();
-
-        if (response.isEmpty()) {
-            return ExchangeResult::Timeout;
-        }
-        return response == expectedResponse ? ExchangeResult::Matched : ExchangeResult::Mismatch;
-    }
-}
-
-QByteArray PayloadSender::buildPayload(const QString &tagString)
-{
-    QByteArray result;
-    if (tagString.isEmpty()) {
-        return result;
-    }
-
-    static const QRegularExpression tagRegExp(QStringLiteral("<([^>]*)>"));
-    QRegularExpressionMatchIterator it = tagRegExp.globalMatch(tagString);
-    while (it.hasNext()) {
-        const QRegularExpressionMatch match = it.next();
-        const QStringList parts = match.captured(1).simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts);
-        if (parts.isEmpty()) {
-            continue;
-        }
-
-        const QString tag = parts.at(0).toLower();
-        if (tag == QLatin1String("b")) {
-            if (parts.size() < 2) {
-                continue;
-            }
-            QString hex = parts.at(1);
-            if (hex.startsWith(QLatin1String("0x"), Qt::CaseInsensitive)) {
-                hex = hex.mid(2);
-            }
-            result.append(QByteArray::fromHex(hex.toLatin1()));
-        } else if (tag == QLatin1String("r")) {
-            if (parts.size() < 2) {
-                continue;
-            }
-            bool ok = false;
-            const int count = parts.at(1).toInt(&ok);
-            if (ok) {
-                result.append(randomBytes(count));
-            }
-        } else {
-            qWarning() << "PayloadSender: unknown payload tag" << tag;
-        }
-    }
-
-    return result;
-}
-
-void PayloadSender::sendAll(const QJsonArray &sendPayload)
-{
-    for (int i = 0; i < sendPayload.size(); ++i) {
-        const QJsonValue value = sendPayload.at(i);
-        if (!value.isObject()) {
-            continue;
-        }
-        sendEntry(value.toObject(), i);
-    }
-}
-
-void PayloadSender::sendEntry(const QJsonObject &entry, int index)
-{
-    const QString endpoint = entry.value(configKey::sendPayloadEndpoint).toString();
-    QString host;
-    quint16 port = 0;
-    if (!parseEndpoint(endpoint, host, port)) {
-        qWarning() << "PayloadSender: skipping entry" << index << "- invalid endpoint" << endpoint;
-        return;
-    }
-
-    const QString protocol = entry.value(configKey::sendPayloadProtocol).toString().toLower();
-    const int timeoutMs = entry.value(configKey::sendPayloadTimeoutMs).toInt();
-    const QByteArray payload = buildPayload(entry.value(configKey::sendPayloadData).toString());
-    const QByteArray expectedResponse = buildPayload(entry.value(configKey::sendPayloadExpectedResponse).toString());
-
-    const QString resolvedHost = NetworkUtilities::getIPAddress(host);
-    const QHostAddress hostAddress(resolvedHost.isEmpty() ? host : resolvedHost);
-
-    QUdpSocket udpSocket;
-    QTcpSocket tcpSocket;
-    QAbstractSocket *socket = nullptr;
-    if (protocol == protoUdp) {
-        socket = &udpSocket;
-        if (udpSocket.writeDatagram(payload, hostAddress, port) < 0) {
-            qWarning() << "PayloadSender: entry" << index << "- udp write failed to" << endpoint << udpSocket.errorString();
-            return;
-        }
-    } else if (protocol == protoTcp) {
-        socket = &tcpSocket;
-        tcpSocket.connectToHost(hostAddress, port);
-        if (!tcpSocket.waitForConnected(timeoutMs)) {
-            qWarning() << "PayloadSender: entry" << index << "- tcp connect failed to" << endpoint << tcpSocket.errorString();
-            return;
-        }
-        if (tcpSocket.write(payload) != payload.size()) {
-            qWarning() << "PayloadSender: entry" << index << "- tcp write failed to" << endpoint << tcpSocket.errorString();
-            return;
-        }
-        tcpSocket.flush();
-    } else {
-        qWarning() << "PayloadSender: skipping entry" << index << "- unsupported protocol" << protocol;
-        return;
-    }
-
-    switch (waitForResponse(*socket, expectedResponse, timeoutMs)) {
-    case ExchangeResult::Sent:
-        qInfo() << "PayloadSender: entry" << index << "-" << protocol << "payload sent to" << endpoint;
-        break;
-    case ExchangeResult::Matched:
-        qInfo() << "PayloadSender: entry" << index << "-" << protocol << "expected response received from" << endpoint;
-        break;
-    case ExchangeResult::Mismatch:
-        qWarning() << "PayloadSender: entry" << index << "-" << protocol << "response mismatch from" << endpoint;
-        break;
-    case ExchangeResult::Timeout:
-        qWarning() << "PayloadSender: entry" << index << "-" << protocol << "response timeout from" << endpoint;
-        break;
-    }
-}

client/core/utils/payloadSender.h

@@ -1,18 +0,0 @@
-#ifndef PAYLOADSENDER_H
-#define PAYLOADSENDER_H
-
-#include <QByteArray>
-#include <QJsonArray>
-#include <QString>
-
-class PayloadSender
-{
-public:
-    static void sendAll(const QJsonArray &sendPayload);
-    static QByteArray buildPayload(const QString &tagString);
-
-private:
-    static void sendEntry(const QJsonObject &entry, int index);
-};
-
-#endif // PAYLOADSENDER_H

client/core/utils/selfhosted/scriptsRegistry.cpp

@@ -50,7 +50,6 @@ QString amnezia::scriptName(SharedScriptType type)
     switch (type) {
     case SharedScriptType::prepare_host: return QLatin1String("prepare_host.sh");
     case SharedScriptType::install_docker: return QLatin1String("install_docker.sh");
-    case SharedScriptType::install_conntrack: return QLatin1String("install_conntrack.sh");
     case SharedScriptType::build_container: return QLatin1String("build_container.sh");
     case SharedScriptType::remove_container: return QLatin1String("remove_container.sh");
     case SharedScriptType::remove_all_containers: return QLatin1String("remove_all_containers.sh");
@@ -367,14 +366,6 @@ amnezia::ScriptVars amnezia::genTelemtVars(const ContainerConfig &containerConfi
         vars.append({ { "$TELEMT_USE_MIDDLE_PROXY", c.useMiddleProxy ? QLatin1String("true") : QLatin1String("false") } });
         vars.append({ { "$TELEMT_MASK", c.maskEnabled ? QLatin1String("true") : QLatin1String("false") } });
         vars.append({ { "$TELEMT_TLS_EMULATION", c.tlsEmulation ? QLatin1String("true") : QLatin1String("false") } });
-
-        QStringList additionalList;
-        for (const QString &s : c.additionalSecrets) {
-            if (!s.isEmpty()) {
-                additionalList << s;
-            }
-        }
-        vars.append({ { "$TELEMT_ADDITIONAL_SECRETS", additionalList.join(QLatin1Char(',')) } });
     }
 
     return vars;

client/core/utils/selfhosted/scriptsRegistry.h

@@ -21,7 +21,6 @@ enum SharedScriptType {
     // General scripts
     prepare_host,
     install_docker,
-    install_conntrack,
     build_container,
     remove_container,
     remove_all_containers,

client/daemon/daemon.cpp

@@ -390,55 +390,55 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
 
   config.m_killSwitchEnabled = QVariant(obj.value("killSwitchOption").toString()).toBool();
 
-  if (const auto jc = obj.value("Jc"); !jc.isUndefined()) {
-    config.m_junkPacketCount = jc.toString();
+  if (!obj.value("Jc").isNull()) {
+    config.m_junkPacketCount = obj.value("Jc").toString();
   }
-  if (const auto jmin = obj.value("Jmin"); !jmin.isUndefined()) {
-    config.m_junkPacketMinSize = jmin.toString();
+  if (!obj.value("Jmin").isNull()) {
+    config.m_junkPacketMinSize = obj.value("Jmin").toString();
   }
-  if (const auto jmax = obj.value("Jmax"); !jmax.isUndefined()) {
-    config.m_junkPacketMaxSize = jmax.toString();
+  if (!obj.value("Jmax").isNull()) {
+    config.m_junkPacketMaxSize = obj.value("Jmax").toString();
   }
-  if (const auto s1 = obj.value("S1"); !s1.isUndefined()) {
-    config.m_initPacketJunkSize = s1.toString();
+  if (!obj.value("S1").isNull()) {
+    config.m_initPacketJunkSize = obj.value("S1").toString();
   }
-  if (const auto s2 = obj.value("S2"); !s2.isUndefined()) {
-    config.m_responsePacketJunkSize = s2.toString();
+  if (!obj.value("S2").isNull()) {
+    config.m_responsePacketJunkSize = obj.value("S2").toString();
   }
-  if (const auto s3 = obj.value("S3"); !s3.isUndefined()) {
-    config.m_cookieReplyPacketJunkSize = s3.toString();
+  if (!obj.value("S3").isNull()) {
+    config.m_cookieReplyPacketJunkSize = obj.value("S3").toString();
   }
-  if (const auto s4 = obj.value("S4"); !s4.isUndefined()) {
-    config.m_transportPacketJunkSize = s4.toString();
+  if (!obj.value("S4").isNull()) {
+    config.m_transportPacketJunkSize = obj.value("S4").toString();
   }
 
-  if (const auto h1 = obj.value("H1"); !h1.isUndefined()) {
-    config.m_initPacketMagicHeader = h1.toString();
+  if (!obj.value("H1").isNull()) {
+    config.m_initPacketMagicHeader = obj.value("H1").toString();
   }
-  if (const auto h2 = obj.value("H2"); !h2.isUndefined()) {
-    config.m_responsePacketMagicHeader = h2.toString();
+  if (!obj.value("H2").isNull()) {
+    config.m_responsePacketMagicHeader = obj.value("H2").toString();
   }
-  if (const auto h3 = obj.value("H3"); !h3.isUndefined()) {
-    config.m_underloadPacketMagicHeader = h3.toString();
+  if (!obj.value("H3").isNull()) {
+    config.m_underloadPacketMagicHeader = obj.value("H3").toString();
   }
-  if (const auto h4 = obj.value("H4"); !h4.isUndefined()) {
-    config.m_transportPacketMagicHeader = h4.toString();
+  if (!obj.value("H4").isNull()) {
+    config.m_transportPacketMagicHeader = obj.value("H4").toString();
   }
 
-  if (const auto i1 = obj.value("I1"); !i1.isUndefined()) {
-    config.m_specialJunk["I1"] = i1.toString();
+  if (!obj.value("I1").isNull()) {
+    config.m_specialJunk["I1"] = obj.value("I1").toString();
   }
-  if (const auto i2 = obj.value("I2"); !i2.isUndefined()) {
-    config.m_specialJunk["I2"] = i2.toString();
+  if (!obj.value("I2").isNull()) {
+    config.m_specialJunk["I2"] = obj.value("I2").toString();
   }
-  if (const auto i3 = obj.value("I3"); !i3.isUndefined()) {
-    config.m_specialJunk["I3"] = i3.toString();
+  if (!obj.value("I3").isNull()) {
+    config.m_specialJunk["I3"] = obj.value("I3").toString();
   }
-  if (const auto i4 = obj.value("I4"); !i4.isUndefined()) {
-    config.m_specialJunk["I4"] = i4.toString();
+  if (!obj.value("I4").isNull()) {
+    config.m_specialJunk["I4"] = obj.value("I4").toString();
   }
-  if (const auto i5 = obj.value("I5"); !i5.isUndefined()) {
-    config.m_specialJunk["I5"] = i5.toString();
+  if (!obj.value("I5").isNull()) {
+    config.m_specialJunk["I5"] = obj.value("I5").toString();
   }
 
   return true;

client/images/controls/arrow-left-right.svg

@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 11L21 7L17 3" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M21 7H9" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 21L3 17L7 13" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15 17H3" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

client/images/images.qrc

@@ -10,7 +10,6 @@
         <file>controls/app.svg</file>
         <file>controls/archive-restore.svg</file>
         <file>controls/arrow-left.svg</file>
-        <file>controls/arrow-left-right.svg</file>
         <file>controls/arrow-right.svg</file>
         <file>controls/bug.svg</file>
         <file>controls/check.svg</file>

client/ios/app/Info.plist.in

@@ -82,32 +82,10 @@
 		<key>NSAllowsLocalNetworking</key>
 		<true/>
 	</dict>
-	<key>CFBundleIconName</key>
-	<string>AppIcon</string>
 	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon</string>
-			</array>
-			<key>CFBundleIconName</key>
-			<string>AppIcon</string>
-		</dict>
-	</dict>
-	<key>CFBundleIcons~ipad</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon</string>
-			</array>
-			<key>CFBundleIconName</key>
-			<string>AppIcon</string>
-		</dict>
-	</dict>
+        <dict/>
+        <key>CFBundleIcons~ipad</key>
+        <dict/>
 	<key>UTImportedTypeDeclarations</key>
 	<array>
 		<dict>

client/platforms/linux/daemon/linuxfirewall.cpp

@@ -33,7 +33,6 @@
 #include "linuxfirewall.h"
 #include "logger.h"
 #include "xray_defs.h"
-#include <QFileInfo>
 #include <QProcess>
 
 #define BRAND_CODE "amn"
@@ -110,7 +109,7 @@ int LinuxFirewall::linkChain(LinuxFirewall::IPVersion ip, const QString& chain,
         //    (we can't safely delete all rules at once since rule numbers change)
         // TODO: occasionally this script results in warnings in logs "Bad rule (does a matching rule exist in the chain?)" - this happens when
         // the e.g OUTPUT chain is empty but this script attempts to delete things from it anyway. It doesn't cause any problems, but we should still fix at some point..
-        return execute(QStringLiteral("if ! %1 -L %2 -n --line-numbers -t %4 2> /dev/null | awk 'int($1) == 1 && $2 == \"%3\" { found=1 } END { if(found==1) { exit 0 } else { exit 1 } }' ; then %1 -I %2 -j %3 -t %4 && %1 -L %2 -n --line-numbers -t %4 2> /dev/null | awk 'int($1) > 1 && $2 == \"%3\" { print $1; exit }' | xargs -r %1 -t %4 -D %2 ; fi").arg(cmd, parent, chain, tableName));
+        return execute(QStringLiteral("if ! %1 -L %2 -n --line-numbers -t %4 2> /dev/null | awk 'int($1) == 1 && $2 == \"%3\" { found=1 } END { if(found==1) { exit 0 } else { exit 1 } }' ; then %1 -I %2 -j %3 -t %4 && %1 -L %2 -n --line-numbers -t %4 2> /dev/null | awk 'int($1) > 1 && $2 == \"%3\" { print $1; exit }' | xargs %1 -t %4 -D %2 ; fi").arg(cmd, parent, chain, tableName));
     }
     else
         return execute(QStringLiteral("if ! %1 -C %2 -j %3 -t %4 2> /dev/null ; then %1 -A %2 -j %3 -t %4; fi").arg(cmd, parent, chain, tableName));
@@ -292,8 +291,6 @@ void LinuxFirewall::install()
 
     installAnchor(IPv4, QStringLiteral("110.allowNets"), {});
 
-    installAnchor(Both, QStringLiteral("400.allowPIA"), {});
-
     installAnchor(Both, QStringLiteral("100.blockAll"), {
                                                             QStringLiteral("-j REJECT"),
                                                         });
@@ -457,33 +454,16 @@ void LinuxFirewall::updateDNSServers(const QStringList& servers)
     static QStringList existingServers {};
 
     existingServers = servers;
-    const QString chain = QStringLiteral("%1.320.allowDNS").arg(kAnchorName);
-    executeIptables(QStringLiteral("iptables"), {QStringLiteral("-F"), chain});
-    const QStringList ifaces = {
-        QStringLiteral("amn0+"), QStringLiteral("tun0+"), QStringLiteral("tun2+")
-    };
-    for (const QString& server : servers) {
-        for (const QString& iface : ifaces) {
-            executeIptables(QStringLiteral("iptables"),
-                {QStringLiteral("-A"), chain, QStringLiteral("-o"), iface,
-                 QStringLiteral("-d"), server, QStringLiteral("-p"), QStringLiteral("udp"),
-                 QStringLiteral("--dport"), QStringLiteral("53"), QStringLiteral("-j"), QStringLiteral("ACCEPT")});
-            executeIptables(QStringLiteral("iptables"),
-                {QStringLiteral("-A"), chain, QStringLiteral("-o"), iface,
-                 QStringLiteral("-d"), server, QStringLiteral("-p"), QStringLiteral("tcp"),
-                 QStringLiteral("--dport"), QStringLiteral("53"), QStringLiteral("-j"), QStringLiteral("ACCEPT")});
-        }
-    }
+    execute(QStringLiteral("iptables -F %1.320.allowDNS").arg(kAnchorName));
+    for (const QString& rule : getDNSRules(servers))
+        execute(QStringLiteral("iptables -A %1.320.allowDNS %2").arg(kAnchorName, rule));
 }
 
 void LinuxFirewall::updateAllowNets(const QStringList& servers)
 {
-    const QString chain = QStringLiteral("%1.110.allowNets").arg(kAnchorName);
-    executeIptables(QStringLiteral("iptables"), {QStringLiteral("-F"), chain});
-    for (const QString& server : servers)
-        executeIptables(QStringLiteral("iptables"),
-            {QStringLiteral("-A"), chain, QStringLiteral("-d"), server,
-             QStringLiteral("-j"), QStringLiteral("ACCEPT")});
+    execute(QStringLiteral("iptables -F %1.110.allowNets").arg(kAnchorName));
+    for (const QString& rule : getAllowRule(servers))
+        execute(QStringLiteral("iptables -A %1.110.allowNets %2").arg(kAnchorName, rule));
 }
 
 void LinuxFirewall::updateBlockNets(const QStringList& servers)
@@ -491,12 +471,9 @@ void LinuxFirewall::updateBlockNets(const QStringList& servers)
     static QStringList existingServers {};
 
     existingServers = servers;
-    const QString chain = QStringLiteral("%1.120.blockNets").arg(kAnchorName);
-    executeIptables(QStringLiteral("iptables"), {QStringLiteral("-F"), chain});
-    for (const QString& server : servers)
-        executeIptables(QStringLiteral("iptables"),
-            {QStringLiteral("-A"), chain, QStringLiteral("-d"), server,
-             QStringLiteral("-j"), QStringLiteral("REJECT")});
+    execute(QStringLiteral("iptables -F %1.120.blockNets").arg(kAnchorName));
+    for (const QString& rule : getBlockRule(servers))
+        execute(QStringLiteral("iptables -A %1.120.blockNets %2").arg(kAnchorName, rule));
 }
 
 int waitForExitCode(QProcess& process)
@@ -529,39 +506,10 @@ int LinuxFirewall::execute(const QString &command, bool ignoreErrors)
     return exitCode;
 }
 
-int LinuxFirewall::executeIptables(const QString &program, const QStringList &args, bool ignoreErrors)
-{
-    QProcess p;
-    p.start(program, args, QProcess::ReadOnly);
-    p.closeWriteChannel();
-
-    int exitCode = waitForExitCode(p);
-    auto out = p.readAllStandardOutput().trimmed();
-    auto err = p.readAllStandardError().trimmed();
-    if ((exitCode != 0 || !err.isEmpty()) && !ignoreErrors)
-        logger.warning() << "(" << exitCode << ") $ " << program << args.join(QLatin1Char(' '));
-    if (!out.isEmpty())
-        logger.info() << out;
-    if (!err.isEmpty())
-        logger.warning() << err;
-    return exitCode;
-}
-
 void LinuxFirewall::setupTrafficSplitting()
 {
-    const QString cgroupBase = QStringLiteral("/sys/fs/cgroup/net_cls");
-    if (!QFileInfo::exists(cgroupBase)) {
-        logger.warning() << "net_cls cgroup v1 not available, traffic splitting disabled";
-        return;
-    }
-
-    execute(QStringLiteral(
-        "if ! grep -qE '^[0-9]+[[:space:]]+%1$' /etc/iproute2/rt_tables 2>/dev/null ; then "
-        "echo '200 %1' >> /etc/iproute2/rt_tables ; fi"
-    ).arg(kRtableName));
-
     auto cGroupDir = "/sys/fs/cgroup/net_cls/" BRAND_CODE "vpnexclusions/";
-    logger.info() << "Setting up cgroup in" << cGroupDir << "for traffic splitting";
+    logger.info() << "Should be setting up cgroup in" << cGroupDir << "for traffic splitting";
     execute(QStringLiteral("if [ ! -d %1 ] ; then mkdir %1 ; sleep 0.1 ; echo %2 > %1/net_cls.classid ; fi").arg(cGroupDir).arg(kCGroupId));
     // Set a rule with priority 100 (lower priority than local but higher than main/default, 0 is highest priority)
     execute(QStringLiteral("if ! ip rule list | grep -q %1 ; then ip rule add from all fwmark %1 lookup %2 pri 100 ; fi").arg(kPacketTag, kRtableName));
@@ -570,7 +518,7 @@ void LinuxFirewall::setupTrafficSplitting()
 void LinuxFirewall::teardownTrafficSplitting()
 {
     logger.info() << "Tearing down cgroup and routing rules";
-    execute(QStringLiteral("if ip rule list | grep -q %1; then ip rule del from all fwmark %1 lookup %2 2>/dev/null ; fi").arg(kPacketTag, kRtableName));
-    execute(QStringLiteral("ip route flush table %1 2>/dev/null || true").arg(kRtableName));
+    execute(QStringLiteral("if ip rule list | grep -q %1; then ip rule del from all fwmark %1 lookup %2 2> /dev/null ; fi").arg(kPacketTag, kRtableName));
+    execute(QStringLiteral("ip route flush table %1").arg(kRtableName));
     execute(QStringLiteral("ip route flush cache"));
 }

client/platforms/linux/daemon/linuxfirewall.h

@@ -85,7 +85,6 @@ private:
     static void setupTrafficSplitting();
     static void teardownTrafficSplitting();
     static int execute(const QString& command, bool ignoreErrors = false);
-    static int executeIptables(const QString& program, const QStringList& args, bool ignoreErrors = false);
 private:
     // Chain names
     static QString kOutputChain, kRootChain, kPostRoutingChain, kPreRoutingChain;

client/platforms/windows/daemon/windowsdaemon.cpp

@@ -62,29 +62,12 @@ void WindowsDaemon::prepareActivation(const InterfaceConfig& config, int inetAda
 }
 
 void WindowsDaemon::activateSplitTunnel(const InterfaceConfig& config, int vpnAdapterIndex) {
-    if (m_splitTunnelManager == nullptr) {
-        if (config.m_vpnDisabledApps.length() > 0) {
-            logger.error() << "Split tunnel manager is not initialized";
-            emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_INIT_FAILURE);
-        }
+    if (m_splitTunnelManager == nullptr)
         return;
-    }
 
   if (config.m_vpnDisabledApps.length() > 0) {
-      if (!m_splitTunnelManager->start(m_inetAdapterIndex, vpnAdapterIndex)) {
-          logger.error() << "Failed to start split tunnel";
-          emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE);
-          return;
-      }
-      if (!m_splitTunnelManager->excludeApps(config.m_vpnDisabledApps)) {
-          logger.error() << "Failed to apply split tunnel app exclusions";
-          emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_EXCLUDE_FAILURE);
-          return;
-      }
-      if (!m_splitTunnelManager->isRunning()) {
-          logger.error() << "Split tunnel did not reach running state";
-          emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE);
-      }
+      m_splitTunnelManager->start(m_inetAdapterIndex, vpnAdapterIndex);
+      m_splitTunnelManager->excludeApps(config.m_vpnDisabledApps);
   } else {
       m_splitTunnelManager->stop();
   }
@@ -96,9 +79,7 @@ bool WindowsDaemon::run(Op op, const InterfaceConfig& config) {
       // 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
-      logger.error() << "Split tunnel manager is not initialized";
       emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_INIT_FAILURE);
-      return false;
     }
     return true;
   }
@@ -109,20 +90,14 @@ bool WindowsDaemon::run(Op op, const InterfaceConfig& config) {
   }
   if (config.m_vpnDisabledApps.length() > 0) {
     if (!m_splitTunnelManager->start(m_inetAdapterIndex)) {
-      logger.error() << "Split tunnel start failed";
       emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE);
-      return false;
     };
     if (!m_splitTunnelManager->excludeApps(config.m_vpnDisabledApps)) {
-      logger.error() << "Split tunnel app exclusion failed";
       emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_EXCLUDE_FAILURE);
-      return false;
     };
     // Now the driver should be running (State == 4)
     if (!m_splitTunnelManager->isRunning()) {
-      logger.error() << "Split tunnel did not reach running state";
       emit backendFailure(DaemonError::ERROR_SPLIT_TUNNEL_START_FAILURE);
-      return false;
     }
     return true;
   }

client/platforms/windows/daemon/windowsfirewall.cpp

@@ -36,8 +36,6 @@
 // ID for the Firewall Sublayer
 DEFINE_GUID(ST_FW_WINFW_BASELINE_SUBLAYER_KEY, 0xc78056ff, 0x2bc1, 0x4211, 0xaa,
             0xdd, 0x7f, 0x35, 0x8d, 0xef, 0x20, 0x2d);
-DEFINE_GUID(ST_FW_WINFW_DNS_SUBLAYER_KEY, 0x60090787, 0xcca1, 0x4937, 0xaa,
-            0xce, 0x51, 0x25, 0x6e, 0xf4, 0x81, 0xf3);
 // ID for the Mullvad Split-Tunnel Sublayer Provider
 DEFINE_GUID(ST_FW_PROVIDER_KEY, 0xe2c114ee, 0xf32a, 0x4264, 0xa6, 0xcb, 0x3f,
             0xa7, 0x99, 0x63, 0x56, 0xd9);
@@ -51,53 +49,6 @@ constexpr uint8_t LOW_WEIGHT = 0;
 constexpr uint8_t MED_WEIGHT = 7;
 constexpr uint8_t HIGH_WEIGHT = 13;
 constexpr uint8_t MAX_WEIGHT = 15;
-
-bool ensureSublayer(HANDLE wfp, const GUID& key, const wchar_t* name,
-                    const wchar_t* description) {
-  FWPM_SUBLAYER0* maybeLayer = nullptr;
-  DWORD result = FwpmSubLayerGetByKey0(wfp, &key, &maybeLayer);
-  if (result == ERROR_SUCCESS) {
-    logger.debug() << "The Sublayer Already Exists:"
-                   << QString::fromWCharArray(name);
-    FwpmFreeMemory0(reinterpret_cast<void**>(&maybeLayer));
-    return true;
-  }
-  if (result != FWP_E_SUBLAYER_NOT_FOUND) {
-    logger.error() << "FwpmSubLayerGetByKey0 failed. Return value:.\n"
-                   << result;
-    return false;
-  }
-
-  result = FwpmTransactionBegin(wfp, NULL);
-  if (result != ERROR_SUCCESS) {
-    logger.error() << "FwpmTransactionBegin0 failed. Return value:.\n"
-                   << result;
-    return false;
-  }
-
-  FWPM_SUBLAYER0 subLayer;
-  memset(&subLayer, 0, sizeof(subLayer));
-  subLayer.subLayerKey = key;
-  subLayer.displayData.name = const_cast<PWSTR>(name);
-  subLayer.displayData.description = const_cast<PWSTR>(description);
-  subLayer.weight = 0xFFFF;
-
-  result = FwpmSubLayerAdd0(wfp, &subLayer, NULL);
-  if (result != ERROR_SUCCESS) {
-    FwpmTransactionAbort0(wfp);
-    logger.error() << "FwpmSubLayerAdd0 failed. Return value:.\n" << result;
-    return false;
-  }
-
-  result = FwpmTransactionCommit0(wfp);
-  if (result != ERROR_SUCCESS) {
-    logger.error() << "FwpmTransactionCommit0 failed. Return value:.\n"
-                   << result;
-    return false;
-  }
-  logger.debug() << "Initialised Sublayer:" << QString::fromWCharArray(name);
-  return true;
-}
 }  // namespace
 
 WindowsFirewall* WindowsFirewall::create(QObject* parent) {
@@ -165,12 +116,47 @@ bool WindowsFirewall::initSublayer() {
   }
   auto cleanup = qScopeGuard([&] { FwpmEngineClose0(wfp); });
 
-  return ensureSublayer(wfp, ST_FW_WINFW_BASELINE_SUBLAYER_KEY,
-                        L"Amnezia-SplitTunnel-Sublayer",
-                        L"Filters that enforce a good baseline") &&
-         ensureSublayer(wfp, ST_FW_WINFW_DNS_SUBLAYER_KEY,
-                        L"Amnezia-SplitTunnel-DNS-Sublayer",
-                        L"DNS filters for split tunneling");
+  // Check if the Layer Already Exists
+  FWPM_SUBLAYER0* maybeLayer;
+  result = FwpmSubLayerGetByKey0(wfp, &ST_FW_WINFW_BASELINE_SUBLAYER_KEY,
+                                 &maybeLayer);
+  if (result == ERROR_SUCCESS) {
+    logger.debug() << "The Sublayer Already Exists!";
+    FwpmFreeMemory0((void**)&maybeLayer);
+    return true;
+  }
+
+  // Step 1: Start Transaction
+  result = FwpmTransactionBegin(wfp, NULL);
+  if (result != ERROR_SUCCESS) {
+    logger.error() << "FwpmTransactionBegin0 failed. Return value:.\n"
+                   << result;
+    return false;
+  }
+
+  // Step 3: Add Sublayer
+  FWPM_SUBLAYER0 subLayer;
+  memset(&subLayer, 0, sizeof(subLayer));
+  subLayer.subLayerKey = ST_FW_WINFW_BASELINE_SUBLAYER_KEY;
+  subLayer.displayData.name = (PWSTR)L"Amnezia-SplitTunnel-Sublayer";
+  subLayer.displayData.description =
+      (PWSTR)L"Filters that enforce a good baseline";
+  subLayer.weight = 0xFFFF;
+
+  result = FwpmSubLayerAdd0(wfp, &subLayer, NULL);
+  if (result != ERROR_SUCCESS) {
+    logger.error() << "FwpmSubLayerAdd0 failed. Return value:.\n" << result;
+    return false;
+  }
+  // Step 4: Commit!
+  result = FwpmTransactionCommit0(wfp);
+  if (result != ERROR_SUCCESS) {
+    logger.error() << "FwpmTransactionCommit0 failed. Return value:.\n"
+                   << result;
+    return false;
+  }
+  logger.debug() << "Initialised Sublayer";
+  return true;
 }
 
 bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {

client/platforms/windows/daemon/windowssplittunnel.cpp

@@ -24,7 +24,6 @@
 #include <QFileInfo>
 #include <QNetworkInterface>
 #include <QScopeGuard>
-#include <QUrl>
 
 #pragma region
 
@@ -149,18 +148,6 @@ ProcessInfo getProcessInfo(HANDLE process, const PROCESSENTRY32W& processMeta) {
   return pi;
 }
 
-QString normalizeExecutablePath(const QString& path) {
-  QString normalized = path.trimmed();
-  if (normalized.startsWith("file:", Qt::CaseInsensitive)) {
-    const QString localPath = QUrl(normalized).toLocalFile();
-    if (!localPath.isEmpty()) {
-      normalized = localPath;
-    }
-  }
-  normalized.replace('/', '\\');
-  return normalized;
-}
-
 }  // namespace
 
 std::unique_ptr<WindowsSplitTunnel> WindowsSplitTunnel::create(
@@ -300,10 +287,6 @@ bool WindowsSplitTunnel::excludeApps(const QStringList& appPaths) {
 
   logger.debug() << "Pushing new Ruleset for Split-Tunnel " << state;
   auto config = generateAppConfiguration(appPaths);
-  if (config.empty()) {
-    logger.error() << "No valid split-tunnel application rules generated";
-    return false;
-  }
 
   DWORD bytesReturned;
   auto ok = DeviceIoControl(m_driver, IOCTL_SET_CONFIGURATION, &config[0],
@@ -331,7 +314,7 @@ bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
     auto ok = DeviceIoControl(m_driver, IOCTL_INITIALIZE, nullptr, 0, nullptr,
                               0, &bytesReturned, nullptr);
     if (!ok) {
-      logger.error() << "Driver init failed. Error:" << GetLastError();
+      logger.error() << "Driver init failed";
       return false;
     }
   }
@@ -340,16 +323,11 @@ bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
   if (getState() == STATE_INITIALIZED) {
     logger.debug() << "State is Init, requires process config";
     auto config = generateProcessBlob();
-    if (config.empty()) {
-      logger.error() << "Process configuration blob is empty";
-      return false;
-    }
     auto ok = DeviceIoControl(m_driver, IOCTL_REGISTER_PROCESSES, &config[0],
                               (DWORD)config.size(), nullptr, 0, &bytesReturned,
                               nullptr);
     if (!ok) {
-      logger.error() << "Failed to set Process Config. Error:"
-                     << GetLastError();
+      logger.error() << "Failed to set Process Config";
       return false;
     }
     logger.debug() << "Set Process Config ok || new State:" << stateString();
@@ -362,16 +340,11 @@ bool WindowsSplitTunnel::start(int inetAdapterIndex, int vpnAdapterIndex) {
   logger.debug() << "Driver is  ready || new State:" << stateString();
 
   auto config = generateIPConfiguration(inetAdapterIndex, vpnAdapterIndex);
-  if (config.empty()) {
-    logger.error() << "Network configuration blob is empty. Internet adapter:"
-                   << inetAdapterIndex << "VPN adapter:" << vpnAdapterIndex;
-    return false;
-  }
   auto ok = DeviceIoControl(m_driver, IOCTL_REGISTER_IP_ADDRESSES, &config[0],
                             (DWORD)config.size(), nullptr, 0, &bytesReturned,
                             nullptr);
   if (!ok) {
-    logger.error() << "Failed to set Network Config. Error:" << GetLastError();
+    logger.error() << "Failed to set Network Config";
     return false;
   }
   logger.debug() << "New Network Config Applied || new State:" << stateString();
@@ -431,22 +404,13 @@ std::vector<uint8_t> WindowsSplitTunnel::generateAppConfiguration(
   size_t cummulated_string_size = 0;
   QStringList dosPaths;
   for (auto const& path : appPaths) {
-    const QString normalizedPath = normalizeExecutablePath(path);
-    auto dosPath = convertPath(normalizedPath);
-    if (dosPath.isEmpty()) {
-      logger.error() << "Rejecting split-tunnel app path with empty device "
-                        "conversion:"
-                     << normalizedPath;
-      continue;
-    }
+    auto dosPath = convertPath(path);
     dosPaths.append(dosPath);
     cummulated_string_size += dosPath.toStdWString().size() * sizeof(wchar_t);
-  }
-  if (dosPaths.isEmpty()) {
-    return {};
+    logger.debug() << dosPath;
   }
   size_t bufferSize = sizeof(CONFIGURATION_HEADER) +
-                      (sizeof(CONFIGURATION_ENTRY) * dosPaths.size()) +
+                      (sizeof(CONFIGURATION_ENTRY) * appPaths.size()) +
                       cummulated_string_size;
   std::vector<uint8_t> outBuffer(bufferSize);
 
@@ -454,7 +418,7 @@ std::vector<uint8_t> WindowsSplitTunnel::generateAppConfiguration(
   auto entry = (CONFIGURATION_ENTRY*)(header + 1);
 
   auto stringDest = &outBuffer[0] + sizeof(CONFIGURATION_HEADER) +
-                    (sizeof(CONFIGURATION_ENTRY) * dosPaths.size());
+                    (sizeof(CONFIGURATION_ENTRY) * appPaths.size());
 
   SIZE_T stringOffset = 0;
 
@@ -473,7 +437,7 @@ std::vector<uint8_t> WindowsSplitTunnel::generateAppConfiguration(
     stringOffset += stringLength;
   }
 
-  header->NumEntries = dosPaths.length();
+  header->NumEntries = appPaths.length();
   header->TotalLength = bufferSize;
 
   return outBuffer;
@@ -485,7 +449,9 @@ std::vector<std::byte> WindowsSplitTunnel::generateIPConfiguration(
 
   auto config = reinterpret_cast<IP_ADDRESSES_CONFIG*>(&out[0]);
 
-  if (vpnAdapterIndex == 0) {
+  auto ifaces = QNetworkInterface::allInterfaces();
+
+    if (vpnAdapterIndex == 0) {
     vpnAdapterIndex = WindowsCommons::VPNAdapterIndex();
   }
   // Always the VPN
@@ -554,7 +520,7 @@ std::vector<uint8_t> WindowsSplitTunnel::generateProcessBlob() {
     auto process_handle = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE,
                                       currentProcess.th32ProcessID);
 
-    if (process_handle == nullptr) {
+    if (process_handle == INVALID_HANDLE_VALUE) {
       continue;
     }
     ProcessInfo info = getProcessInfo(process_handle, currentProcess);
@@ -674,48 +640,23 @@ bool WindowsSplitTunnel::isInstalled() {
 }
 
 QString WindowsSplitTunnel::convertPath(const QString& path) {
-  const QString normalizedPath = normalizeExecutablePath(path);
-  if (normalizedPath.isEmpty()) {
-    logger.error() << "Empty executable path for DOS device conversion";
-    return "";
-  }
-  auto parts = normalizedPath.split("\\", Qt::SkipEmptyParts);
-  if (parts.isEmpty()) {
-    logger.error() << "Invalid executable path for DOS device conversion:"
-                   << normalizedPath;
-    return "";
-  }
+  auto parts = path.split("/");
   QString driveLetter = parts.takeFirst();
   if (!driveLetter.contains(":") || parts.size() == 0) {
     // device should contain : for e.g C:
-    logger.error() << "Invalid executable path for DOS device conversion:"
-                   << normalizedPath;
     return "";
   }
-  QByteArray buffer(2048 * sizeof(wchar_t), 0);
-  DWORD ok = 0;
-  DWORD err = ERROR_SUCCESS;
-  for (int attempt = 0; attempt < 4; ++attempt) {
-    ok = QueryDosDeviceW(reinterpret_cast<LPCWSTR>(driveLetter.utf16()),
-                         reinterpret_cast<LPWSTR>(buffer.data()),
-                         buffer.size() / sizeof(wchar_t));
-    if (ok != 0) {
-      break;
-    }
-    err = GetLastError();
-    if (err != ERROR_INSUFFICIENT_BUFFER) {
-      WindowsUtils::windowsLog("Err fetching dos path");
-      logger.error() << "QueryDosDeviceW failed for" << driveLetter
-                     << "error:" << err;
-      return "";
-    }
+  QByteArray buffer(2048, 0xFFu);
+  auto ok = QueryDosDeviceW(qUtf16Printable(driveLetter),
+                            (wchar_t*)buffer.data(), buffer.size() / 2);
+
+  if (ok == ERROR_INSUFFICIENT_BUFFER) {
     buffer.resize(buffer.size() * 2);
-    buffer.fill(0);
+    ok = QueryDosDeviceW(qUtf16Printable(driveLetter), (wchar_t*)buffer.data(),
+                         buffer.size() / 2);
   }
   if (ok == 0) {
     WindowsUtils::windowsLog("Err fetching dos path");
-    logger.error() << "QueryDosDeviceW failed after buffer growth for"
-                   << driveLetter << "error:" << err;
     return "";
   }
   QString deviceName;

client/secureQSettings.cpp

@@ -1,7 +1,8 @@
 #include "secureQSettings.h"
 
+#include "../client/3rd/QSimpleCrypto/src/include/QAead.h"
+#include "../client/3rd/QSimpleCrypto/src/include/QBlockCipher.h"
 #include "core/utils/utilities.h"
-#include "cryptoUtils.h"
 #include <QDataStream>
 #include <QDebug>
 #include <QEventLoop>
@@ -179,8 +180,11 @@ void SecureQSettings::clearSettings()
 
 QByteArray SecureQSettings::encryptText(const QByteArray &value) const
 {
-    QByteArray result = CryptoUtils::encryptAes256Cbc(value, getEncKey(), getEncIv());
-    if (result.isEmpty() && !value.isEmpty()) {
+    QSimpleCrypto::QBlockCipher cipher;
+    QByteArray result;
+    try {
+        result = cipher.encryptAesBlockCipher(value, getEncKey(), getEncIv());
+    } catch (...) { // todo change error handling in QSimpleCrypto?
         qCritical() << "error when encrypting the settings value";
     }
     return result;
@@ -188,8 +192,11 @@ QByteArray SecureQSettings::encryptText(const QByteArray &value) const
 
 QByteArray SecureQSettings::decryptText(const QByteArray &ba) const
 {
-    QByteArray result = CryptoUtils::decryptAes256Cbc(ba, getEncKey(), getEncIv());
-    if (result.isEmpty() && !ba.isEmpty()) {
+    QSimpleCrypto::QBlockCipher cipher;
+    QByteArray result;
+    try {
+        result = cipher.decryptAesBlockCipher(ba, getEncKey(), getEncIv());
+    } catch (...) { // todo change error handling in QSimpleCrypto?
         qCritical() << "error when decrypting the settings value";
     }
     return result;
@@ -218,7 +225,8 @@ QByteArray SecureQSettings::getEncKey() const
 
     if (m_key.isEmpty()) {
         // Create new key
-        QByteArray key = CryptoUtils::generateRandomBytes(32);
+        QSimpleCrypto::QBlockCipher cipher;
+        QByteArray key = cipher.generatePrivateSalt(32);
         if (key.isEmpty()) {
             qCritical() << "SecureQSettings::getEncKey Unable to generate new enc key";
         }
@@ -246,7 +254,8 @@ QByteArray SecureQSettings::getEncIv() const
 
     if (m_iv.isEmpty()) {
         // Create new IV
-        QByteArray iv = CryptoUtils::generateRandomBytes(32);
+        QSimpleCrypto::QBlockCipher cipher;
+        QByteArray iv = cipher.generatePrivateSalt(32);
         if (iv.isEmpty()) {
             qCritical() << "SecureQSettings::getEncIv Unable to generate new enc IV";
         }

client/server_scripts/install_conntrack.sh

@@ -1,10 +0,0 @@
-if command -v conntrack > /dev/null 2>&1; then echo "conntrack already installed"; exit 0; fi;\
-if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); silent_inst="-yq install --install-recommends"; check_pkgs="-yq update"; conntrack_pkg="conntrack"; dist="debian";\
-elif which dnf > /dev/null 2>&1; then pm=$(which dnf); silent_inst="-yq install"; check_pkgs="-yq check-update"; conntrack_pkg="conntrack-tools"; dist="fedora";\
-elif which yum > /dev/null 2>&1; then pm=$(which yum); silent_inst="-y -q install"; check_pkgs="-y -q check-update"; conntrack_pkg="conntrack-tools"; dist="centos";\
-elif which zypper > /dev/null 2>&1; then pm=$(which zypper); silent_inst="-nq install"; check_pkgs="-nq refresh"; conntrack_pkg="conntrack-tools"; dist="opensuse";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="-S --noconfirm --noprogressbar --quiet"; check_pkgs="-Sup"; conntrack_pkg="conntrack-tools"; dist="archlinux";\
-else echo "Packet manager not found"; exit 0; fi;\
-if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
-sudo $pm $check_pkgs; sudo $pm $silent_inst $conntrack_pkg;\
-command -v conntrack > /dev/null 2>&1 && echo "conntrack installed" || echo "conntrack install failed"

client/server_scripts/serverScripts.qrc

@@ -18,7 +18,6 @@
         <file>dns/Dockerfile</file>
         <file>dns/run_container.sh</file>
         <file>install_docker.sh</file>
-        <file>install_conntrack.sh</file>
         <file>ipsec/configure_container.sh</file>
         <file>ipsec/Dockerfile</file>
         <file>ipsec/mobileconfig.plist</file>

client/server_scripts/telemt/configure_container.sh

@@ -61,12 +61,6 @@ rm -f /data/config.toml
     echo ""
     echo "[access.users]"
     echo "$TELEMT_USER_NAME = \"$SECRET\""
-    i=1
-    for EXTRA in $(echo "$TELEMT_ADDITIONAL_SECRETS" | tr ',' ' '); do
-        echo "$EXTRA" | grep -qE '^[0-9a-fA-F]{32}$' || continue
-        echo "extra_$i = \"$EXTRA\""
-        i=$((i + 1))
-    done
 } > /data/config.toml
 
 echo "$SECRET" > /data/secret

client/ui/controllers/api/subscriptionUiController.cpp

@@ -303,8 +303,6 @@ bool SubscriptionUiController::importFreeFromGateway()
         emit installServerFromApiFinished(tr("%1 installed successfully.").arg(m_apiServicesModel->getSelectedServiceName()));
         return true;
     } else if (errorCode == ErrorCode::ApiCaptchaRequiredError && captchaInfo.isRequired) {
-        m_captchaState = CaptchaState{};
-        m_captchaState.flow = CaptchaFlow::Import;
         m_captchaState.userCountryCode = userCountryCode;
         m_captchaState.serviceType = serviceType;
         m_captchaState.serviceProtocol = serviceProtocol;
@@ -329,11 +327,6 @@ void SubscriptionUiController::onCaptchaSolved(const QString &captchaId, const Q
         return;
     }
 
-    if (m_captchaState.flow == CaptchaFlow::Update) {
-        resolveUpdateCaptcha(captchaId, solution);
-        return;
-    }
-
     SubscriptionController::ProtocolData protocolData;
     protocolData.certPrivKey = m_captchaState.openvpnPrivKey;
     protocolData.wireGuardClientPrivKey = m_captchaState.wireguardClientPrivKey;
@@ -375,33 +368,6 @@ void SubscriptionUiController::onRefreshCaptchaRequested()
         return;
     }
 
-    if (m_captchaState.flow == CaptchaFlow::Update) {
-        SubscriptionController::CaptchaInfo captchaInfo;
-        SubscriptionController::ProtocolData usedProtocolData;
-        ErrorCode errorCode = m_subscriptionController->updateServiceFromGateway(
-                m_captchaState.serverId,
-                m_captchaState.newCountryCode,
-                m_captchaState.isConnectEvent,
-                &captchaInfo,
-                &usedProtocolData);
-
-        if (errorCode == ErrorCode::ApiCaptchaRequiredError && captchaInfo.isRequired) {
-            m_captchaState.updateProtocolData = usedProtocolData;
-            emit captchaRequired(captchaInfo.captchaId, captchaInfo.captchaImageBase64,
-                                 captchaInfo.hint.isEmpty() ? tr("Enter the digits from the image to continue") : captchaInfo.hint);
-        } else if (errorCode == ErrorCode::NoError) {
-            emitCaptchaUpdateSuccess();
-        } else {
-            m_captchaState.isPending = false;
-            if (errorCode == ErrorCode::ApiSubscriptionExpiredError) {
-                emit subscriptionExpiredOnServer();
-            } else {
-                emit errorOccurred(errorCode);
-            }
-        }
-        return;
-    }
-
     SubscriptionController::ProtocolData protocolData;
     protocolData.certPrivKey = m_captchaState.openvpnPrivKey;
     protocolData.wireGuardClientPrivKey = m_captchaState.wireguardClientPrivKey;
@@ -426,39 +392,6 @@ void SubscriptionUiController::onRefreshCaptchaRequested()
     }
 }
 
-void SubscriptionUiController::resolveUpdateCaptcha(const QString &captchaId, const QString &solution)
-{
-    SubscriptionController::CaptchaInfo retryCaptcha;
-    ErrorCode errorCode = m_subscriptionController->resolveUpdateServiceCaptcha(
-            m_captchaState.serverId,
-            m_captchaState.newCountryCode,
-            m_captchaState.isConnectEvent,
-            m_captchaState.updateProtocolData,
-            captchaId,
-            solution,
-            &retryCaptcha);
-
-    if (errorCode == ErrorCode::NoError) {
-        emitCaptchaUpdateSuccess();
-        return;
-    }
-
-    if ((errorCode == ErrorCode::ApiCaptchaInvalidError || errorCode == ErrorCode::ApiCaptchaRefreshError
-         || errorCode == ErrorCode::ApiCaptchaRequiredError)
-        && retryCaptcha.isRequired) {
-        emit captchaRequired(retryCaptcha.captchaId, retryCaptcha.captchaImageBase64,
-                             retryCaptcha.hint.isEmpty() ? tr("Enter the digits from the image to continue") : retryCaptcha.hint);
-        return;
-    }
-
-    m_captchaState.isPending = false;
-    if (errorCode == ErrorCode::ApiSubscriptionExpiredError) {
-        emit subscriptionExpiredOnServer();
-    } else {
-        emit errorOccurred(errorCode);
-    }
-}
-
 bool SubscriptionUiController::importTrialFromGateway(const QString &email)
 {
     emit trialEmailError(QString());
@@ -490,29 +423,20 @@ bool SubscriptionUiController::updateServiceFromGateway(const QString &serverId,
                 || oldApiV2->apiConfig.isSubscriptionExpired();
     }
 
-    SubscriptionController::CaptchaInfo captchaInfo;
-    SubscriptionController::ProtocolData usedProtocolData;
-    ErrorCode errorCode = m_subscriptionController->updateServiceFromGateway(serverId, newCountryCode, isConnectEvent,
-                                                                             &captchaInfo, &usedProtocolData);
+    ErrorCode errorCode = m_subscriptionController->updateServiceFromGateway(serverId, newCountryCode, isConnectEvent);
 
     if (errorCode == ErrorCode::NoError) {
-        emitUpdateSuccess(wasSubscriptionExpired, reloadServiceConfig, newCountryName);
+        if (wasSubscriptionExpired) {
+            emit subscriptionRefreshNeeded();
+        }
+        if (reloadServiceConfig) {
+            emit reloadServerFromApiFinished(tr("API config reloaded"));
+        } else if (newCountryName.isEmpty()) {
+            emit updateServerFromApiFinished();
+        } else {
+            emit changeApiCountryFinished(tr("Successfully changed the country of connection to %1").arg(newCountryName));
+        }
         return true;
-    } else if (errorCode == ErrorCode::ApiCaptchaRequiredError && captchaInfo.isRequired) {
-        m_captchaState = CaptchaState{};
-        m_captchaState.flow = CaptchaFlow::Update;
-        m_captchaState.serverId = serverId;
-        m_captchaState.newCountryCode = newCountryCode;
-        m_captchaState.newCountryName = newCountryName;
-        m_captchaState.isConnectEvent = isConnectEvent;
-        m_captchaState.reloadServiceConfig = reloadServiceConfig;
-        m_captchaState.wasSubscriptionExpired = wasSubscriptionExpired;
-        m_captchaState.updateProtocolData = usedProtocolData;
-        m_captchaState.isPending = true;
-
-        emit captchaRequired(captchaInfo.captchaId, captchaInfo.captchaImageBase64,
-                             captchaInfo.hint.isEmpty() ? tr("Enter the digits from the image to continue") : captchaInfo.hint);
-        return false;
     } else {
         if (errorCode == ErrorCode::ApiSubscriptionExpiredError) {
             emit subscriptionExpiredOnServer();
@@ -523,37 +447,6 @@ bool SubscriptionUiController::updateServiceFromGateway(const QString &serverId,
     }
 }
 
-void SubscriptionUiController::emitUpdateSuccess(bool wasSubscriptionExpired, bool reloadServiceConfig, const QString &newCountryName)
-{
-    if (wasSubscriptionExpired) {
-        emit subscriptionRefreshNeeded();
-    }
-    if (reloadServiceConfig) {
-        emit reloadServerFromApiFinished(tr("API config reloaded"));
-    } else if (newCountryName.isEmpty()) {
-        emit updateServerFromApiFinished();
-    } else {
-        emit changeApiCountryFinished(tr("Successfully changed the country of connection to %1").arg(newCountryName));
-    }
-}
-
-void SubscriptionUiController::emitCaptchaUpdateSuccess()
-{
-    const bool fromValidateConfig = m_captchaState.fromValidateConfig;
-    const bool wasSubscriptionExpired = m_captchaState.wasSubscriptionExpired;
-    const bool reloadServiceConfig = m_captchaState.reloadServiceConfig;
-    const QString newCountryName = m_captchaState.newCountryName;
-
-    m_captchaState.isPending = false;
-    emit captchaFlowDismissRequested();
-
-    if (fromValidateConfig) {
-        emit configValidated(true);
-        return;
-    }
-    emitUpdateSuccess(wasSubscriptionExpired, reloadServiceConfig, newCountryName);
-}
-
 
 bool SubscriptionUiController::deactivateDevice(const QString &serverId)
 {
@@ -589,25 +482,7 @@ void SubscriptionUiController::validateConfig()
 
     bool hasInstalledContainers = m_serversController->hasInstalledContainers(serverId);
 
-    SubscriptionController::CaptchaInfo captchaInfo;
-    SubscriptionController::ProtocolData usedProtocolData;
-    ErrorCode errorCode = m_subscriptionController->validateAndUpdateConfig(serverId, hasInstalledContainers,
-                                                                            &captchaInfo, &usedProtocolData);
-
-    if (errorCode == ErrorCode::ApiCaptchaRequiredError && captchaInfo.isRequired) {
-        m_captchaState = CaptchaState{};
-        m_captchaState.flow = CaptchaFlow::Update;
-        m_captchaState.fromValidateConfig = true;
-        m_captchaState.serverId = serverId;
-        m_captchaState.isConnectEvent = true;
-        m_captchaState.updateProtocolData = usedProtocolData;
-        m_captchaState.isPending = true;
-
-        emit captchaRequired(captchaInfo.captchaId, captchaInfo.captchaImageBase64,
-                             captchaInfo.hint.isEmpty() ? tr("Enter the digits from the image to continue") : captchaInfo.hint);
-        emit configValidated(false);
-        return;
-    }
+    ErrorCode errorCode = m_subscriptionController->validateAndUpdateConfig(serverId, hasInstalledContainers);
 
     if (errorCode != ErrorCode::NoError) {
         if (errorCode == ErrorCode::ApiSubscriptionExpiredError) {
@@ -633,18 +508,6 @@ bool SubscriptionUiController::isVlessProtocol(const QString &serverId)
 }
 
 
-QString SubscriptionUiController::currentProtocol(const QString &serverId)
-{
-    return m_subscriptionController->currentProtocol(serverId);
-}
-
-
-QStringList SubscriptionUiController::availableProtocols(const QString &serverId)
-{
-    return m_subscriptionController->availableProtocols(serverId);
-}
-
-
 void SubscriptionUiController::removeApiConfig(const QString &serverId)
 {
     m_subscriptionController->removeApiConfig(serverId);

client/ui/controllers/api/subscriptionUiController.h

@@ -57,8 +57,6 @@ public slots:
 
     void setCurrentProtocol(const QString &serverId, const QString &protocolName);
     bool isVlessProtocol(const QString &serverId);
-    QString currentProtocol(const QString &serverId);
-    QStringList availableProtocols(const QString &serverId);
 
     bool isCaptchaAwaitingUser() const;
     void onCaptchaSolved(const QString &captchaId, const QString &solution);
@@ -97,15 +95,7 @@ signals:
     void unsupportedConnectDrawerRequested();
 
 private:
-    enum class CaptchaFlow {
-        Import,
-        Update
-    };
-
     struct CaptchaState {
-        CaptchaFlow flow = CaptchaFlow::Import;
-
-        // Import flow
         QString userCountryCode;
         QString serviceType;
         QString serviceProtocol;
@@ -113,25 +103,10 @@ private:
         QString wireguardClientPrivKey;
         QString wireguardClientPubKey;
         QString xrayUuid;
-
-        // Update flow
-        QString serverId;
-        QString newCountryCode;
-        QString newCountryName;
-        bool isConnectEvent = false;
-        bool reloadServiceConfig = false;
-        bool wasSubscriptionExpired = false;
-        bool fromValidateConfig = false;
-        SubscriptionController::ProtocolData updateProtocolData;
-
         bool isPending = false;
     } m_captchaState;
 
 private:
-    void emitUpdateSuccess(bool wasSubscriptionExpired, bool reloadServiceConfig, const QString &newCountryName);
-    void emitCaptchaUpdateSuccess();
-    void resolveUpdateCaptcha(const QString &captchaId, const QString &solution);
-
     QList<QString> getQrCodes();
     int getQrCodesCount();
     QString getVpnKey();

client/ui/controllers/qml/pageController.h

@@ -45,6 +45,8 @@ namespace PageLoader
         PageSettingsApiDevices,
         PageSettingsApiSubscriptionKey,
         PageSettingsKillSwitchExceptions,
+        PageSettingsConnectionType,
+        PageSettingsLocalProxy,
 
         PageServiceSftpSettings,
         PageServiceTorWebsiteSettings,

client/ui/controllers/selfhosted/installUiController.cpp

@@ -9,7 +9,6 @@
 #include <QStandardPaths>
 #include <QFutureWatcher>
 #include <QtConcurrent>
-#include <utility>
 
 #include "core/utils/api/apiUtils.h"
 #include "core/controllers/selfhosted/installController.h"
@@ -363,27 +362,17 @@ void InstallUiController::setContainerEnabled(const QString &serverId, int conta
     }
 
     emit serverIsBusy(true);
+    const ErrorCode errorCode = m_installController->setDockerContainerEnabledState(serverId, container, enabled);
+    emit serverIsBusy(false);
 
-    InstallController *installController = m_installController;
-    auto *watcher = new QFutureWatcher<ErrorCode>(this);
-    QObject::connect(watcher, &QFutureWatcher<ErrorCode>::finished, this,
-                     [this, watcher, serverId, container, enabled]() {
-                         const ErrorCode errorCode = watcher->result();
-                         watcher->deleteLater();
-                         emit serverIsBusy(false);
+    if (errorCode == ErrorCode::NoError) {
+        const ContainerConfig currentConfig = m_serversController->getContainerConfig(serverId, container);
+        m_protocolModel->updateModel(currentConfig);
+        emit setContainerEnabledFinished(enabled);
+        return;
+    }
 
-                         if (errorCode == ErrorCode::NoError) {
-                             const ContainerConfig currentConfig = m_serversController->getContainerConfig(serverId, container);
-                             m_protocolModel->updateModel(currentConfig);
-                             emit setContainerEnabledFinished(enabled);
-                             return;
-                         }
-                         emit installationErrorOccurred(errorCode);
-                     });
-    QFuture<ErrorCode> future = QtConcurrent::run([installController, serverId, container, enabled]() -> ErrorCode {
-        return installController->setDockerContainerEnabledState(serverId, container, enabled);
-    });
-    watcher->setFuture(future);
+    emit installationErrorOccurred(errorCode);
 }
 
 void InstallUiController::refreshContainerStatus(const QString &serverId, int containerIndex)
@@ -393,23 +382,13 @@ void InstallUiController::refreshContainerStatus(const QString &serverId, int co
         return;
     }
 
-    using StatusResult = std::pair<int, int>; // {status, errorCode}
-    InstallController *installController = m_installController;
-    auto *watcher = new QFutureWatcher<StatusResult>(this);
-    QObject::connect(watcher, &QFutureWatcher<StatusResult>::finished, this, [this, watcher]() {
-        const StatusResult result = watcher->result();
-        watcher->deleteLater();
-        emit containerStatusRefreshed(result.first, result.second);
-    });
-    QFuture<StatusResult> future = QtConcurrent::run([installController, serverId, container]() -> StatusResult {
-        int status = 3;
-        const ErrorCode errorCode = installController->queryDockerContainerStatus(serverId, container, status);
-        if (errorCode != ErrorCode::NoError) {
-            return { 3, static_cast<int>(errorCode) };
-        }
-        return { status, static_cast<int>(ErrorCode::NoError) };
-    });
-    watcher->setFuture(future);
+    int status = 3;
+    const ErrorCode errorCode = m_installController->queryDockerContainerStatus(serverId, container, status);
+    if (errorCode != ErrorCode::NoError) {
+        emit containerStatusRefreshed(3);
+        return;
+    }
+    emit containerStatusRefreshed(status);
 }
 
 void InstallUiController::refreshContainerDiagnostics(const QString &serverId, int containerIndex, int port)
@@ -419,27 +398,14 @@ void InstallUiController::refreshContainerDiagnostics(const QString &serverId, i
         return;
     }
 
-    using DiagResult = std::pair<bool, MtProxyContainerDiagnostics>;
-    InstallController *installController = m_installController;
-    auto *watcher = new QFutureWatcher<DiagResult>(this);
-    QObject::connect(watcher, &QFutureWatcher<DiagResult>::finished, this, [this, watcher]() {
-        const DiagResult result = watcher->result();
-        watcher->deleteLater();
-        if (!result.first) {
-            emit containerDiagnosticsRefreshed(false, false, -1, QString(), QString());
-            return;
-        }
-        const MtProxyContainerDiagnostics &diag = result.second;
-        emit containerDiagnosticsRefreshed(diag.portReachable, diag.upstreamReachable, diag.clientsConnected,
-                                           diag.lastConfigRefresh, diag.statsEndpoint);
-    });
-    QFuture<DiagResult> future =
-            QtConcurrent::run([installController, serverId, container, port]() -> DiagResult {
-                MtProxyContainerDiagnostics diag;
-                const ErrorCode errorCode = installController->queryMtProxyDiagnostics(serverId, container, port, diag);
-                return { errorCode == ErrorCode::NoError, diag };
-            });
-    watcher->setFuture(future);
+    MtProxyContainerDiagnostics diag;
+    const ErrorCode errorCode = m_installController->queryMtProxyDiagnostics(serverId, container, port, diag);
+    if (errorCode != ErrorCode::NoError) {
+        emit containerDiagnosticsRefreshed(false, false, -1, QString(), QString());
+        return;
+    }
+    emit containerDiagnosticsRefreshed(diag.portReachable, diag.upstreamReachable, diag.clientsConnected,
+                                       diag.lastConfigRefresh, diag.statsEndpoint);
 }
 
 void InstallUiController::fetchContainerSecret(const QString &serverId, int containerIndex)
@@ -449,17 +415,8 @@ void InstallUiController::fetchContainerSecret(const QString &serverId, int cont
         return;
     }
 
-    InstallController *installController = m_installController;
-    auto *watcher = new QFutureWatcher<QString>(this);
-    QObject::connect(watcher, &QFutureWatcher<QString>::finished, this, [this, watcher]() {
-        const QString secret = watcher->result();
-        watcher->deleteLater();
-        emit containerSecretFetched(secret);
-    });
-    QFuture<QString> future = QtConcurrent::run([installController, serverId, container]() -> QString {
-        return installController->fetchDockerContainerSecret(serverId, container);
-    });
-    watcher->setFuture(future);
+    const QString secret = m_installController->fetchDockerContainerSecret(serverId, container);
+    emit containerSecretFetched(secret);
 }
 
 void InstallUiController::rebootServer(const QString &serverId)

client/ui/controllers/selfhosted/installUiController.h

@@ -114,7 +114,7 @@ signals:
     void removeAllContainersFinished(const QString &finishedMessage);
     void removeContainerFinished(const QString &finishedMessage);
     void setContainerEnabledFinished(bool enabled);
-    void containerStatusRefreshed(int status, int errorCode);
+    void containerStatusRefreshed(int status);
     void containerDiagnosticsRefreshed(bool portReachable, bool upstreamReachable, int clientsConnected,
                                        const QString &lastConfigRefresh, const QString &statsEndpoint);
     void containerSecretFetched(const QString &secret);

client/ui/controllers/settingsUiController.cpp

@@ -37,6 +37,11 @@ SettingsUiController::SettingsUiController(SettingsController* settingsControlle
     if (m_settingsController->isDevGatewayEnv()) {
         m_settingsController->enableDevMode();
     }
+
+    connect(m_settingsController, &SettingsController::localProxySettingsUpdated, this,
+            &SettingsUiController::localProxySettingsUpdated);
+    connect(m_settingsController, &SettingsController::localProxyStartFailed, this,
+            &SettingsUiController::localProxyStartFailed);
 }
 
 void SettingsUiController::toggleAmneziaDns(bool enable)
@@ -358,3 +363,53 @@ void SettingsUiController::disableHomeAdLabel()
     m_settingsController->disableHomeAdLabel();
     emit isHomeAdLabelVisibleChanged(false);
 }
+
+bool SettingsUiController::isLocalProxySupported() const
+{
+    return m_settingsController->isLocalProxySupported();
+}
+
+bool SettingsUiController::isLocalProxyHttpEnabled() const
+{
+    return m_settingsController->isLocalProxyHttpEnabled();
+}
+
+int SettingsUiController::localProxyPort() const
+{
+    return m_settingsController->localProxyPort();
+}
+
+QString SettingsUiController::localProxyOwnerId() const
+{
+    return m_settingsController->localProxyOwnerId();
+}
+
+bool SettingsUiController::setLocalProxyPort(int port)
+{
+    return m_settingsController->setLocalProxyPort(port);
+}
+
+bool SettingsUiController::isLocalProxyPortBusy(int port) const
+{
+    return m_settingsController->isLocalProxyPortBusy(port);
+}
+
+bool SettingsUiController::isLocalProxyPortUserDefined() const
+{
+    return m_settingsController->isLocalProxyPortUserDefined();
+}
+
+int SettingsUiController::findFirstAvailableLocalProxyPort(int startPort) const
+{
+    return m_settingsController->findFirstAvailableLocalProxyPort(startPort);
+}
+
+bool SettingsUiController::enableLocalProxy(const QString &ownerId, int port)
+{
+    return m_settingsController->enableLocalProxy(ownerId, port);
+}
+
+void SettingsUiController::disableLocalProxy()
+{
+    m_settingsController->disableLocalProxy();
+}

client/ui/controllers/settingsUiController.h

@@ -31,6 +31,10 @@ public:
     Q_PROPERTY(bool isHomeAdLabelVisible READ isHomeAdLabelVisible NOTIFY isHomeAdLabelVisibleChanged)
     Q_PROPERTY(bool autoStartEnabled READ isAutoStartEnabled NOTIFY autoStartChanged)
     Q_PROPERTY(bool startMinimized READ isStartMinimizedEnabled NOTIFY startMinimizedChanged)
+    Q_PROPERTY(bool isLocalProxySupported READ isLocalProxySupported CONSTANT)
+    Q_PROPERTY(bool isLocalProxyHttpEnabled READ isLocalProxyHttpEnabled NOTIFY localProxySettingsUpdated)
+    Q_PROPERTY(int localProxyPort READ localProxyPort WRITE setLocalProxyPort NOTIFY localProxySettingsUpdated)
+    Q_PROPERTY(QString localProxyOwnerId READ localProxyOwnerId NOTIFY localProxySettingsUpdated)
 
 public slots:
     void toggleAmneziaDns(bool enable);
@@ -101,6 +105,17 @@ public slots:
     bool isHomeAdLabelVisible();
     void disableHomeAdLabel();
 
+    bool isLocalProxySupported() const;
+    bool isLocalProxyHttpEnabled() const;
+    int localProxyPort() const;
+    QString localProxyOwnerId() const;
+    bool setLocalProxyPort(int port);
+    bool isLocalProxyPortBusy(int port) const;
+    bool isLocalProxyPortUserDefined() const;
+    int findFirstAvailableLocalProxyPort(int startPort) const;
+    bool enableLocalProxy(const QString &ownerId, int port);
+    void disableLocalProxy();
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
@@ -135,6 +150,8 @@ signals:
     void isHomeAdLabelVisibleChanged(bool visible);
     void autoStartChanged();
     void startMinimizedChanged();
+    void localProxySettingsUpdated();
+    void localProxyStartFailed(const QString &message);
 
 private:
     SettingsController* m_settingsController;

client/ui/models/api/apiAccountInfoModel.cpp

@@ -73,6 +73,12 @@ QVariant ApiAccountInfoModel::data(const QModelIndex &index, int role) const
         }
         return false;
     }
+    case IsProtocolSelectionSupportedRole: {
+        if (m_accountInfoData.supportedProtocols.size() > 1) {
+            return true;
+        }
+        return false;
+    }
     case IsSubscriptionExpiredRole: {
         if (m_accountInfoData.configType == serverConfigUtils::ConfigType::AmneziaFreeV3) {
             return false;
@@ -126,6 +132,10 @@ void ApiAccountInfoModel::updateModel(const QJsonObject &accountInfoObject, cons
     accountInfoData.subscriptionDescription = accountInfoObject.value(apiDefs::key::subscriptionDescription).toString();
     accountInfoData.isRenewalAvailable = accountInfoObject.value(apiDefs::key::isRenewalAvailable).toBool(false);
 
+    for (const auto &protocol : accountInfoObject.value(apiDefs::key::supportedProtocols).toArray()) {
+        accountInfoData.supportedProtocols.push_back(protocol.toString());
+    }
+
     m_accountInfoData = accountInfoData;
 
     m_supportInfo = accountInfoObject.value(apiDefs::key::supportInfo).toObject();
@@ -191,6 +201,7 @@ QHash<int, QByteArray> ApiAccountInfoModel::roleNames() const
     roles[IsComponentVisibleRole] = "isComponentVisible";
     roles[IsSubscriptionRenewalAvailableRole] = "isSubscriptionRenewalAvailable";
     roles[HasExpiredWorkerRole] = "hasExpiredWorker";
+    roles[IsProtocolSelectionSupportedRole] = "isProtocolSelectionSupported";
     roles[IsSubscriptionExpiredRole] = "isSubscriptionExpired";
     roles[IsSubscriptionExpiringSoonRole] = "isSubscriptionExpiringSoon";
     roles[IsInAppPurchaseRole] = "isInAppPurchase";

client/ui/models/api/apiAccountInfoModel.h

@@ -22,6 +22,7 @@ public:
         IsComponentVisibleRole,
         IsSubscriptionRenewalAvailableRole,
         HasExpiredWorkerRole,
+        IsProtocolSelectionSupportedRole,
         IsSubscriptionExpiredRole,
         IsSubscriptionExpiringSoonRole,
         IsInAppPurchaseRole
@@ -57,6 +58,8 @@ private:
 
         serverConfigUtils::ConfigType configType;
 
+        QStringList supportedProtocols;
+
         QString subscriptionDescription;
 
         bool isInAppPurchase = false;

client/ui/models/serversModel.cpp

@@ -152,4 +152,3 @@ ServerCredentials ServersModel::serverCredentials(int index) const
     }
     return m_descriptions.at(index).selfHostedSshCredentials;
 }
-

client/ui/models/serversModel.h

@@ -10,6 +10,7 @@
 class ServersModel : public QAbstractListModel
 {
     Q_OBJECT
+
 public:
     enum Roles {
         NameRole = Qt::UserRole + 1,

client/ui/models/services/mtProxyConfigModel.cpp

@@ -1,6 +1,6 @@
 #include "mtProxyConfigModel.h"
 
-#include "ui/utils/mtProxyPublicHostInput.h"
+#include "ui/models/utils/mtproxy_public_host_input.h"
 
 #include "core/utils/networkUtilities.h"
 #include "core/utils/qrCodeUtils.h"
@@ -8,14 +8,19 @@
 #include "core/utils/constants/configKeys.h"
 #include "qrcodegen.hpp"
 
+#include <QClipboard>
+#include <QGuiApplication>
 #include <QHostAddress>
 #include <QRegExp>
 #include <QRegularExpression>
 #include <QtGlobal>
+#include <qqml.h>
 
 using namespace amnezia;
 
-MtProxyConfigModel::MtProxyConfigModel(QObject *parent) : QAbstractListModel(parent) {}
+MtProxyConfigModel::MtProxyConfigModel(QObject *parent) : QAbstractListModel(parent) {
+    qmlRegisterType<PublicHostInputValidator>("MtProxyConfig", 1, 0, "PublicHostInputValidator");
+}
 
 int MtProxyConfigModel::rowCount(const QModelIndex &parent) const {
     Q_UNUSED(parent);
@@ -327,7 +332,7 @@ void MtProxyConfigModel::removeAdditionalSecret(int idx) {
 QVariantList MtProxyConfigModel::additionalSecretsList() const {
     QVariantList out;
     out.reserve(m_protocolConfig.additionalSecrets.size());
-    for (const auto &s : m_protocolConfig.additionalSecrets) {
+    for (const auto &s: m_protocolConfig.additionalSecrets) {
         if (!s.isEmpty()) {
             out.append(s);
         }
@@ -393,9 +398,6 @@ bool MtProxyConfigModel::isValidPublicHost(const QString &host) const {
         return NetworkUtilities::checkIPv4Format(t);
     }
     if (a.protocol() == QHostAddress::IPv6Protocol) {
-        if (a.isNull() || a.isLoopback() || a == QHostAddress(QHostAddress::AnyIPv6)) {
-            return false;
-        }
         return true;
     }
     static const QRegularExpression onlyAsciiDigits(QStringLiteral(R"(^\d+$)"));
@@ -502,12 +504,20 @@ bool MtProxyConfigModel::isValidFakeTlsDomain(const QString &domain) const {
     if (!re.exactMatch(t)) {
         return false;
     }
+    // ee + 32 hex (base secret) + hex(UTF-8 domain); keep headroom under typical client limits.
     if (t.toUtf8().size() > 111) {
         return false;
     }
     return true;
 }
 
+QString MtProxyConfigModel::clipboardText() const {
+    if (QClipboard *c = QGuiApplication::clipboard()) {
+        return c->text();
+    }
+    return QString();
+}
+
 QString MtProxyConfigModel::sanitizeFakeTlsDomainFieldText(const QString &input) const {
     const QString t = normalizeFakeTlsDomainInput(input);
     QString out;
@@ -568,6 +578,7 @@ QString MtProxyConfigModel::sanitizeMtProxyTagFieldText(const QString &input) co
     if (trimmed.startsWith(QLatin1String("0x"), Qt::CaseInsensitive)) {
         trimmed = trimmed.mid(2).trimmed();
     }
+    // Prefer a contiguous 32-hex run (paste from bot message with extra text).
     static const QRegularExpression runHex(QStringLiteral(R"(([0-9a-fA-F]{32}))"));
     const QRegularExpressionMatch m = runHex.match(trimmed);
     if (m.hasMatch()) {
@@ -588,6 +599,18 @@ QString MtProxyConfigModel::sanitizeMtProxyTagFieldText(const QString &input) co
     return out;
 }
 
+QString MtProxyConfigModel::sanitizeWorkersFieldText(const QString &input) const {
+    QString out;
+    out.reserve(qMin(input.size(), 3));
+    for (const QChar &c: input) {
+        const ushort u = c.unicode();
+        if (u >= '0' && u <= '9' && out.size() < 3) {
+            out.append(c);
+        }
+    }
+    return out;
+}
+
 QString MtProxyConfigModel::sanitizeOptionalIpv4FieldText(const QString &input) const {
     QString out;
     out.reserve(qMin(input.size(), 15));

client/ui/models/services/mtProxyConfigModel.h

@@ -128,12 +128,16 @@ public slots:
 
     Q_INVOKABLE bool isFakeTlsDomainInputAllowed(const QString &text) const;
 
+    Q_INVOKABLE QString clipboardText() const;
+
     Q_INVOKABLE QString sanitizePublicHostFieldText(const QString &input) const;
 
     Q_INVOKABLE QString sanitizePortFieldText(const QString &input) const;
 
     Q_INVOKABLE QString sanitizeMtProxyTagFieldText(const QString &input) const;
 
+    Q_INVOKABLE QString sanitizeWorkersFieldText(const QString &input) const;
+
     Q_INVOKABLE QString sanitizeOptionalIpv4FieldText(const QString &input) const;
 
     Q_INVOKABLE bool isFakeTlsDomainTypingIncomplete(const QString &text) const;

client/ui/models/services/telemtConfigModel.cpp

@@ -1,12 +1,7 @@
 #include "telemtConfigModel.h"
 
-#include "ui/utils/mtProxyPublicHostInput.h"
-
-#include <QHostAddress>
-#include <QRegExp>
 #include <QRegularExpression>
 
-#include "core/utils/networkUtilities.h"
 #include "core/utils/qrCodeUtils.h"
 #include "core/utils/constants/configKeys.h"
 #include "core/utils/constants/protocolConstants.h"
@@ -54,11 +49,7 @@ bool TelemtConfigModel::setData(const QModelIndex &index, const QVariant &value,
             break;
         }
         case Roles::TagRole: {
-            const QString tag = sanitizeMtProxyTagFieldText(value.toString());
-            if (!isValidMtProxyTag(tag)) {
-                return false;
-            }
-            m_protocolConfig.tag = tag;
+            m_protocolConfig.tag = value.toString();
             break;
         }
         case Roles::IsEnabledRole: {
@@ -66,11 +57,7 @@ bool TelemtConfigModel::setData(const QModelIndex &index, const QVariant &value,
             break;
         }
         case Roles::PublicHostRole: {
-            const QString h = value.toString().trimmed();
-            if (!isValidPublicHost(h)) {
-                return false;
-            }
-            m_protocolConfig.publicHost = h;
+            m_protocolConfig.publicHost = value.toString();
             break;
         }
         case Roles::TransportModeRole: {
@@ -78,11 +65,7 @@ bool TelemtConfigModel::setData(const QModelIndex &index, const QVariant &value,
             break;
         }
         case Roles::TlsDomainRole: {
-            const QString d = value.toString().trimmed();
-            if (!isValidFakeTlsDomain(d)) {
-                return false;
-            }
-            m_protocolConfig.tlsDomain = d;
+            m_protocolConfig.tlsDomain = value.toString();
             break;
         }
         case Roles::AdditionalSecretsRole: {
@@ -102,19 +85,11 @@ bool TelemtConfigModel::setData(const QModelIndex &index, const QVariant &value,
             break;
         }
         case Roles::NatInternalIpRole: {
-            const QString ip = value.toString().trimmed();
-            if (!isValidOptionalIpv4(ip)) {
-                return false;
-            }
-            m_protocolConfig.natInternalIp = ip;
+            m_protocolConfig.natInternalIp = value.toString();
             break;
         }
         case Roles::NatExternalIpRole: {
-            const QString ip = value.toString().trimmed();
-            if (!isValidOptionalIpv4(ip)) {
-                return false;
-            }
-            m_protocolConfig.natExternalIp = ip;
+            m_protocolConfig.natExternalIp = value.toString();
             break;
         }
         case Roles::MaskEnabledRole: {
@@ -263,7 +238,7 @@ void TelemtConfigModel::setSecret(const QString &secret) {
 }
 
 bool TelemtConfigModel::validateAndSetSecret(const QString &rawSecret) {
-    if (!QRegularExpression("^[0-9a-fA-F]{32}$").match(rawSecret).hasMatch()) {
+    if (!QRegularExpression(QStringLiteral("^[0-9a-fA-F]{32}$")).match(rawSecret).hasMatch()) {
         return false;
     }
     setData(index(0), rawSecret, SecretRole);
@@ -279,11 +254,7 @@ void TelemtConfigModel::setTag(const QString &tag) {
 }
 
 void TelemtConfigModel::setPublicHost(const QString &host) {
-    const QString t = host.trimmed();
-    if (!isValidPublicHost(t)) {
-        return;
-    }
-    setData(index(0), t, PublicHostRole);
+    setData(index(0), host, PublicHostRole);
 }
 
 void TelemtConfigModel::setTransportMode(const QString &mode) {
@@ -291,15 +262,13 @@ void TelemtConfigModel::setTransportMode(const QString &mode) {
 }
 
 QString TelemtConfigModel::getTransportMode() const {
-    return m_protocolConfig.transportMode.isEmpty()
-           ? QString(protocols::telemt::transportModeStandard)
-           : m_protocolConfig.transportMode;
+    return m_protocolConfig.transportMode.isEmpty() ? QString::fromUtf8(protocols::telemt::transportModeStandard)
+                                                    : m_protocolConfig.transportMode;
 }
 
 QString TelemtConfigModel::getTlsDomain() const {
-    return m_protocolConfig.tlsDomain.isEmpty()
-           ? QString(protocols::telemt::defaultTlsDomain)
-           : m_protocolConfig.tlsDomain;
+    return m_protocolConfig.tlsDomain.isEmpty() ? QString::fromUtf8(protocols::telemt::defaultTlsDomain)
+                                                : m_protocolConfig.tlsDomain;
 }
 
 QString TelemtConfigModel::getPublicHost() const {
@@ -307,11 +276,7 @@ QString TelemtConfigModel::getPublicHost() const {
 }
 
 void TelemtConfigModel::setTlsDomain(const QString &domain) {
-    const QString t = domain.trimmed();
-    if (!isValidFakeTlsDomain(t)) {
-        return;
-    }
-    setData(index(0), t, TlsDomainRole);
+    setData(index(0), domain, TlsDomainRole);
 }
 
 void TelemtConfigModel::setWorkersMode(const QString &mode) {
@@ -327,19 +292,11 @@ void TelemtConfigModel::setNatEnabled(bool enabled) {
 }
 
 void TelemtConfigModel::setNatInternalIp(const QString &ip) {
-    const QString t = ip.trimmed();
-    if (!isValidOptionalIpv4(t)) {
-        return;
-    }
-    setData(index(0), t, NatInternalIpRole);
+    setData(index(0), ip, NatInternalIpRole);
 }
 
 void TelemtConfigModel::setNatExternalIp(const QString &ip) {
-    const QString t = ip.trimmed();
-    if (!isValidOptionalIpv4(t)) {
-        return;
-    }
-    setData(index(0), t, NatExternalIpRole);
+    setData(index(0), ip, NatExternalIpRole);
 }
 
 void TelemtConfigModel::setMaskEnabled(bool enabled) {
@@ -377,17 +334,6 @@ void TelemtConfigModel::removeAdditionalSecret(int idx) {
     emit dataChanged(index(0), index(0), QList<int>{AdditionalSecretsRole});
 }
 
-QVariantList TelemtConfigModel::additionalSecretsList() const {
-    QVariantList out;
-    out.reserve(m_protocolConfig.additionalSecrets.size());
-    for (const auto &s : m_protocolConfig.additionalSecrets) {
-        if (!s.isEmpty()) {
-            out.append(s);
-        }
-    }
-    return out;
-}
-
 void TelemtConfigModel::setEnabled(bool enabled) {
     m_protocolConfig.isEnabled = enabled;
     emit dataChanged(index(0), index(0), QList<int>{IsEnabledRole});
@@ -402,15 +348,15 @@ QString TelemtConfigModel::generateQrCode(const QString &text) {
 }
 
 QString TelemtConfigModel::defaultTlsDomain() const {
-    return protocols::telemt::defaultTlsDomain;
+    return QString::fromUtf8(protocols::telemt::defaultTlsDomain);
 }
 
 QString TelemtConfigModel::defaultPort() const {
-    return protocols::telemt::defaultPort;
+    return QString::fromUtf8(protocols::telemt::defaultPort);
 }
 
 QString TelemtConfigModel::defaultWorkers() const {
-    return protocols::telemt::defaultWorkers;
+    return QString::fromUtf8(protocols::telemt::defaultWorkers);
 }
 
 int TelemtConfigModel::maxWorkers() const {
@@ -418,303 +364,19 @@ int TelemtConfigModel::maxWorkers() const {
 }
 
 QString TelemtConfigModel::transportModeStandard() const {
-    return protocols::telemt::transportModeStandard;
+    return QString::fromUtf8(protocols::telemt::transportModeStandard);
 }
 
 QString TelemtConfigModel::transportModeFakeTLS() const {
-    return protocols::telemt::transportModeFakeTLS;
+    return QString::fromUtf8(protocols::telemt::transportModeFakeTLS);
 }
 
 QString TelemtConfigModel::workersModeAuto() const {
-    return protocols::telemt::workersModeAuto;
+    return QString::fromUtf8(protocols::telemt::workersModeAuto);
 }
 
 QString TelemtConfigModel::workersModeManual() const {
-    return protocols::telemt::workersModeManual;
-}
-
-bool TelemtConfigModel::isValidPublicHost(const QString &host) const {
-    const QString t = host.trimmed();
-    if (t.isEmpty()) {
-        return true;
-    }
-    if (t.length() > 253) {
-        return false;
-    }
-    QHostAddress a(t);
-    if (a.protocol() == QHostAddress::IPv4Protocol) {
-        return NetworkUtilities::checkIPv4Format(t);
-    }
-    if (a.protocol() == QHostAddress::IPv6Protocol) {
-        if (a.isNull() || a.isLoopback() || a == QHostAddress(QHostAddress::AnyIPv6)) {
-            return false;
-        }
-        return true;
-    }
-    static const QRegularExpression onlyAsciiDigits(QStringLiteral(R"(^\d+$)"));
-    if (onlyAsciiDigits.match(t).hasMatch()) {
-        return false;
-    }
-    return NetworkUtilities::domainRegExp().exactMatch(t);
-}
-
-bool TelemtConfigModel::isPublicHostInputAllowed(const QString &text) const {
-    return mtproxyPublicHostInputAllowed(text);
-}
-
-bool TelemtConfigModel::isPublicHostTypingIncomplete(const QString &text) const {
-    const QString t = text.trimmed();
-    if (isValidPublicHost(t)) {
-        return false;
-    }
-
-    static const QRegularExpression onlyDigitDot(QStringLiteral(R"(^[0-9.]+$)"));
-    if (onlyDigitDot.match(t).hasMatch()) {
-        if (t.endsWith(QLatin1Char('.'))) {
-            return true;
-        }
-        const QStringList parts = t.split(QLatin1Char('.'), Qt::KeepEmptyParts);
-        if (parts.size() < 4) {
-            return true;
-        }
-        for (const QString &part: parts) {
-            if (part.isEmpty()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    if (t.contains(QLatin1Char(':'))) {
-        if (t.contains(QLatin1String(":::"))) {
-            return false;
-        }
-        if (t.endsWith(QLatin1Char(':'))) {
-            return true;
-        }
-        QHostAddress a(t);
-        if (a.protocol() == QHostAddress::IPv6Protocol) {
-            return false;
-        }
-        if (!t.contains(QLatin1String("::")) && t.count(QLatin1Char(':')) < 7 && !t.contains(QLatin1Char('.'))) {
-            return true;
-        }
-        return false;
-    }
-
-    if (!t.contains(QLatin1Char('.'))) {
-        return true;
-    }
-
-    return false;
-}
-
-bool TelemtConfigModel::isValidMtProxyTag(const QString &tag) const {
-    if (tag.isEmpty()) {
-        return true;
-    }
-    static const QRegularExpression re(
-            QStringLiteral("^([0-9a-fA-F]{%1})$").arg(protocols::telemt::botTagHexLength));
-    return re.match(tag).hasMatch();
-}
-
-bool TelemtConfigModel::isMtProxyTagTypingIncomplete(const QString &text) const {
-    const QString t = text.trimmed();
-    if (t.isEmpty()) {
-        return true;
-    }
-    static const QRegularExpression hexOnly(QStringLiteral(R"(^[0-9a-fA-F]*$)"));
-    if (!hexOnly.match(t).hasMatch()) {
-        return false;
-    }
-    return t.size() < protocols::telemt::botTagHexLength;
-}
-
-int TelemtConfigModel::mtProxyBotTagHexLength() const {
-    return protocols::telemt::botTagHexLength;
-}
-
-bool TelemtConfigModel::isValidFakeTlsDomain(const QString &domain) const {
-    const QString t = domain.trimmed();
-    if (t.isEmpty()) {
-        return true;
-    }
-    if (t.length() > 253) {
-        return false;
-    }
-    QHostAddress addr;
-    if (addr.setAddress(t)) {
-        return false;
-    }
-    static const QRegularExpression onlyAsciiDigits(QStringLiteral(R"(^\d+$)"));
-    if (onlyAsciiDigits.match(t).hasMatch()) {
-        return false;
-    }
-    QRegExp re(NetworkUtilities::domainRegExp());
-    re.setCaseSensitivity(Qt::CaseInsensitive);
-    if (!re.exactMatch(t)) {
-        return false;
-    }
-    if (t.toUtf8().size() > 111) {
-        return false;
-    }
-    return true;
-}
-
-QString TelemtConfigModel::normalizeFakeTlsDomainInput(const QString &input) const {
-    QString t = input.trimmed();
-    if (t.startsWith(QLatin1String("https://"), Qt::CaseInsensitive)) {
-        t = t.mid(8);
-    } else if (t.startsWith(QLatin1String("http://"), Qt::CaseInsensitive)) {
-        t = t.mid(7);
-    }
-    if (const int slash = t.indexOf(QLatin1Char('/')); slash >= 0) {
-        t = t.left(slash);
-    }
-    if (const int at = t.indexOf(QLatin1Char('@')); at >= 0) {
-        t = t.mid(at + 1);
-    }
-    if (const int colon = t.indexOf(QLatin1Char(':')); colon >= 0) {
-        t = t.left(colon);
-    }
-    if (t.startsWith(QLatin1String("www."), Qt::CaseInsensitive)) {
-        const QString rest = t.mid(4);
-        if (rest.contains(QLatin1Char('.'))) {
-            t = rest;
-        }
-    }
-    return t.trimmed();
-}
-
-bool TelemtConfigModel::isFakeTlsDomainTypingIncomplete(const QString &text) const {
-    const QString t = text.trimmed();
-    if (t.isEmpty()) {
-        return true;
-    }
-    if (isValidFakeTlsDomain(t)) {
-        return false;
-    }
-    if (t.contains(QLatin1Char('/')) || t.contains(QLatin1Char(':')) || t.contains(QLatin1Char('@'))
-        || t.contains(QLatin1Char(' '))) {
-        return false;
-    }
-    if (t.contains(QLatin1String(".."))) {
-        return false;
-    }
-    if (!t.contains(QLatin1Char('.'))) {
-        return true;
-    }
-    if (t.endsWith(QLatin1Char('.'))) {
-        return true;
-    }
-    static const QRegularExpression legalPartial(QStringLiteral(R"(^[a-zA-Z0-9.-]*$)"));
-    if (!legalPartial.match(t).hasMatch()) {
-        return false;
-    }
-    return true;
-}
-
-bool TelemtConfigModel::isFakeTlsDomainInputAllowed(const QString &text) const {
-    if (text.length() > 253) {
-        return false;
-    }
-    static const QRegularExpression re(QStringLiteral(R"(^[a-zA-Z0-9.-]*$)"));
-    return re.match(text).hasMatch();
-}
-
-QString TelemtConfigModel::sanitizeFakeTlsDomainFieldText(const QString &input) const {
-    const QString t = normalizeFakeTlsDomainInput(input);
-    QString out;
-    out.reserve(t.size());
-    for (const QChar &c: t) {
-        const ushort u = c.unicode();
-        const bool letter = (u >= 'a' && u <= 'z') || (u >= 'A' && u <= 'Z');
-        const bool digit = (u >= '0' && u <= '9');
-        if (letter || digit || u == '.' || u == '-') {
-            out.append(c);
-        }
-    }
-    if (out.size() > 253) {
-        out.truncate(253);
-    }
-    return out;
-}
-
-QString TelemtConfigModel::sanitizePublicHostFieldText(const QString &input) const {
-    QString out;
-    const int cap = qMin(input.size(), 253);
-    out.reserve(cap);
-    for (const QChar &c: input) {
-        if (out.size() >= 253) {
-            break;
-        }
-        const ushort u = c.unicode();
-        if ((u >= 'a' && u <= 'z') || (u >= 'A' && u <= 'Z') || (u >= '0' && u <= '9') || u == '.' || u == ':' ||
-            u == '-') {
-            out.append(c);
-        }
-    }
-    return out;
-}
-
-QString TelemtConfigModel::sanitizePortFieldText(const QString &input) const {
-    QString out;
-    out.reserve(qMin(input.size(), 5));
-    for (const QChar &c: input) {
-        const ushort u = c.unicode();
-        if (u >= '0' && u <= '9' && out.size() < 5) {
-            out.append(c);
-        }
-    }
-    return out;
-}
-
-QString TelemtConfigModel::sanitizeMtProxyTagFieldText(const QString &input) const {
-    QString trimmed = input.trimmed();
-    if (trimmed.startsWith(QLatin1String("0x"), Qt::CaseInsensitive)) {
-        trimmed = trimmed.mid(2).trimmed();
-    }
-    static const QRegularExpression runHex(QStringLiteral(R"(([0-9a-fA-F]{32}))"));
-    const QRegularExpressionMatch m = runHex.match(trimmed);
-    if (m.hasMatch()) {
-        return m.captured(1);
-    }
-    const int cap = protocols::telemt::botTagHexLength;
-    QString out;
-    out.reserve(qMin(trimmed.size(), cap));
-    for (const QChar &c: trimmed) {
-        if (out.size() >= cap) {
-            break;
-        }
-        const ushort u = c.unicode();
-        if ((u >= '0' && u <= '9') || (u >= 'a' && u <= 'f') || (u >= 'A' && u <= 'F')) {
-            out.append(c);
-        }
-    }
-    return out;
-}
-
-QString TelemtConfigModel::sanitizeOptionalIpv4FieldText(const QString &input) const {
-    QString out;
-    out.reserve(qMin(input.size(), 15));
-    for (const QChar &c: input) {
-        if (out.size() >= 15) {
-            break;
-        }
-        const ushort u = c.unicode();
-        if ((u >= '0' && u <= '9') || u == '.') {
-            out.append(c);
-        }
-    }
-    return out;
-}
-
-bool TelemtConfigModel::isValidOptionalIpv4(const QString &ip) const {
-    const QString t = ip.trimmed();
-    if (t.isEmpty()) {
-        return true;
-    }
-    return NetworkUtilities::checkIPv4Format(t);
+    return QString::fromUtf8(protocols::telemt::workersModeManual);
 }
 
 QHash<int, QByteArray> TelemtConfigModel::roleNames() const {

client/ui/models/services/telemtConfigModel.h

@@ -88,8 +88,6 @@ public slots:
 
     Q_INVOKABLE void removeAdditionalSecret(int idx);
 
-    Q_INVOKABLE QVariantList additionalSecretsList() const;
-
     Q_INVOKABLE QString generateQrCode(const QString &text);
 
     Q_INVOKABLE void setEnabled(bool enabled);
@@ -118,44 +116,12 @@ public slots:
 
     Q_INVOKABLE QString workersModeManual() const;
 
-    Q_INVOKABLE bool isValidPublicHost(const QString &host) const;
-
-    Q_INVOKABLE bool isPublicHostInputAllowed(const QString &text) const;
-
-    Q_INVOKABLE bool isPublicHostTypingIncomplete(const QString &text) const;
-
-    Q_INVOKABLE bool isValidMtProxyTag(const QString &tag) const;
-
-    Q_INVOKABLE bool isMtProxyTagTypingIncomplete(const QString &text) const;
-
-    Q_INVOKABLE int mtProxyBotTagHexLength() const;
-
-    Q_INVOKABLE bool isValidFakeTlsDomain(const QString &domain) const;
-
-    Q_INVOKABLE bool isFakeTlsDomainTypingIncomplete(const QString &text) const;
-
-    Q_INVOKABLE bool isFakeTlsDomainInputAllowed(const QString &text) const;
-
-    Q_INVOKABLE QString sanitizeFakeTlsDomainFieldText(const QString &input) const;
-
-    Q_INVOKABLE QString sanitizePublicHostFieldText(const QString &input) const;
-
-    Q_INVOKABLE QString sanitizePortFieldText(const QString &input) const;
-
-    Q_INVOKABLE QString sanitizeMtProxyTagFieldText(const QString &input) const;
-
-    Q_INVOKABLE QString sanitizeOptionalIpv4FieldText(const QString &input) const;
-
-    Q_INVOKABLE bool isValidOptionalIpv4(const QString &ip) const;
-
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
     static void applyDefaults(amnezia::TelemtProtocolConfig &c);
 
-    QString normalizeFakeTlsDomainInput(const QString &input) const;
-
     amnezia::DockerContainer m_container = amnezia::DockerContainer::None;
     QJsonObject m_fullConfig;
     amnezia::TelemtProtocolConfig m_protocolConfig;

client/ui/models/utils/mtproxy_public_host_input.cpp

@@ -1,4 +1,4 @@
-#include "mtProxyPublicHostInput.h"
+#include "mtproxy_public_host_input.h"
 
 #include <QRegularExpression>
 

client/ui/models/utils/mtproxy_public_host_input.h

@@ -1,5 +1,5 @@
-#ifndef MTPROXYPUBLICHOSTINPUT_H
-#define MTPROXYPUBLICHOSTINPUT_H
+#ifndef MTPROXY_PUBLIC_HOST_INPUT_H
+#define MTPROXY_PUBLIC_HOST_INPUT_H
 
 #include <QString>
 

client/ui/qml/Controls2/BaseHeaderType.qml

@@ -12,6 +12,7 @@ Item {
     property int headerTextMaximumLineCount: 2
     property int headerTextElide: Qt.ElideRight
     property string descriptionText
+    property string descriptionColor: AmneziaStyle.color.mutedGray
     property string descriptionLinkText
     property string descriptionLinkUrl
     property alias headerRow: headerRow
@@ -42,7 +43,7 @@ Item {
             Layout.topMargin: 16
             Layout.fillWidth: true
             text: root.descriptionText
-            color: AmneziaStyle.color.mutedGray
+            color: root.descriptionColor
             visible: root.descriptionText !== ""
         }
 

client/ui/qml/Controls2/CaptchaDialogType.qml

@@ -20,42 +20,13 @@ Popup {
     signal captchaSolved(string captchaId, string solution)
     signal refreshCaptchaRequested()
 
-    readonly property int keyboardHeight: {
-        if (PageController.imeHeight > 0) {
-            return PageController.imeHeight
-        }
-        if (Qt.platform.os === "ios" && Qt.inputMethod.visible) {
-            const r = Qt.inputMethod.keyboardRectangle
-            if (r.height <= 0) {
-                return 0
-            }
-            return Math.max(0, Math.round(parent.height - r.y))
-        }
-        return 0
-    }
-
     leftMargin: 25
     rightMargin: 25
     bottomMargin: 70 + SettingsController.safeAreaBottomMargin
 
     width: parent.width - leftMargin - rightMargin
 
-    x: Math.round((parent.width - width) / 2)
-    y: {
-        const centered = Math.round((parent.height - height) / 2)
-        if (root.keyboardHeight === 0) {
-            return centered
-        }
-        return Math.max(20, Math.min(centered, parent.height - root.keyboardHeight - height - 16))
-    }
-
-    Behavior on y {
-        NumberAnimation {
-            duration: 150
-            easing.type: Easing.OutCubic
-        }
-    }
-
+    anchors.centerIn: parent
     modal: true
     closePolicy: Popup.NoAutoClose
 
@@ -66,7 +37,7 @@ Popup {
     onOpened: {
         timer.start()
         solutionField.textField.text = ""
-        solutionField.textField.forceActiveFocus()
+        solutionField.textField.focus = true
     }
 
     onCaptchaIdChanged: {

client/ui/qml/Controls2/ContextMenuType.qml

@@ -4,7 +4,7 @@ import QtQuick.Controls
 Menu {
     property var textObj
 
-    popupType: Qt.platform.os === "ios" ? Popup.Item : Popup.Native
+    popupType: Popup.Native
 
     property Item inputBlocker: null
 

client/ui/qml/Controls2/TextAreaType.qml

@@ -93,9 +93,7 @@ Rectangle {
 
                 wrapMode: Text.Wrap
 
-                ContextMenu.menu: Qt.platform.os === "ios" ? null : contextMenu
-
-                ContextMenuType {
+                ContextMenu.menu: ContextMenuType {
                     id: contextMenu
                     textObj: textArea
                 }

client/ui/qml/Controls2/TextAreaWithFooterType.qml

@@ -79,9 +79,7 @@ Rectangle {
 
                 wrapMode: Text.Wrap
 
-                ContextMenu.menu: Qt.platform.os === "ios" ? null : contextMenu
-
-                ContextMenuType {
+                ContextMenu.menu: ContextMenuType {
                     id: contextMenu
                     textObj: textArea
                 }

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -15,6 +15,7 @@ Item {
     property string headerTextColor: AmneziaStyle.color.mutedGray
 
     property alias errorText: errorField.text
+    property bool clearErrorOnTextChanged: true
     property bool checkEmptyText: false
     property bool rightButtonClickedOnEnter: false
 
@@ -135,7 +136,9 @@ Item {
                         }
 
                         onTextChanged: {
-                            root.errorText = ""
+                            if (root.clearErrorOnTextChanged) {
+                                root.errorText = ""
+                            }
                         }
 
                         onActiveFocusChanged: {
@@ -144,9 +147,7 @@ Item {
                             }
                         }
 
-                        ContextMenu.menu: Qt.platform.os === "ios" ? null : contextMenu
-
-                        ContextMenuType {
+                        ContextMenu.menu: ContextMenuType {
                             id: contextMenu
                             textObj: textField
                         }

client/ui/qml/Pages2/PageHome.qml

@@ -21,41 +21,6 @@ PageType {
 
     property var containersDropDownRef: null
 
-    property var apiAvailableProtocols: []
-    property string apiCurrentProtocol: ""
-
-    readonly property bool isApiProtocolSelectionVisible: ServersUiController.isDefaultServerFromApi && root.apiAvailableProtocols.length > 0
-
-    function updateApiProtocolState() {
-        if (ServersUiController.isDefaultServerFromApi) {
-            root.apiAvailableProtocols = SubscriptionUiController.availableProtocols(ServersUiController.defaultServerId)
-            root.apiCurrentProtocol = SubscriptionUiController.currentProtocol(ServersUiController.defaultServerId)
-        } else {
-            root.apiAvailableProtocols = []
-            root.apiCurrentProtocol = ""
-        }
-    }
-
-    function protocolDisplayName(protocol) {
-        switch (protocol) {
-        case "awg": return "AmneziaWG"
-        case "vless": return "VLESS"
-        default: return protocol
-        }
-    }
-
-    Component.onCompleted: {
-        root.updateApiProtocolState()
-    }
-
-    Connections {
-        target: ServersUiController
-
-        function onDefaultServerIdChanged() {
-            root.updateApiProtocolState()
-        }
-    }
-
     Connections {
         target: Qt.application
 
@@ -245,10 +210,6 @@ PageType {
                     drawer.collapsedHeight = collapsed.implicitHeight
                 }
 
-                onImplicitHeightChanged: {
-                    drawer.collapsedHeight = collapsed.implicitHeight
-                }
-
                 DividerType {
                     Layout.topMargin: 10
                     Layout.fillWidth: false
@@ -350,7 +311,7 @@ PageType {
                     objectName: "rowLayoutLabel"
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                     Layout.topMargin: 8
-                    Layout.bottomMargin: root.isApiProtocolSelectionVisible ? 8 : (drawer.isCollapsedStateActive ? 44 : ServersUiController.isDefaultServerFromApi ? 61 : 16)
+                    Layout.bottomMargin: drawer.isCollapsedStateActive ? 44 : ServersUiController.isDefaultServerFromApi ? 61 : 16
                     spacing: 0
 
                     BasicButtonType {
@@ -404,61 +365,6 @@ PageType {
                         }
                     }
                 }
-
-                RowLayout {
-                    objectName: "protocolRowLayout"
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.bottomMargin: drawer.isCollapsedStateActive ? 44 : 61
-                    spacing: 0
-
-                    visible: root.isApiProtocolSelectionVisible
-
-                    BasicButtonType {
-                        id: protocolButton
-                        objectName: "protocolButton"
-
-                        enabled: root.apiAvailableProtocols.length > 1
-                        hoverEnabled: enabled
-
-                        implicitHeight: 36
-
-                        leftPadding: 16
-                        rightPadding: 16
-
-                        defaultColor: AmneziaStyle.color.transparent
-                        hoveredColor: AmneziaStyle.color.translucentWhite
-                        pressedColor: AmneziaStyle.color.sheerWhite
-                        disabledColor: AmneziaStyle.color.transparent
-                        textColor: AmneziaStyle.color.mutedGray
-
-                        buttonTextLabel.lineHeight: 16
-                        buttonTextLabel.font.pixelSize: 13
-                        buttonTextLabel.font.weight: 400
-
-                        text: root.apiAvailableProtocols.length > 1
-                            ? root.protocolDisplayName(root.apiCurrentProtocol)
-                            : root.protocolDisplayName(root.apiAvailableProtocols[0])
-                        leftImageSource: "qrc:/images/controls/arrow-left-right.svg"
-                        leftImageColor: AmneziaStyle.color.mutedGray
-
-                        rightImageSource: enabled ? "qrc:/images/controls/chevron-down.svg" : ""
-
-                        Keys.onEnterPressed: this.clicked()
-                        Keys.onReturnPressed: this.clicked()
-
-                        onClicked: {
-                            if (ConnectionController.isConnectionInProgress) {
-                                PageController.showNotificationMessage(qsTr("Unable change protocol while trying to make an active connection"))
-                                return
-                            }
-                            if (ConnectionController.isConnected) {
-                                PageController.showNotificationMessage(qsTr("Cannot change protocol during active connection"))
-                                return
-                            }
-                            protocolSelectionDrawer.openTriggered()
-                        }
-                    }
-                }
             }
 
             ColumnLayout {
@@ -573,119 +479,4 @@ PageType {
             }
         }
     }
-
-    DrawerType2 {
-        id: protocolSelectionDrawer
-        objectName: "protocolSelectionDrawer"
-
-        anchors.fill: parent
-
-        expandedStateContent: Item {
-            id: protocolDrawerContainer
-
-            implicitHeight: root.height * 0.5
-
-            Component.onCompleted: {
-                protocolSelectionDrawer.expandedHeight = protocolDrawerContainer.implicitHeight
-            }
-
-            ColumnLayout {
-                id: protocolDrawerHeader
-
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.topMargin: 16
-
-                BackButtonType {
-                    id: protocolDrawerBackButton
-
-                    Layout.fillWidth: true
-
-                    backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                    backButtonFunction: function() { protocolSelectionDrawer.closeTriggered() }
-                }
-
-                Header2Type {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
-                    headerText: qsTr("VPN protocol")
-                }
-            }
-
-            ListViewType {
-                id: protocolDrawerListView
-
-                anchors.top: protocolDrawerHeader.bottom
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.topMargin: 16
-
-                model: root.apiAvailableProtocols
-
-                ButtonGroup {
-                    id: protocolDrawerButtonGroup
-                }
-
-                delegate: Item {
-                    implicitWidth: protocolDrawerListView.width
-                    implicitHeight: protocolDrawerDelegate.implicitHeight
-
-                    ColumnLayout {
-                        id: protocolDrawerDelegate
-
-                        anchors.fill: parent
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
-
-                        VerticalRadioButton {
-                            id: protocolDrawerRadioButton
-
-                            Layout.fillWidth: true
-
-                            text: root.protocolDisplayName(modelData)
-
-                            ButtonGroup.group: protocolDrawerButtonGroup
-
-                            checkable: !ConnectionController.isConnected
-                            checked: modelData === root.apiCurrentProtocol
-
-                            onClicked: {
-                                protocolSelectionDrawer.closeTriggered()
-
-                                if (modelData === root.apiCurrentProtocol) {
-                                    return
-                                }
-
-                                if (ConnectionController.isConnected) {
-                                    PageController.showNotificationMessage(qsTr("Cannot change protocol during active connection"))
-                                    return
-                                }
-
-                                PageController.showBusyIndicator(true)
-                                ServersUiController.setProcessedServerId(ServersUiController.defaultServerId)
-                                SubscriptionUiController.setCurrentProtocol(ServersUiController.defaultServerId, modelData)
-                                if (!SubscriptionUiController.updateServiceFromGateway(ServersUiController.defaultServerId, "", "", true)) {
-                                    SubscriptionUiController.setCurrentProtocol(ServersUiController.defaultServerId, root.apiCurrentProtocol)
-                                }
-                                root.updateApiProtocolState()
-                                PageController.showBusyIndicator(false)
-                            }
-
-                            Keys.onEnterPressed: protocolDrawerRadioButton.clicked()
-                            Keys.onReturnPressed: protocolDrawerRadioButton.clicked()
-                        }
-
-                        DividerType {
-                            Layout.fillWidth: true
-                        }
-                    }
-                }
-            }
-        }
-    }
 }