Merge branch 'task/ip-address-host-ios17' into staging-2.11.0

ivpn · Oct 10, 2023 · ad4cc6f · ad4cc6f
2 parents 000e54c + 9d3724b
commit ad4cc6f
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 2 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -22,7 +22,7 @@ As a contributor, here are the guidelines we would like you to follow:
 ## Creating an Issue
 
 * If you want to report a security problem **DO NOT CREATE AN ISSUE**, please read our [Security Policy](/.github/SECURITY.md) on how to submit a security vulnerability.
-* When creating a new issue, chose a "Bug report" or "Feature request" template and fill the required information.
+* When creating a new issue, choose a "Bug report" or "Feature request" template and fill the required information.
 * Please describe the steps necessary to reproduce the issue you are running into.
 
 <a name="pr"></a>

diff --git a/IVPNClient/Info.plist b/IVPNClient/Info.plist
@@ -74,5 +74,67 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>198.50.177.220</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict>
+			<key>149.56.162.156</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict>
+			<key>198.50.177.222</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict>
+			<key>149.56.162.159</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict>
+			<key>198.50.177.223</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict> 
+			<key>2607:5300:203:1735::8888</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict> 
+			<key>2607:5300:203:1735::8</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict> 
+			<key>2607:5300:203:1735:6580:7300:0:aaaa</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionMinimumTLSVersion</key>
+				<string>TLSv1.2</string>
+			</dict> 
+		</dict>  
+	</dict>
 </dict>
 </plist>
diff --git a/IVPNClient/Managers/APIClient.swift b/IVPNClient/Managers/APIClient.swift
@@ -98,7 +98,15 @@ class APIClient: NSObject {
     private var hostName = UserDefaults.shared.apiHostName
 
     private var baseURL: URL {
-        return URL(string: "https://\(hostName)")!
+        if let url = URL(string: "https://\(hostName)") {
+            return url
+        }
+
+        if let url = URL(string: "https://[\(hostName)]") {
+            return url
+        }
+
+        return URL(string: "https://\(Config.ApiHostName)")!
     }
 
     private var userAgent: String {