Merge pull request #607 from Chilledheart/ios_prepare_for_vpn

ios: trying to figure the way to start vpn
Chilledheart · Dec 31, 2023 · d44c794 · d44c794
2 parents f487e95 + 42a37ef
commit d44c794
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4107,6 +4107,8 @@ if (GUI)
           )
           if ((NOT XCODE_CODESIGN_IDENTITY STREQUAL "-") OR XCODE_DEPLOYMENT_TEAM)
             set_target_properties(${APP_NAME} PROPERTIES
+              XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/src/ios/yass.entitlements
+              XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/src/ios/extensions/PacketTunnel.entitlements
               XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${XCODE_CODESIGN_IDENTITY}"
               XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${XCODE_DEPLOYMENT_TEAM}"
               XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic")
@@ -4148,10 +4150,12 @@ if (GUI)
             MACOSX_BUNDLE_GUI_IDENTIFIER "it.gui.ios.yass.PacketTunnel"
             XCODE_ATTRIBUTE_PRODUCT_NAME "PacketTunnel"
             XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "it.gui.ios.yass.PacketTunnel"
-            XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path"
             XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES"
-            XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11"
+            XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++20";
             XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"
+            XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES YES
+            XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
+            XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES
             XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER ""
             )
 
@@ -4169,6 +4173,13 @@ if (GUI)
              XCODE_ATTRIBUTE_SKIP_INSTALL  NO
              XCODE_ATTRIBUTE_INSTALL_PATH  "$(LOCAL_APPS_DIR)"
           )
+
+          add_custom_command(TARGET ${APP_NAME} PRE_BUILD
+              COMMAND ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:PacketTunnel>ex $<TARGET_FILE_DIR:${APP_NAME}>/Frameworks/PacketTunnel.appex
+              DEPENDS PacketTunnel
+          )
+
+          target_link_libraries(${APP_NAME} PRIVATE ${NetworkExtension_LIBRARY})
     endif()
 
     if (NOT CMAKE_SKIP_INSTALL_RULES)

diff --git a/src/ios/YassAppDelegate.mm b/src/ios/YassAppDelegate.mm
@@ -2,6 +2,8 @@
 /* Copyright (c) 2023 Chilledheart  */
 #import "ios/YassAppDelegate.h"
 
+#import <NetworkExtension/NetworkExtension.h>
+
 #include "cli/cli_worker.hpp"
 
 #include <pthread.h>
@@ -29,6 +31,7 @@ @implementation YassAppDelegate {
   enum YASSState state_;
   std::string error_msg_;
   Worker worker_;
+  NETunnelProviderManager *vpn_manager_;
 }
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions {
@@ -118,11 +121,36 @@ - (void)OnStop:(BOOL)quiet {
 - (void)OnStarted {
   state_ = STARTED;
   config::SaveConfig();
-
-  YassViewController* viewController =
-      (YassViewController*)
-          UIApplication.sharedApplication.keyWindow.rootViewController;
-  [viewController Started];
+
+  [NETunnelProviderManager loadAllFromPreferencesWithCompletionHandler:^(NSArray<NETunnelProviderManager *> * _Nullable managers, NSError * _Nullable error) {
+    if (error) {
+      std::string err_msg = gurl_base::SysNSStringToUTF8([error localizedDescription]);
+      [self OnStop:true];
+      [self OnStartFailed:err_msg];
+      return;
+    }
+    vpn_manager_ = managers[0];
+    NETunnelProviderProtocol* tunnelProtocol = [[NETunnelProviderProtocol alloc] init];
+    tunnelProtocol.serverAddress = @"";
+    tunnelProtocol.providerBundleIdentifier = @"it.gui.ios.PacketTunnel";
+    tunnelProtocol.providerConfiguration = @{};
+    tunnelProtocol.username = @"";
+    // tunnelProtocol.passwordReference = @"";
+    vpn_manager_.protocolConfiguration = tunnelProtocol;
+    vpn_manager_.localizedDescription = @"YASS VPN";
+    vpn_manager_.enabled = TRUE;
+    BOOL ret = [vpn_manager_.connection startVPNTunnelAndReturnError:&error];
+    if (ret == TRUE) {
+      YassViewController* viewController =
+          (YassViewController*)
+              UIApplication.sharedApplication.keyWindow.rootViewController;
+      [viewController Started];
+    } else {
+      std::string err_msg = gurl_base::SysNSStringToUTF8([error localizedDescription]);
+      [self OnStop:true];
+      [self OnStartFailed:err_msg];
+    }
+  }];
 }
 
 - (void)OnStartFailed:(std::string)error_msg {

diff --git a/src/ios/extensions/Info.plist b/src/ios/extensions/Info.plist
@@ -2,12 +2,34 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.networkextension.packet-tunnel</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>PacketTunnelProvider</string>
-	</dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleDisplayName</key>
+    <string>PacketTunnel</string>
+    <key>CFBundleExecutable</key>
+    <string>PacketTunnel</string>
+    <key>CFBundleIdentifier</key>
+    <string>it.gui.ios.yass.PacketTunnel</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>yass</string>
+    <key>CFBundlePackageType</key>
+    <string>XPC!</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+        <string>arm64</string>
+    </array>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.networkextension.packet-tunnel</string>
+        <key>NSExtensionPrincipalClass</key>
+        <string>PacketTunnelProvider</string>
+    </dict>
 </dict>
 </plist>
diff --git a/src/ios/extensions/PacketTunnel.entitlements b/src/ios/extensions/PacketTunnel.entitlements
@@ -6,5 +6,17 @@
     <array>
         <string>group.it.gui.ios.yass</string>
     </array>
+
+    <key>com.apple.developer.networking.networkextension</key>
+    <array>
+        <string>packet-tunnel-provider</string>
+        <string>app-proxy-provider</string>
+        <string>content-filter-provider</string>
+        <string>dns-proxy</string>
+    </array>
+    <key>com.apple.developer.networking.vpn.api</key>
+    <array>
+        <string>allow-vpn</string>
+    </array>
 </dict>
 </plist>
diff --git a/src/ios/yass.entitlements b/src/ios/yass.entitlements
@@ -0,0 +1,10 @@
+<?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>com.apple.security.application-groups</key>
+    <array>
+        <string>group.it.gui.ios.yass</string>
+    </array>
+</dict>
+</plist>
diff --git a/tools/build.go b/tools/build.go
@@ -891,6 +891,8 @@ func buildStageGenerateBuildScript() {
 			} else {
 				glog.Fatalf("Invalid archFlag: %s", archFlag);
 			}
+			cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DXCODE_CODESIGN_IDENTITY=%s", iosCodeSignIdentityFlag))
+			cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DXCODE_DEPLOYMENT_TEAM=%s", iosDevelopmentTeamFlag))
 			glog.Info("No Packaging supported for simulator, disabling...")
 			noPackagingFlag = true
 		} else if subSystemNameFlag != "" {