diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a51c19b2..b6ec7e04 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -53,26 +53,26 @@ jobs: bash deploy/build_linux.sh - name: 'Pack installer' - run: cd deploy && tar -cf AmneziaVPN_Linux_Installer.tar AmneziaVPN_Linux_Installer.bin + run: cd deploy && tar -cf ObscurifyVPN_Linux_Installer.tar ObscurifyVPN_Linux_Installer.bin - name: 'Upload installer artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_Linux_installer.tar - path: deploy/AmneziaVPN_Linux_Installer.tar + name: ObscurifyVPN_Linux_installer.tar + path: deploy/ObscurifyVPN_Linux_Installer.tar retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_Linux_unpacked + name: ObscurifyVPN_Linux_unpacked path: deploy/AppDir retention-days: 7 - name: 'Upload translations artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_translations + name: ObscurifyVPN_translations path: client/translations retention-days: 7 @@ -131,14 +131,14 @@ jobs: - name: 'Upload installer artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_Windows_installer - path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe + name: ObscurifyVPN_Windows_installer + path: ObscurifyVPN_x${{ env.BUILD_ARCH }}.exe retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_Windows_unpacked + name: ObscurifyVPN_Windows_unpacked path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release retention-days: 7 @@ -237,7 +237,7 @@ jobs: # with: # name: app-store ipa & dsyms # path: | -# ${{ github.workspace }}/AmneziaVPN-iOS.ipa +# ${{ github.workspace }}/ObscurifyVPN-iOS.ipa # ${{ github.workspace }}/*.app.dSYM.zip # retention-days: 7 @@ -299,15 +299,15 @@ jobs: - name: 'Upload installer artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_MacOS_installer - path: AmneziaVPN.dmg + name: ObscurifyVPN_MacOS_installer + path: ObscurifyVPN.dmg retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN_MacOS_unpacked - path: deploy/build/client/AmneziaVPN.app + name: ObscurifyVPN_MacOS_unpacked + path: deploy/build/client/ObscurifyVPN.app retention-days: 7 # ------------------------------------------------------ @@ -427,40 +427,40 @@ jobs: - name: 'Upload x86_64 apk' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN-android-x86_64 - path: deploy/build/AmneziaVPN-x86_64-release.apk + name: ObscurifyVPN-android-x86_64 + path: deploy/build/ObscurifyVPN-x86_64-release.apk compression-level: 0 retention-days: 7 - name: 'Upload x86 apk' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN-android-x86 - path: deploy/build/AmneziaVPN-x86-release.apk + name: ObscurifyVPN-android-x86 + path: deploy/build/ObscurifyVPN-x86-release.apk compression-level: 0 retention-days: 7 - name: 'Upload arm64-v8a apk' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN-android-arm64-v8a - path: deploy/build/AmneziaVPN-arm64-v8a-release.apk + name: ObscurifyVPN-android-arm64-v8a + path: deploy/build/ObscurifyVPN-arm64-v8a-release.apk compression-level: 0 retention-days: 7 - name: 'Upload armeabi-v7a apk' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN-android-armeabi-v7a - path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk + name: ObscurifyVPN-android-armeabi-v7a + path: deploy/build/ObscurifyVPN-armeabi-v7a-release.apk compression-level: 0 retention-days: 7 - name: 'Upload aab' uses: actions/upload-artifact@v4 with: - name: AmneziaVPN-android - path: deploy/build/AmneziaVPN-release.aab + name: ObscurifyVPN-android + path: deploy/build/ObscurifyVPN-release.aab compression-level: 0 retention-days: 7 diff --git a/.gitignore b/.gitignore index 5b90fd55..9f7cd27d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ # User settings *.user macOSPackage/ -AmneziaVPN.dmg -AmneziaVPN.exe -AmneziaVPN_*.exe +ObscurifyVPN.dmg +ObscurifyVPN.exe +ObscurifyVPN_*.exe deploy/build/* deploy/build_32/* deploy/build_64/* diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index bd9988fc..cd8dfb69 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -305,7 +305,7 @@ if(APPLE) set(BUILD_IOS_GROUP_IDENTIFIER group.org.obscurify.ObscurifyVPN CACHE STRING "iOS Group identifier") endif() if(NOT BUILD_VPN_DEVELOPMENT_TEAM) - set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Obscurify VPN Development Team") + set(BUILD_VPN_DEVELOPMENT_TEAM KU5NAU9B7H CACHE STRING "Obscurify VPN Development Team") endif() set(CMAKE_XCODE_GENERATE_SCHEME FALSE) diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index 5fda3506..1d088440 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -76,11 +76,12 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks" XCODE_EMBED_APP_EXTENSIONS networkextension - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" - XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN" - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN" + XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic + # XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" + # XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" + # XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.ObscurifyVPN" + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.ObscurifyVPN" ) set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_SWIFT_VERSION "5.0" @@ -90,7 +91,7 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx" ) set_target_properties(${PROJECT} PROPERTIES - XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK" + XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "KU5NAU9B7H" ) target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_compile_options(${PROJECT} PRIVATE diff --git a/client/ios/app/Info.plist.in b/client/ios/app/Info.plist.in index 45b08cc9..2d6e4f77 100644 --- a/client/ios/app/Info.plist.in +++ b/client/ios/app/Info.plist.in @@ -46,7 +46,7 @@ UIUserInterfaceStyle Light com.wireguard.ios.app_group_id - group.org.amnezia.AmneziaVPN + group.org.obscurify.ObscurifyVPN UIViewControllerBasedStatusBarAppearance NSCameraUsageDescription @@ -74,7 +74,7 @@ UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.amnezia-config + org.obscurify.ObscurifyVPN.amnezia-config UTTypeTagSpecification public.filename-extension @@ -97,7 +97,7 @@ UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.wireguard-config + org.obscurify.ObscurifyVPN.wireguard-config UTTypeTagSpecification public.filename-extension @@ -121,7 +121,7 @@ UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.openvpn-config + org.obscurify.ObscurifyVPN.openvpn-config UTTypeTagSpecification public.filename-extension @@ -140,11 +140,11 @@ public.data UTTypeDescription - AmneziaVPN backup file + ObscurifyVPN backup file UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.backup-config + org.obscurify.ObscurifyVPN.backup-config UTTypeTagSpecification public.filename-extension @@ -167,10 +167,10 @@ Alternate LSItemContentTypes - org.amnezia.AmneziaVPN.amnezia-config - org.amnezia.AmneziaVPN.wireguard-config - org.amnezia.AmneziaVPN.openvpn-config - org.amnezia.AmneziaVPN.backup-config + org.obscurify.ObscurifyVPN.amnezia-config + org.obscurify.ObscurifyVPN.wireguard-config + org.obscurify.ObscurifyVPN.openvpn-config + org.obscurify.ObscurifyVPN.backup-config diff --git a/client/ios/app/main.entitlements b/client/ios/app/main.entitlements index d9f00bb1..ac1402bd 100644 --- a/client/ios/app/main.entitlements +++ b/client/ios/app/main.entitlements @@ -7,14 +7,12 @@ packet-tunnel-provider com.apple.security.application-groups - - group.org.amnezia.AmneziaVPN - + com.apple.security.files.user-selected.read-write keychain-access-groups - $(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN + $(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN diff --git a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements index 92432b56..d38e3bb0 100644 --- a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements +++ b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements @@ -7,12 +7,10 @@ packet-tunnel-provider com.apple.security.application-groups - - group.org.amnezia.AmneziaVPN - + keychain-access-groups - $(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN + $(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt index c448ed08..bad138ef 100644 --- a/client/ios/networkextension/CMakeLists.txt +++ b/client/ios/networkextension/CMakeLists.txt @@ -27,12 +27,13 @@ set_target_properties(networkextension PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../Frameworks" - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" + XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic + # XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" + # XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" - XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN.network-extension" - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN.network-extension" + # XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.ObscurifyVPN.network-extension" + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.ObscurifyVPN.network-extension" ) set_target_properties(networkextension PROPERTIES @@ -44,7 +45,7 @@ set_target_properties(networkextension PROPERTIES ) set_target_properties("networkextension" PROPERTIES - XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK" + XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "KU5NAU9B7H" ) find_library(FW_ASSETS_LIBRARY AssetsLibrary) diff --git a/client/main.cpp b/client/main.cpp index aca9e62b..bd24c5e5 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -21,7 +21,7 @@ bool isAnotherInstanceRunning() QLocalSocket socket; socket.connectToServer("AmneziaVPNInstance"); if (socket.waitForConnected(500)) { - qWarning() << "AmneziaVPN is already running"; + qWarning() << "ObscurifyVPN is already running"; return true; } return false; diff --git a/client/platforms/ios/Log.swift b/client/platforms/ios/Log.swift index d2222f9d..ef0a2433 100644 --- a/client/platforms/ios/Log.swift +++ b/client/platforms/ios/Log.swift @@ -14,7 +14,7 @@ struct Log { } } - private static let appGroupID = "group.org.amnezia.AmneziaVPN" + private static let appGroupID = "group.org.obscurify.ObscurifyVPN" static let appLogURL = { let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)! diff --git a/client/platforms/macos/macosutils.mm b/client/platforms/macos/macosutils.mm index 177ed2a2..e7166a8b 100644 --- a/client/platforms/macos/macosutils.mm +++ b/client/platforms/macos/macosutils.mm @@ -21,7 +21,7 @@ NSString* MacOSUtils::appId() { if (!appId) { // Fallback. When an unsigned/un-notarized app is executed in // command-line mode, it could fail the fetching of its own bundle id. - appId = @"org.amnezia.AmneziaVPN"; + appId = @"org.obscurify.ObscurifyVPN"; } return appId; diff --git a/deploy/data/macos/AmneziaVPN.plist b/deploy/data/macos/AmneziaVPN.plist index 8dabbc9e..c725e4fc 100644 --- a/deploy/data/macos/AmneziaVPN.plist +++ b/deploy/data/macos/AmneziaVPN.plist @@ -3,10 +3,10 @@ Label - AmneziaVPN-service + ObscurifyVPN-service ProgramArguments - /Applications/AmneziaVPN.app/Contents/MacOS/AmneziaVPN-service + /Applications/ObscurifyVPN.app/Contents/MacOS/ObscurifyVPN-service KeepAlive diff --git a/deploy/installer/config/macos.xml.in b/deploy/installer/config/macos.xml.in index 3888d08d..00e39b4a 100644 --- a/deploy/installer/config/macos.xml.in +++ b/deploy/installer/config/macos.xml.in @@ -1,11 +1,11 @@ - AmneziaVPN + ObscurifyVPN @CMAKE_PROJECT_VERSION@ - AmneziaVPN - AmneziaVPN - AmneziaVPN - /Applications/AmneziaVPN.app + ObscurifyVPN + ObscurifyVPN + ObscurifyVPN + /Applications/ObscurifyVPN.app 600 380 Mac @@ -21,7 +21,7 @@ https://amneziavpn.org/updates/macos true - AmneziaVPN - repository for macOS + ObscurifyVPN - repository for macOS