PIA-1940: Add dnsFollowAppRules to VpnState object

pia-foss · Jun 18, 2024 · 3f41c30 · 3f41c30
1 parent 1c4ad05
commit 3f41c30
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/ProxyExtension/SplitTunnelProxyProvider/VpnState.swift b/ProxyExtension/SplitTunnelProxyProvider/VpnState.swift
@@ -56,6 +56,13 @@ struct VpnStateFactory {
         }
         vpnState.isConnected = isConnected
         log(.info, "isConnected: \(isConnected)")
+
+        guard let dnsFollowAppRules = options!["dnsFollowAppRules"] as? Bool else {
+            log(.error, "Error: Cannot find dnsFollowAppRules in options")
+            return nil
+        }
+        vpnState.dnsFollowAppRules = dnsFollowAppRules
+        log(.info, "dnsFollowAppRules: \(dnsFollowAppRules)")
 
         guard let whitelistGroupName = options!["whitelistGroupName"] as? String else {
             log(.error, "Error: Cannot find whitelistGroupName in options")
@@ -78,5 +85,6 @@ struct VpnState: Equatable {
     var serverAddress: String = ""
     var routeVpn: Bool = false
     var isConnected: Bool = false
+    var dnsFollowAppRules: Bool = false
     var whitelistGroupName: String = ""
 }
diff --git a/ProxyTests/MessageHandlerTest.swift b/ProxyTests/MessageHandlerTest.swift
@@ -33,6 +33,7 @@ final class MessageHandlerTest: QuickSpec {
                     "serverAddress": "1.1.1.1",
                     "routeVpn": true,
                     "isConnected": true,
+                    "dnsFollowAppRules": true,
                     "whitelistGroupName": "acmevpn"
                 ]
 
@@ -54,6 +55,7 @@ final class MessageHandlerTest: QuickSpec {
                     expect(vpnState.serverAddress).to(equal("1.1.1.1"))
                     expect(vpnState.routeVpn).to(equal(true))
                     expect(vpnState.isConnected).to(equal(true))
+                    expect(vpnState.dnsFollowAppRules).to(equal(true))
                     expect(vpnState.whitelistGroupName).to(equal("acmevpn"))
                 }
 

diff --git a/ProxyTests/VpnStateTest.swift b/ProxyTests/VpnStateTest.swift
@@ -16,6 +16,7 @@ class VpnStateSpec: QuickSpec {
                         "logLevel" : "debug",
                         "routeVpn" : true,
                         "isConnected" : true,
+                        "dnsFollowAppRules": true,
                         "whitelistGroupName" : "group1"]
                     expect(VpnStateFactory.create(options: correctOptions)).toNot(beNil())
                 }
@@ -38,6 +39,7 @@ class VpnStateSpec: QuickSpec {
                     "logLevel" : "debug",
                     "routeVpn" : true,
                     "isConnected" : true,
+                    "dnsFollowAppRules": true,
                     "whitelistGroupName" : "group1"]
                     expect(VpnStateFactory.create(options: wrongTypeOptions)).to(beNil())
                 }