Merge branch 'develop'

.github/CONTRIBUTING.md

@@ -59,7 +59,7 @@ In case when there is no issue:
 <type>/<short-summary-or-description>
 ```
 
-Where <type> can be `epic`, `feature`, `task`, `bugfix`, `hotfix` or `release`.
+Where `<type>` can be `epic`, `feature`, `task`, `bugfix`, `hotfix` or `release`.
 
 ### Branches
 

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.12.0 - 2024-02-12  
+
+[NEW] Device Management  
+[FIXED] Selecting individual servers with IKEv2  
+[FIXED] Minor UI issues on the server map  
+
 ## 2.11.1 - 2023-12-05  
 
 [NEW] Option to Block LAN traffic when connected to an untrusted network  

IVPNClient/AppDelegate.swift

@@ -364,7 +364,7 @@ extension AppDelegate: UIApplicationDelegate {
         }
     }
 
-    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
         let endpoint = url.lastPathComponent
         handleURLEndpoint(endpoint)
         return true

IVPNClient/Enums/AddressType.swift

@@ -30,9 +30,9 @@ enum AddressType {
     case other
 
     static func validateIpAddress(_ address: String) -> AddressType {
-        if let _ = IPv4Address(address) {
+        if IPv4Address(address) != nil {
             return .IPv4
-        } else if let _ = IPv6Address(address) {
+        } else if IPv6Address(address) != nil {
             return .IPv6
         } else {
             return .other

IVPNClient/Enums/ApiResults/ErrorResultSessionNew.swift

@@ -30,6 +30,8 @@ struct SessionLimitData: Decodable {
     let upgradeToPlan: String
     let upgradeToUrl: String
     let paymentMethod: String
+    let deviceManagement: Bool
+    let deviceManagementUrl: String
 }
 
 struct ErrorResultSessionNew: Decodable {

IVPNClient/Enums/ApiResults/Session.swift

@@ -34,6 +34,7 @@ struct Session: Decodable {
     let token: String?
     let vpnUsername: String?
     let vpnPassword: String?
+    let deviceName: String?
     let serviceStatus: ServiceStatus
     let wireguard: WireGuardResult?
 }

IVPNClient/Enums/ApiResults/SessionStatus.swift

@@ -25,6 +25,7 @@ import Foundation
 
 struct SessionStatus: Decodable {
     let status: Int
+    let deviceName: String?
     let serviceStatus: ServiceStatus
 
     var serviceActive: Bool {

IVPNClient/Managers/ConnectionManager.swift

@@ -239,9 +239,10 @@ class ConnectionManager {
     func connect() {
         updateSelectedServer(status: .connecting)
 
+        let host = NETunnelProviderProtocol.getHost()
         let accessDetails = AccessDetails(
-            serverAddress: settings.selectedServer.gateway,
-            ipAddresses: settings.selectedServer.ipAddresses,
+            ipAddress: host?.host ?? settings.selectedServer.gateway,
+            gateway: settings.selectedServer.gateway,
             username: KeyChain.vpnUsername ?? "",
             passwordRef: KeyChain.vpnPasswordRef
         )
@@ -309,9 +310,10 @@ class ConnectionManager {
                 return
             }
 
+            let host = NETunnelProviderProtocol.getHost()
             let accessDetails = AccessDetails(
-                serverAddress: Application.shared.settings.selectedServer.gateway,
-                ipAddresses: Application.shared.settings.selectedServer.ipAddresses,
+                ipAddress: host?.host ?? settings.selectedServer.gateway,
+                gateway: settings.selectedServer.gateway,
                 username: KeyChain.vpnUsername ?? "",
                 passwordRef: KeyChain.vpnPasswordRef
             )

IVPNClient/Managers/KeyChain.swift

@@ -37,6 +37,7 @@ class KeyChain {
     private static let sessionTokenKey = "session_token"
     private static let vpnUsernameKey = "vpn_username"
     private static let vpnPasswordKey = "vpn_password"
+    private static let deviceNameKey = "deviceName"
 
     static let bundle: Keychain = {
         return Keychain(service: "net.ivpn.clients.ios", accessGroup: "WQXXM75BYN.net.ivpn.IVPN-Client").accessibility(.whenPasscodeSetThisDeviceOnly)
@@ -149,12 +150,22 @@ class KeyChain {
         sessionToken = session.token
         vpnUsername = session.vpnUsername
         vpnPassword = session.vpnPassword
+        deviceName = session.deviceName
 
         if let wireguardResult = session.wireguard, let ipAddress = wireguardResult.ipAddress {
             KeyChain.wgIpAddress = ipAddress
         }
     }
 
+    class var deviceName: String? {
+        get {
+            return KeyChain.bundle[deviceNameKey]
+        }
+        set {
+            KeyChain.bundle[deviceNameKey] = newValue
+        }
+    }
+
     static func clearAll() {
         username = nil
         tempUsername = nil
@@ -166,6 +177,7 @@ class KeyChain {
         sessionToken = nil
         vpnUsername = nil
         vpnPassword = nil
+        deviceName = nil
     }
 
 }

IVPNClient/Managers/NavigationManager.swift

@@ -35,11 +35,16 @@ class NavigationManager {
         return viewController
     }
 
-    static func getLoginViewController() -> UIViewController {
+    static func getLoginViewController(showLogoutAlert: Bool = false) -> UIViewController {
         let storyBoard = UIStoryboard(name: "Signup", bundle: nil)
-        let viewController = storyBoard.instantiateViewController(withIdentifier: "loginView")
+        let navController = storyBoard.instantiateViewController(withIdentifier: "loginView") as? UINavigationController
+        navController?.modalPresentationStyle = .formSheet
 
-        return viewController
+        if let viewController = navController?.topViewController as? LoginViewController {
+            viewController.showLogoutAlert = showLogoutAlert
+        }
+
+        return navController!
     }
 
     static func getChangePlanViewController() -> UIViewController {

IVPNClient/Managers/SessionManager.swift

@@ -27,7 +27,7 @@ import Foundation
     func createSessionStart()
     func createSessionSuccess()
     func createSessionFailure(error: Any?)
-    func createSessionTooManySessions(error: Any?)
+    func createSessionTooManySessions(error: Any?, isNewStyleAccount: Bool)
     func createSessionAuthenticationError()
     func createSessionServiceNotActive()
     func createSessionAccountNotActivated(error: Any?)
@@ -67,6 +67,7 @@ class SessionManager {
 
         var kem = KEM()
         let params = sessionNewParams(force: force, username: username, confirmation: confirmation, captcha: captcha, captchaId: captchaId, kem: kem)
+        let isNewStyleAccount = ServiceStatus.isNewStyleAccount(username: username ?? "")
         let request = ApiRequestDI(method: .post, endpoint: Config.apiSessionNew, params: params)
 
         ApiService.shared.requestCustomError(request) { (result: ResultCustomError<Session, ErrorResultSessionNew>) in
@@ -99,7 +100,7 @@ class SessionManager {
                         return
                     case 602:
                         log(.info, message: "Create session error: createSessionTooManySessions")
-                        self.delegate?.createSessionTooManySessions(error: error)
+                        self.delegate?.createSessionTooManySessions(error: error, isNewStyleAccount: isNewStyleAccount)
                         return
                     case 11005:
                         log(.info, message: "Create session error: createSessionAccountNotActivated")
@@ -141,6 +142,7 @@ class SessionManager {
             switch result {
             case .success(let model):
                 Application.shared.serviceStatus = model.serviceStatus
+                KeyChain.deviceName = model.deviceName
                 NotificationCenter.default.post(name: Notification.Name.EvaluatePlanUpdate, object: nil)
 
                 if model.serviceActive {

IVPNClient/Managers/VPNManager.swift

@@ -126,8 +126,7 @@ class VPNManager {
     }
 
     private func setupNEVPNManager(manager: NEVPNManager, accessDetails: AccessDetails, status: NEVPNStatus? = nil, completion: @escaping (Error?) -> Void) {
-        let serverAddress = accessDetails.ipAddresses.randomElement() ?? accessDetails.serverAddress
-        self.setupIKEv2Tunnel(manager: manager, accessDetails: accessDetails, serverAddress: serverAddress, status: status)
+        self.setupIKEv2Tunnel(manager: manager, accessDetails: accessDetails, status: status)
         manager.saveToPreferences { error in
             if let error = error, error.code == 5 {
                 manager.isOnDemandEnabled = false
@@ -141,7 +140,7 @@ class VPNManager {
             }
 
             manager.loadFromPreferences { _ in
-                self.setupIKEv2Tunnel(manager: manager, accessDetails: accessDetails, serverAddress: serverAddress, status: status)
+                self.setupIKEv2Tunnel(manager: manager, accessDetails: accessDetails, status: status)
                 manager.saveToPreferences { _ in
                     completion(nil)
                 }
@@ -179,11 +178,11 @@ class VPNManager {
         }
     }
 
-    private func setupIKEv2Tunnel(manager: NEVPNManager, accessDetails: AccessDetails, serverAddress: String, status: NEVPNStatus? = nil) {
+    private func setupIKEv2Tunnel(manager: NEVPNManager, accessDetails: AccessDetails, status: NEVPNStatus? = nil) {
         let configuration = NEVPNProtocolIKEv2()
-        configuration.remoteIdentifier = accessDetails.serverAddress
+        configuration.remoteIdentifier = accessDetails.gateway
         configuration.localIdentifier = accessDetails.username
-        configuration.serverAddress = serverAddress
+        configuration.serverAddress = accessDetails.ipAddress
         configuration.username = accessDetails.username
         configuration.passwordReference = accessDetails.passwordRef
         configuration.authenticationMethod = .none

IVPNClient/Models/AccessDetails.swift

@@ -25,14 +25,14 @@ import Foundation
 
 class AccessDetails {
 
-    var serverAddress: String
-    var ipAddresses: [String]
+    var ipAddress: String
+    var gateway: String
     var username: String
     var passwordRef: Data?
 
-    init(serverAddress: String, ipAddresses: [String], username: String, passwordRef: Data?) {
-        self.serverAddress = serverAddress
-        self.ipAddresses = ipAddresses
+    init(ipAddress: String, gateway: String, username: String, passwordRef: Data?) {
+        self.ipAddress = ipAddress
+        self.gateway = gateway
         self.username = username
         self.passwordRef = passwordRef
     }

IVPNClient/Models/ServiceStatus.swift

@@ -35,6 +35,7 @@ struct ServiceStatus: Codable {
     let upgradeToUrl: String?
     let paymentMethod: String?
     let capabilities: [String]?
+    let deviceManagement: Bool
 
     // MARK: - Initialize -
 
@@ -48,6 +49,7 @@ struct ServiceStatus: Codable {
         upgradeToUrl = service?.upgradeToUrl ?? nil
         paymentMethod = service?.paymentMethod ?? nil
         capabilities = service?.capabilities ?? nil
+        deviceManagement = service?.deviceManagement ?? false
     }
 
     // MARK: - Methods -
@@ -89,7 +91,15 @@ struct ServiceStatus: Codable {
     }
 
     func isNewStyleAccount() -> Bool {
-        return paymentMethod == "prepaid"
+        guard let username = username else {
+            return true
+        }
+
+        return username.hasPrefix("i-")
+    }
+
+    static func isNewStyleAccount(username: String) -> Bool {
+        return username.hasPrefix("i-")
     }
 
     func daysUntilSubscriptionExpiration() -> Int {

IVPNClient/Models/V2Ray/V2RayConfig.swift

@@ -112,7 +112,7 @@ struct V2RayConfig: Codable {
                             let connection: [String]
                             let pragma: String
 
-                            enum CodingKeys : String, CodingKey {
+                            enum CodingKeys: String, CodingKey {
                                 case host = "Host"
                                 case userAgent = "User-Agent"
                                 case acceptEncoding = "Accept-Encoding"

IVPNClient/Models/V2Ray/V2RayCore.swift

@@ -36,7 +36,7 @@ class V2RayCore {
 
     func start() -> Error? {
         let _ = close()
-        var error: Error? = nil
+        var error: Error?
 
         guard let config = makeConfig() else {
             return NSError(domain: "", code: 99, userInfo: [NSLocalizedDescriptionKey: "V2Ray configuration cannot be loaded"])
@@ -52,7 +52,7 @@ class V2RayCore {
     }
 
     func close() -> Error? {
-        var error: Error? = nil
+        var error: Error?
 
         if let instance = instance {
             var stopError: NSError?

IVPNClient/Models/VPNServer.swift

@@ -98,15 +98,14 @@ class VPNServer {
     private (set) var latitude: Double
     private (set) var longitude: Double
     private (set) var isp: String
-    private (set) var ipAddresses: [String]
     private (set) var hosts: [Host]
     private (set) var load: Double?
     private (set) var ipv6: IPv6?
     var dnsName: String?
 
     // MARK: - Initialize -
 
-    init(gateway: String, dnsName: String? = nil, countryCode: String, country: String, city: String, latitude: Double = 0, longitude: Double = 0, isp: String = "", ipAddresses: [String] = [], hosts: [Host] = [], fastest: Bool = false, load: Double = 0, ipv6: IPv6? = nil) {
+    init(gateway: String, dnsName: String? = nil, countryCode: String, country: String, city: String, latitude: Double = 0, longitude: Double = 0, isp: String = "", hosts: [Host] = [], fastest: Bool = false, load: Double = 0, ipv6: IPv6? = nil) {
         self.gateway = gateway
         self.dnsName = dnsName
         self.countryCode = countryCode
@@ -115,7 +114,6 @@ class VPNServer {
         self.latitude = latitude
         self.longitude = longitude
         self.isp = isp
-        self.ipAddresses = ipAddresses
         self.hosts = hosts
         self.fastest = fastest
         self.load = load

IVPNClient/Models/VPNServerList.swift

@@ -282,7 +282,7 @@ class VPNServerList {
     }
 
     func getServer(byIpAddress ipAddress: String) -> VPNServer? {
-        return getServers().first { $0.ipAddresses.first { $0 == ipAddress } != nil }
+        return getServers().first { $0.hosts.first?.host == ipAddress }
     }
 
     func getServer(byGateway gateway: String) -> VPNServer? {
@@ -394,21 +394,10 @@ class VPNServerList {
         servers.removeAll()
 
         for server in serversList {
-            var serverIpList = [String]()
             var serverHostsList = [Host]()
 
-            if let ipAddressList = server["ip_addresses"] as? [String?] {
-                for ipAddress in ipAddressList where ipAddress != nil {
-                    serverIpList.append(ipAddress!)
-                }
-            }
-
             if let hostsList = server["hosts"] as? [[String: Any]] {
                 for host in hostsList {
-                    if let hostIp = host["host"] as? String {
-                        serverIpList.append(hostIp)
-                    }
-
                     var newHost = Host(
                         host: host["host"] as? String ?? "",
                         hostName: host["hostname"] as? String ?? "",
@@ -438,7 +427,6 @@ class VPNServerList {
                 latitude: server["latitude"] as? Double ?? 0,
                 longitude: server["longitude"] as? Double ?? 0,
                 isp: server["isp"] as? String ?? "",
-                ipAddresses: serverIpList,
                 hosts: serverHostsList
             )