suppressing sudo password prompt

Run the "which" with sudo to check the $LOCK_CMD variable in case the user's PATH variable has incorrect values ​​if the user is not root and is only a member of the sudo group.

.github/workflows/deploy.yml

@@ -23,9 +23,6 @@ jobs:
               - 'recipes/**'
               - 'conanfile.py'
               - '.github/workflows/deploy.yml'
-              - 'cmake/conan_provider.cmake'
-              - 'cmake/platform_settings.cmake'
-              - 'cmake/recipes_bootstrap.cmake'
 
   Bake-Prebuilts-Linux:
     runs-on: ubuntu-latest

CMakeLists.txt

@@ -18,9 +18,9 @@ project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION}
         HOMEPAGE_URL "https://amnezia.org/"
 )
 
-# trigger conan to kick off `conan install` globally
-find_package(OpenSSL REQUIRED)
 if (PREBUILTS_ONLY)
+    # trigger conan to kick off `conan install`
+    find_package(OpenSSL REQUIRED)
     return()
 endif()
 

client/CMakeLists.txt

@@ -212,32 +212,11 @@ endif()
 
 install(TARGETS ${PROJECT}
     DESTINATION ${CMAKE_INSTALL_BINDIR}
-    RUNTIME_DEPENDENCY_SET client_deps
     COMPONENT AmneziaVPN
 )
-
-if(APPLE)
-    set(RUNTIME_DEPS_DIR ${CMAKE_INSTALL_BINDIR}/AmneziaVPN.app/Contents/Frameworks)
-else()
-    set(RUNTIME_DEPS_DIR ${CMAKE_INSTALL_BINDIR})
-endif()
-
-install(RUNTIME_DEPENDENCY_SET client_deps
-    PRE_EXCLUDE_REGEXES
-        [[api-ms-win-.*]]
-        [[ext-ms-.*]]
-        [[kernel32\.dll]]
-        [[hvsifiletrust\.dll]]
-        [[libc\.so\..*]] [[libgcc_s\.so\..*]] [[libm\.so\..*]] [[libstdc\+\+\.so\..*]]
-        [[.*\.framework]]
-        [[^[Qq]t.*]]
-    POST_EXCLUDE_REGEXES
-        [[^.*[\\/]system32[\\/].*\.dll$]]
-        [[^/lib.*]]
-        [[^/usr/lib.*]]
-    DIRECTORIES ${CONAN_RUNTIME_LIB_DIRS}
+install(FILES $<TARGET_RUNTIME_DLLS:${PROJECT}>
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT AmneziaVPN
-    DESTINATION "${RUNTIME_DEPS_DIR}"
 )
 
 set(deploy_tool_options "")

client/cmake/ios.cmake

@@ -54,6 +54,7 @@ target_include_directories(${PROJECT} PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
 
 
 set_target_properties(${PROJECT} PROPERTIES
+    XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
     MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Info.plist.in
     MACOSX_BUNDLE_ICON_FILE "AppIcon"
     MACOSX_BUNDLE_INFO_STRING "AmneziaVPN"

client/core/controllers/coreController.cpp

@@ -203,9 +203,6 @@ void CoreController::initControllers()
     m_ipSplitTunnelingUiController = new IpSplitTunnelingUiController(m_ipSplitTunnelingController, m_ipSplitTunnelingModel, this);
     setQmlContextProperty("IpSplitTunnelingController", m_ipSplitTunnelingUiController);
 
-    m_serversBackupController = new ServersBackupController(m_settings, m_serversModel, m_serversUiController, m_serversController);
-    setQmlContextProperty("ServersBackupController", m_serversBackupController);
-
     m_allowedDnsUiController = new AllowedDnsUiController(m_allowedDnsController, m_allowedDnsModel, this);
     setQmlContextProperty("AllowedDnsController", m_allowedDnsUiController);
 

client/core/controllers/coreController.h

@@ -24,7 +24,6 @@
 #include "ui/controllers/settingsUiController.h"
 #include "ui/controllers/serversUiController.h"
 #include "ui/controllers/ipSplitTunnelingUiController.h"
-#include "ui/controllers/serversBackupController.h"
 #include "ui/controllers/systemController.h"
 #include "ui/controllers/languageUiController.h"
 #include "ui/controllers/updateUiController.h"
@@ -175,7 +174,6 @@ private:
     AllowedDnsUiController* m_allowedDnsUiController;
     LanguageUiController* m_languageUiController;
     UpdateUiController* m_updateUiController;
-    ServersBackupController* m_serversBackupController;
 
     SubscriptionUiController* m_subscriptionUiController;
     ApiNewsUiController* m_apiNewsUiController;

client/core/controllers/selfhosted/importController.cpp

@@ -486,7 +486,7 @@ QJsonObject ImportController::extractOpenVpnConfig(const QString &data) const
     QJsonObject config;
     config[configKey::containers] = arr;
     config[configKey::defaultContainer] = configKey::amneziaOpenvpn;
-    config[configKey::description] = m_serversRepository->nextAvailableServerName();
+    config[configKey::description] = m_appSettingsRepository->nextAvailableServerName();
 
     const static QRegularExpression dnsRegExp("dhcp-option DNS (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
     QRegularExpressionMatchIterator dnsMatch = dnsRegExp.globalMatch(data);
@@ -645,7 +645,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data, Config
     QJsonObject config;
     config[configKey::containers] = arr;
     config[configKey::defaultContainer] = containerName;
-    config[configKey::description] = m_serversRepository->nextAvailableServerName();
+    config[configKey::description] = m_appSettingsRepository->nextAvailableServerName();
 
     const static QRegularExpression dnsRegExp(
             "DNS = "
@@ -699,7 +699,7 @@ QJsonObject ImportController::extractXrayConfig(const QString &data, ConfigTypes
             ? configKey::amneziaSsxray
             : configKey::amneziaXray;
     if (description.isEmpty()) {
-        config[configKey::description] = m_serversRepository->nextAvailableServerName();
+        config[configKey::description] = m_appSettingsRepository->nextAvailableServerName();
     } else {
         config[configKey::description] = description;
     }

client/core/controllers/selfhosted/installController.cpp

@@ -358,7 +358,7 @@ void InstallController::addEmptyServer(const ServerCredentials &credentials)
     serverConfig.userName = credentials.userName;
     serverConfig.password = credentials.secretData;
     serverConfig.port = credentials.port;
-    serverConfig.description = m_serversRepository->nextAvailableServerName();
+    serverConfig.description = m_appSettingsRepository->nextAvailableServerName();
     serverConfig.displayName = serverConfig.description.isEmpty() ? serverConfig.hostName : serverConfig.description;
     serverConfig.defaultContainer = DockerContainer::None;
 
@@ -1170,7 +1170,7 @@ ErrorCode InstallController::installServer(const ServerCredentials &credentials,
     serverConfig.userName = credentials.userName;
     serverConfig.password = credentials.secretData;
     serverConfig.port = credentials.port;
-    serverConfig.description = m_serversRepository->nextAvailableServerName();
+    serverConfig.description = m_appSettingsRepository->nextAvailableServerName();
 
     for (auto iterator = preparedContainers.begin(); iterator != preparedContainers.end(); iterator++) {
         serverConfig.containers.insert(iterator.key(), iterator.value());
@@ -1240,26 +1240,28 @@ ErrorCode InstallController::installContainer(const QString &serverId, DockerCon
     return ErrorCode::NoError;
 }
 
-ErrorCode InstallController::checkSshConnection(ServerCredentials &credentials, QString &output,
+ErrorCode InstallController::checkSshConnection(const ServerCredentials &credentials, QString &output,
                                                 std::function<QString()> passphraseCallback)
 {
     SshSession sshSession(this);
     ErrorCode errorCode = ErrorCode::NoError;
 
-    if (credentials.secretData.contains("BEGIN") && credentials.secretData.contains("PRIVATE KEY")) {
+    ServerCredentials processedCredentials = credentials;
+
+    if (processedCredentials.secretData.contains("BEGIN") && processedCredentials.secretData.contains("PRIVATE KEY")) {
         if (!passphraseCallback) {
             return ErrorCode::SshPrivateKeyError;
         }
 
         QString decryptedPrivateKey;
-        errorCode = sshSession.getDecryptedPrivateKey(credentials, decryptedPrivateKey, passphraseCallback);
+        errorCode = sshSession.getDecryptedPrivateKey(processedCredentials, decryptedPrivateKey, passphraseCallback);
         if (errorCode != ErrorCode::NoError) {
             return errorCode;
         }
-        credentials.secretData = decryptedPrivateKey;
+        processedCredentials.secretData = decryptedPrivateKey;
     }
 
-    output = sshSession.checkSshConnection(credentials, errorCode);
+    output = sshSession.checkSshConnection(processedCredentials, errorCode);
     return errorCode;
 }
 

client/core/controllers/selfhosted/installController.h

@@ -64,8 +64,7 @@ public:
     
     bool isUpdateDockerContainerRequired(DockerContainer container, const ContainerConfig &oldConfig, const ContainerConfig &newConfig);
     
-    ErrorCode checkSshConnection(ServerCredentials &credentials, QString &output,
-                                 std::function<QString()> passphraseCallback = nullptr);
+    ErrorCode checkSshConnection(const ServerCredentials &credentials, QString &output, std::function<QString()> passphraseCallback = nullptr);
     
     bool isServerAlreadyExists(const ServerCredentials &credentials, int &existingServerIndex);
     

client/core/controllers/settingsController.cpp

@@ -363,6 +363,6 @@ void SettingsController::disablePremV1MigrationReminder()
 
 QString SettingsController::nextAvailableServerName() const
 {
-    return m_serversRepository->nextAvailableServerName();
+    return m_appSettingsRepository->nextAvailableServerName();
 }
 

client/core/controllers/updateController.cpp

@@ -13,6 +13,7 @@
 #include "version.h"
 #include "core/controllers/gatewayController.h"
 #include "core/utils/constants/apiKeys.h"
+#include "core/utils/errorStrings.h"
 #include "core/utils/selfhosted/scriptsRegistry.h"
 
 namespace
@@ -108,7 +109,7 @@ void UpdateController::fetchGatewayUrl()
             .then(this, [this, gatewayController](QPair<ErrorCode, QByteArray> result) {
                 auto [err, gatewayResponse] = result;
                 if (err != ErrorCode::NoError) {
-                    logger.error() << "Gateway request failed, error code:" << static_cast<int>(err);
+                    logger.error() << errorString(err);
                     finishUpdateCheck();
                     return;
                 }
@@ -249,9 +250,17 @@ void UpdateController::runInstaller()
             runLinuxInstaller(kInstallerLocalPath);
     #endif
         } else {
-            logger.error() << "Installer download failed, network error:" << static_cast<int>(reply->error())
-                           << reply->errorString();
-            logger.error() << "HTTP status:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
+                || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
+                logger.error() << errorString(ErrorCode::ApiConfigTimeoutError);
+            } else {
+                QString err = reply->errorString();
+                logger.error() << QString::fromUtf8(reply->readAll());
+                logger.error() << "Network error code:" << QString::number(static_cast<int>(reply->error()));
+                logger.error() << "Error message:" << err;
+                logger.error() << "HTTP status:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+                logger.error() << errorString(ErrorCode::ApiConfigDownloadError);
+            }
         }
         reply->deleteLater();
     });

client/core/repositories/secureAppSettingsRepository.cpp

@@ -426,6 +426,26 @@ void SecureAppSettingsRepository::clearSettings()
     emit settingsCleared();
 }
 
+QString SecureAppSettingsRepository::nextAvailableServerName() const
+{
+    int i = 0;
+    bool nameExist = false;
+
+    do {
+        i++;
+        nameExist = false;
+        QJsonArray servers = QJsonDocument::fromJson(value("Servers/serversList").toByteArray()).array();
+        for (const QJsonValue &server : servers) {
+            if (server.toObject().value(configKey::description).toString() == QString("Server") + " " + QString::number(i)) {
+                nameExist = true;
+                break;
+            }
+        }
+    } while (nameExist);
+
+    return QString("Server") + " " + QString::number(i);
+}
+
 void SecureAppSettingsRepository::setInstallationUuid(const QString &uuid)
 {
     m_settings->setValue("Conf/installationUuid", uuid);

client/core/repositories/secureAppSettingsRepository.h

@@ -90,6 +90,8 @@ public:
     bool restoreAppConfig(const QByteArray &cfg);
     void clearSettings();
 
+    QString nextAvailableServerName() const;
+
     QByteArray xraySavedConfigs() const;
     void setXraySavedConfigs(const QByteArray &data);
 

client/core/repositories/secureServersRepository.cpp

@@ -3,7 +3,6 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonValue>
-#include <QSet>
 #include <QUuid>
 
 #include "core/utils/serverConfigUtils.h"
@@ -33,45 +32,6 @@ QJsonObject embedStorageServerId(const QString &serverId, const QJsonObject &pay
     return o;
 }
 
-QString storedServerDisplayName(const SecureServersRepository *repository, const QString &serverId)
-{
-    using Kind = serverConfigUtils::ConfigType;
-    switch (repository->serverKind(serverId)) {
-    case Kind::SelfHostedAdmin:
-        if (const auto cfg = repository->selfHostedAdminConfig(serverId)) {
-            return cfg->displayName;
-        }
-        break;
-    case Kind::SelfHostedUser:
-        if (const auto cfg = repository->selfHostedUserConfig(serverId)) {
-            return cfg->displayName;
-        }
-        break;
-    case Kind::Native:
-        if (const auto cfg = repository->nativeConfig(serverId)) {
-            return cfg->displayName;
-        }
-        break;
-    case Kind::AmneziaPremiumV2:
-    case Kind::AmneziaFreeV3:
-    case Kind::ExternalPremium:
-        if (const auto cfg = repository->apiV2Config(serverId)) {
-            return cfg->displayName;
-        }
-        break;
-    case Kind::AmneziaPremiumV1:
-    case Kind::AmneziaFreeV2:
-        if (const auto cfg = repository->legacyApiConfig(serverId)) {
-            return cfg->displayName;
-        }
-        break;
-    case Kind::Invalid:
-    default:
-        break;
-    }
-    return {};
-}
-
 } // namespace
 
 SecureServersRepository::SecureServersRepository(SecureQSettings *settings, QObject *parent)
@@ -193,28 +153,6 @@ void SecureServersRepository::clearServers()
     syncToStorage();
 }
 
-QString SecureServersRepository::nextAvailableServerName() const
-{
-    QSet<QString> usedNames;
-    usedNames.reserve(m_orderedServerIds.size());
-
-    for (const QString &serverId : m_orderedServerIds) {
-        const QString displayName = storedServerDisplayName(this, serverId);
-        if (!displayName.isEmpty()) {
-            usedNames.insert(displayName);
-        }
-    }
-
-    int i = 0;
-    QString candidate;
-    do {
-        i++;
-        candidate = QStringLiteral("Server %1").arg(i);
-    } while (usedNames.contains(candidate));
-
-    return candidate;
-}
-
 QString SecureServersRepository::addServer(const QString &serverId, const QJsonObject &serverJson, serverConfigUtils::ConfigType kind)
 {
     const QString id = normalizedOrGeneratedServerId(serverId);

client/core/repositories/secureServersRepository.h

@@ -48,8 +48,6 @@ public:
 
     void clearServers();
 
-    QString nextAvailableServerName() const;
-
     void invalidateCache();
 
 signals:

client/core/utils/selfhosted/sshClient.cpp

@@ -290,86 +290,6 @@ namespace libssh {
         return watcher.result();
     }
 
-    ErrorCode Client::scpFileDownload(const QString& remotePath, const QString& localPath)
-    {
-        // Use full path for SCP download
-        m_scpSession = ssh_scp_new(m_session, SSH_SCP_READ, remotePath.toStdString().c_str());
-
-        if (m_scpSession == nullptr) {
-            return fromLibsshErrorCode();
-        }
-
-        if (ssh_scp_init(m_scpSession) != SSH_OK) {
-            auto errorCode = fromLibsshErrorCode();
-            closeScpSession();
-            return errorCode;
-        }
-
-        QFutureWatcher<ErrorCode> watcher;
-        connect(&watcher, &QFutureWatcher<ErrorCode>::finished, this, &Client::scpFileDownloadFinished);
-        QFuture<ErrorCode> future = QtConcurrent::run([this, &remotePath, &localPath]() {
-            // Pull request - this gets file info
-            int result = ssh_scp_pull_request(m_scpSession);
-            if (result != SSH_SCP_REQUEST_NEWFILE) {
-                return fromLibsshErrorCode();
-            }
-
-            // Accept the request
-            ssh_scp_accept_request(m_scpSession);
-
-            // Get file size
-            int fileSize = ssh_scp_request_get_size(m_scpSession);
-            if (fileSize <= 0) {
-                return ErrorCode::InternalError;
-            }
-
-            // Open local file for writing
-            QFile fout(localPath);
-            if (!fout.open(QIODevice::WriteOnly)) {
-                return fromFileErrorCode(fout.error());
-            }
-
-            // Read file data in chunks
-            constexpr size_t bufferSize = 16384;
-            int transferred = 0;
-
-            while (transferred < fileSize) {
-                int chunkSize = qMin(bufferSize, static_cast<size_t>(fileSize - transferred));
-                QByteArray buffer(chunkSize, 0);
-
-                int bytesRead = ssh_scp_read(m_scpSession, buffer.data(), chunkSize);
-                if (bytesRead == SSH_ERROR) {
-                    fout.close();
-                    return fromLibsshErrorCode();
-                }
-
-                if (bytesRead != chunkSize) {
-                    fout.close();
-                    return ErrorCode::InternalError;
-                }
-
-                qint64 bytesWritten = fout.write(buffer);
-                if (bytesWritten != chunkSize) {
-                    fout.close();
-                    return fromFileErrorCode(fout.error());
-                }
-
-                transferred += bytesRead;
-            }
-
-            fout.close();
-            return ErrorCode::NoError;
-        });
-        watcher.setFuture(future);
-
-        QEventLoop wait;
-        QObject::connect(this, &Client::scpFileDownloadFinished, &wait, &QEventLoop::quit);
-        wait.exec();
-
-        closeScpSession();
-        return watcher.result();
-    }
-
     void Client::closeScpSession()
     {
         if (m_scpSession != nullptr) {

client/core/utils/selfhosted/sshClient.h

@@ -38,8 +38,6 @@ namespace libssh {
                                const QString &localPath,
                                const QString &remotePath,
                                const QString &fileDesc);
-        ErrorCode scpFileDownload(const QString &remotePath,
-                                   const QString &localPath);
         ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback);
     private:
         ErrorCode closeChannel();
@@ -56,7 +54,6 @@ namespace libssh {
     signals:
         void writeToChannelFinished();
         void scpFileCopyFinished();
-        void scpFileDownloadFinished();
     };
 }
 

client/core/utils/selfhosted/sshSession.cpp

@@ -44,11 +44,6 @@ SshSession::~SshSession()
     m_sshClient.disconnectFromHost();
 }
 
-void SshSession::resetConnection()
-{
-    m_sshClient.disconnectFromHost();
-}
-
 ErrorCode SshSession::runScript(const ServerCredentials &credentials, QString script,
                                 const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut,
                                 const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr)

client/core/utils/selfhosted/sshSession.h

@@ -47,9 +47,6 @@ public:
     ErrorCode uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
                                libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
 
-    /** Force-close the current SSH connection so the next operation starts fresh. */
-    void resetConnection();
-
 private:
     libssh::Client m_sshClient;
 };

client/ios/networkextension/CMakeLists.txt

@@ -26,8 +26,6 @@ set_target_properties(networkextension PROPERTIES
     XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
 
     XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../Frameworks"
-
-    XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
 )
 
 if(DEPLOY)
@@ -116,20 +114,10 @@ target_include_directories(networkextension PRIVATE ${CLIENT_ROOT_DIR})
 target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(openvpnadapter REQUIRED)
-# FIXME(ygurov): https://github.com/conan-io/conan/issues/20034
-set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_property(TARGET amnezia::openvpnadapter APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
 target_link_libraries(networkextension PRIVATE amnezia::openvpnadapter)
 
 find_package(awg-apple REQUIRED)
 target_link_libraries(networkextension PRIVATE amnezia::awg-apple)
 
 find_package(hev-socks5-tunnel REQUIRED)
-# FIXME(ygurov): https://github.com/conan-io/conan/issues/20034
-set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_property(TARGET heiher::hev-socks5-tunnel APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
 target_link_libraries(networkextension PRIVATE heiher::hev-socks5-tunnel)

client/server_scripts/check_server_is_busy.sh

@@ -1,7 +1,8 @@
-if which apt-get > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/dpkg/lock-frontend";\
-elif which dnf > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/cache/dnf/* /var/run/dnf/* /var/lib/dnf/* /var/lib/rpm/*";\
-elif which yum > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/yum.pid";\
-elif which zypper > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/zypp.pid";\
-elif which pacman > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/pacman/db.lck";\
-else echo "Packet manager not found"; echo "Internal error"; exit 1; fi;\
-if command -v $LOCK_CMD > /dev/null 2>&1; then sudo $LOCK_CMD $LOCK_FILE 2>/dev/null; else echo "$LOCK_CMD not installed"; fi
+if which apt-get > /dev/null 2>&1 || command -v apt-get > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/dpkg/lock-frontend";\
+elif which dnf > /dev/null 2>&1 || command -v dnf > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/cache/dnf/* /var/run/dnf/* /var/lib/dnf/* /var/lib/rpm/*";\
+elif which yum > /dev/null 2>&1 || command -v yum > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/yum.pid";\
+elif which zypper > /dev/null 2>&1 || command -v zypper > /dev/null 2>&1; then LOCK_CMD="cat"; LOCK_FILE="/var/run/zypp.pid";\
+elif which pacman > /dev/null 2>&1 || command -v pacman > /dev/null 2>&1; then LOCK_CMD="fuser"; LOCK_FILE="/var/lib/pacman/db.lck";\
+else echo "Packet manager not found"; echo "Internal error"; exit 1;\
+fi;\
+if sudo -n which $LOCK_CMD > /dev/null 2>&1 || command -v $LOCK_CMD > /dev/null 2>&1; then sudo $LOCK_CMD $LOCK_FILE 2>/dev/null; else echo "$LOCK_CMD not installed"; fi

client/server_scripts/check_user_in_sudo.sh

@@ -1,8 +1,8 @@
-if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); opt="--version";\
-elif which dnf > /dev/null 2>&1; then pm=$(which dnf); opt="--version";\
-elif which yum > /dev/null 2>&1; then pm=$(which yum); opt="--version";\
-elif which zypper > /dev/null 2>&1; then pm=$(which zypper); opt="--version";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); opt="--version";\
+if pm=$(which apt-get 2>/dev/null || command -v apt-get 2>/dev/null); then opt="--version";\
+elif pm=$(which dnf 2>/dev/null || command -v dnf 2>/dev/null); then opt="--version";\
+elif pm=$(which yum 2>/dev/null || command -v yum 2>/dev/null); then opt="--version";\
+elif pm=$(which zypper 2>/dev/null || command -v zypper 2>/dev/null); then opt="--version";\
+elif pm=$(which pacman 2>/dev/null || command -v pacman 2>/dev/null); then opt="--version";\
 else pm="uname"; opt="-a";\
 fi;\
 CUR_USER=$(whoami 2>/dev/null || echo $HOME | sed 's/.*\///');\

client/translations/amneziavpn_ru_RU.ts

@@ -2880,16 +2880,6 @@ Thank you for staying with us!</source>
         <source>Add them to the application if they were not displayed</source>
         <translation>Добавить их в приложение, если они не отображаются</translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="126"/>
-        <source>Backup</source>
-        <translation>Резервное копирование</translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="127"/>
-        <source>Local copy of VPN protocols, services, all server settings and users</source>
-        <translation>Локальная копия VPN-протоколов, сервисов, всех настроек сервера и пользователей</translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="124"/>
         <source>Reboot server</source>
@@ -3579,34 +3569,6 @@ Thank you for staying with us!</source>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
-    <message>
-        <source>No containers found in backup file</source>
-        <translation>В файле резервной копии не найдено контейнеров</translation>
-    </message>
-    <message>
-        <source>Installing %1 (%2/%3)...</source>
-        <translation>Устанавливается %1 (%2/%3)...</translation>
-    </message>
-    <message>
-        <source>backup.tgz</source>
-        <translation>backup.tgz</translation>
-    </message>
-    <message>
-        <source>RestoredServer</source>
-        <translation>Восстановленный сервер</translation>
-    </message>
-    <message>
-        <source>Restore from backup</source>
-        <translation>Восстановить из резервной копии</translation>
-    </message>
-    <message>
-        <source>Restoration of VPN protocols, services, all server settings and users</source>
-        <translation>Восстановление VPN-протоколов, сервисов, всех настроек сервера и пользователей</translation>
-    </message>
-    <message>
-        <source>Select Backup to Restore</source>
-        <translation>Выберите файл резервной копии</translation>
-    </message>
 </context>
 <context>
     <name>PageSetupWizardInstalling</name>
@@ -5424,131 +5386,6 @@ FileZilla или другие SFTP-клиенты, а также смонтир
         <translation>Будет установлен протокол AmneziaWG. Он обеспечивает высокую скорость соединения и гарантирует стабильную работу даже в самых сложных условиях.</translation>
     </message>
 </context>
-<context>
-    <name>PageSettingsServerBackup</name>
-    <message>
-        <source>Backup</source>
-        <translation>Резервное копирование</translation>
-    </message>
-    <message>
-        <source>Local copy of VPN protocols, services, all server settings and users.</source>
-        <translation>Локальная копия VPN-протоколов, сервисов, всех настроек сервера и пользователей.</translation>
-    </message>
-    <message>
-        <source>More about backups</source>
-        <translation>Подробнее о резервных копиях</translation>
-    </message>
-    <message>
-        <source>Create backup</source>
-        <translation>Создать резервную копию</translation>
-    </message>
-    <message>
-        <source>Restore from backup</source>
-        <translation>Восстановить из резервной копии</translation>
-    </message>
-    <message>
-        <source>Create backup and download to device?</source>
-        <translation>Создать резервную копию и скачать на устройство?</translation>
-    </message>
-    <message>
-        <source>Backup will be created on server and automatically downloaded to your device</source>
-        <translation>Резервная копия будет создана на сервере и автоматически скачана на ваше устройство</translation>
-    </message>
-    <message>
-        <source>Create server configuration backup?</source>
-        <translation>Создать резервную копию конфигурации сервера?</translation>
-    </message>
-    <message>
-        <source>This will create a backup of your server containers configuration on the server</source>
-        <translation>На сервере будет создана резервная копия конфигурации контейнеров</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Создать</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <source>Select Backup to Restore</source>
-        <translation>Выберите файл резервной копии</translation>
-    </message>
-    <message>
-        <source>Backup files (*.tar.gz *.backup *.tgz *.gz)</source>
-        <translation>Файлы резервных копий (*.tar.gz *.backup *.tgz *.gz)</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Сервер</translation>
-    </message>
-    <message>
-        <source>Backup created successfully: %1</source>
-        <translation>Резервная копия успешно создана: %1</translation>
-    </message>
-    <message>
-        <source>Backup downloaded successfully!\n\nSaved to:\n%1</source>
-        <translation>Резервная копия успешно скачана!\n\nСохранена в:\n%1</translation>
-    </message>
-    <message>
-        <source>Backup error: %1</source>
-        <translation>Ошибка резервного копирования: %1</translation>
-    </message>
-</context>
-<context>
-    <name>PageSettingsServerRestoreMode</name>
-    <message>
-        <source>%1 on %2</source>
-        <translation>%1 на %2</translation>
-    </message>
-    <message>
-        <source>Restore from backup</source>
-        <translation>Восстановление из резервной копии</translation>
-    </message>
-    <message>
-        <source>Add data from backup</source>
-        <translation>Добавить данные из резервной копии</translation>
-    </message>
-    <message>
-        <source>If the same protocols are already installed on the server, they will be updated. Created users and access will be saved</source>
-        <translation>Если на сервере уже установлены такие же протоколы, они будут обновлены. Созданные пользователи и доступы сохранятся</translation>
-    </message>
-    <message>
-        <source>Replace</source>
-        <translation>Заменить</translation>
-    </message>
-    <message>
-        <source>All installed protocols, users and their access will not be saved</source>
-        <translation>Все установленные протоколы, пользователи и их доступы не будут сохранены</translation>
-    </message>
-    <message>
-        <source>Backup restore error: %1</source>
-        <translation>Ошибка восстановления из резервной копии: %1</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Сервер</translation>
-    </message>
-</context>
-<context>
-    <name>PageSettingsServerBackupRestored</name>
-    <message>
-        <source>%1 on &quot;%2&quot;</source>
-        <translation>%1 на &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <source>Backup restored</source>
-        <translation>Резервная копия восстановлена</translation>
-    </message>
-    <message>
-        <source>To home</source>
-        <translation>На главную</translation>
-    </message>
-    <message>
-        <source>To server settings</source>
-        <translation>К настройкам сервера</translation>
-    </message>
-</context>
 <context>
     <name>main2</name>
     <message>

client/ui/controllers/qml/pageController.h

@@ -32,9 +32,6 @@ namespace PageLoader
         PageSettingsNewsNotifications,
         PageSettingsNewsDetail,
         PageSettingsBackup,
-        PageSettingsServerBackup,
-        PageSettingsServerRestoreMode,
-        PageSettingsServerBackupRestored,
         PageSettingsAbout,
         PageSettingsLogging,
         PageSettingsSplitTunneling,
@@ -154,7 +151,6 @@ signals:
     void goToPageSettings();
     void goToPageViewConfig();
     void goToPageSettingsServerServices();
-    void goToPageSettingsServerManagement();
     void goToPageSettingsBackup();
     void goToShareConnectionPage(QString headerText, QString configContentHeaderText, QString configCaption, QString configExtension,
                                  QString configFileName);

client/ui/controllers/serversBackupController.h

@@ -1,406 +0,0 @@
-#ifndef SERVERSBACKUPCONTROLLER_H
-#define SERVERSBACKUPCONTROLLER_H
-
-#include <QObject>
-#include <QString>
-#include <QDateTime>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QFileInfo>
-
-class QTemporaryFile;
-class ServersModel;
-class ServersUiController;
-class ServersController;
-class SecureQSettings;
-
-#include <QPointer>
-
-#include "core/utils/containerEnum.h"
-#include "core/utils/commonStructs.h"
-#include "core/utils/errorCodes.h"
-#include "core/utils/selfhosted/sshSession.h"
-
-using namespace amnezia;
-
-/**
- * @brief Controller for managing Amnezia VPN configuration backups
- * 
- * Uses existing ServerController and libssh::Client from Amnezia
- * Bash scripts are embedded directly in C++ code
- * Supports direct container backup via docker cp
- * 
- * Fully cross-platform: Windows, macOS, Linux, iOS, Android
- */
-class ServersBackupController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ServersBackupController(SecureQSettings *settings, ServersModel *serversModel,
-                                     ServersUiController *serversUiController, ServersController *serversController,
-                                     QObject *parent = nullptr);
-    ~ServersBackupController();
-
-    /**
-     * @brief Backup information
-     */
-    struct BackupInfo {
-        QString filename;
-        QString fullPath;
-        QDateTime createdAt;
-        qint64 size;
-        bool isValid;
-        QStringList containers;
-    };
-
-    enum BackupStatus {
-        Idle,
-        InProgress,
-        Success,
-        Failed
-    };
-    Q_ENUM(BackupStatus)
-
-public slots:
-    /**
-     * @brief Create backup on server (all containers)
-     * @param credentials Server credentials
-     */
-    void createBackup(const ServerCredentials &credentials);
-    
-    /**
-     * @brief Create backup and automatically download to device (for QML)
-     * @param downloadToDevice Download to device after creation?
-     * @param deleteFromServer Delete from server after download?
-     */
-    Q_INVOKABLE void createBackupWithDownload(bool downloadToDevice = true, 
-                                               bool deleteFromServer = true);
-
-    /**
-     * @brief Create backup of specific container
-     * @param credentials Server credentials
-     * @param container Container type for backup
-     */
-    void createContainerBackup(const ServerCredentials &credentials, DockerContainer container);
-    
-    /**
-     * @brief Create backup of specific container by name
-     * @param credentials Server credentials
-     * @param containerName Container name (e.g. "amnezia-awg")
-     */
-    void createBackupByName(const ServerCredentials &credentials, const QString &containerName);
-
-    /**
-     * @brief Create backup of multiple containers
-     * @param credentials Server credentials
-     * @param containers List of containers for backup
-     */
-    void createContainersBackup(const ServerCredentials &credentials, const QList<DockerContainer> &containers);
-
-    /**
-     * @brief Get list of backups from server
-     * @param credentials Server credentials
-     */
-    void fetchBackupList(const ServerCredentials &credentials);
-
-    /**
-     * @brief Restore from backup
-     * @param credentials Server credentials
-     * @param backupFilename Backup file name
-     * @param containers List of containers (empty = all)
-     * @param replaceMode If true - clears container first, then restores. If false - adds data on top of existing
-     */
-    void restoreBackup(const ServerCredentials &credentials, 
-                       const QString &backupFilename, 
-                       const QStringList &containers = QStringList(),
-                       bool replaceMode = false);
-
-    /**
-     * @brief Check backup status on server
-     * @param credentials Server credentials
-     */
-    void checkBackupStatus(const ServerCredentials &credentials);
-
-    /**
-     * @brief Download backup to local machine
-     * @param credentials Server credentials
-     * @param backupFilename Backup file name
-     * @param localPath Save path
-     */
-    void downloadBackup(const ServerCredentials &credentials,
-                        const QString &backupFilename, 
-                        const QString &localPath);
-
-    /**
-     * @brief Upload backup to server
-     * @param credentials Server credentials
-     * @param localPath Path to local file
-     * @param replaceMode Restore mode (true = replace, false = add). Saved for later use in restoreBackup
-     */
-    void uploadBackup(const ServerCredentials &credentials,
-                      const QString &localPath,
-                      bool replaceMode = false);
-    
-    // Overloaded method for setup wizard with separate credential parameters
-    Q_INVOKABLE void uploadBackupWithStrings(const QString &hostname,
-                                             const QString &username,
-                                             const QString &secretData,
-                                             const QString &localPath,
-                                             bool replaceMode = false);
-    
-    /**
-     * @brief Universal method to start restore (from QML)
-     * Automatically selects correct path depending on parameters
-     * @param isFromSetupWizard Restore from setup wizard?
-     * @param backupFilePath Path to local backup file
-     * @param replaceMode Restore mode (true = replace, false = add)
-     * @param wizardHostname Hostname for setup wizard (optional)
-     * @param wizardUsername Username for setup wizard (optional)
-     * @param wizardSecretData Secret data for setup wizard (optional)
-     */
-    Q_INVOKABLE void startRestore(bool isFromSetupWizard,
-                                   const QString &backupFilePath,
-                                   bool replaceMode,
-                                   const QString &wizardHostname = QString(),
-                                   const QString &wizardUsername = QString(),
-                                   const QString &wizardSecretData = QString());
-    
-    /**
-     * @brief Prepare restore information from backup file
-     * Parses filename, extracts IP, prepares metadata
-     * @param backupFilePath Path to backup file
-     * @return QVariantMap with keys: fileName, serverIp
-     */
-    Q_INVOKABLE QVariantMap getBackupFileInfo(const QString &backupFilePath);
-    
-    /**
-     * @brief Scan backup file and determine which containers it contains
-     * @param localPath Path to local backup file
-     * @return List of container names found in backup
-     */
-    Q_INVOKABLE QStringList scanBackupForContainers(const QString &localPath);
-    
-    /**
-     * @brief Set default server and container after restore (for setup wizard)
-     * @param isFromSetupWizard Was restore called from setup wizard
-     * @return true if successful, false if no servers or containers
-     */
-    Q_INVOKABLE bool setDefaultServerAfterRestore(bool isFromSetupWizard);
-    
-    /**
-     * @brief Install containers from backup on empty server (for setup wizard)
-     * Scans backup, adds empty server and sends signal to install containers
-     * @param backupFilePath Path to local backup file
-     * @param hostname Server hostname
-     * @param username Username for SSH
-     * @param secretData Password/key for SSH
-     */
-    Q_INVOKABLE void prepareRestoreFromBackup(const QString &backupFilePath,
-                                               const QString &hostname,
-                                               const QString &username,
-                                               const QString &secretData);
-
-    /**
-     * @brief Delete backup from server
-     * @param credentials Server credentials
-     * @param backupFilename Backup file name
-     */
-    void deleteBackup(const ServerCredentials &credentials,
-                      const QString &backupFilename);
-
-    /**
-     * @brief Set backup directory on server
-     */
-    void setBackupDirectory(const QString &directory);
-
-    /**
-     * @brief Get backup directory
-     */
-    QString backupDirectory() const { return m_backupDir; }
-
-signals:
-    /**
-     * @brief Operation status changed
-     */
-    void statusChanged(BackupStatus status);
-
-    /**
-     * @brief Operation progress (0-100)
-     */
-    void progressChanged(int percent, const QString &message);
-
-    /**
-     * @brief Backup list received
-     */
-    void backupListReceived(const QList<BackupInfo> &backups);
-
-    /**
-     * @brief Backup created successfully
-     */
-    void backupCreated(const QString &backupFilename);
-
-    /**
-     * @brief Backup restored successfully
-     */
-    void backupRestored();
-    
-    /**
-     * @brief Need to set default server and container (for setup wizard)
-     * This signal is sent after backupRestored() if restore was from setup wizard
-     */
-    void needSetDefaultServer();
-    
-    /**
-     * @brief Default server and container successfully set
-     * Can navigate to result page
-     */
-    void defaultServerAndContainerSet();
-    
-    /**
-     * @brief All containers from backup installed
-     * Can proceed to data restore
-     * @param backupFilePath Path to backup file
-     * @param hostname Hostname
-     * @param username Username  
-     * @param secretData Secret data
-     * @param serverIp IP address (for display)
-     * @param fileName File name (for display)
-     */
-    void readyForRestore(const QString &backupFilePath,
-                        const QString &hostname,
-                        const QString &username,
-                        const QString &secretData,
-                        const QString &serverIp,
-                        const QString &fileName);
-
-    /**
-     * @brief Backup downloaded
-     */
-    void backupDownloaded(const QString &localPath);
-
-    /**
-     * @brief Backup uploaded to server
-     */
-    void backupUploaded(const QString &serverPath);
-
-    /**
-     * @brief Backup status information received
-     */
-    void backupStatusReceived(const QJsonObject &status);
-
-    /**
-     * @brief Error occurred
-     */
-    void errorOccurred(const QString &errorMessage, ErrorCode errorCode);
-
-private:
-    /**
-     * @brief Get bash script for creating backup of all containers
-     * @param ipAddress Server IP address in underscored format (e.g. "192_119_110_11")
-     */
-    QString getBackupScript(const QString &ipAddress) const;
-
-    /**
-     * @brief Get bash script for creating backup of specific container
-     * @param container Container type
-     * @param ipAddress Server IP address in underscored format (e.g. "192_119_110_11")
-     */
-    QString getContainerBackupScript(DockerContainer container, const QString &ipAddress) const;
-
-    /**
-     * @brief Get bash script for creating backup of multiple containers
-     * @param containers List of containers
-     * @param ipAddress Server IP address in underscored format (e.g. "192_119_110_11")
-     */
-    QString getContainersBackupScript(const QList<DockerContainer> &containers, const QString &ipAddress) const;
-
-    /**
-     * @brief Get bash script for restore
-     * @param backupFilename Backup file name
-     * @param containers List of containers
-     * @param replaceMode If true - clears container first, then restores
-     */
-    QString getRestoreScript(const QString &backupFilename, const QStringList &containers, bool replaceMode = false) const;
-
-    /**
-     * @brief Get bash script for status check
-     */
-    QString getCheckStatusScript() const;
-
-    /**
-     * @brief Get bash script for backup list
-     */
-    QString getListBackupsScript() const;
-
-    /**
-     * @brief Parse backup list from output
-     */
-    QList<BackupInfo> parseBackupList(const QString &output);
-
-    /**
-     * @brief Parse status from output
-     */
-    QJsonObject parseBackupStatus(const QString &output);
-
-    /**
-     * @brief Handle standard output
-     */
-    ErrorCode handleStdOut(const QString &data, QString &output);
-
-    /**
-     * @brief Handle error output
-     */
-    ErrorCode handleStdErr(const QString &data, QString &error);
-
-    /**
-     * @brief Set status
-     */
-    void setStatus(BackupStatus status);
-
-    /**
-     * @brief Set progress
-     */
-    void setProgress(int percent, const QString &message);
-    
-    /**
-     * @brief Attempt to set default container (called from timer)
-     */
-    void trySetDefaultContainer();
-
-    ErrorCode runHostScript(const ServerCredentials &credentials, const QString &script,
-                            const std::function<ErrorCode(const QString &, libssh::Client &)> &cbStdOut = nullptr,
-                            const std::function<ErrorCode(const QString &, libssh::Client &)> &cbStdErr = nullptr);
-    ErrorCode downloadFileFromHost(const ServerCredentials &credentials, const QString &remotePath, const QString &localPath);
-    ErrorCode uploadFileToHostPublic(const ServerCredentials &credentials, const QString &localPath, const QString &remotePath,
-                                     libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
-
-private:
-    QPointer<SecureQSettings> m_settings;
-    ServersModel *m_serversModel;
-    ServersUiController *m_serversUiController;
-    ServersController *m_serversController;
-    SshSession m_sshSession;
-    BackupStatus m_status;
-    QString m_backupDir;
-    QString m_currentOutput;
-    QString m_currentError;
-    bool m_restoreReplaceMode; // Save restore mode for use after uploadBackup
-    QTemporaryFile *m_tempUploadFile; // Temp file for Android URI (to prevent deletion before upload completes)
-    
-    // For setting default container
-    int m_containerRetryCount;
-    static constexpr int m_maxContainerRetries = 3;
-    
-    // For automatic restore after upload
-    ServerCredentials m_pendingRestoreCredentials;
-    bool m_autoRestoreAfterUpload;
-    
-    // For automatic backup download/delete
-    bool m_autoDownloadAfterCreate;
-    bool m_autoDeleteAfterDownload;
-    QString m_lastCreatedBackupFilename;
-};
-
-#endif // SERVERSBACKUPCONTROLLER_H
-

client/ui/controllers/systemController.cpp

@@ -168,42 +168,6 @@ void SystemController::setQmlRoot(QObject *qmlRoot)
     m_qmlRoot = qmlRoot;
 }
 
-QString SystemController::getFileNameFromPath(const QString &filePath)
-{
-    if (filePath.isEmpty()) {
-        return "";
-    }
-    
-#ifdef Q_OS_ANDROID
-    // Для Android URI используем специальный метод для получения имени файла
-    if (filePath.startsWith("content://")) {
-        QString fileName = AndroidController::instance()->getFileName(filePath);
-        if (!fileName.isEmpty()) {
-            return fileName;
-        }
-        // Если не удалось получить имя через ContentResolver, пытаемся извлечь из URI
-    }
-#endif
-    
-    // Для обычных путей или если Android метод не сработал
-    QFileInfo fileInfo(filePath);
-    QString fileName = fileInfo.fileName();
-    
-    // Если имя файла пустое, пытаемся извлечь из пути
-    if (fileName.isEmpty()) {
-        QStringList parts = filePath.split('/');
-        if (!parts.isEmpty()) {
-            fileName = parts.last();
-            // Декодируем URL-кодированные символы
-            if (fileName.contains('%')) {
-                fileName = QUrl::fromPercentEncoding(fileName.toUtf8());
-            }
-        }
-    }
-    
-    return fileName;
-}
-
 bool SystemController::isAuthenticated()
 {
 #ifdef Q_OS_ANDROID

client/ui/controllers/systemController.h

@@ -18,13 +18,6 @@ public:
 public slots:
     QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",
                         const bool isSaveMode = false, const QString &defaultSuffix = "");
-    
-    /**
-     * @brief Получить имя файла из пути или URI (для Android)
-     * @param filePath Путь к файлу или URI
-     * @return Имя файла
-     */
-    Q_INVOKABLE QString getFileNameFromPath(const QString &filePath);
 
     void setQmlRoot(QObject *qmlRoot);
 

client/ui/qml/Pages2/PageSettingsServerBackup.qml

@@ -1,212 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import Style 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Components"
-import "../Config"
-
-PageType {
-    id: root
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20 + SettingsController.safeAreaTopMargin
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                flickable.contentY = 0
-            }
-        }
-    }
-
-    FlickableType {
-        id: flickable
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        contentHeight: contentColumn.implicitHeight
-
-        ColumnLayout {
-            id: contentColumn
-            width: flickable.width
-
-            spacing: 16
-
-            BaseHeaderType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 8
-                
-                headerText: qsTr("Backup")
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                
-                text: qsTr("Local copy of VPN protocols, services, all server settings and users.")
-                color: AmneziaStyle.color.mutedGray
-            }
-
-            Text {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: -8
-                
-                text: qsTr("More about backups")
-                color: AmneziaStyle.color.goldenApricot
-                font.pixelSize: 14
-                
-                MouseArea {
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        // TODO: Open help page or show more info
-                    }
-                }
-            }
-
-            ColumnLayout {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 16
-                spacing: 12
-
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    text: qsTr("Create backup")
-                    
-                    clickedFunc: function() {
-                        createBackup(true)
-                    }
-                }
-
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    text: qsTr("Restore from backup")
-                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                    disabledColor: AmneziaStyle.color.mutedGray
-                    textColor: AmneziaStyle.color.goldenApricot
-                    borderWidth: 1
-
-                    clickedFunc: function() {
-                        restoreBackup()
-                    }
-                }
-            }
-        }
-    }
-
-    function createBackup(shouldDownload) {
-        // Default shouldDownload = true
-        var downloadAfterCreate = (shouldDownload !== undefined) ? shouldDownload : true
-        
-        var headerText = downloadAfterCreate ? 
-            qsTr("Create backup and download to device?") :
-            qsTr("Create server configuration backup?")
-        var descriptionText = downloadAfterCreate ?
-            qsTr("Backup will be created on server and automatically downloaded to your device") :
-            qsTr("This will create a backup of your server containers configuration on the server")
-        var yesButtonText = qsTr("Create")
-        var noButtonText = qsTr("Cancel")
-
-        var yesButtonFunction = function() {
-            PageController.showBusyIndicator(true)
-            // Call C++ method that manages download and delete automatically
-            ServersBackupController.createBackupWithDownload(downloadAfterCreate, true)
-        }
-        var noButtonFunction = function() {}
-
-        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-    }
-
-    function restoreBackup() {
-        var filter = GC.isMobile() ? "*.gz *.tgz *.tar.gz" : "Backup files (*.tar.gz *.backup *.tgz *.gz)"
-        var localPath = SystemController.getFileName(
-            qsTr("Select Backup to Restore"), 
-            filter,
-            "",
-            false,
-            ""
-        )
-        
-        if (!localPath || localPath.length === 0) {
-            return
-        }
-        
-        // Get file information via C++
-        var fileInfo = ServersBackupController.getBackupFileInfo(localPath)
-        var fileName = fileInfo.fileName || "backup.tgz"
-        var serverIp = fileInfo.serverIp || ""
-        
-        // If IP not found in filename, use current server
-        if (!serverIp || serverIp.length === 0) {
-            serverIp = ServersUiController.serverHostName(ServersUiController.processedServerId) || ""
-        }
-
-        var serverName = ServersUiController.serverName(ServersUiController.processedServerId) || qsTr("Server")
-        
-        // Open restore mode selection page
-        var parentItem = root.parent
-        while (parentItem && parentItem.objectName !== "tabBarStackView") {
-            parentItem = parentItem.parent
-        }
-        
-        if (parentItem && typeof parentItem.push === "function") {
-            parentItem.push(PageController.getPagePath(PageEnum.PageSettingsServerRestoreMode), {
-                "backupFilePath": localPath,
-                "backupFileName": fileName,
-                "serverName": serverName,
-                "serverIp": serverIp
-            })
-        } else {
-            console.warn("Could not find StackView to navigate to restore mode page")
-        }
-    }
-
-    // ============ Backup Controller Connections ============
-
-    Connections {
-        target: ServersBackupController
-
-        function onBackupCreated(backupFilename) {
-            // If auto-download is not enabled, show success message
-            PageController.showBusyIndicator(false)
-            PageController.showNotificationMessage(qsTr("Backup created successfully: %1").arg(backupFilename))
-        }
-
-        function onBackupDownloaded(localPath) {
-            PageController.showBusyIndicator(false)
-            console.log("Backup downloaded to:", localPath)
-            PageController.showNotificationMessage(qsTr("Backup downloaded successfully!\n\nSaved to:\n%1").arg(localPath))
-        }
-
-        function onProgressChanged(percent, message) {
-            console.log("Backup progress:", percent, "%", message)
-        }
-
-        function onErrorOccurred(errorMessage, errorCode) {
-            PageController.showBusyIndicator(false)
-            PageController.showErrorMessage(qsTr("Backup error: %1").arg(errorMessage))
-        }
-    }
-}

client/ui/qml/Pages2/PageSettingsServerBackupRestored.qml

@@ -1,130 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import Style 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Components"
-import "../Config"
-
-PageType {
-    id: root
-
-    property string backupFileName: ""
-    property string serverName: ""
-    property string serverIp: ""
-    property bool isFromSetupWizard: false
-    
-    Component.onCompleted: {
-        // Убеждаемся, что все свойства инициализированы
-        if (!backupFileName) backupFileName = ""
-        if (!serverName) serverName = ""
-        if (!serverIp) serverIp = ""
-    }
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20 + SettingsController.safeAreaTopMargin
-
-        backButtonFunction: function() {
-            // После успешного restore всегда идем на главную страницу
-            PageController.goToPageHome()
-        }
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                flickable.contentY = 0
-            }
-        }
-    }
-
-    FlickableType {
-        id: flickable
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        contentHeight: contentColumn.implicitHeight
-
-        ColumnLayout {
-            id: contentColumn
-            width: flickable.width
-
-            spacing: 16
-
-            BaseHeaderType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 8
-                
-                headerText: qsTr("Backup restored")
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                
-                text: {
-                    var baseText = qsTr("%1 on \"%2\"").arg(backupFileName).arg(serverName)
-                    if (serverIp && serverIp.length > 0) {
-                        return baseText + ", " + serverIp
-                    }
-                    return baseText
-                }
-                color: AmneziaStyle.color.mutedGray
-            }
-
-            ColumnLayout {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 24
-                spacing: 12
-
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    
-                    text: qsTr("To home")
-                    implicitHeight: 56
-                    
-                    clickedFunc: function() {
-                        // Переход на главную страницу (PageHome)
-                        PageController.goToPageHome()
-                    }
-                }
-
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    
-                    text: qsTr("To server settings")
-                    implicitHeight: 56
-                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: AmneziaStyle.color.transparent
-                    pressedColor: AmneziaStyle.color.transparent
-                    borderWidth: 1
-                    borderColor: "#FFFFFF"
-                    textColor: "#FFFFFF"
-                    
-                    clickedFunc: function() {
-                        // Открываем страницу настроек сервера с активной вкладкой "Управление"
-                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                        // Устанавливаем активной вкладку "Управление" через сигнал
-                        PageController.goToPageSettingsServerManagement()
-                    }
-                }
-            }
-        }
-    }
-}

client/ui/qml/Pages2/PageSettingsServerData.qml

@@ -96,7 +96,6 @@ PageType {
 
     property list<QtObject> serverActions: [
         check,
-        backupSection,
         reboot,
         remove,
         clear,
@@ -107,7 +106,6 @@ PageType {
         id: check
 
         property bool isVisible: root.isServerWithWriteAccess
-        readonly property bool isBackupSection: false
         readonly property string title: qsTr("Check the server for previously installed Amnezia services")
         readonly property string description: qsTr("Add them to the application if they were not displayed")
         readonly property var tColor: AmneziaStyle.color.paleGray
@@ -118,25 +116,10 @@ PageType {
         }
     }
 
-    QtObject {
-        id: backupSection
-
-        property bool isVisible: root.isServerWithWriteAccess
-        readonly property bool isBackupSection: false
-        readonly property string title: qsTr("Backup")
-        readonly property string description: qsTr("Local copy of VPN protocols, services, all server settings and users")
-        readonly property var tColor: AmneziaStyle.color.paleGray
-        readonly property var clickedHandler: function() {
-            // Navigate to server backup page using PageController
-            PageController.goToPage(PageEnum.PageSettingsServerBackup)
-        }
-    }
-
     QtObject {
         id: reboot
 
         property bool isVisible: root.isServerWithWriteAccess
-        readonly property bool isBackupSection: false
         readonly property string title: qsTr("Reboot server")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed
@@ -167,7 +150,6 @@ PageType {
         id: remove
 
         property bool isVisible: true
-        readonly property bool isBackupSection: false
         readonly property string title: qsTr("Remove server from application")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed
@@ -198,7 +180,6 @@ PageType {
         id: clear
 
         property bool isVisible: root.isServerWithWriteAccess
-        readonly property bool isBackupSection: false
         readonly property string title: qsTr("Clear server from Amnezia software")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed
@@ -228,7 +209,6 @@ PageType {
         id: reset
 
         property bool isVisible: ServersUiController.isServerFromApi(ServersUiController.processedServerId)
-        readonly property bool isBackupSection: false
         readonly property string title: qsTr("Reset API config")
         readonly property string description: ""
         readonly property var tColor: AmneziaStyle.color.vibrantRed
@@ -255,5 +235,4 @@ PageType {
         }
     }
 
-
 }

client/ui/qml/Pages2/PageSettingsServerInfo.qml

@@ -29,10 +29,6 @@ PageType {
         function onGoToPageSettingsServerServices() {
             tabBar.setCurrentIndex(root.pageSettingsServerServices)
         }
-        
-        function onGoToPageSettingsServerManagement() {
-            tabBar.setCurrentIndex(root.pageSettingsServerData)
-        }
     }
 
     Connections {

client/ui/qml/Pages2/PageSettingsServerRestoreMode.qml

@@ -1,212 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import Style 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Components"
-import "../Config"
-
-PageType {
-    id: root
-
-    property string backupFilePath: ""
-    property string backupFileName: ""
-    property string serverName: ""
-    property string serverIp: ""
-    property bool isFromSetupWizard: false
-    
-    // Credentials for setup wizard (when server is not yet added to ServersModel)
-    property string wizardHostname: ""
-    property string wizardUsername: ""
-    property string wizardSecretData: ""
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20 + SettingsController.safeAreaTopMargin
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                flickable.contentY = 0
-            }
-        }
-    }
-
-    FlickableType {
-        id: flickable
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        contentHeight: contentColumn.implicitHeight
-
-        ColumnLayout {
-            id: contentColumn
-            width: flickable.width
-
-            spacing: 16
-
-            BaseHeaderType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 8
-                
-                headerText: qsTr("Restore from backup")
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                
-                text: {
-                    // Show only filename and IP address, without server name
-                    if (serverIp && serverIp.length > 0) {
-                        return qsTr("%1 on %2").arg(backupFileName).arg(serverIp)
-                    }
-                    return backupFileName
-                }
-                color: AmneziaStyle.color.mutedGray
-            }
-
-            ColumnLayout {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 16
-                spacing: 0
-
-                LabelWithButtonType {
-                    Layout.fillWidth: true
-
-                    text: qsTr("Add data from backup")
-                    descriptionText: qsTr("If the same protocols are already installed on the server, they will be updated. Created users and access will be saved")
-                    rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                    clickedFunction: function() {
-                        startRestore(false) // false = add mode
-                    }
-                }
-
-                DividerType {}
-
-                LabelWithButtonType {
-                    Layout.fillWidth: true
-
-                    text: qsTr("Replace")
-                    descriptionText: qsTr("All installed protocols, users and their access will not be saved")
-                    rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                    textColor: AmneziaStyle.color.vibrantRed
-
-                    clickedFunction: function() {
-                        startRestore(true) // true = replace mode
-                    }
-                }
-            }
-        }
-    }
-
-    property bool restoreReplaceMode: false
-
-    function startRestore(replaceMode) {
-        restoreReplaceMode = replaceMode
-        PageController.showBusyIndicator(true)
-        
-        // Call universal C++ method that will determine how to perform restore
-        ServersBackupController.startRestore(
-            isFromSetupWizard,
-            backupFilePath,
-            replaceMode,
-            wizardHostname || "",
-            wizardUsername || "",
-            wizardSecretData || ""
-        )
-    }
-
-    property string lastUploadedBackupFilename: ""
-
-    Connections {
-        target: ServersBackupController
-
-        function onBackupRestored() {
-            console.log("  onBackupRestored, isFromSetupWizard:", isFromSetupWizard)
-            
-            // For setup wizard, call C++ method to set default server and container
-            if (isFromSetupWizard) {
-                ServersBackupController.setDefaultServerAfterRestore(true)
-            } else {
-                // For regular mode, navigate directly
-                PageController.showBusyIndicator(false)
-                navigateToRestoredPage()
-            }
-        }
-        
-        function onDefaultServerAndContainerSet() {
-            console.log("  onDefaultServerAndContainerSet - navigating to restored page")
-            // C++ has set default server and container, navigate to result page
-            PageController.showBusyIndicator(false)
-            navigateToRestoredPage()
-        }
-
-        function onErrorOccurred(errorMessage, errorCode) {
-            PageController.showBusyIndicator(false)
-            PageController.showErrorMessage(qsTr("Backup restore error: %1").arg(errorMessage))
-        }
-    }
-    
-    
-    function navigateToRestoredPage() {
-        // Navigate to successful restore page
-        // Get actual server name from model
-        var actualServerName = serverName
-        if (root.isFromSetupWizard && ServersUiController.getServersCount() > 0) {
-            var lastServerId = ServersUiController.getServerId(ServersUiController.getServersCount() - 1)
-            actualServerName = ServersUiController.serverName(lastServerId) || qsTr("Server")
-        } else if (!serverName || serverName.length === 0) {
-            actualServerName = ServersUiController.serverName(ServersUiController.processedServerId) || qsTr("Server")
-        }
-        
-        var parentItem = root.parent
-        
-        // For setup wizard use regular StackView
-        if (root.isFromSetupWizard) {
-            while (parentItem && typeof parentItem.push !== "function") {
-                parentItem = parentItem.parent
-            }
-            if (parentItem && typeof parentItem.push === "function") {
-                parentItem.push(PageController.getPagePath(PageEnum.PageSettingsServerBackupRestored), {
-                    "backupFileName": backupFileName,
-                    "serverName": actualServerName,
-                    "serverIp": serverIp,
-                    "isFromSetupWizard": true
-                })
-            }
-        } else {
-            // For management menu, find tabBarStackView
-            while (parentItem && parentItem.objectName !== "tabBarStackView") {
-                parentItem = parentItem.parent
-            }
-            if (parentItem && typeof parentItem.push === "function") {
-                parentItem.push(PageController.getPagePath(PageEnum.PageSettingsServerBackupRestored), {
-                    "backupFileName": backupFileName,
-                    "serverName": actualServerName,
-                    "serverIp": serverIp,
-                    "isFromSetupWizard": false
-                })
-            } else {
-                console.warn("Could not find StackView to navigate to restored page")
-            }
-        }
-    }
-}

client/ui/qml/Pages2/PageSetupWizardCredentials.qml

@@ -13,12 +13,6 @@ import "../Controls2/TextTypes"
 PageType {
     id: root
 
-    property var setupWizardEasy: null
-    
-    property string savedHostname: ""
-    property string savedUsername: ""
-    property string savedSecretData: ""
-
     BackButtonType {
         id: backButton
 
@@ -136,11 +130,6 @@ PageType {
                         return
                     }
 
-                    root.savedHostname = _hostname
-                    root.savedUsername = _username
-                    root.savedSecretData = _secretData
-                    console.log("Saved credentials in PageSetupWizardCredentials:", _hostname, _username)
-                    
                     PageController.goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }

client/ui/qml/Pages2/PageSetupWizardEasy.qml

@@ -15,216 +15,8 @@ import "../Config"
 
 PageType {
     id: root
-    objectName: "pageSetupWizardEasy"
 
     property bool isEasySetup: true
-    property bool isRestoreFromBackup: false
-    property string backupFilePath: ""
-    property string restoreHostname: ""
-    property string restoreUsername: ""
-    property string restoreSecretData: ""
-    property bool waitingForServerToAdd: false
-    
-    // For installing containers from backup
-    property var containersToInstall: []
-    property int currentContainerIndex: 0
-    property bool isInstallingContainers: false
-    
-    // Connections for ServersBackupController
-    Connections {
-        target: ServersBackupController
-        
-        function onReadyForRestore(backupFilePath, hostname, username, secretData, serverIp, fileName) {
-            console.log("onReadyForRestore received from C++")
-            console.log("  backupFilePath:", backupFilePath)
-            console.log("  hostname:", hostname)
-            console.log("  serverIp:", serverIp)
-            console.log("  fileName:", fileName)
-            
-            // Scan backup to determine containers (C++ already did this, but needed for QML)
-            var foundContainers = ServersBackupController.scanBackupForContainers(backupFilePath)
-            console.log("Found containers:", foundContainers)
-            
-            if (foundContainers.length === 0) {
-                PageController.showErrorMessage(qsTr("No containers found in backup file"))
-                root.isRestoreFromBackup = false
-                return
-            }
-            
-            root.containersToInstall = foundContainers
-            root.currentContainerIndex = 0
-            
-            // Now add empty server with these credentials
-            InstallController.setProcessedServerCredentials(hostname, username, secretData)
-            
-            // Set waiting flag
-            root.waitingForServerToAdd = true
-            
-            console.log("Backup scanned, adding server...")
-            // Add server (asynchronously)
-            InstallController.addEmptyServer()
-            
-            // Further execution will happen in onInstallServerFinished
-        }
-    }
-    
-    // Connections for tracking server addition
-    Connections {
-        target: InstallController
-        
-        function onInstallServerFinished(finishedMessage) {
-            if (root.waitingForServerToAdd && root.isRestoreFromBackup && root.backupFilePath.length > 0) {
-                console.log("Server added successfully, now installing containers from backup...")
-                root.waitingForServerToAdd = false
-
-                // Start installing containers
-                root.isInstallingContainers = true
-                installNextContainer()
-            }
-        }
-        
-        function onInstallContainerFinished(finishedMessage, isServiceInstall) {
-            if (root.isInstallingContainers) {
-                console.log("Container installed:", finishedMessage)
-                
-                // Move to next container
-                root.currentContainerIndex++
-                
-                if (root.currentContainerIndex < root.containersToInstall.length) {
-                    // Install next container
-                    installNextContainer()
-                } else {
-                    // All containers installed, now do restore
-                    console.log("All containers installed, starting restore...")
-                    root.isInstallingContainers = false
-                    
-                    // IMPORTANT: Turn off busy indicator before navigation
-                    PageController.showBusyIndicator(false)
-                    
-                    // Start navigation to restore mode selection page
-                    navigationTimer.start()
-                }
-            }
-        }
-    }
-    
-    // Function to install next container from list
-    function installNextContainer() {
-        if (root.currentContainerIndex >= root.containersToInstall.length) {
-            return
-        }
-        
-        var containerName = root.containersToInstall[root.currentContainerIndex]
-        console.log("Installing container:", containerName, "(", root.currentContainerIndex + 1, "/", root.containersToInstall.length, ")")
-        
-        // Convert container name to DockerContainer enum
-        var dockerContainer = ContainerProps.containerFromString(containerName)
-        
-        if (dockerContainer === 0) { // None
-            console.log("Unknown container:", containerName, "skipping...")
-            root.currentContainerIndex++
-            installNextContainer()
-            return
-        }
-        
-        // Get default settings for container
-        var defaultProtocol = ContainerProps.defaultProtocol(dockerContainer)
-        var defaultPort = InstallController.getPortForInstall(defaultProtocol)
-        var defaultTransport = InstallController.defaultTransportProto(defaultProtocol)
-
-        // Set server index
-        var serverIdx = ServersModel.getServersCount() - 1
-        ServersModel.processedIndex = serverIdx
-        var serverId = ServersUiController.getServerId(serverIdx)
-
-        // Show loading indicator with message
-        PageController.showBusyIndicator(true)
-        PageController.showNotificationMessage(qsTr("Installing %1 (%2/%3)...")
-            .arg(containerName)
-            .arg(root.currentContainerIndex + 1)
-            .arg(root.containersToInstall.length))
-
-        // Ensure credentials are set
-        InstallController.setProcessedServerCredentials(root.restoreHostname, root.restoreUsername, root.restoreSecretData)
-
-        // Install container
-        console.log("Installing container:", containerName, "serverId:", serverId)
-        ContainersModel.setProcessedContainerIndex(dockerContainer)
-        InstallController.install(dockerContainer, defaultPort, defaultTransport, serverId)
-    }
-    
-    // Timer for navigating to restore mode selection page after file selection
-    Timer {
-        id: navigationTimer
-        interval: 500
-        repeat: false
-        onTriggered: {
-            if (root.backupFilePath.length > 0 && root.isRestoreFromBackup) {
-                console.log("Navigation timer triggered, going to restore mode page")
-                console.log("Credentials available:", root.restoreHostname, root.restoreUsername, root.restoreSecretData.length > 0 ? "***" : "EMPTY")
-                
-                // Get filename
-                var fileName = SystemController.getFileNameFromPath(root.backupFilePath)
-                if (!fileName || fileName === undefined || fileName.length === 0) {
-                    var fallbackName = root.backupFilePath.split('/').pop()
-                    fileName = (fallbackName && fallbackName.length > 0) ? fallbackName : qsTr("backup.tgz")
-                }
-                fileName = String(fileName)
-                
-                // Extract IP address from filename
-                var serverIp = ""
-                var ipMatch = fileName.match(/^([\d_]+)\s*-/)
-                if (ipMatch && ipMatch.length > 1) {
-                    serverIp = ipMatch[1].replace(/_/g, ".")
-                }
-                if (!serverIp || serverIp.length === 0) {
-                    serverIp = root.restoreHostname
-                }
-                
-                var serverName = root.restoreHostname
-                if (!serverName || serverName.length === 0) {
-                    serverName = qsTr("RestoredServer")
-                }
-                
-                // Navigate to installation page
-                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                
-                // Immediately find StackView and navigate to restore page
-                // Server already added, as we waited for onInstallServerFinished
-                Qt.callLater(function() {
-                    var pagePath = "qrc:/ui/qml/Pages2/PageSettingsServerRestoreMode.qml"
-
-                    // Traverse upward from root to find the containing StackView.
-                    // StackView has both `push` function and `depth` property.
-                    // This avoids a recursive downward search that causes stack overflow
-                    // on iOS when the component tree is large (many VPN managers).
-                    var stackView = root.parent
-                    while (stackView) {
-                        if (typeof stackView.push === "function" && stackView.hasOwnProperty("depth")) {
-                            break
-                        }
-                        stackView = stackView.parent
-                    }
-
-                    if (stackView) {
-                        console.log("Found StackView, pushing restore mode page")
-                        stackView.push(pagePath, {
-                            "backupFilePath": root.backupFilePath,
-                            "backupFileName": fileName,
-                            "serverName": "",
-                            "serverIp": serverIp,
-                            "isFromSetupWizard": true,
-                            "wizardHostname": root.restoreHostname,
-                            "wizardUsername": root.restoreUsername,
-                            "wizardSecretData": root.restoreSecretData
-                        })
-                    } else {
-                        console.error("Could not find StackView")
-                    }
-                })
-            }
-        }
-    }
 
     SortFilterProxyModel {
         id: proxyContainersModel
@@ -357,83 +149,6 @@ PageType {
                 Keys.onReturnPressed: this.clicked()
             }
 
-            DividerType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-            }
-
-            CardType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                headerText: qsTr("Restore from backup")
-                bodyText: qsTr("Restoration of VPN protocols, services, all server settings and users")
-
-                ButtonGroup.group: buttonGroup
-
-                onClicked: function() {
-                    
-                    var filter = GC.isMobile() ? "*.gz *.tgz *.tar.gz" : "Backup files (*.tar.gz *.backup *.tgz *.gz)"
-                    var localPath = SystemController.getFileName(
-                        qsTr("Select Backup to Restore"), 
-                        filter,
-                        "",
-                        false,
-                        ""
-                    )
-                    
-                    console.log("Selected file path:", localPath)
-                    
-                    if (!localPath || localPath.length === 0) {
-                        console.log("No file selected")
-                        return
-                    }
-                    
-                    // Save backup file path
-                    root.backupFilePath = localPath
-                    root.isRestoreFromBackup = true
-                    
-                    // Get credentials from PageSetupWizardCredentials via StackView search
-                    var credentialsPage = null
-                    var item = root
-                    
-                    // Find StackView
-                    while (item && !item.hasOwnProperty("depth")) {
-                        item = item.parent
-                    }
-                    
-                    // If found StackView, search for PageSetupWizardCredentials in its history
-                    if (item && item.depth > 0) {
-                        for (var i = 0; i < item.depth; i++) {
-                            var page = item.get(i)
-                            if (page && page.hasOwnProperty("savedHostname")) {
-                                credentialsPage = page
-                                break
-                            }
-                        }
-                    }
-                    
-                    if (credentialsPage && credentialsPage.savedHostname.length > 0) {
-                        root.restoreHostname = credentialsPage.savedHostname
-                        root.restoreUsername = credentialsPage.savedUsername
-                        root.restoreSecretData = credentialsPage.savedSecretData
-                        console.log("Got credentials from PageSetupWizardCredentials:", root.restoreHostname, root.restoreUsername)
-                        
-                        // Call C++ method to prepare restore
-                        // It will scan backup and send readyForRestore signal
-                        ServersBackupController.prepareRestoreFromBackup(localPath, root.restoreHostname, root.restoreUsername, root.restoreSecretData)
-                    } else {
-                        console.log("WARNING: No credentials found")
-                        return
-                    }
-                }
-
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
-            }
-
             BasicButtonType {
                 id: continueButton
 

client/ui/qml/qml.qrc

@@ -106,11 +106,8 @@
         <file>Pages2/PageSettingsKillSwitch.qml</file>
         <file>Pages2/PageSettingsKillSwitchExceptions.qml</file>
         <file>Pages2/PageSettingsLogging.qml</file>
-        <file>Pages2/PageSettingsServerBackup.qml</file>
-        <file>Pages2/PageSettingsServerBackupRestored.qml</file>
         <file>Pages2/PageSettingsServerData.qml</file>
         <file>Pages2/PageSettingsServerInfo.qml</file>
-        <file>Pages2/PageSettingsServerRestoreMode.qml</file>
         <file>Pages2/PageSettingsServerProtocol.qml</file>
         <file>Pages2/PageSettingsServerProtocols.qml</file>
         <file>Pages2/PageSettingsServerServices.qml</file>

cmake/platform_settings.cmake

@@ -20,7 +20,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
     set(_CONAN_INSTALL_ARGS
         "-c=tools.android:cmake_legacy_toolchain=false"
         "-c=tools.build:sharedlinkflags=['-Wl,-z,max-page-size=16384']"
-        "-c=tools.build:exelinkflags=['-Wl,-z,max-page-size=16384']")
+        "-c=tools.build:exelinkflags=['-Wl,-z,max-page-size=16384']"
+        "-o=openssl/*:shared=True")
     set(CMAKE_ANDROID_STL_TYPE "c++_shared" CACHE STRING "")
 endif()
 
@@ -28,12 +29,6 @@ if (WIN32 OR APPLE)
     set(CMAKE_INSTALL_BINDIR ".")
 endif()
 
-# Apple NE-based apps do not support any dylibs or variations
-# So Qt would use the openssl bundled with system, not application
-if (NOT(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR (APPLE AND MACOS_NE)))
-    list(APPEND _CONAN_INSTALL_ARGS "-o=openssl/*:shared=True")
-endif()
-
 list(PREPEND _CONAN_INSTALL_ARGS "--build=missing")
 list(JOIN _CONAN_INSTALL_ARGS ";" _CONAN_INSTALL_ARGS_JOINED)
 set(CONAN_INSTALL_ARGS ${_CONAN_INSTALL_ARGS_JOINED} CACHE STRING "" FORCE)

recipes/openvpnadapter/conanfile.py

@@ -5,7 +5,6 @@ from conan.errors import ConanInvalidConfiguration
 from conan.tools.scm import Git
 from conan.internal.model.pkg_type import PackageType
 from conan.tools.files import chdir
-from conan.tools.apple import XCRun
 
 import os
 import shutil
@@ -50,10 +49,7 @@ class OpenVPNAdapter(ConanFile):
 
     def build(self):
         with chdir(self, self.source_folder):
-            xcrun = XCRun(self)
-
-            xcodebuild = xcrun.find("xcodebuild")
-            self.run(f"{xcodebuild}"
+            self.run("xcrun xcodebuild"
                 " -project OpenVPNAdapter.xcodeproj"
                 " -scheme OpenVPNAdapter"
                 " -configuration Release"
@@ -61,20 +57,10 @@ class OpenVPNAdapter(ConanFile):
                 f" -sdk {self._sdk}"
                 f' "CONFIGURATION_BUILD_DIR={self.build_folder}"'
                 f' "BUILT_PRODUCTS_DIR={self.build_folder}"'
-                " MACH_O_TYPE=staticlib"
                 " BUILD_LIBRARY_FOR_DISTRIBUTION=YES"
                 " CODE_SIGNING_ALLOWED=NO"
             )
 
-            openvpnadapter = os.path.join(self.build_folder, "OpenVPNAdapter.framework", "OpenVPNAdapter")
-            self.run(f"{xcrun.libtool} -static -o"
-                     f" {openvpnadapter}"
-                     f" {openvpnadapter}"
-                     f' {os.path.join(self.build_folder, "OpenVPNClient.framework", "OpenVPNClient")}'
-                     f' {os.path.join(self.build_folder, "LZ4.framework", "LZ4")}'
-                     f' {os.path.join(self.build_folder, "mbedTLS.framework", "mbedTLS")}'
-            )
-
     def package(self):
         shutil.copytree(os.path.join(self.build_folder, "OpenVPNAdapter.framework"),
                         os.path.join(self.package_folder, "OpenVPNAdapter.framework"))
@@ -84,4 +70,3 @@ class OpenVPNAdapter(ConanFile):
         self.cpp_info.type = PackageType.STATIC
         self.cpp_info.package_framework = True
         self.cpp_info.location = os.path.join(self.package_folder, "OpenVPNAdapter.framework")
-        self.cpp_info.frameworks = ["SystemConfiguration"]

service/server/CMakeLists.txt

@@ -316,9 +316,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 endif()
 
 if(APPLE)
-    set_target_properties(${PROJECT} PROPERTIES
-        INSTALL_RPATH "@executable_path/../Frameworks"
-    )
+    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set_target_properties(${PROJECT} PROPERTIES
+            INSTALL_RPATH "@executable_path/../Frameworks"
+            BUILD_WITH_INSTALL_RPATH TRUE
+        )
+    endif()
 
     find_library(FW_COREFOUNDATION CoreFoundation)
     find_library(FW_SYSTEMCONFIG SystemConfiguration)
@@ -425,32 +428,11 @@ endif()
 # install target
 install(TARGETS ${PROJECT}
     DESTINATION ${CMAKE_INSTALL_BINDIR}
-    RUNTIME_DEPENDENCY_SET service_deps
     COMPONENT AmneziaVPN
 )
-
-if(APPLE)
-    set(RUNTIME_DEPS_DIR ${CMAKE_INSTALL_BINDIR}/../Frameworks)
-else()
-    set(RUNTIME_DEPS_DIR ${CMAKE_INSTALL_BINDIR})
-endif()
-
-install(RUNTIME_DEPENDENCY_SET service_deps
-    PRE_EXCLUDE_REGEXES
-        [[api-ms-win-.*]]
-        [[ext-ms-.*]]
-        [[kernel32\.dll]]
-        [[hvsifiletrust\.dll]]
-        [[libc\.so\..*]] [[libgcc_s\.so\..*]] [[libm\.so\..*]] [[libstdc\+\+\.so\..*]]
-        [[.*\.framework]]
-        [[^[Qq]t.*]]
-    POST_EXCLUDE_REGEXES
-        [[^.*[\\/]system32[\\/].*\.dll$]]
-        [[^/lib.*]]
-        [[^/usr/lib.*]]
-    DIRECTORIES ${CONAN_RUNTIME_LIB_DIRS}
+install(FILES $<TARGET_RUNTIME_DLLS:${PROJECT}>
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT AmneziaVPN
-    DESTINATION "${RUNTIME_DEPS_DIR}"
 )
 
 qt_generate_deploy_app_script(