Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/port-availability-on-container-setup

.github/workflows/deploy.yml

@@ -42,12 +42,18 @@ jobs:
         export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
         bash deploy/build_linux.sh
 
-    - name: 'Upload artifact'
+    - name: 'Upload installer artifact'
       uses: actions/upload-artifact@v3
       with:
-        name: AmneziaVPN_Linux
+        name: AmneziaVPN_Linux_installer
         path: deploy/AmneziaVPN_Linux_Installer
-        retention-days: 3
+        retention-days: 7
+    - name: 'Upload unpacked artifact'
+      uses: actions/upload-artifact@v3
+      with:
+        name: AmneziaVPN_Linux_unpacked
+        path: deploy/AppDir
+        retention-days: 7
 
 # ------------------------------------------------------
 
@@ -97,12 +103,18 @@ jobs:
         set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin"
         call deploy\\build_windows.bat
 
-    - name: 'Upload artifact'
+    - name: 'Upload installer artifact'
       uses: actions/upload-artifact@v3
       with:
-        name: AmneziaVPN_Windows
+        name: AmneziaVPN_Windows_installer
         path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
-        retention-days: 3
+        retention-days: 7
+    - name: 'Upload unpacked artifact'
+      uses: actions/upload-artifact@v3
+      with:
+        name: AmneziaVPN_Windows_unpacked
+        path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release
+        retention-days: 7
 
 # ------------------------------------------------------
 
@@ -225,12 +237,18 @@ jobs:
         export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
         bash deploy/build_macos.sh
 
-    - name: 'Upload artifact'
+    - name: 'Upload installer artifact'
       uses: actions/upload-artifact@v3
       with:
-        name: AmneziaVPN_MacOS
+        name: AmneziaVPN_MacOS_installer
         path: AmneziaVPN.dmg
-        retention-days: 3
+        retention-days: 7
+    - name: 'Upload unpacked artifact'
+      uses: actions/upload-artifact@v3
+      with:
+        name: AmneziaVPN_MacOS_unpacked
+        path: deploy/build/client/AmneziaVPN.app
+        retention-days: 7
 
 # ------------------------------------------------------
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 project(${PROJECT})

client/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 project(${PROJECT} VERSION 2.1.2)

client/protocols/openvpnovercloakprotocol.cpp

@@ -109,8 +109,6 @@ QString OpenVpnOverCloakProtocol::cloakExecPath()
 {
 #ifdef Q_OS_WIN
     return Utils::executable(QString("cloak/ck-client"), true);
-#elif defined Q_OS_LINUX
-        return Utils::usrExecutable("ck-client");
 #else
     return Utils::executable(QString("/ck-client"), true);
 #endif

client/protocols/shadowsocksvpnprotocol.cpp

@@ -109,8 +109,6 @@ QString ShadowSocksVpnProtocol::shadowSocksExecPath()
 {
 #ifdef Q_OS_WIN
     return Utils::executable(QString("ss/ss-local"), true);
-#elif defined Q_OS_LINUX
-    return Utils::usrExecutable(QString("ss-local"));
 #else
     return Utils::executable(QString("/ss-local"), true);
 #endif
@@ -118,5 +116,17 @@ QString ShadowSocksVpnProtocol::shadowSocksExecPath()
 
 void ShadowSocksVpnProtocol::readShadowSocksConfiguration(const QJsonObject &configuration)
 {
-    m_shadowSocksConfig = configuration.value(ProtocolProps::key_proto_config_data(Proto::ShadowSocks)).toObject();
+    QJsonObject shadowSocksConfig = configuration.value(ProtocolProps::key_proto_config_data(Proto::ShadowSocks)).toObject();
+    bool isLocalPortConvertOk = false;
+    bool isServerPortConvertOk = false;
+    int localPort = shadowSocksConfig.value("local_port").toString().toInt(&isLocalPortConvertOk);
+    int serverPort = shadowSocksConfig.value("server_port").toString().toInt(&isServerPortConvertOk);
+    if (!isLocalPortConvertOk) {
+        qDebug() << "Error when converting local_port field in ShadowSocks config";
+    } else if (!isServerPortConvertOk) {
+        qDebug() << "Error when converting server_port field in ShadowSocks config";
+    }
+    shadowSocksConfig["local_port"] = localPort;
+    shadowSocksConfig["server_port"] = serverPort;
+    m_shadowSocksConfig = shadowSocksConfig;
 }

service/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT service)
 project(${PROJECT})
@@ -16,4 +16,4 @@ endif()
 
 if(WIN32)
     add_subdirectory(wireguard-service)
-endif()
+endif()

service/server/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN-service)
 project(${PROJECT})

service/wireguard-service/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT wireguard-service)
 project(${PROJECT} LANGUAGES CXX)