ios: add add post quantum kyber in settings

Chilledheart · May 7, 2024 · fdd55a7 · fdd55a7
1 parent e4efcd1
commit fdd55a7
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4018,12 +4018,14 @@ if (GUI)
     elseif (GUI_FLAVOUR STREQUAL "ios")
         set(MAIN_STORYBOARD ${CMAKE_CURRENT_SOURCE_DIR}/src/ios/Base.lproj/Main.storyboard)
         set(LAUNCH_STORYBOARD ${CMAKE_CURRENT_SOURCE_DIR}/src/ios/Base.lproj/LaunchScreen.storyboard)
+        file(GLOB SETTINGS_BUNDLE ${CMAKE_CURRENT_SOURCE_DIR}/src/ios/Settings.bundle)
         set(ALLRESOURCES)
         if (${CMAKE_GENERATOR} MATCHES "^Xcode.*")
           set(ALLRESOURCES
             ${ALLRESOURCES}
             ${MAIN_STORYBOARD}
             ${LAUNCH_STORYBOARD}
+            ${SETTINGS_BUNDLE}
             src/ios/PrivacyInfo.xcprivacy
             src/ios/en.lproj/Localizable.strings
             src/ios/en.lproj/Main.strings
@@ -4377,6 +4379,8 @@ if (GUI)
             MACOSX_PACKAGE_LOCATION "Resources/Base.lproj")
           set_source_files_properties("${LAUNCH_STORYBOARD}" PROPERTIES
             MACOSX_PACKAGE_LOCATION "Resources/Base.lproj")
+          set_source_files_properties(${SETTINGS_BUNDLE} PROPERTIES
+            MACOSX_PACKAGE_LOCATION "Resources")
           set_source_files_properties("src/ios/en.lproj/Localizable.strings" PROPERTIES
             MACOSX_PACKAGE_LOCATION "Resources")
           set_source_files_properties("src/ios/en.lproj/Main.strings" PROPERTIES

diff --git a/src/ios/Settings.bundle/Root.plist b/src/ios/Settings.bundle/Root.plist
@@ -0,0 +1,21 @@
+<?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>StringsTable</key>
+	<string>Root</string>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Kyber post-quantum key agreement for TLS</string>
+			<key>Key</key>
+			<string>ENABLE_POST_QUANTUM_KYBER</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/src/ios/Settings.bundle/en.lproj/Root.strings b/src/ios/Settings.bundle/en.lproj/Root.strings
diff --git a/src/ios/Settings.bundle/zh-Hans.lproj/Root.strings b/src/ios/Settings.bundle/zh-Hans.lproj/Root.strings
diff --git a/src/ios/YassAppDelegate.mm b/src/ios/YassAppDelegate.mm
@@ -46,11 +46,18 @@ @implementation YassAppDelegate {
   NSString* doh_url_;
   NSString* dot_host_;
   NSString* connect_timeout_;
+  BOOL enable_post_quantum_kyber_;
 }
 
 - (BOOL)application:(UIApplication*)application
     didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id>*)launchOptions {
   state_ = STOPPED;
+  [self didDefaultsChanged:nil];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(didDefaultsChanged:)
+                                               name:NSUserDefaultsDidChangeNotification
+                                             object:nil];
+
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(didChangeVpnStatus:)
                                                name:NEVPNStatusDidChangeNotification
@@ -256,6 +263,7 @@ - (void)OnStartSaveAndLoadInstance:(NETunnelProviderManager*)vpn_manager {
     @(kDoHURLFieldName) : doh_url_,
     @(kDoTHostFieldName) : dot_host_,
     @(kConnectTimeoutFieldName) : connect_timeout_,
+    @(kEnablePostQuantumKyberKey) : @(enable_post_quantum_kyber_),
   };
   tunnelProtocol.username = @"";
   tunnelProtocol.identityDataPassword = @"";
@@ -287,6 +295,13 @@ - (void)OnStartSaveAndLoadInstance:(NETunnelProviderManager*)vpn_manager {
 
 #pragma mark - Notification
 
+- (void)didDefaultsChanged:(NSNotification*)notification {
+  // Use standard one for data that is only for Host App.
+  // Use suiteName for data that you want to share between Extension and Host App.
+  enable_post_quantum_kyber_ = [[NSUserDefaults standardUserDefaults] boolForKey:@(kEnablePostQuantumKyberKey)];
+  absl::SetFlag(&FLAGS_enable_post_quantum_kyber, enable_post_quantum_kyber_);
+}
+
 - (void)didChangeVpnStatus:(NSNotification*)notification {
   if (!vpn_manager_) {
     status_ = NSLocalizedString(@"DISCONNECTED", @"Disconnected");

diff --git a/src/ios/extensions/YassPacketTunnelProvider.mm b/src/ios/extensions/YassPacketTunnelProvider.mm
@@ -48,6 +48,7 @@ - (void)startTunnelWithOptions:(NSDictionary*)options completionHandler:(void (^
   auto doh_url = SysNSStringToUTF8(dict[@(kDoHURLFieldName)]);
   auto dot_host = SysNSStringToUTF8(dict[@(kDoTHostFieldName)]);
   auto connect_timeout = SysNSStringToUTF8(dict[@(kConnectTimeoutFieldName)]);
+  auto enable_post_quantum_kyber = [dict[@(kEnablePostQuantumKyberKey)] boolValue];
 
   auto err_msg =
       config::ReadConfigFromArgument(server_host, "" /*server_sni*/, server_port, username, password, method_string,
@@ -59,6 +60,8 @@ - (void)startTunnelWithOptions:(NSDictionary*)options completionHandler:(void (^
     return;
   }
 
+  absl::SetFlag(&FLAGS_enable_post_quantum_kyber, enable_post_quantum_kyber);
+
   absl::AnyInvocable<void(asio::error_code)> callback = [self, completionHandler](asio::error_code ec) {
     bool successed = false;
     std::string err_msg;

diff --git a/src/ios/utils.h b/src/ios/utils.h
@@ -22,4 +22,6 @@ constexpr const char kDoHURLFieldName[] = "doh_url";
 constexpr const char kDoTHostFieldName[] = "dot_host";
 constexpr const char kConnectTimeoutFieldName[] = "connect_timeout";
 
+constexpr const char kEnablePostQuantumKyberKey[] = "ENABLE_POST_QUANTUM_KYBER";
+
 #endif  //  YASS_IOS_UTILS