fix: return default sni to googletagmanager

fix: return macos ne icon
2026-07-20 23:59:31 +03:00 · 2026-07-20 16:01:26 +08:00 · 2026-07-20 15:44:54 +08:00
13 changed files with 44 additions and 43 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -501,7 +501,7 @@ jobs:
    - name: 'Setup xcode'
      uses: maxim-lobanov/setup-xcode@v1
      with:
-        xcode-version: '26.3.0'
+        xcode-version: '26.6.0'

    - name: 'Install Qt'
      uses: jurplel/install-qt-action@v4
--- a/client/cmake/macos_ne.cmake
+++ b/client/cmake/macos_ne.cmake
@@ -133,6 +133,11 @@ target_sources(${PROJECT} PRIVATE
    ${CLIENT_ROOT_DIR}/platforms/ios/StoreKit2Helper.swift
 )

+set_source_files_properties(
+    ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Images.xcassets
+    PROPERTIES MACOSX_PACKAGE_LOCATION Resources
+)
+
 target_sources(${PROJECT} PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Images.xcassets
    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
--- a/client/core/models/protocols/awgProtocolConfig.cpp
+++ b/client/core/models/protocols/awgProtocolConfig.cpp
@@ -196,21 +196,11 @@ QJsonObject AwgClientConfig::toJson() const
        obj[configKey::transportPacketMagicHeader] = transportPacketMagicHeader;
    }
    
-    if (!specialJunk1.isEmpty()) {
-        obj[configKey::specialJunk1] = specialJunk1;
-    }
-    if (!specialJunk2.isEmpty()) {
-        obj[configKey::specialJunk2] = specialJunk2;
-    }
-    if (!specialJunk3.isEmpty()) {
-        obj[configKey::specialJunk3] = specialJunk3;
-    }
-    if (!specialJunk4.isEmpty()) {
-        obj[configKey::specialJunk4] = specialJunk4;
-    }
-    if (!specialJunk5.isEmpty()) {
-        obj[configKey::specialJunk5] = specialJunk5;
-    }
+    obj[configKey::specialJunk1] = specialJunk1;
+    obj[configKey::specialJunk2] = specialJunk2;
+    obj[configKey::specialJunk3] = specialJunk3;
+    obj[configKey::specialJunk4] = specialJunk4;
+    obj[configKey::specialJunk5] = specialJunk5;
    
    if (isObfuscationEnabled) {
        obj[configKey::isObfuscationEnabled] = isObfuscationEnabled;
--- a/client/core/utils/constants/protocolConstants.h
+++ b/client/core/utils/constants/protocolConstants.h
@@ -64,7 +64,7 @@ namespace amnezia
            constexpr char defaultFlow[] = "xtls-rprx-vision";
            constexpr char defaultTransport[] = "raw";
            constexpr char defaultFingerprint[] = "chrome";
-            constexpr char defaultSni[] = "cdn.example.com";
+            constexpr char defaultSni[] = "www.googletagmanager.com";
            constexpr char defaultAlpn[] = "HTTP/2";

            constexpr char defaultXhttpMode[] = "Auto";
--- a/client/macos/app/Info.plist.in
+++ b/client/macos/app/Info.plist.in
@@ -44,8 +44,20 @@
 		<key>NSAllowsLocalNetworking</key>
 		<true/>
 	</dict>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
 	<key>CFBundleIcons</key>
-        <dict/>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>AppIcon</string>
+			</array>
+			<key>CFBundleIconName</key>
+			<string>AppIcon</string>
+		</dict>
+	</dict>
 	<key>UTImportedTypeDeclarations</key>
 	<array>
 		<dict>
--- a/conanfile.py
+++ b/conanfile.py
@@ -19,26 +19,26 @@ class AmneziaVPN(ConanFile):

        if has_service:
            if os == "Windows":
-                self.requires("awg-windows/0.2.0")
+                self.requires("awg-windows/0.1.9")
                self.requires("tap-windows6/9.27.0")
                self.requires("win-split-tunnel/1.2.5.0")
                self.requires("wintun/0.14.1")
            else:
-                self.requires("awg-go/0.2.19")
+                self.requires("awg-go/0.2.18")

-            self.requires("amnezia-xray-bindings/1.2.0")
+            self.requires("amnezia-xray-bindings/1.1.0")
            self.requires("tun2socks/2.6.0")
            self.requires("openvpn/2.7.0")
            self.requires("v2ray-rules-dat/202603162227")

        if has_ne:
-            self.requires("awg-apple/2.0.3")
+            self.requires("awg-apple/2.0.2")
            self.requires("hev-socks5-tunnel/2.15.0", options={"as_framework": True})
            self.requires("openvpnadapter/1.0.0")

        if os == "Android":
-            self.requires("amnezia-libxray/1.0.1")
-            self.requires("awg-android/2.0.2")
+            self.requires("amnezia-libxray/1.0.0")
+            self.requires("awg-android/2.0.1")
            self.requires("openvpn-pt-android/1.0.0")

        # expicitly use libssh@amnezia to prevent it from being downloaded from conan-center
--- a/recipes/amnezia-libxray/conanfile.py
+++ b/recipes/amnezia-libxray/conanfile.py
@@ -11,7 +11,7 @@ from pathlib import Path

 class AmneziaLibxray(ConanFile):
    name = "amnezia-libxray"
-    version = "1.0.1"
+    version = "1.0.0"
    settings = "os", "arch", "compiler"

    def configure(self):
@@ -29,8 +29,8 @@ class AmneziaLibxray(ConanFile):
            raise ConanInvalidConfiguration(f"{self.name} v{self.version} does not support {self.settings.os}")

    def source(self):
-        get(self, f"https://github.com/amnezia-vpn/amnezia-libxray/archive/refs/tags/v{self.version}.zip",
-            sha256="f17bca781d4a2fad4dfda9e8b1c0f6960a3f75f6218b906b1b0e2458652ffa5a", strip_root=True
+        get(self, "https://github.com/amnezia-vpn/amnezia-libxray/archive/refs/tags/v1.0.0.zip",
+            sha256="0c50c5acd5063a9fc3cfbb5b3e11481d30cfa3762b3cb1d72130248ff498e9df", strip_root=True
        )

    def generate(self):
--- a/recipes/amnezia-xray-bindings/conanfile.py
+++ b/recipes/amnezia-xray-bindings/conanfile.py
@@ -13,7 +13,7 @@ import shlex

 class AmneziaXrayBindings(ConanFile):
    name = "amnezia-xray-bindings"
-    version = "1.2.0"
+    version = "1.1.0"
    settings = "os", "arch", "compiler"

    _arch_map = {
@@ -76,8 +76,8 @@ class AmneziaXrayBindings(ConanFile):
            )

    def source(self):
-        get(self, f"https://github.com/amnezia-vpn/amnezia-xray-bindings/archive/v{self.version}.zip",
-            sha256="45b687dcd90cf1d953ece9c9f42d0b02785b2bbb33a97f5bad229f048da34d7c", strip_root=True)
+        get(self, "https://github.com/amnezia-vpn/amnezia-xray-bindings/archive/v1.1.0.zip",
+            sha256="6ea768ec7002cedd422a39aea17704b888acaf794432aa5937cfc92fb6d80eb5", strip_root=True)

    def generate(self):
        tc = AutotoolsToolchain(self)
--- a/recipes/awg-android/conanfile.py
+++ b/recipes/awg-android/conanfile.py
@@ -9,7 +9,7 @@ import platform

 class AwgAndroid(ConanFile):
    name = "awg-android"
-    version = "2.0.2"
+    version = "2.0.1"
    settings = "os", "arch", "build_type", "compiler"

    def configure(self):
--- a/recipes/awg-apple/conanfile.py
+++ b/recipes/awg-apple/conanfile.py
@@ -9,7 +9,7 @@ import os

 class AwgApple(ConanFile):
    name = "awg-apple"
-    version = "2.0.3"
+    version = "2.0.2"
    settings = "os", "arch", "compiler"

    @property
@@ -39,7 +39,7 @@ class AwgApple(ConanFile):

    def source(self):
        get(self, f"https://github.com/amnezia-vpn/amneziawg-apple/archive/refs/tags/v{self.version}.zip",
-            sha256="a868f0dfbded869b6c08b7a7a0e8c1a5485e649a179f4d1715b1b93664ea4fd4", strip_root=True
+            sha256="a04f49eac9f82bbf5dd9031bab188d44de2b3482efde1b6e970821de1d5a3c5d", strip_root=True
        )

    def generate(self):
--- a/recipes/awg-go/conanfile.py
+++ b/recipes/awg-go/conanfile.py
@@ -14,7 +14,7 @@ import shlex

 class AwgGo(ConanFile):
    name = "awg-go"
-    version = "0.2.19"
+    version = "0.2.18"
    package_type = "application"
    settings = "os", "arch"

@@ -61,7 +61,7 @@ class AwgGo(ConanFile):

    def source(self):
        get(self, f"https://github.com/amnezia-vpn/amneziawg-go/archive/refs/tags/v{self.version}.zip",
-            sha256="430396f9f2d4f6559ac69f178b707f955f7f847723b78e9de748b73d7e718798", strip_root=True
+            sha256="58eefbd012e79bd1525f0e02d748979e9480acc1a339df8ceb3b9ffafcedb1ba", strip_root=True
        )

    def generate(self):
--- a/recipes/awg-windows/conanfile.py
+++ b/recipes/awg-windows/conanfile.py
@@ -8,7 +8,7 @@ import os

 class AwgWindows(ConanFile):
    name = "awg-windows"
-    version = "0.2.0"
+    version = "0.1.9"
    settings = "os", "arch"

    @property
@@ -63,7 +63,7 @@ class AwgWindows(ConanFile):

    def source(self):
        get(self, f"https://github.com/amnezia-vpn/amneziawg-windows/archive/refs/tags/v{self.version}.zip",
-            sha256="9e74240b9bae2f9c8a9381bdf6e5a43ad37653de186e01e0f5a92935e4310252", strip_root=True)
+            sha256="5c29a75cb2beae291cc51b64840a39f838da5f300b9e956f7964813a687ec74c", strip_root=True)
        
    def generate(self):
        tc = AutotoolsToolchain(self)
--- a/service/server/CMakeLists.txt
+++ b/service/server/CMakeLists.txt
@@ -333,12 +333,6 @@ if(APPLE)
        DESTINATION ${CMAKE_INSTALL_BINDIR}
        COMPONENT AmneziaVPN
    )
-    add_custom_command(TARGET ${PROJECT} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
-        ${CMAKE_SOURCE_DIR}/deploy/data/macos/pf
-        "$<TARGET_FILE_DIR:${PROJECT}>/pf"
-        COMMAND_EXPAND_LISTS
-    )
 endif()

 # install non-linked dependencies
Author	SHA1	Message	Date
vkamn	42b81bbae2	fix: return default sni to googletagmanager	2026-07-20 16:01:26 +08:00
vkamn	fad07064f4	fix: return macos ne icon	2026-07-20 15:44:54 +08:00