Merge branch 'master' into development

.gitignore

@@ -10,4 +10,5 @@ daemon/References/Windows/Native Projects/IVPN KEM Helper/x64/*
 daemon/References/Windows/kem/kem-helper.exe
 daemon/References/common/kem-helper/_out_linux/
 daemon/References/common/kem-helper/_out_macos/
-daemon/References/common/kem-helper/_out_windows/
+daemon/References/common/kem-helper/_out_windows/
+daemon/References/Windows/v2ray/v2ray.exe

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file.  
 
+## Version 3.12.0 - 2023-08-31
+
+[NEW] Added V2Ray as an optional obfuscation type for WireGuard and OpenVPN connections  
+[NEW] Added a new action for ‘WiFi control’: Block LAN Traffic (for untrusted WiFi networks)  
+[IMPROVED] Refactored firewall rules for LAN access  
+[IMPROVED] (Linux) DEB/RPM packages now have a dependency on ‘iptables’  
+[FIX] ‘WiFi control’ actions are now enabled by default  
+[FIX] Fixed slow speed and high CPU usage during the downloading of application updates  
+[FIX] (Linux) It was not possible to enable Split Tunnel on some Linux distributions  
+
+[Download IVPN Client for Windows](https://repo.ivpn.net/windows/bin/IVPN-Client-v3.12.0.exe)  
+SHA256: 2425f3e339eeb8bb8ac11734b2db918083eea6d2cd9172109e0748b2fcd62f19  
+
+[Download IVPN Client for macOS (Intel)](https://repo.ivpn.net/macos/bin/IVPN-3.12.0.dmg)  
+SHA256: a5d53be80054db17a46498a46f5327a89484f6cf4b5c6795a08db4cbe5137269  
+[Download IVPN Client for macOS (M1)](https://repo.ivpn.net/macos/bin/IVPN-3.12.0-arm64.dmg)  
+SHA256: 9a08e5455e1c14475a22d22b698509dcfa184909321f51624495a204c6fbe961  
+
+[Download IVPN Client for Linux (DEB)](https://repo.ivpn.net/stable/pool/ivpn_3.12.0_amd64.deb)  
+SHA256: a46245e28ec9f7b98c389bda9c6d7e64378625f87c3af589b615effb383e69d4  
+[Download IVPN Client for Linux (RPM)](https://repo.ivpn.net/stable/pool/ivpn-3.12.0-1.x86_64.rpm)  
+SHA256: a5f01bfa1cdcc0e4b3f398d4bfd2c0e05e5b1bcbfd7616960b71e5796c2e843e  
+
+[Download IVPN Client UI for Linux (DEB)](https://repo.ivpn.net/stable/pool/ivpn-ui_3.12.0_amd64.deb)  
+SHA256: b2712d46371bac392c36e077bbac12ff6139c78f622e51c6b5549127f84b7aa3  
+[Download IVPN Client UI for Linux (RPM)](https://repo.ivpn.net/stable/pool/ivpn-ui-3.12.0-1.x86_64.rpm)  
+SHA256: dc888967650f370f82ed2acdc06f01104ac786e4bdaef7132c1ca4ab123d9d2c  
+
 ## Version 3.11.15 - 2023-08-07
 
 [FIX] (Windows) App update check fails due to missing libraries  

cli/References/Linux/build.sh

@@ -110,7 +110,9 @@ OBFSPXY_BIN=$DAEMON_REPO_ABS_PATH/References/Linux/_deps/obfs4proxy_inst/obfs4pr
 WG_QUICK_BIN=$DAEMON_REPO_ABS_PATH/References/Linux/_deps/wireguard-tools_inst/wg-quick
 WG_BIN=$DAEMON_REPO_ABS_PATH/References/Linux/_deps/wireguard-tools_inst/wg
 DNSCRYPT_PROXY_BIN=$DAEMON_REPO_ABS_PATH/References/Linux/_deps/dnscryptproxy_inst/dnscrypt-proxy
+V2RAY_BIN=$DAEMON_REPO_ABS_PATH/References/Linux/_deps/v2ray_inst/v2ray
 KEM_HELPER_BIN=$DAEMON_REPO_ABS_PATH/References/Linux/_deps/kem-helper/kem-helper-bin/kem-helper
+
 #if [ "$(find ${DNSCRYPT_PROXY_BIN} -perm 755)" != "${DNSCRYPT_PROXY_BIN}" ] || [ "$(find ${OBFSPXY_BIN} -perm 755)" != "${OBFSPXY_BIN}" ] || [ "$(find ${WG_QUICK_BIN} -perm 755)" != "${WG_QUICK_BIN}" ] || [ "$(find ${WG_BIN} -perm 755)" != "${WG_BIN}" ]
 #then
 #  echo ----------------------------------------------------------
@@ -200,7 +202,7 @@ CreatePackage()
   #   [*] Before remove (3.3.30 : rpm : 0)
   #   [*] After remove (3.3.30 : rpm : 0)
 
-  fpm -d openvpn $EXTRA_ARGS \
+  fpm -d openvpn -d iptables $EXTRA_ARGS \
     --rpm-rpmbuild-define "_build_id_links none" \
     --deb-no-default-config-files -s dir -t $PKG_TYPE -n ivpn -v $VERSION --url https://www.ivpn.net --license "GNU GPL3" \
     --template-scripts --template-value pkg=$PKG_TYPE \
@@ -215,6 +217,7 @@ CreatePackage()
     $DAEMON_REPO_ABS_PATH/References/Linux/scripts/_out_bin/ivpn-service=/usr/bin/ \
     $OUT_DIR/ivpn=/usr/bin/ \
     $OBFSPXY_BIN=/opt/ivpn/obfsproxy/obfs4proxy \
+    $V2RAY_BIN=/opt/ivpn/v2ray/v2ray \
     $WG_QUICK_BIN=/opt/ivpn/wireguard-tools/wg-quick \
     $WG_BIN=/opt/ivpn/wireguard-tools/wg \
     ${DNSCRYPT_PROXY_BIN}=/opt/ivpn/dnscrypt-proxy/dnscrypt-proxy \

cli/References/Linux/package_scripts/after-install.sh

@@ -58,6 +58,7 @@ silent chmod 0700 $IVPN_ETC/*.down        # can execute only owner (root)
 silent chmod 0755 /usr/bin/ivpn           # can change only owner (root)
 silent chmod 0755 /usr/bin/ivpn-service   # can change only owner (root)
 silent chmod 0755 $IVPN_OPT/obfsproxy/obfs4proxy          # can change only owner (root)
+silent chmod 0755 $IVPN_OPT/v2ray/v2ray                   # can change only owner (root)
 silent chmod 0755 $IVPN_OPT/wireguard-tools/wg-quick      # can change only owner (root)
 silent chmod 0755 $IVPN_OPT/wireguard-tools/wg            # can change only owner (root)
 silent chmod 0755 $IVPN_OPT/dnscrypt-proxy/dnscrypt-proxy # can change only owner (root)

cli/commands/base.go

@@ -35,6 +35,7 @@ import (
 	apitypes "github.com/ivpn/desktop-app/daemon/api/types"
 	"github.com/ivpn/desktop-app/daemon/protocol/types"
 	"github.com/ivpn/desktop-app/daemon/splittun"
+	"github.com/ivpn/desktop-app/daemon/v2r"
 	"github.com/ivpn/desktop-app/daemon/vpn"
 )
 
@@ -89,13 +90,16 @@ func printState(w *tabwriter.Writer, state vpn.State, connected types.ConnectedR
 		return w
 	}
 	since := time.Unix(connected.TimeSecFrom1970, 0)
+
 	protocol := fmt.Sprintf("%v", connected.VpnType)
-	if connected.VpnType == vpn.OpenVPN {
-		obfsCfg := helloResp.DaemonSettings.ObfsproxyConfig
-		if obfsCfg.IsObfsproxy() {
-			protocol += fmt.Sprintf(" (Obfsproxy: %s)", obfsCfg.ToString())
+	if connected.V2RayProxy != v2r.None {
+		protocol += fmt.Sprintf(" (V2Ray: VMESS/%s)", connected.V2RayProxy.ToString())
+	} else if connected.VpnType == vpn.OpenVPN {
+		if connected.Obfsproxy.IsObfsproxy() {
+			protocol += fmt.Sprintf(" (Obfsproxy: %s)", connected.Obfsproxy.ToString())
 		}
 	}
+
 	fmt.Fprintf(w, "    Protocol\t:\t%v\n", protocol)
 	fmt.Fprintf(w, "    Local IP\t:\t%v\n", connected.ClientIP)
 	if len(connected.ClientIPv6) > 0 {