Merge branch 'dev' into feature/qt6-libssh-support

.gitignore

@@ -127,3 +127,6 @@ captures/
 # Android Profiling
 *.hprof
 client/3rd/ShadowSocks/ss_ios.xcconfig
+
+# UML generated pics
+out/

client/3rd/QtSsh/src/botan/botan.cmake

@@ -27,7 +27,7 @@ if(APPLE AND NOT IOS)
     set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/macos/botan_all.cpp)
 endif()
 
-if(LINUX)
+if(LINUX AND NOT ANDROID)
     include_directories(${CMAKE_CURRENT_LIST_DIR}/linux)
     set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/linux/botan_all.h)
     set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/linux/botan_all.cpp)

client/containers/containers_defs.cpp

@@ -70,7 +70,7 @@ QList<DockerContainer> ContainerProps::allContainers()
 QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 {
     return {
-        {DockerContainer::None, "Unknown (Old version)"},
+        {DockerContainer::None, "Not installed"},
         {DockerContainer::OpenVpn, "OpenVPN"},
         {DockerContainer::ShadowSocks, "OpenVpn over ShadowSocks"},
         {DockerContainer::Cloak, "OpenVpn over Cloak"},

client/core/servercontroller.cpp

@@ -396,10 +396,9 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
         return ErrorCode::NoError;
     });
 
-    watcher.setFuture(future);
-
     QEventLoop wait;
     QObject::connect(&watcher, &QFutureWatcher<ErrorCode>::finished, &wait, &QEventLoop::quit);
+    watcher.setFuture(future);
     wait.exec();
 
     m_cancelInstallation = false;

client/protocols/wireguardprotocol.cpp

@@ -12,7 +12,7 @@ WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject*
     VpnProtocol(configuration, parent)
 {
     m_configFile.setFileName(QDir::tempPath() + QDir::separator() + serviceName() + ".conf");
-    readWireguardConfiguration(configuration);
+    writeWireguardConfiguration(configuration);
 }
 
 WireguardProtocol::~WireguardProtocol()
@@ -70,7 +70,7 @@ void WireguardProtocol::stop()
 
 }
 
-void WireguardProtocol::readWireguardConfiguration(const QJsonObject &configuration)
+void WireguardProtocol::writeWireguardConfiguration(const QJsonObject &configuration)
 {
     QJsonObject jConfig = configuration.value(ProtocolProps::key_proto_config_data(Proto::WireGuard)).toObject();
 

client/protocols/wireguardprotocol.h

@@ -23,7 +23,7 @@ public:
 
 private:
     QString configPath() const;
-    void readWireguardConfiguration(const QJsonObject &configuration);
+    void writeWireguardConfiguration(const QJsonObject &configuration);
 
     void updateRouteGateway(QString line);
     void updateVpnGateway(const QString &line);

client/resources.qrc

@@ -163,5 +163,6 @@
         <file>images/svg/control_point_black_24dp.svg</file>
         <file>images/svg/settings_suggest_black_24dp.svg</file>
         <file>server_scripts/website_tor/Dockerfile</file>
+        <file>ui/qml/Controls/PopupWithQuestion.qml</file>
     </qresource>
 </RCC>

client/server_scripts/openvpn_cloak/Dockerfile

@@ -1,5 +1,4 @@
 FROM alpine:3.15
-
 LABEL maintainer="AmneziaVPN"
 
 ARG SS_RELEASE="v1.13.1"

client/server_scripts/openvpn_cloak/configure_container.sh

@@ -1,6 +1,6 @@
 cat > /opt/amnezia/openvpn/server.conf <<EOF
 port $OPENVPN_PORT
-proto $OPENVPN_TRANSPORT_PROTO
+proto tcp
 dev tun
 ca /opt/amnezia/openvpn/ca.crt
 cert /opt/amnezia/openvpn/AmneziaReq.crt
@@ -39,7 +39,7 @@ cat > /opt/amnezia/cloak/ck-config.json <<EOF
 {
   "ProxyBook": {
      "openvpn": [
-     "$OPENVPN_TRANSPORT_PROTO",
+     "tcp",
      "localhost:$OPENVPN_PORT"
     ],
      "shadowsocks": [

client/ui/pages_logic/protocols/OpenVpnLogic.cpp

@@ -51,9 +51,15 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
     set_lineEditSubnetText(openvpnConfig.value(config_key::subnet_address).
                                       toString(protocols::openvpn::defaultSubnetAddress));
 
-    QString trasnsport = openvpnConfig.value(config_key::transport_proto).
+    QString trasnsport;
-            toString(protocols::openvpn::defaultTransportProto);
+    if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-
+        trasnsport = "tcp";
+        set_radioButtonUdpEnabled(false);
+        set_radioButtonTcpEnabled(false);
+    } else {
+        trasnsport = openvpnConfig.value(config_key::transport_proto).
+                toString(protocols::openvpn::defaultTransportProto);
+    }
     set_radioButtonUdpChecked(trasnsport == protocols::openvpn::defaultTransportProto);
     set_radioButtonTcpChecked(trasnsport != protocols::openvpn::defaultTransportProto);
 
@@ -80,12 +86,6 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
             toString(protocols::openvpn::defaultAdditionalServerConfig);
     set_textAreaAdditionalServerConfig(additionalServerConfig);
 
-    if (container == DockerContainer::ShadowSocks) {
-        set_radioButtonUdpEnabled(false);
-        set_radioButtonTcpEnabled(false);
-        set_radioButtonTcpChecked(true);
-    }
-
     set_lineEditPortText(openvpnConfig.value(config_key::port).
                                     toString(protocols::openvpn::defaultPort));
 

client/ui/qml/Controls/PopupWithQuestion.qml

@@ -0,0 +1,57 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Popup {
+    id: root
+
+    property string questionText
+    property string yesText: "yes"
+    property string noText: "no"
+    property var yesFunc
+    property var noFunc
+
+    anchors.centerIn: Overlay.overlay
+    modal: true
+    closePolicy: Popup.NoAutoClose
+
+    width: parent.width - 20
+
+    ColumnLayout {
+        width: parent.width
+        Text {
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+            wrapMode: Text.WordWrap
+            font.pixelSize: 16
+            text: questionText
+        }
+
+        RowLayout {
+            BlueButtonType {
+                id: yesButton
+                Layout.preferredWidth: parent.width / 2
+                Layout.fillWidth: true
+                text: yesText
+                onClicked: {
+                    root.enabled = false
+                    if (yesFunc && typeof yesFunc === "function") {
+                        yesFunc()
+                    }
+                    root.enabled = true
+                }
+            }
+            BlueButtonType {
+                id: noButton
+                Layout.preferredWidth: parent.width / 2
+                Layout.fillWidth: true
+                text: noText
+                onClicked: {
+                    if (noFunc && typeof noFunc === "function") {
+                        noFunc()
+                    }
+                }
+            }
+        }
+    }
+}

client/ui/qml/Pages/PageNewServerProtocols.qml

@@ -63,7 +63,7 @@ PageBase {
             pageLoader.focus = true
         }
 
-        onContainerSelected: {
+        onContainerSelected: function(c_index){
             var containerProto =  ContainerProps.defaultProtocol(c_index)
 
             tf_port_num.text = ProtocolProps.defaultPort(containerProto)

client/ui/qml/Pages/PageServerContainers.qml

@@ -55,7 +55,6 @@ PageBase {
                 tf_port_num.text = qsTr("Default")
             }
             else tf_port_num.text = ProtocolProps.defaultPort(containerProto)
-
             cb_port_proto.currentIndex = ProtocolProps.defaultTransportProto(containerProto)
 
             tf_port_num.enabled = ProtocolProps.defaultPortChangeable(containerProto)
@@ -297,23 +296,24 @@ PageBase {
                                 implicitHeight: 30
 
                                 checked: default_role
-
+                                onClicked: popupRemove.open()
-                                MessageDialog {
-                                    id: dialogRemove
-                                    buttons: StandardButton.Yes | StandardButton.Cancel
-                                    title: "AmneziaVPN"
-                                    text: qsTr("Remove container") + " " + name_role + "?" + "\n" + qsTr("This action will erase all data of this container on the server.")
-                                    onAccepted: {
-                                        tb_c.currentIndex = -1
-                                        ServerContainersLogic.onPushButtonRemoveClicked(proxyContainersModel.mapToSource(index))
-                                    }
-                                }
-
-                                onClicked: dialogRemove.open()
 
                                 VisibleBehavior on visible { }
                             }
 
+                            PopupWithQuestion {
+                                id: popupRemove
+                                questionText: qsTr("Remove container") + " " + name_role + "?" + "\n" + qsTr("This action will erase all data of this container on the server.")
+                                yesFunc: function() {
+                                    tb_c.currentIndex = -1
+                                    ServerContainersLogic.onPushButtonRemoveClicked(proxyContainersModel.mapToSource(index))
+                                    close()
+                                }
+                                noFunc: function() {
+                                    close()
+                                }
+                            }
+
                             ImageButtonType {
                                 id: button_share
                                 visible: (index === tb_c.currentIndex) && ServerContainersLogic.isManagedServer
@@ -418,7 +418,7 @@ PageBase {
 
     BlueButtonType {
         id: pb_add_container
-        visible: container_selector.selectedIndex < 0
+        visible: container_selector.selectedIndex < 0 && ServerContainersLogic.isManagedServer
 
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
@@ -430,6 +430,5 @@ PageBase {
         text: qsTr("Install new service")
         font.pixelSize: 16
         onClicked: container_selector.visible ? container_selector.close() : container_selector.open()
-
     }
 }

client/ui/qml/Pages/PageServerSettings.qml

@@ -93,24 +93,49 @@ PageBase {
                     ServerSettingsLogic.onPushButtonClearClientCacheClicked()
                 }
             }
+
             BlueButtonType {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
                 text: ServerSettingsLogic.pushButtonClearText
                 visible: ServerSettingsLogic.pushButtonClearVisible
                 onClicked: {    
-                    ServerSettingsLogic.onPushButtonClearServer()
+                    popupClearServer.open()
                 }
             }
+
+            PopupWithQuestion {
+                id: popupClearServer
+                questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
+                yesFunc: function() {
+                    ServerSettingsLogic.onPushButtonClearServer()
+                    close()
+                }
+                noFunc: function() {
+                    close()
+                }
+            }
+
             BlueButtonType {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
                 text: qsTr("Forget this server")
                 onClicked: {
-                    ServerSettingsLogic.onPushButtonForgetServer()
+                    popupForgetServer.open()
                 }
             }
 
+            PopupWithQuestion {
+                id: popupForgetServer
+                questionText: "Attention! This action will not remove the container on the server, it will only remove the container information from the application. Continue?"
+                yesFunc: function() {
+                    ServerSettingsLogic.onPushButtonForgetServer()
+                    close()
+                }
+                noFunc: function() {
+                    close()
+                }
+            }
         }
     }
 

client/ui/qml/Pages/Protocols/PageProtoCloak.qml

@@ -11,10 +11,9 @@ PageProtocolBase {
     protocol: ProtocolEnum.Cloak
     logic: UiLogic.protocolLogic(protocol)
 
-    enabled: logic.pageEnabled
     BackButton {
         id: back
-        enabled: logic.pageEnabled
+        enabled: !logic.pushButtonCancelVisible
     }
 
     Caption {

client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml

@@ -13,7 +13,7 @@ PageProtocolBase {
 
     BackButton {
         id: back
-        enabled: logic.pageEnabled
+        enabled: !logic.pushButtonCancelVisible
     }
 
     Caption {
@@ -285,8 +285,6 @@ PageProtocolBase {
                             }
                         }
                     }
-
-
                 }
 
                 BasicButtonType {
@@ -338,8 +336,6 @@ PageProtocolBase {
                             }
                         }
                     }
-
-
                 }
 
                 LabelType {

client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml

@@ -13,7 +13,7 @@ PageProtocolBase {
 
     BackButton {
         id: back
-        enabled: logic.pageEnabled
+        enabled: !logic.pushButtonCancelVisible
     }
 
     Caption {

client/ui/qml/main.qml

@@ -232,18 +232,6 @@ Window  {
         }
     }
 
-    MessageDialog {
-        id: closePrompt
-//        x: (root.width - width) / 2
-//        y: (root.height - height) / 2
-        title: qsTr("Exit")
-        text: qsTr("Do you really want to quit?")
-//        standardButtons: StandardButton.Yes | StandardButton.No
-//        onYesClicked: {
-//            Qt.quit()
-//        }
-        visible: false
-    }
     MessageDialog {
         id: publicKeyWarning
         title: "AmneziaVPN"

deploy/installer/config/controlscript.js

@@ -26,7 +26,7 @@ function appInstalled()
     } else if (runningOnMacOS()){
         appInstalledUninstallerPath = "/Applications/" + appName() + ".app/maintenancetool.app/Contents/MacOS/maintenancetool";
     } else if (runningOnLinux()){
-	allInstalledUninstallerPath = "/opt/" + appName();
+        appInstalledUninstallerPath = "/opt/" + appName() + "/maintenancetool";
     }
 
     return installer.fileExists(appInstalledUninstallerPath) || installer.fileExists(appInstalledUninstallerPath_x86);
@@ -49,7 +49,7 @@ function runningOnMacOS()
 
 function runningOnLinux()
 {
-    return (installer.value("os") === "linux");
+    return ((installer.value("os") === "linux") || (installer.value("os") === "x11"));
 }
 
 function sleep(miliseconds) {

deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js

@@ -93,7 +93,7 @@ Component.prototype.createOperations = function()
     } else if (runningOnMacOS()) {
         component.addElevatedOperation("Execute", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "@TargetDir@/post_uninstall.sh");
     } else if (runningOnLinux()) {
-	component.addElevatedOperation("Execute", "bash", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "bash", "@TargetDir@/post_uninstall.sh");
+        component.addElevatedOperation("Execute", "bash", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "bash", "@TargetDir@/post_uninstall.sh");
     }
 }