Merge branch 'develop'

.github/CONTRIBUTING.md

@@ -9,6 +9,7 @@ As a contributor, here are the guidelines we would like you to follow:
 * [Git Workflow](#git)
 * [Commit Message Guidelines](#commit)
 * [Coding Conventions](#conventions)
+* [Beta Program](#beta-program)
 
 <a name="contributing"></a>
 ## Contributing Code
@@ -108,4 +109,18 @@ This projects is using [SwiftLint](https://github.com/realm/SwiftLint) to enforc
 
 ```sh
 $ fastlane lint
-```
+```
+
+<a name="beta-program"></a>
+## IVPN iOS App Beta Program
+
+Users with an active IVPN account can join our iOS app beta program:
+
+1. Install the iOS [TestFlight app](https://testflight.apple.com)
+2. Open [https://testflight.apple.com/join/FnmEzHHb](https://testflight.apple.com/join/FnmEzHHb) on your iOS device
+3. You will be presented with detailed instructions on how to install the IVPN iOS beta app
+
+Any feedback will be very useful to us. You can submit feedback either by opening an issue on [GitHub](https://github.com/ivpn/ios-app/issues), or send a direct message to [email protected].
+
+**IMPORTANT NOTE:**  
+Do not use IVPN prerelease (beta) apps in situations where you need to protect your privacy or security, but only for testing new unreleased features and improvements.

.github/SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Reporting a security vulnerability to IVPN
 
-If you believe you have found a security vulnerability, **DO NOT CREATE AN ISSUE**. Instead, please send an email to [email protected]. We treat all reports with the highest priority and confidentiality.
+If you believe you have found a security vulnerability, **DO NOT CREATE AN ISSUE**. Instead, please send an email to [email protected] or file a report directly on GitHub with [Private vulnerability reporting](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability). We treat all reports with the highest priority and confidentiality.
 
 ## Incident resolution process
 
@@ -58,4 +58,4 @@ fw0vw5vWVvCDLCQx+sLeNNwWl8291JZNPaSjhuUkK7npNRHV8M3AC5UhhJjwS5K98YeZUeE/4SLN
 T7Vor9NUBZb2g6gu2CwiPAhOS5TY/Oqgh3rvBcDS8X9pgOYXpnTrRLJNhZEjNawRvsqbjJV7vpzL
 x6/Qj0RvfminJWZZz54gHHuh/98PpmByzXLdpQ8GH+PiUd8n5AyA9FxW81kSLTE==o/fv 
 -----END PGP PUBLIC KEY BLOCK----- 
-```
+```

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.7.0 - 2022-11-23  
+
+[NEW] Ability to connect to a specific host in a location  
+[NEW] Support for custom ports  
+[IMPROVED] Warning about existing VPN connection(s) when downgrading subscription plan  
+[FIXED] IPv6 connection information not displayed on iOS 16+ devices  
+[FIXED] Port number displayed in the settings when MultiHop is enabled  
+
 ## 2.6.3 - 2022-05-17  
 
 [IMPROVED] Option to select UDP or TCP when using OpenVPN MultiHop  

Gemfile.lock

@@ -187,7 +187,7 @@ GEM
     tty-screen (0.7.0)
     tty-spinner (0.9.2)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.6)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)

IVPNClient/AppDelegate.swift

@@ -167,11 +167,7 @@ class AppDelegate: UIResponder {
             })
         case Config.urlTypeLogin:
             if let topViewController = UIApplication.topViewController() {
-                if #available(iOS 13.0, *) {
-                    topViewController.present(NavigationManager.getLoginViewController(), animated: true, completion: nil)
-                } else {
-                    topViewController.present(NavigationManager.getLoginViewController(), animated: true, completion: nil)
-                }
+                topViewController.present(NavigationManager.getLoginViewController(), animated: true, completion: nil)
             }
         default:
             break

IVPNClient/Assets.xcassets/icon-arrow-down-gray.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-arrow-down-gray.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

IVPNClient/Assets.xcassets/icon-arrow-up-gray.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-arrow-up-gray.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

IVPNClient/Config/Config.swift

@@ -65,29 +65,6 @@ struct Config {
     static let stableVPNStatusInterval: TimeInterval = 0.5
 
     static let defaultProtocol = ConnectionSettings.wireguard(.udp, 2049)
-    static let supportedProtocols = [
-        ConnectionSettings.ipsec,
-        ConnectionSettings.openvpn(.udp, 2049),
-        ConnectionSettings.openvpn(.udp, 2050),
-        ConnectionSettings.openvpn(.udp, 53),
-        // ConnectionSettings.openvpn(.udp, 80),
-        // ConnectionSettings.openvpn(.udp, 443),
-        ConnectionSettings.openvpn(.udp, 1194),
-        ConnectionSettings.openvpn(.tcp, 443),
-        ConnectionSettings.openvpn(.tcp, 1443),
-        ConnectionSettings.openvpn(.tcp, 80),
-        ConnectionSettings.wireguard(.udp, 2049),
-        ConnectionSettings.wireguard(.udp, 2050),
-        ConnectionSettings.wireguard(.udp, 53),
-        // ConnectionSettings.wireguard(.udp, 80),
-        // ConnectionSettings.wireguard(.udp, 443),
-        ConnectionSettings.wireguard(.udp, 1194),
-        ConnectionSettings.wireguard(.udp, 30587),
-        ConnectionSettings.wireguard(.udp, 41893),
-        ConnectionSettings.wireguard(.udp, 48574),
-        ConnectionSettings.wireguard(.udp, 58237)
-    ]
-
     static let supportedProtocolTypes = [
         ConnectionSettings.wireguard(.udp, 2049),
         ConnectionSettings.ipsec,

IVPNClient/Enums/ConnectionSettings.swift

@@ -30,6 +30,10 @@ enum ConnectionSettings {
     case wireguard(WireGuardProtocol, Int)
 
     func format() -> String {
+        if UserDefaults.shared.isMultiHop {
+            return formatMultiHop()
+        }
+
         switch self {
         case .ipsec:
             return "IKEv2"
@@ -56,7 +60,7 @@ enum ConnectionSettings {
             case .udp:
                 return "OpenVPN, UDP"
            }
-        case .wireguard(_, _):
+        case .wireguard:
             return "WireGuard, UDP"
         }
     }
@@ -137,7 +141,7 @@ enum ConnectionSettings {
     }
 
     func supportedProtocolsFormat(protocols: [ConnectionSettings]) -> [String] {
-        let protocols = supportedProtocols(protocols: Config.supportedProtocols)
+        let protocols = supportedProtocols(protocols: protocols)
         return protocols.map({ $0.formatProtocol() })
     }
 
@@ -146,11 +150,41 @@ enum ConnectionSettings {
     }
 
     static func getSavedProtocol() -> ConnectionSettings {
-        let protocolIndex = UserDefaults.standard.integer(forKey: UserDefaults.Key.selectedProtocolIndex)
+        let portString = UserDefaults.standard.string(forKey: UserDefaults.Key.selectedProtocol) ?? ""
+        return getFrom(portString: portString)
+    }
+
+    static func getFrom(portString: String) -> ConnectionSettings {
+        var name = ""
+        var proto = ""
+        var port = 0
+        let components = portString.components(separatedBy: "-")
+
+        if let protocolName = components[safeIndex: 0] {
+            name = protocolName
+        }
+        if let protocolType = components[safeIndex: 1] {
+            proto = protocolType
+        }
+        if let protocolPort = components[safeIndex: 2] {
+            port = Int(protocolPort) ?? 0
+        }
 
-        if Config.supportedProtocols.indices.contains(protocolIndex) && UserDefaults.standard.object(forKey: UserDefaults.Key.selectedProtocolIndex) != nil || !(KeyChain.sessionToken ?? "").isEmpty {
-            return Config.supportedProtocols[protocolIndex]
-        } else {
+        switch name {
+        case "ikev2":
+            return .ipsec
+        case "openvpn":
+            switch proto {
+            case "tcp":
+                return .openvpn(.tcp, port)
+            case "udp":
+                return .openvpn(.udp, port)
+            default:
+                return Config.defaultProtocol
+            }
+        case "wireguard":
+            return .wireguard(.udp, port)
+        default:
             return Config.defaultProtocol
         }
     }

IVPNClient/Managers/APIClient.swift

@@ -152,6 +152,12 @@ class APIClient: NSObject {
         urlComponents.path = baseURL.path
         urlComponents.queryItems = request.queryItems
 
+        // TODO: Remove when fixed in future iOS versions
+        // https://github.com/ivpn/ios-app/issues/276
+        if #available(iOS 16.0, *), let addressType = request.addressType, addressType == .IPv6 {
+            urlComponents.host = "[\(hostName)]"
+        }
+
         if request.method == .post {
             urlComponents.queryItems = []
         }

IVPNClient/Managers/ConnectionManager.swift

@@ -533,7 +533,7 @@ class ConnectionManager {
         }
 
         getWireGuardLog { _ in
-            var wireGuardLog: String? = nil
+            var wireGuardLog: String?
             let filePath = FileSystemManager.sharedFilePath(name: "WireGuard.log").path
             if let file = NSData(contentsOfFile: filePath) {
                 wireGuardLog = String(data: file as Data, encoding: .utf8) ?? ""

IVPNClient/Managers/NavigationManager.swift

@@ -181,4 +181,16 @@ class NavigationManager {
         return navController!
     }
 
+    static func getAddCustomPortViewController(delegate: AddCustomPortViewControllerDelegate? = nil) -> UIViewController {
+        let storyBoard = UIStoryboard(name: "Main", bundle: nil)
+        let navController = storyBoard.instantiateViewController(withIdentifier: "addCustomPort") as? UINavigationController
+        navController?.modalPresentationStyle = .formSheet
+
+        if let viewController = navController?.topViewController as? AddCustomPortViewController {
+            viewController.delegate = delegate
+        }
+
+        return navController!
+    }
+
 }

IVPNClient/Managers/SessionManager.swift

@@ -123,6 +123,7 @@ class SessionManager {
             switch result {
             case .success(let model):
                 Application.shared.serviceStatus = model.serviceStatus
+                NotificationCenter.default.post(name: Notification.Name.EvaluatePlanUpdate, object: nil)
 
                 if model.serviceActive {
                     self.delegate?.sessionStatusSuccess()

IVPNClient/Managers/StorageManager.swift

@@ -58,6 +58,7 @@ class StorageManager {
     static func clearSession() {
         remove(entityName: "Network")
         remove(entityName: "Server")
+        remove(entityName: "CustomPort")
     }
 
     static func remove(entityName: String) {
@@ -154,6 +155,29 @@ extension StorageManager {
         }
     }
 
+    static func saveCustomPort(vpnProtocol: String = "", type: String = "", port: Int = 0) {
+        let customPort = CustomPort(context: context)
+        customPort.vpnProtocol = vpnProtocol
+        customPort.type = type
+        customPort.port = Int32(port)
+        saveContext()
+    }
+
+    static func fetchCustomPorts(vpnProtocol: String = "") -> [CustomPort]? {
+        let request: NSFetchRequest<CustomPort> = CustomPort.fetchRequest(vpnProtocol: vpnProtocol)
+
+        do {
+            let result = try context.fetch(request)
+            if !result.isEmpty {
+                return result
+            }
+        } catch {
+            log(error: "Coult not load collection from StorageManager")
+        }
+
+        return nil
+    }
+
 }
 
 // MARK: - NEOnDemandRule -

IVPNClient/Managers/VPNManager.swift

@@ -413,7 +413,7 @@ class VPNManager {
         }
 
         do {
-            try session.sendProviderMessage(Message.requestLog.data) { data in
+            try session.sendProviderMessage(Message.requestLog.data) { _ in
                 completion(nil)
                 return
             }

IVPNClient/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17192" systemVersion="19H2" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21511" systemVersion="22A5352e" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="CustomPort" representedClassName="CustomPort" syncable="YES">
+        <attribute name="port" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="type" optional="YES" attributeType="String"/>
+        <attribute name="vpnProtocol" optional="YES" attributeType="String"/>
+    </entity>
     <entity name="Network" representedClassName="Network" syncable="YES">
         <attribute name="isDefault" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="name" optional="YES" attributeType="String"/>
@@ -10,8 +15,4 @@
         <attribute name="gateway" optional="YES" attributeType="String"/>
         <attribute name="isFastestEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
     </entity>
-    <elements>
-        <element name="Network" positionX="-54" positionY="-9" width="128" height="105"/>
-        <element name="Server" positionX="-54" positionY="18" width="128" height="73"/>
-    </elements>
 </model>

IVPNClient/Models/CoreData/CustomPort+CoreDataClass.swift

@@ -0,0 +1,30 @@
+//
+//  CustomPort+CoreDataClass.swift
+//  IVPN iOS app
+//  https://github.com/ivpn/ios-app
+//
+//  Created by Juraj Hilje on 2022-10-05.
+//  Copyright (c) 2022 Privatus Limited.
+//
+//  This file is part of the IVPN iOS app.
+//
+//  The IVPN iOS app is free software: you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License as published by the Free
+//  Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+//  The IVPN iOS app is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+//  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+//  details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with the IVPN iOS app. If not, see <https://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import CoreData
+
+@objc(CustomPort)
+public class CustomPort: NSManagedObject {
+
+}