TLS support

Author: Cenmrev

V2RayX/AppDelegate.m

@@ -12,7 +12,7 @@
 
 #define kV2RayXHelper @"/Library/Application Support/V2RayX/v2rayx_sysconf"
 #define kSysconfVersion @"v2rayx_sysconf 1.0.0"
-#define kV2RayXSettingVersion 1
+#define kV2RayXSettingVersion 2
 #define nilCoalescing(a,b) ( (a != nil) ? (a) : (b) ) // equivalent to ?? operator in Swift
 
 @interface AppDelegate () {
@@ -71,7 +71,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
         return [GCDWebServerDataResponse responseWithData:[weakSelf pacData] contentType:@"application/x-ns-proxy-autoconfig"];
     }];
     NSNumber* setingVersion = [[NSUserDefaults standardUserDefaults] objectForKey:@"setingVersion"];
-    if(setingVersion == nil || [setingVersion integerValue] != 1) {
+    if(setingVersion == nil || [setingVersion integerValue] != kV2RayXSettingVersion) {
         NSAlert *noServerAlert = [[NSAlert alloc] init];
         [noServerAlert setMessageText:@"Sorry, unknown settings!\nAll V2RayX settings will be reset."];
         [noServerAlert runModal];
@@ -88,12 +88,16 @@ - (void) writeDefaultSettings {
     NSDictionary *defaultSettings =
     @{
       @"setingVersion": [NSNumber numberWithInteger:kV2RayXSettingVersion],
-      @"proxyIsOn": [NSNumber numberWithBool:false],
+      @"proxyIsOn": [NSNumber numberWithBool:NO],
       @"proxyMode": [NSNumber numberWithInteger:0],
       @"selectedServerIndex": [NSNumber numberWithInteger:0],
       @"localPort": [NSNumber numberWithInteger:1081],
-      @"udpSupport": [NSNumber numberWithBool:false],
+      @"udpSupport": [NSNumber numberWithBool:NO],
       @"dns": @"localhost",
+      @"useTLS": [NSNumber numberWithBool:NO],
+      @"tlsSettings": @{
+              @"allowInsecure": [NSNumber numberWithBool:NO]
+              },
       @"profiles":@[
                     @{
                         @"address": @"v2ray.cool",

V2RayX/ConfigWindowController.h

@@ -45,7 +45,9 @@
 //ws fields
 @property (weak) IBOutlet NSButton *wsCrButton;
 @property (weak) IBOutlet NSTextField *wsPathField;
-
+//tls fields
+@property (weak) IBOutlet NSButton *tlsUseButton;
+@property (weak) IBOutlet NSButton *tlsAiButton;
 
 @property (nonatomic) ServerProfile* selectedProfile;
 @property NSInteger selectedServerIndex;

V2RayX/ConfigWindowController.m

@@ -155,6 +155,11 @@ - (IBAction)showtransportSettings:(id)sender {
     [_wsCrButton setState:[transportSettings[@"wsSettings"][@"connectionReuse"] boolValue]];
     NSString *savedWsPath = transportSettings[@"wsSettings"][@"path"];
     [_wsPathField setStringValue: savedWsPath != nil ? savedWsPath : @""];
+    //tls
+    [_tlsUseButton setState:[[[NSUserDefaults standardUserDefaults] objectForKey:@"useTLS"] boolValue]];
+    NSDictionary* tlsSettings = [[NSUserDefaults standardUserDefaults] objectForKey:@"tlsSettings"];
+    [_tlsAiButton setState:[tlsSettings[@"allowInsecure"] boolValue]];
+    [self useTLS:nil];
     //show sheet
     [[self window] beginSheet:_transportWindow completionHandler:^(NSModalResponse returnCode) {
     }];
@@ -212,13 +217,18 @@ - (IBAction)tOK:(id)sender {
               };
             NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
             [defaults setObject:transportSettings forKey:@"transportSettings"];
+            [defaults setObject:[NSNumber numberWithBool:[_tlsUseButton state]] forKey:@"useTLS"];
+            [defaults setObject:@{@"allowInsecure": [NSNumber numberWithBool:[_tlsAiButton state]]} forKey:@"tlsSettings"];
             //close sheet
-            [self tCancel:nil];
+            [[self window] endSheet:_transportWindow];
         }
     }];
+}
 
-
+- (IBAction)useTLS:(id)sender {
+    [_tlsAiButton setEnabled:[_tlsUseButton state]];
 }
+
 - (IBAction)transportHelp:(id)sender {
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.v2ray.com/chapter_02/05_transport.html"]];
 }

V2RayX/ServerProfile.m

@@ -54,8 +54,11 @@ - (NSDictionary*)v2rayConfigWithLocalPort:(NSInteger)localPort
     config[@"outbound"][@"settings"][@"vnext"][0][@"users"][0][@"id"] = self.userId;
     config[@"outbound"][@"settings"][@"vnext"][0][@"users"][0][@"alterId"] = self.alterId;
     config[@"outbound"][@"settings"][@"vnext"][0][@"users"][0][@"security"] = @[@"aes-128-cfb", @"aes-128-gcm", @"chacha20-poly1305"][self.security.integerValue % 3];
-    NSMutableDictionary* streamSettings = [[[NSUserDefaults standardUserDefaults] objectForKey:@"transportSettings"] mutableCopy];
+    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary* streamSettings = [[userDefaults objectForKey:@"transportSettings"] mutableCopy];
     streamSettings[@"network"] = @[@"tcp", @"kcp", @"ws"][self.network.integerValue % 3];
+    streamSettings[@"security"] = [[userDefaults objectForKey:@"useTLS"] boolValue] ? @"tls" : @"none";
+    streamSettings[@"tlsSettings"] = [userDefaults objectForKey:@"tlsSettings"];
     config[@"outbound"][@"streamSettings"] = streamSettings;
     NSArray* dnsArray = [[[NSUserDefaults standardUserDefaults] objectForKey:@"dns"] componentsSeparatedByString:@","];
     if ([dnsArray count] > 0) {