* refactoring: improved the performance of secure_settings * bugfix: fixed textFields on PageSetupWizardCredentials * bugfix: fixed scrolling by keys on PageSettingsApiServerInfo * chore: hide site links for ios (#1374) * chore: fixed log output with split tunneling info * chore: hide "open logs folder" button for mobule platforms * chore: fixed again log output with split tunneling info * chore: bump version * Install apparmor (#1379) Install apparmor * chore: returned the backup page for androidTV * Enable PFS for Windows IKEv2 * refactoring: moved api info pages from ServerInfo * refactoring: moved gateway interaction functions to a separate class * bugfix: fixed storeEndpoint parsing * chore: returned links for mobile platforms * Update VPN protocol descriptions * Update VPN description texts * feature: added pages for subscription settings feature * feature: added page for export api native configs * feature: added error handling and minor ui fixes * refactor: update ios build configuration to use automatic code signing and prebuilt OpenVPNAdapter framework * feat: remove OpenVPNAdapter submodule * feat: remove ios openvpn script and associated cmake configuration * Update README.md * Update README_RU.md * Update README.md fix link * feature: added share vpn key to subscription settings page * bugfix: fixed possible crush on android * add timeouts in ipc client init * apply timeouts only for Windows * apply format to file * refactoring: simplified the validity check of the config before connection - improved project structure * bugfix: fixed visability of share drawer * feature: added 409 error handling from server response * chore: fixed android build * chore: fixed qr code display * Rewrite timeouts using waitForSource * feature: added error messages handler * feature: added issued configs info parsing * feature: added functionality to revoke api configs * chore: added links to instructions * chore: fixed qr code with vpnkey processing * chore: fixed native config post processing * chore: added link to android tv instruction * change node to IpcProcessTun2SocksReplica * chore: minor ui fixes * Update Windows OpenSSL (#1426) * Update Windows OpenSSL to 3.0.16 and add shared library for QSslSocket plugin * chore: update link to submodule 3rd-prebuild --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> * chore: added 404 handling for revoke configs - added revoke before remove api server for premium v2 * chore: added log to see proxy decrypt errors * chore: minor ui fix * chore: bump version * bugfix: fixed mobile controllers initialization (#1436) * bugfix: fixed mobile controllers initialization * chore: bump version * Merge pull request #1440 from amnezia-vpn/feature/subscription-settings-page feature/subscription settings page --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> Co-authored-by: pokamest <pokamest@gmail.com> Co-authored-by: Mykola Baibuz <mykola.baibuz@gmail.com> Co-authored-by: Yaroslav Yashin <yaroslav.yashin@gmail.com> Co-authored-by: KsZnak <ksu@amnezia.org> Co-authored-by: Cyril Anisimov <CyAn84@gmail.com>
118 lines
5.5 KiB
CMake
118 lines
5.5 KiB
CMake
enable_language(Swift)
|
|
|
|
set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
|
|
|
|
add_executable(networkextension)
|
|
set_target_properties(networkextension PROPERTIES
|
|
XCODE_PRODUCT_TYPE com.apple.product-type.app-extension
|
|
BUNDLE_EXTENSION appex
|
|
|
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
|
|
MACOSX_BUNDLE_INFO_STRING "AmneziaVPNNetworkExtension"
|
|
MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPNNetworkExtension"
|
|
MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension"
|
|
MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}"
|
|
|
|
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension"
|
|
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/AmneziaVPNNetworkExtension.entitlements
|
|
XCODE_ATTRIBUTE_MARKETING_VERSION "${APP_MAJOR_VERSION}"
|
|
XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${BUILD_ID}"
|
|
XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPNNetworkExtension"
|
|
|
|
XCODE_ATTRIBUTE_APPLICATION_EXTENSION_API_ONLY "YES"
|
|
XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
|
|
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
|
|
|
|
XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../Frameworks"
|
|
|
|
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
|
|
)
|
|
|
|
set_target_properties(networkextension PROPERTIES
|
|
XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
|
|
XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES"
|
|
XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/WireGuardNetworkExtension-Bridging-Header.h"
|
|
XCODE_ATTRIBUTE_SWIFT_OPTIMIZATION_LEVEL "-Onone"
|
|
XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO"
|
|
)
|
|
|
|
set_target_properties("networkextension" PROPERTIES
|
|
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
|
|
)
|
|
|
|
find_library(FW_ASSETS_LIBRARY AssetsLibrary)
|
|
find_library(FW_MOBILE_CORE MobileCoreServices)
|
|
find_library(FW_UI_KIT UIKit)
|
|
find_library(FW_LIBRESOLV libresolv.9.tbd)
|
|
|
|
target_link_libraries(networkextension PRIVATE ${FW_ASSETS_LIBRARY})
|
|
target_link_libraries(networkextension PRIVATE ${FW_MOBILE_CORE})
|
|
target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
|
|
target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV})
|
|
|
|
target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
|
|
target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)
|
|
|
|
set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/amneziawg-apple/Sources)
|
|
|
|
target_sources(networkextension PRIVATE
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/PacketTunnelSettingsGenerator.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/DNSResolver.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardNetworkExtension/ErrorNotifier.swift
|
|
${WG_APPLE_SOURCE_DIR}/Shared/Keychain.swift
|
|
${WG_APPLE_SOURCE_DIR}/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
|
|
${WG_APPLE_SOURCE_DIR}/Shared/Model/NETunnelProviderProtocol+Extension.swift
|
|
${WG_APPLE_SOURCE_DIR}/Shared/Model/String+ArrayConversion.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/TunnelConfiguration.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/IPAddressRange.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/Endpoint.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/DNSServer.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/InterfaceConfiguration.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/PeerConfiguration.swift
|
|
${WG_APPLE_SOURCE_DIR}/Shared/FileManager+Extension.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKitC/x25519.c
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/Array+ConcurrentMap.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/IPAddress+AddrInfo.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKit/PrivateKey.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/HevSocksTunnel.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/NELogController.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+WireGuard.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPN.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+Xray.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/WGConfig.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/XrayConfig.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/iosglue.mm
|
|
)
|
|
|
|
target_sources(networkextension PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/PrivacyInfo.xcprivacy
|
|
)
|
|
|
|
set_property(TARGET networkextension APPEND PROPERTY RESOURCE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/PrivacyInfo.xcprivacy
|
|
)
|
|
|
|
## Build wireguard-go-version.h
|
|
execute_process(
|
|
COMMAND go list -m golang.zx2c4.com/wireguard
|
|
WORKING_DIRECTORY ${CLIENT_ROOT_DIR}/3rd/wireguard-apple/Sources/WireGuardKitGo
|
|
OUTPUT_VARIABLE WG_VERSION_FULL
|
|
)
|
|
string(REGEX REPLACE ".*v\([0-9.]*\).*" "\\1" WG_VERSION_STRING 1.1.1)
|
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/wireguard-go-version.h.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-version.h)
|
|
target_sources(networkextension PRIVATE
|
|
${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-version.h)
|
|
|
|
target_include_directories(networkextension PRIVATE ${CLIENT_ROOT_DIR})
|
|
target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/ios/arm64/libwg-go.a)
|
|
|
|
target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework)
|