andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration

Browse Source
This commit is contained in:
vladimir.kuznetsov
2022-12-01 20:11:56 +03:00
parent 2a80117d42 e65d312503
commit 21a6ab369e
22 changed files with 597 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/3rd/QtSsh/src/botan/botan.cmake
+8
View File
@@ -62,4 +62,12 @@ if(IOS)
# HEADERS += $$PWD/ios/iphone/botan_all.h # HEADERS += $$PWD/ios/iphone/botan_all.h
# SOURCES += $$PWD/ios/iphone/botan_all.cpp # SOURCES += $$PWD/ios/iphone/botan_all.cpp
# } # }
link_directories(${CMAKE_CURRENT_LIST_DIR}/ios/iphone)
set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ios/iphone/botan_all.h)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ios/iphone/botan_all.cpp)
endif() endif()
client/CMakeLists.txt
+95 -21
View File
@@ -163,20 +163,59 @@ if(WIN32)
endif() endif()
if(APPLE) if(APPLE)
add_compile_definitions(MVPN_MACOS)
if(NOT BUILD_OSX_APP_IDENTIFIER)
set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier")
endif()
if(NOT BUILD_IOS_APP_IDENTIFIER)
set(BUILD_IOS_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "iOS Application identifier")
endif()
if(NOT BUILD_IOS_GROUP_IDENTIFIER)
set(BUILD_IOS_GROUP_IDENTIFIER group.org.amnezia.AmneziaVPN.Guardian CACHE STRING "iOS Group identifier")
endif()
if(NOT BUILD_VPN_DEVELOPMENT_TEAM)
set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Amnezia VPN Development Team")
endif()
if(IOS)
message("ios in mac")
#do nothing, IOS is added in below
else() #mac
message("MAC build")
set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.h)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.mm)
# set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
add_compile_definitions(MVPN_MACOS)
# ICON = $$PWD/images/app.icns # ICON = $$PWD/images/app.icns
set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.h)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.mm)
# LIBS += -framework Cocoa -framework ApplicationServices -framework CoreServices -framework Foundation -framework AppKit -framework Security message(STATUS "test ${PROJECT_SOURCE_DIR}")
# LIBS += $$PWD/3rd/OpenSSL/lib/macos/x86_64/libcrypto.a find_library(LIB_LIBCRYPTO NAMES "libcrypto.a"
# LIBS += $$PWD/3rd/OpenSSL/lib/macos/x86_64/libssl.a PATHS ${PROJECT_SOURCE_DIR}/3rd/OpenSSL/lib/macos/x86_64/ NO_DEFAULT_PATH)
find_library(LIB_SSL NAMES "libssl.a"
PATHS ${PROJECT_SOURCE_DIR}/3rd/OpenSSL/lib/macos/x86_64/ NO_DEFAULT_PATH)
find_library(FW_COCOA Cocoa)
find_library(FW_APPLICATIONSERVICES ApplicationServices)
find_library(FW_CORESERVICES CoreServices)
find_library(FW_FOUNDATION Foundation)
find_library(FW_APPKIT AppKit)
find_library(FW_SECURITY Security)
set(LIBS ${LIBS} FW_COCOA FW_APPLICATIONSERVICES FW_FOUNDATION FW_APPKIT FW_SECURITY FW_CORESERVICES
LIB_LIBCRYPTO LIB_SSL)
endif()
endif() endif()
if(LINUX AND NOT ANDROID) if(LINUX AND NOT ANDROID)
add_compile_definitions(MVPN_LINUX) add_compile_definitions(MVPN_LINUX)
@@ -189,7 +228,7 @@ if(LINUX AND NOT ANDROID)
link_directories(${CMAKE_CURRENT_LIST_DIR}/platforms/linux) link_directories(${CMAKE_CURRENT_LIST_DIR}/platforms/linux)
endif() endif()
if(WIN32 OR APPLE OR (LINUX AND NOT ANDROID)) if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
message("Client desktop build") message("Client desktop build")
add_compile_definitions(AMNEZIA_DESKTOP) add_compile_definitions(AMNEZIA_DESKTOP)
@@ -238,20 +277,25 @@ if(ANDROID)
) )
endif() endif()
qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
qt_add_translations(${PROJECT} TS_FILES
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
if(IOS) if(IOS)
message("Client iOS build") message("Client iOS build")
# CONFIG += static # CONFIG += static
# CONFIG += file_copies # CONFIG += file_copies
# # For the authentication
# LIBS += -framework AuthenticationServices
# # For notifications find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices)
# LIBS += -framework UIKit find_library(FW_UIKIT UIKit)
# LIBS += -framework Foundation find_library(FW_FOUNDATION Foundation)
# LIBS += -framework StoreKit find_library(FW_STOREKIT StoreKit)
# LIBS += -framework UserNotifications find_library(FW_USERNOTIFICATIONS UserNotifications)
set(LIBS ${LIBS} FW_AUTHENTICATIONSERVICES FW_UIKIT FW_FOUNDATION FW_STOREKIT FW_USERNOTIFICATIONS)
add_compile_definitions(MVPN_IOS) add_compile_definitions(MVPN_IOS)
@@ -267,7 +311,7 @@ if(IOS)
${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QtAppDelegate-C-Interface.h ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QtAppDelegate-C-Interface.h
) )
# i think in cmake it is not necessary? # i think in cmake it is not necessary? yes in iOS we are using native
# SOURCES -= # SOURCES -=
# platforms/ios/QRCodeReaderBase.cpp # platforms/ios/QRCodeReaderBase.cpp
# platforms/ios/MobileUtils.cpp # platforms/ios/MobileUtils.cpp
@@ -284,11 +328,44 @@ if(IOS)
${CMAKE_CURRENT_LIST_DIR}/platforms/ios/MobileUtils.mm ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/MobileUtils.mm
) )
set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
add_subdirectory(ios/networkextension)
add_dependencies(${PROJECT} networkextension)
set_target_properties(${PROJECT} PROPERTIES XCODE_EMBED_APP_EXTENSIONS networkextension)
# Q_ENABLE_BITCODE.value = NO # Q_ENABLE_BITCODE.value = NO
# Q_ENABLE_BITCODE.name = ENABLE_BITCODE # Q_ENABLE_BITCODE.name = ENABLE_BITCODE
# QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE # QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE
endif() endif()
if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos")
message("Building for iPhone OS")
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0)
set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.amnezia.${PROJECT}"
OUTPUT_NAME "AmneziaVPN"
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1"
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/ios/app/Info.plist
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development")
find_library(LIB_LIBCRYPTO NAMES "libcrypto.a"
PATHS ${PROJECT_SOURCE_DIR}/3rd/OpenSSL/lib/ios/iphone/ NO_DEFAULT_PATH)
find_library(LIB_SSL NAMES "libssl.a"
PATHS ${PROJECT_SOURCE_DIR}/3rd/OpenSSL/lib/ios/iphone/ NO_DEFAULT_PATH)
# set(LIBS ${LIBS} LIB_LIBCRYPTO LIB_SSL)
endif()
#if(IPHONEOS) #if(IPHONEOS)
# message("Building for iPhone OS") # message("Building for iPhone OS")
# QMAKE_TARGET_BUNDLE_PREFIX = org.amnezia # QMAKE_TARGET_BUNDLE_PREFIX = org.amnezia
@@ -296,11 +373,11 @@ endif()
# QMAKE_IOS_DEPLOYMENT_TARGET = 12.0 # QMAKE_IOS_DEPLOYMENT_TARGET = 12.0
# QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1 # QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1
# QMAKE_DEVELOPMENT_TEAM = X7UJ388FXK # QMAKE_DEVELOPMENT_TEAM = X7UJ388FXK
# QMAKE_PROVISIONING_PROFILE = f2fefb59-14aa-4aa9-ac14-1d5531b06dcc # QMAKE_PROVISIONING_PROFILE = f2fefb59-14aa-4aa9-ac14-1d5531b06dcc not added yet
# QMAKE_XCODE_CODE_SIGN_IDENTITY = "Apple Distribution" # QMAKE_XCODE_CODE_SIGN_IDENTITY = "Apple Distribution"
# QMAKE_INFO_PLIST = $$PWD/ios/app/Info.plist # QMAKE_INFO_PLIST = $$PWD/ios/app/Info.plist
# XCODEBUILD_FLAGS += -allowProvisioningUpdates # XCODEBUILD_FLAGS += -allowProvisioningUpdates not added yet
# DEFINES += iphoneos # DEFINES += iphoneos
@@ -318,10 +395,7 @@ endif()
# NETWORKEXTENSION=1 # NETWORKEXTENSION=1
qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
qt_add_translations(${PROJECT} TS_FILES
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
if(ANDROID) if(ANDROID)
add_custom_command( add_custom_command(
@@ -376,7 +450,7 @@ target_link_libraries(${PROJECT} PRIVATE
Qt6::Core5Compat ${LIBS} Qt6::Core5Compat ${LIBS}
) )
if(WIN32 OR APPLE OR (LINUX AND NOT ANDROID)) if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_interface.rep) qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_interface.rep)
qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_process_interface.rep) qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_process_interface.rep)
endif() endif()
client/core/servercontroller.cpp
+5
View File
@@ -662,6 +662,11 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
vars.append({{"$OPENVPN_TA_KEY", "" }}); vars.append({{"$OPENVPN_TA_KEY", "" }});
} }
vars.append({{"$OPENVPN_ADDITIONAL_CLIENT_CONFIG", openvpnConfig.value(config_key::additional_client_config).
toString(protocols::openvpn::defaultAdditionalClientConfig) }});
vars.append({{"$OPENVPN_ADDITIONAL_SERVER_CONFIG", openvpnConfig.value(config_key::additional_server_config).
toString(protocols::openvpn::defaultAdditionalServerConfig) }});
// ShadowSocks vars // ShadowSocks vars
vars.append({{"$SHADOWSOCKS_SERVER_PORT", ssConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) }}); vars.append({{"$SHADOWSOCKS_SERVER_PORT", ssConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) }});
vars.append({{"$SHADOWSOCKS_LOCAL_PORT", ssConfig.value(config_key::local_port).toString(protocols::shadowsocks::defaultLocalProxyPort) }}); vars.append({{"$SHADOWSOCKS_LOCAL_PORT", ssConfig.value(config_key::local_port).toString(protocols::shadowsocks::defaultLocalProxyPort) }});
client/ios/networkextension/CMakeLists.txt
+105
View File
@@ -0,0 +1,105 @@
enable_language(Swift)
add_executable(networkextension)
set_target_properties(networkextension PROPERTIES
OUTPUT_NAME "AmneziaVPNNetworkExtension"
XCODE_PRODUCT_TYPE com.apple.product-type.app-extension
BUNDLE_EXTENSION appex
MACOSX_BUNDLE ON
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPNNetworkExtension"
MACOSX_BUNDLE_BUNDLE_VERSION "${BUILD_ID}"
MACOSX_BUNDLE_COPYRIGHT "MPL-2.0"
MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension"
MACOSX_BUNDLE_INFO_STRING "MozillaVPNNetworkExtension"
MACOSX_BUNDLE_LONG_VERSION_STRING "${CMAKE_PROJECT_VERSION}-${BUILD_ID}"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION}"
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension"
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_PRECOMPILE_BRIDGING_HEADER "NO"
XCODE_ATTRIBUTE_APPLICATION_EXTENSION_API_ONLY "YES"
XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/AmneziaVPNNetworkExtension.entitlements
)
find_library(FW_ASSETS_LIBRARY AssetsLibrary)
find_library(FW_MOBILE_CORE MobileCoreServices)
find_library(FW_UI_KIT UIKit)
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_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)
set(WG_APPLE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rd/wireguard-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
${CMAKE_SOURCE_DIR}/platforms/ios/iostunnel.swift
${CMAKE_SOURCE_DIR}/platforms/ios/iosglue.mm
${CMAKE_SOURCE_DIR}/platforms/ios/ioslogger.swift
)
## Build wireguard-go-version.h
execute_process(
COMMAND go list -m golang.zx2c4.com/wireguard
WORKING_DIRECTORY ${CMAKE_SOURCE_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 ${CMAKE_SOURCE_DIR})
target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
## HACK: Build only the first architecture, this will break universal builds
## for now, but they are already broken for mobile, which uses the arch to
## determine iOS vs. simulator builds :)
if(NOT CMAKE_OSX_ARCHITECTURES)
set(OSXARCH arm64)
else()
list(GET CMAKE_OSX_ARCHITECTURES 0 OSXARCH)
endif()
## Build the wireguard go library
## TODO: The upstream makefile also makes an attempt to patch the golang runtime
## to provide the boot-time clock instead of an uptime clock. We should probably
## make an attempt to do the same, somehow?
include(${CMAKE_SOURCE_DIR}/src/cmake/golang.cmake)
if(OSXARCH STREQUAL "x86_64")
set(GOARCH amd64)
else()
set(GOARCH ${FIRST_OSX_ARCHITECTURE})
endif()
add_go_library(libwg-go ${CMAKE_SOURCE_DIR}/3rd/wireguard-apple/Sources/WireGuardKitGo/api-apple.go
GOOS ios
GOARCH ${GOARCH}
CGO_CFLAGS -arch ${OSXARCH}
CGO_LDFLAGS -arch ${OSXARCH}
)
target_link_libraries(networkextension PRIVATE libwg-go)
client/ios/networkextension/Info.plist
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>MozillaVPNNetworkExtension</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.networkextension.packet-tunnel</string>
<key>NSExtensionPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
</dict>
<key>com.wireguard.ios.app_group_id</key>
<string>group.$(APP_ID_IOS)</string>
<key>com.wireguard.macos.app_group_id</key>
<string>$(DEVELOPMENT_TEAM).group.$(APP_ID_MACOS)</string>
</dict>
</plist>
client/ios/networkextension/Info.plist.in
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSMinimumSystemVersion</key>
<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
<key>CFBundleDisplayName</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.networkextension.packet-tunnel</string>
<key>NSExtensionPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
</dict>
<key>com.wireguard.ios.app_group_id</key>
<string>group.${BUILD_IOS_APP_IDENTIFIER}</string>
<key>com.wireguard.macos.app_group_id</key>
<string>${BUILD_VPN_DEVELOPMENT_TEAM}.group.${BUILD_OSX_APP_IDENTIFIER}</string>
</dict>
</plist>
client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
+21
View File
@@ -0,0 +1,21 @@
#include "wireguard-go-version.h"
#include "3rd/wireguard-apple/Sources/WireGuardKitGo/wireguard.h"
#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
#include <stdbool.h>
#include <stdint.h>
#define WG_KEY_LEN (32)
#define WG_KEY_LEN_BASE64 (45)
#define WG_KEY_LEN_HEX (65)
void key_to_base64(char base64[WG_KEY_LEN_BASE64],
const uint8_t key[WG_KEY_LEN]);
bool key_from_base64(uint8_t key[WG_KEY_LEN], const char* base64);
void key_to_hex(char hex[WG_KEY_LEN_HEX], const uint8_t key[WG_KEY_LEN]);
bool key_from_hex(uint8_t key[WG_KEY_LEN], const char* hex);
bool key_eq(const uint8_t key1[WG_KEY_LEN], const uint8_t key2[WG_KEY_LEN]);
void write_msg_to_log(const char* tag, const char* msg);
client/ios/networkextension/wireguard-go-version.h.in
+3
View File
@@ -0,0 +1,3 @@
#ifndef WIREGUARD_GO_VERSION
#define WIREGUARD_GO_VERSION "@WG_VERSION_STRING@"
#endif // WIREGUARD_GO_VERSION
client/platforms/ios/iostunnel.swift
+148 -146
View File
@@ -2,7 +2,7 @@ import Foundation
import NetworkExtension import NetworkExtension
import os import os
import Darwin import Darwin
import OpenVPNAdapter //import OpenVPNAdapter
//import Tun2socks //import Tun2socks
enum TunnelProtoType: String { enum TunnelProtoType: String {
@@ -48,11 +48,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
} }
}() }()
private lazy var ovpnAdapter: OpenVPNAdapter = { // private lazy var ovpnAdapter: OpenVPNAdapter = {
let adapter = OpenVPNAdapter() // let adapter = OpenVPNAdapter()
adapter.delegate = self // adapter.delegate = self
return adapter // return adapter
}() // }()
private var shadowSocksConfig: Data? = nil private var shadowSocksConfig: Data? = nil
private var openVPNConfig: Data? = nil private var openVPNConfig: Data? = nil
@@ -70,7 +70,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
// private var session: NWUDPSession? = nil // private var session: NWUDPSession? = nil
// private var observer: AnyObject? // private var observer: AnyObject?
let vpnReachability = OpenVPNReachability() // let vpnReachability = OpenVPNReachability()
var startHandler: ((Error?) -> Void)? var startHandler: ((Error?) -> Void)?
var stopHandler: (() -> Void)? var stopHandler: (() -> Void)?
@@ -97,7 +97,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
errorNotifier: errorNotifier, errorNotifier: errorNotifier,
completionHandler: completionHandler) completionHandler: completionHandler)
case .openvpn: case .openvpn:
startOpenVPN(completionHandler: completionHandler) break
//startOpenVPN(completionHandler: completionHandler)
case .shadowsocks: case .shadowsocks:
break break
// startShadowSocks(completionHandler: completionHandler) // startShadowSocks(completionHandler: completionHandler)
@@ -111,7 +112,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
case .wireguard: case .wireguard:
stopWireguard(with: reason, completionHandler: completionHandler) stopWireguard(with: reason, completionHandler: completionHandler)
case .openvpn: case .openvpn:
stopOpenVPN(with: reason, completionHandler: completionHandler) break
// stopOpenVPN(with: reason, completionHandler: completionHandler)
case .shadowsocks: case .shadowsocks:
break break
// stopShadowSocks(with: reason, completionHandler: completionHandler) // stopShadowSocks(with: reason, completionHandler: completionHandler)
@@ -187,17 +189,17 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
} }
} }
private func startOpenVPN(completionHandler: @escaping (Error?) -> Void) { // private func startOpenVPN(completionHandler: @escaping (Error?) -> Void) {
guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol, // guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
let providerConfiguration = protocolConfiguration.providerConfiguration, // let providerConfiguration = protocolConfiguration.providerConfiguration,
let ovpnConfiguration: Data = providerConfiguration[Constants.ovpnConfigKey] as? Data else { // let ovpnConfiguration: Data = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
// TODO: handle errors properly // // TODO: handle errors properly
wg_log(.error, message: "Can't start startOpenVPN()") // wg_log(.error, message: "Can't start startOpenVPN()")
return // return
} // }
//
setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler) // setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
} // }
/* /*
private func startShadowSocks(completionHandler: @escaping (Error?) -> Void) { private func startShadowSocks(completionHandler: @escaping (Error?) -> Void) {
guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol, guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
@@ -236,13 +238,13 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
} }
} }
private func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) { // private func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
stopHandler = completionHandler // stopHandler = completionHandler
if vpnReachability.isTracking { // if vpnReachability.isTracking {
vpnReachability.stopTracking() // vpnReachability.stopTracking()
} // }
ovpnAdapter.disconnect() // ovpnAdapter.disconnect()
} // }
/* /*
private func stopShadowSocks(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) { private func stopShadowSocks(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
stopOpenVPN(with: reason) { [weak self] in stopOpenVPN(with: reason) { [weak self] in
@@ -686,47 +688,47 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
} }
} }
*/ */
private func setupAndlaunchOpenVPN(withConfig ovpnConfiguration: Data, withShadowSocks viaSS: Bool = false, completionHandler: @escaping (Error?) -> Void) { // private func setupAndlaunchOpenVPN(withConfig ovpnConfiguration: Data, withShadowSocks viaSS: Bool = false, completionHandler: @escaping (Error?) -> Void) {
wg_log(.info, message: "Inside setupAndlaunchOpenVPN()") // wg_log(.info, message: "Inside setupAndlaunchOpenVPN()")
let str = String(decoding: ovpnConfiguration, as: UTF8.self) // let str = String(decoding: ovpnConfiguration, as: UTF8.self)
wg_log(.info, message: "OPENVPN config: \(str)") // wg_log(.info, message: "OPENVPN config: \(str)")
//
let configuration = OpenVPNConfiguration() // let configuration = OpenVPNConfiguration()
configuration.fileContent = ovpnConfiguration // configuration.fileContent = ovpnConfiguration
if viaSS { // if viaSS {
// configuration.settings = [ //// configuration.settings = [
// "remote": "137.74.6.148 1194", //// "remote": "137.74.6.148 1194",
// "proto": "tcp", //// "proto": "tcp",
// "link-mtu": "1480", //// "link-mtu": "1480",
// "tun-mtu": "1460", //// "tun-mtu": "1460",
// ] //// ]
} // }
let evaluation: OpenVPNConfigurationEvaluation // let evaluation: OpenVPNConfigurationEvaluation
do { // do {
evaluation = try ovpnAdapter.apply(configuration: configuration) // evaluation = try ovpnAdapter.apply(configuration: configuration)
} catch { // } catch {
completionHandler(error) // completionHandler(error)
return // return
} // }
//
if !evaluation.autologin { // if !evaluation.autologin {
wg_log(.info, message: "Implement login with user credentials") // wg_log(.info, message: "Implement login with user credentials")
} // }
//
vpnReachability.startTracking { [weak self] status in // vpnReachability.startTracking { [weak self] status in
guard status == .reachableViaWiFi else { return } // guard status == .reachableViaWiFi else { return }
self?.ovpnAdapter.reconnect(afterTimeInterval: 5) // self?.ovpnAdapter.reconnect(afterTimeInterval: 5)
} // }
//
startHandler = completionHandler // startHandler = completionHandler
ovpnAdapter.connect(using: packetFlow) // ovpnAdapter.connect(using: packetFlow)
//
let ifaces = Interface.allInterfaces() // let ifaces = Interface.allInterfaces()
.filter { $0.family == .ipv4 } // .filter { $0.family == .ipv4 }
.map { iface in iface.name } // .map { iface in iface.name }
//
wg_log(.error, message: "Available TUN Interfaces: \(ifaces)") // wg_log(.error, message: "Available TUN Interfaces: \(ifaces)")
} // }
// MARK: -- Network observing methods // MARK: -- Network observing methods
@@ -796,87 +798,87 @@ extension WireGuardLogLevel {
} }
} }
extension NEPacketTunnelFlow: OpenVPNAdapterPacketFlow {} //extension NEPacketTunnelFlow: OpenVPNAdapterPacketFlow {}
/* extension NEPacketTunnelFlow: ShadowSocksAdapterPacketFlow {} */ /* extension NEPacketTunnelFlow: ShadowSocksAdapterPacketFlow {} */
extension PacketTunnelProvider: OpenVPNAdapterDelegate { //extension PacketTunnelProvider: OpenVPNAdapterDelegate {
//
// OpenVPNAdapter calls this delegate method to configure a VPN tunnel. // // OpenVPNAdapter calls this delegate method to configure a VPN tunnel.
// `completionHandler` callback requires an object conforming to `OpenVPNAdapterPacketFlow` // // `completionHandler` callback requires an object conforming to `OpenVPNAdapterPacketFlow`
// protocol if the tunnel is configured without errors. Otherwise send nil. // // protocol if the tunnel is configured without errors. Otherwise send nil.
// `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so // // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so
// you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and // // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and
// send `self.packetFlow` to `completionHandler` callback. // // send `self.packetFlow` to `completionHandler` callback.
func openVPNAdapter( // func openVPNAdapter(
_ openVPNAdapter: OpenVPNAdapter, // _ openVPNAdapter: OpenVPNAdapter,
configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?, // configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?,
completionHandler: @escaping (Error?) -> Void // completionHandler: @escaping (Error?) -> Void
) { // ) {
// In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers // // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers
// send empty string to NEDNSSettings.matchDomains // // send empty string to NEDNSSettings.matchDomains
networkSettings?.dnsSettings?.matchDomains = [""] // networkSettings?.dnsSettings?.matchDomains = [""]
//
// Set the network settings for the current tunneling session. // // Set the network settings for the current tunneling session.
setTunnelNetworkSettings(networkSettings, completionHandler: completionHandler) // setTunnelNetworkSettings(networkSettings, completionHandler: completionHandler)
} // }
//
// Process events returned by the OpenVPN library // // Process events returned by the OpenVPN library
func openVPNAdapter( // func openVPNAdapter(
_ openVPNAdapter: OpenVPNAdapter, // _ openVPNAdapter: OpenVPNAdapter,
handleEvent event: // handleEvent event:
OpenVPNAdapterEvent, message: String? // OpenVPNAdapterEvent, message: String?
) { // ) {
switch event { // switch event {
case .connected: // case .connected:
if reasserting { // if reasserting {
reasserting = false // reasserting = false
} // }
//
guard let startHandler = startHandler else { return } // guard let startHandler = startHandler else { return }
//
startHandler(nil) // startHandler(nil)
self.startHandler = nil // self.startHandler = nil
case .disconnected: // case .disconnected:
guard let stopHandler = stopHandler else { return } // guard let stopHandler = stopHandler else { return }
//
if vpnReachability.isTracking { // if vpnReachability.isTracking {
vpnReachability.stopTracking() // vpnReachability.stopTracking()
} // }
//
stopHandler() // stopHandler()
self.stopHandler = nil // self.stopHandler = nil
case .reconnecting: // case .reconnecting:
reasserting = true // reasserting = true
default: // default:
break // break
} // }
} // }
//
// Handle errors thrown by the OpenVPN library // // Handle errors thrown by the OpenVPN library
func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) { // func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) {
// Handle only fatal errors // // Handle only fatal errors
guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool, // guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool,
fatal == true else { return } // fatal == true else { return }
//
if vpnReachability.isTracking { // if vpnReachability.isTracking {
vpnReachability.stopTracking() // vpnReachability.stopTracking()
} // }
//
if let startHandler = startHandler { // if let startHandler = startHandler {
startHandler(error) // startHandler(error)
self.startHandler = nil // self.startHandler = nil
} else { // } else {
cancelTunnelWithError(error) // cancelTunnelWithError(error)
} // }
} // }
//
// Use this method to process any log message returned by OpenVPN library. // // Use this method to process any log message returned by OpenVPN library.
func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleLogMessage logMessage: String) { // func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleLogMessage logMessage: String) {
// Handle log messages // // Handle log messages
wg_log(.info, message: logMessage) // wg_log(.info, message: logMessage)
} // }
} //}
/* /*
extension PacketTunnelProvider: Tun2socksTunWriterProtocol { extension PacketTunnelProvider: Tun2socksTunWriterProtocol {
func write(_ p0: Data?, n: UnsafeMutablePointer<Int>?) throws { func write(_ p0: Data?, n: UnsafeMutablePointer<Int>?) throws {
client/protocols/ios_vpnprotocol.h
+1 -1
View File
@@ -1,9 +1,9 @@
#ifndef IOS_VPNPROTOCOL_H #ifndef IOS_VPNPROTOCOL_H
#define IOS_VPNPROTOCOL_H #define IOS_VPNPROTOCOL_H
#include "platforms/ios/json.h"
#include "vpnprotocol.h" #include "vpnprotocol.h"
#include "protocols/protocols_defs.h" #include "protocols/protocols_defs.h"
#include "json.h"
using namespace amnezia; using namespace amnezia;
client/protocols/protocols_defs.h
+5
View File
@@ -53,6 +53,9 @@ constexpr char subnet_address[] = "subnet_address";
constexpr char subnet_mask[] = "subnet_mask"; constexpr char subnet_mask[] = "subnet_mask";
constexpr char subnet_cidr[] = "subnet_cidr"; constexpr char subnet_cidr[] = "subnet_cidr";
constexpr char additional_client_config[] = "additional_client_config";
constexpr char additional_server_config[] = "additional_server_config";
// proto config keys // proto config keys
constexpr char last_config[] = "last_config"; constexpr char last_config[] = "last_config";
} }
@@ -82,6 +85,8 @@ constexpr bool defaultTlsAuth = true;
constexpr char ncpDisableString[] = "ncp-disable"; constexpr char ncpDisableString[] = "ncp-disable";
constexpr char tlsAuthString[] = "tls-auth /opt/amnezia/openvpn/ta.key 0"; constexpr char tlsAuthString[] = "tls-auth /opt/amnezia/openvpn/ta.key 0";
constexpr char defaultAdditionalClientConfig[] = "";
constexpr char defaultAdditionalServerConfig[] = "";
} }
namespace shadowsocks { namespace shadowsocks {
client/server_scripts/openvpn/configure_container.sh
+1
View File
@@ -23,4 +23,5 @@ verb 1
tls-server tls-server
tls-version-min 1.2 tls-version-min 1.2
$OPENVPN_TLS_AUTH $OPENVPN_TLS_AUTH
$OPENVPN_ADDITIONAL_SERVER_CONFIG
EOF EOF
client/server_scripts/openvpn/template.ovpn
+2
View File
@@ -21,6 +21,8 @@ block-outside-dns
remote $REMOTE_HOST $OPENVPN_PORT remote $REMOTE_HOST $OPENVPN_PORT
$OPENVPN_ADDITIONAL_CLIENT_CONFIG
<ca> <ca>
$OPENVPN_CA_CERT $OPENVPN_CA_CERT
</ca> </ca>
client/server_scripts/openvpn_cloak/configure_container.sh
+1
View File
@@ -23,6 +23,7 @@ verb 1
tls-server tls-server
tls-version-min 1.2 tls-version-min 1.2
$OPENVPN_TLS_AUTH $OPENVPN_TLS_AUTH
$OPENVPN_ADDITIONAL_SERVER_CONFIG
EOF EOF
# Cloak config # Cloak config
client/server_scripts/openvpn_cloak/template.ovpn
+2
View File
@@ -22,6 +22,8 @@ block-outside-dns
route $REMOTE_HOST 255.255.255.255 net_gateway route $REMOTE_HOST 255.255.255.255 net_gateway
remote 127.0.0.1 1194 remote 127.0.0.1 1194
$OPENVPN_ADDITIONAL_CLIENT_CONFIG
<ca> <ca>
$OPENVPN_CA_CERT $OPENVPN_CA_CERT
</ca> </ca>
client/server_scripts/openvpn_shadowsocks/configure_container.sh
+1
View File
@@ -23,6 +23,7 @@ verb 1
tls-server tls-server
tls-version-min 1.2 tls-version-min 1.2
$OPENVPN_TLS_AUTH $OPENVPN_TLS_AUTH
$OPENVPN_ADDITIONAL_SERVER_CONFIG
EOF EOF
# ShadowSocks config # ShadowSocks config
client/server_scripts/openvpn_shadowsocks/template.ovpn
+2
View File
@@ -23,6 +23,8 @@ socks-proxy 127.0.0.1 $SHADOWSOCKS_LOCAL_PORT
route $REMOTE_HOST 255.255.255.255 net_gateway route $REMOTE_HOST 255.255.255.255 net_gateway
remote $REMOTE_HOST $OPENVPN_PORT remote $REMOTE_HOST $OPENVPN_PORT
$OPENVPN_ADDITIONAL_CLIENT_CONFIG
<ca> <ca>
$OPENVPN_CA_CERT $OPENVPN_CA_CERT
</ca> </ca>
client/src/cmake/golang.cmake
+72
View File
@@ -0,0 +1,72 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
## Find the absolute path to the go build tool.
find_program(GOLANG_BUILD_TOOL NAMES go REQUIRED)
## Create a library target built from a golang c-archive.
function(add_go_library GOTARGET SOURCE)
cmake_parse_arguments(GOLANG
""
"GOOS;GOARCH"
"CGO_CFLAGS;CGO_LDFLAGS"
${ARGN})
get_filename_component(SRC_NAME ${SOURCE} NAME)
get_filename_component(DIR_NAME ${SOURCE} DIRECTORY)
get_filename_component(DIR_ABSOLUTE ${DIR_NAME} ABSOLUTE)
file(GLOB_RECURSE SRC_DEPS ${DIR_NAME}/*.go)
set(HEADER_NAME "${GOTARGET}.h")
set(ARCHIVE_NAME "${GOTARGET}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(GOCACHE ${CMAKE_BINARY_DIR}/go-cache)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/go-cache)
set(GOFLAGS -buildmode=c-archive -trimpath -v)
if(IS_DIRECTORY ${DIR_NAME}/vendor)
set(GOFLAGS ${GOFLAGS} -mod vendor)
endif()
## Add extras to the CGO compiler and linker flags.
execute_process(OUTPUT_VARIABLE DEFAULT_CGO_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env CGO_CFLAGS)
execute_process(OUTPUT_VARIABLE DEFAULT_CGO_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env CGO_LDFLAGS)
separate_arguments(DEFAULT_CGO_CFLAGS NATIVE_COMMAND ${DEFAULT_CGO_CFLAGS})
separate_arguments(DEFAULT_CGO_LDFLAGS NATIVE_COMMAND ${DEFAULT_CGO_LDFLAGS})
list(PREPEND GOLANG_CGO_CFLAGS ${DEFAULT_CGO_CFLAGS})
list(PREPEND GOLANG_CGO_LDFLAGS ${DEFAULT_CGO_LDFLAGS})
if(NOT GOLANG_GOOS)
execute_process(OUTPUT_VARIABLE GOLANG_GOOS OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env GOOS)
endif()
if(NOT GOLANG_GOARCH)
execute_process(OUTPUT_VARIABLE GOLANG_GOARCH OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND ${GOLANG_BUILD_TOOL} env GOARCH)
endif()
if(APPLE AND CMAKE_OSX_SYSROOT)
execute_process(OUTPUT_VARIABLE SDKROOT OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND xcrun --sdk ${CMAKE_OSX_SYSROOT} --show-sdk-path)
list(APPEND GOLANG_CGO_CFLAGS -isysroot ${SDKROOT})
list(APPEND GOLANG_CGO_LDFLAGS -isysroot ${SDKROOT})
endif()
## The actual commands that do the building.
add_custom_target(golang_${GOTARGET}
BYPRODUCTS ${ARCHIVE_NAME} ${HEADER_NAME}
WORKING_DIRECTORY ${DIR_ABSOLUTE}
SOURCES ${SRC_DEPS} ${DIR_NAME}/go.mod
COMMAND ${CMAKE_COMMAND} -E env GOCACHE=${GOCACHE}
CGO_ENABLED=1
CGO_CFLAGS="${GOLANG_CGO_CFLAGS}"
CGO_LDFLAGS="${GOLANG_CGO_LDFLAGS}"
GOOS="${GOLANG_GOOS}"
GOARCH="${GOLANG_GOARCH}"
${GOLANG_BUILD_TOOL} build ${GOFLAGS} -o ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME} ${SRC_NAME}
)
set_target_properties(golang_${GOTARGET} PROPERTIES FOLDER "Libs")
## Wrap up the built library as an imported target.
add_library(${GOTARGET} STATIC IMPORTED GLOBAL)
add_dependencies(${GOTARGET} golang_${GOTARGET})
set_target_properties(${GOTARGET} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}
INTERFACE_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER_NAME}
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME})
endfunction(add_go_library)
client/ui/pages_logic/protocols/OpenVpnLogic.cpp
+12
View File
@@ -21,6 +21,8 @@ OpenVpnLogic::OpenVpnLogic(UiLogic *logic, QObject *parent):
m_checkBoxBlockDnsChecked{false}, m_checkBoxBlockDnsChecked{false},
m_lineEditPortText{}, m_lineEditPortText{},
m_checkBoxTlsAuthChecked{false}, m_checkBoxTlsAuthChecked{false},
m_textAreaAdditionalClientConfig{""},
m_textAreaAdditionalServerConfig{""},
m_pushButtonSaveVisible{false}, m_pushButtonSaveVisible{false},
m_progressBarResetVisible{false}, m_progressBarResetVisible{false},
@@ -67,6 +69,14 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
bool isTlsAuth = openvpnConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth); bool isTlsAuth = openvpnConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
set_checkBoxTlsAuthChecked(isTlsAuth); set_checkBoxTlsAuthChecked(isTlsAuth);
QString additionalClientConfig = openvpnConfig.value(config_key::additional_client_config).
toString(protocols::openvpn::defaultAdditionalClientConfig);
set_textAreaAdditionalClientConfig(additionalClientConfig);
QString additionalServerConfig = openvpnConfig.value(config_key::additional_server_config).
toString(protocols::openvpn::defaultAdditionalServerConfig);
set_textAreaAdditionalServerConfig(additionalServerConfig);
if (container == DockerContainer::ShadowSocks) { if (container == DockerContainer::ShadowSocks) {
set_radioButtonUdpEnabled(false); set_radioButtonUdpEnabled(false);
set_radioButtonTcpEnabled(false); set_radioButtonTcpEnabled(false);
@@ -142,5 +152,7 @@ QJsonObject OpenVpnLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
oldConfig.insert(config_key::block_outside_dns, checkBoxBlockDnsChecked()); oldConfig.insert(config_key::block_outside_dns, checkBoxBlockDnsChecked());
oldConfig.insert(config_key::port, lineEditPortText()); oldConfig.insert(config_key::port, lineEditPortText());
oldConfig.insert(config_key::tls_auth, checkBoxTlsAuthChecked()); oldConfig.insert(config_key::tls_auth, checkBoxTlsAuthChecked());
oldConfig.insert(config_key::additional_client_config, textAreaAdditionalClientConfig());
oldConfig.insert(config_key::additional_server_config, textAreaAdditionalServerConfig());
return oldConfig; return oldConfig;
} }
client/ui/pages_logic/protocols/OpenVpnLogic.h
+2
View File
@@ -22,6 +22,8 @@ class OpenVpnLogic : public PageProtocolLogicBase
AUTO_PROPERTY(bool, checkBoxBlockDnsChecked) AUTO_PROPERTY(bool, checkBoxBlockDnsChecked)
AUTO_PROPERTY(QString, lineEditPortText) AUTO_PROPERTY(QString, lineEditPortText)
AUTO_PROPERTY(bool, checkBoxTlsAuthChecked) AUTO_PROPERTY(bool, checkBoxTlsAuthChecked)
AUTO_PROPERTY(QString, textAreaAdditionalClientConfig)
AUTO_PROPERTY(QString, textAreaAdditionalServerConfig)
AUTO_PROPERTY(bool, pushButtonSaveVisible) AUTO_PROPERTY(bool, pushButtonSaveVisible)
AUTO_PROPERTY(bool, progressBarResetVisible) AUTO_PROPERTY(bool, progressBarResetVisible)
client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
+10 -4
View File
@@ -281,7 +281,10 @@ PageProtocolBase {
font.styleName: "normal" font.styleName: "normal"
font.pixelSize: 16 font.pixelSize: 16
color: "#181922" color: "#181922"
text: logic.textAreaAdditionalClientConfig
onEditingFinished: {
logic.textAreaAdditionalClientConfig = text
}
} }
} }
@@ -294,7 +297,7 @@ PageProtocolBase {
implicitWidth: parent.width implicitWidth: parent.width
height: 21 height: 21
text: qsTr("Additional client config commands →") text: qsTr("Additional server config commands →")
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
} }
@@ -305,7 +308,7 @@ PageProtocolBase {
font.styleName: "normal" font.styleName: "normal"
font.pixelSize: 16 font.pixelSize: 16
color: "#15CDCB"; color: "#15CDCB";
text: pb_client_config.text text: pb_server_config.text
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
@@ -331,7 +334,10 @@ PageProtocolBase {
font.styleName: "normal" font.styleName: "normal"
font.pixelSize: 16 font.pixelSize: 16
color: "#181922" color: "#181922"
text: logic.textAreaAdditionalServerConfig
onEditingFinished: {
logic.textAreaAdditionalServerConfig = text
}
} }
} }
deploy/build_macos.sh
+1 -1
View File
@@ -3,7 +3,7 @@ echo "Build script started ..."
set -o errexit -o nounset set -o errexit -o nounset
while getopts n: flag while getopts n flag
do do
case "${flag}" in case "${flag}" in
n) NOTARIZE_APP=1;; n) NOTARIZE_APP=1;;