Add encrypted DNS proxy domain as part of config

7 files changed, 18 insertions, 3 deletions

diff --git a/ios/Configurations/Api.xcconfig.template b/ios/Configurations/Api.xcconfig.template
index 8d3b160109..0fb8b09e90 100644
--- a/ios/Configurations/Api.xcconfig.template
+++ b/ios/Configurations/Api.xcconfig.template
@@ -8,6 +8,11 @@ API_HOST_NAME[config=Release] = api.$(HOST_NAME)
 API_HOST_NAME[config=MockRelease] = api.$(HOST_NAME)
 API_HOST_NAME[config=Staging] = api.$(HOST_NAME)
 
+ENCRYPTED_DNS_HOST_NAME[config=Debug] = frakta.eu
+ENCRYPTED_DNS_HOST_NAME[config=Release] = frakta.eu
+ENCRYPTED_DNS_HOST_NAME[config=MockRelease] = frakta.eu
+ENCRYPTED_DNS_HOST_NAME[config=Staging] = stagemole.frakta.eu
+
 API_ENDPOINT[config=Debug] = 45.83.223.196:443
 API_ENDPOINT[config=Release] = 45.83.223.196:443
 API_ENDPOINT[config=MockRelease] = 45.83.223.196:443
diff --git a/ios/MullvadREST/ApiHandlers/RESTDefaults.swift b/ios/MullvadREST/ApiHandlers/RESTDefaults.swift
index 1f59b10f92..8875096931 100644
--- a/ios/MullvadREST/ApiHandlers/RESTDefaults.swift
+++ b/ios/MullvadREST/ApiHandlers/RESTDefaults.swift
@@ -21,6 +21,8 @@ extension REST {
     /// Default API endpoint.
     public static let defaultAPIEndpoint = AnyIPEndpoint(string: infoDictionary["ApiEndpoint"] as! String)!
 
+    public static let encryptedDNSHostname = infoDictionary["EncryptedDnsHostName"] as! String
+
     /// Disables API IP address cache when in staging environment and sticks to using default API endpoint instead.
     public static let isStagingEnvironment = false
 
diff --git a/ios/MullvadREST/Info.plist b/ios/MullvadREST/Info.plist
index b66a823a40..644beb120a 100644
--- a/ios/MullvadREST/Info.plist
+++ b/ios/MullvadREST/Info.plist
@@ -6,5 +6,7 @@
 	<string>$(API_HOST_NAME)</string>
 	<key>ApiEndpoint</key>
 	<string>$(API_ENDPOINT)</string>
+	<key>EncryptedDnsHostName</key>
+	<string>$(ENCRYPTED_DNS_HOST_NAME)</string>
 </dict>
 </plist>
diff --git a/ios/MullvadREST/Transport/EncryptedDNS/EncryptedDNSTransport.swift b/ios/MullvadREST/Transport/EncryptedDNS/EncryptedDNSTransport.swift
index 230743bdfa..2910a14eed 100644
--- a/ios/MullvadREST/Transport/EncryptedDNS/EncryptedDNSTransport.swift
+++ b/ios/MullvadREST/Transport/EncryptedDNS/EncryptedDNSTransport.swift
@@ -22,7 +22,7 @@ public final class EncryptedDNSTransport: RESTTransport {
 
     public init(urlSession: URLSession) {
         self.urlSession = urlSession
-        self.encryptedDnsProxy = EncryptedDNSProxy()
+        self.encryptedDnsProxy = EncryptedDNSProxy(domain: REST.encryptedDNSHostname)
     }
 
     public func stop() {
diff --git a/ios/MullvadRustRuntime/EncryptedDNSProxy.swift b/ios/MullvadRustRuntime/EncryptedDNSProxy.swift
index 5179cbc51b..85c605fac5 100644
--- a/ios/MullvadRustRuntime/EncryptedDNSProxy.swift
+++ b/ios/MullvadRustRuntime/EncryptedDNSProxy.swift
@@ -18,9 +18,11 @@ public class EncryptedDNSProxy {
     private var stateLock = NSLock()
     private var didStart = false
     private let state: OpaquePointer
+    private let domain: String
 
-    public init() {
-        state = encrypted_dns_proxy_init("frakta.eu")
+    public init(domain: String) {
+        self.domain = domain
+        state = encrypted_dns_proxy_init(domain)
         proxyConfig = ProxyHandle(context: nil, port: 0)
     }
 
diff --git a/ios/MullvadVPNTests/Info.plist b/ios/MullvadVPNTests/Info.plist
index 8eb7b6a836..bd4375ba32 100644
--- a/ios/MullvadVPNTests/Info.plist
+++ b/ios/MullvadVPNTests/Info.plist
@@ -2,6 +2,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>EncryptedDnsHostName</key>
+	<string>$(ENCRYPTED_DNS_HOST_NAME)</string>
 	<key>ApiHostName</key>
 	<string>$(API_HOST_NAME)</string>
 	<key>ApiEndpoint</key>
diff --git a/ios/MullvadVPNUITests/Info.plist b/ios/MullvadVPNUITests/Info.plist
index e01e57495e..229e948327 100644
--- a/ios/MullvadVPNUITests/Info.plist
+++ b/ios/MullvadVPNUITests/Info.plist
@@ -10,6 +10,8 @@
 	<string>$(API_ENDPOINT)</string>
 	<key>ApiHostName</key>
 	<string>$(API_HOST_NAME)</string>
+	<key>EncryptedDnsHostName</key>
+	<string>$(ENCRYPTED_DNS_HOST_NAME)</string>
 	<key>AttachAppLogsOnFailure</key>
 	<string>$(ATTACH_APP_LOGS_ON_FAILURE)</string>
 	<key>DisplayName</key>