Merge branch 'develop' into public-beta

.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>
@@ -59,11 +59,11 @@ 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
 
-`master` - The production branch. Clone or fork this repository for the latest copy.  
+`main` - The production branch. Clone or fork this repository for the latest copy.  
 `develop` - The active development branch. Pull requests should be directed to this branch.  
 `<feature branch>` - The feature of fix branch. Pull requests should be made from this branch into `develop` brach.  
 

.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----- 
-```
+```

.github/workflows/ci.yml

@@ -1,33 +1,26 @@
 name: CI
 
-on: pull_request
+# This action is disabled until we can run it on Apple Silicon powered macOS runners - https://github.com/github/roadmap/issues/528
 
-jobs:
-  test:
-    name: Unit and UI Tests
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: Pods
-        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-pods-
-    - name: Install dependencies
-      run: pod install
-    - name: Set up config files
-      run: |
-        cp IVPNClient/Config/staging.template.xcconfig IVPNClient/Config/staging.xcconfig
-        cp IVPNClient/Config/release.template.xcconfig IVPNClient/Config/release.xcconfig
-        cp wireguard-tunnel-provider/Config/wg-staging.template.xcconfig wireguard-tunnel-provider/Config/wg-staging.xcconfig
-        cp wireguard-tunnel-provider/Config/wg-release.template.xcconfig wireguard-tunnel-provider/Config/wg-release.xcconfig
-        cp today-extension/Config/today-extension-staging.template.xcconfig today-extension/Config/today-extension-staging.xcconfig
-        cp today-extension/Config/today-extension-release.template.xcconfig today-extension/Config/today-extension-release.xcconfig
-        cp IVPNClient/Config/OpenVPNConf.template.swift IVPNClient/Config/OpenVPNConf.swift
-        cp fastlane/Appfile.template fastlane/Appfile
-    - name: Build and test
-      run: xcodebuild test -workspace IVPNClient.xcworkspace -scheme IVPNClient -destination 'platform=iOS Simulator,name=iPhone 11'
+# on:
+#   push:
+#     branches: [ "main", "develop" ]
+#   pull_request:
+
+# jobs:
+#   test:
+#     name: Unit and UI Tests
+#     runs-on: macOS-latest
+#     steps:
+#     - uses: actions/setup-go@v2
+#       with:
+#         go-version: 1.18
+#     - uses: actions/checkout@v2
+#     - name: Set up config files
+#       run: |
+#         cp IVPNClient/Config/staging.template.xcconfig IVPNClient/Config/staging.xcconfig
+#         cp IVPNClient/Config/release.template.xcconfig IVPNClient/Config/release.xcconfig
+#         cp IVPNClient/Config/OpenVPNConf.template.swift IVPNClient/Config/OpenVPNConf.swift
+#         cp fastlane/Appfile.template fastlane/Appfile
+#     - name: Build and test
+#       run: xcodebuild test -scheme IVPNClient -destination 'platform=iOS Simulator,name=iPhone 14'

.github/workflows/linter.yml

@@ -1,6 +1,9 @@
 name: Lint Code Base
 
-on: pull_request
+on:
+  push:
+    branches: [ "main", "develop" ]
+  pull_request:
 
 jobs:
   build:

.github/workflows/mobsfscan.yml

@@ -0,0 +1,17 @@
+name: mobsfscan
+
+on:
+  push:
+    branches: [ "main", "develop" ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: mobsfscan
+    steps:
+    - uses: actions/checkout@v2
+    - name: mobsfscan
+      uses: MobSF/mobsfscan@main
+      with:
+        args: '. --json'

.github/workflows/swiftlint.yml

@@ -1,6 +1,8 @@
 name: SwiftLint
 
 on:
+  push:
+    branches: [ "main", "develop" ]
   pull_request:
     paths:
       - '.github/workflows/swiftlint.yml'

.gitignore

@@ -1,6 +1,13 @@
 ## Build generated
 build/
 DerivedData/
+Frameworks/
+
+## Source / dependencies
+submodules/
+
+## Static libraries
+IVPNClient/liboqs/*.a
 
 ## Various settings
 *.pbxuser
@@ -58,15 +65,11 @@ Carthage/Build
 # Rules for .xcconfig files
 staging.xcconfig
 release.xcconfig
-wg-staging.xcconfig
-wg-release.xcconfig
-today-extension-staging.xcconfig
-today-extension-release.xcconfig
 
 # Rules for .swift files
 OpenVPNConf.swift
 
 # Fastlane
 fastlane/test_output
 fastlane/report.xml
-fastlane/Appfile
+fastlane/Appfile

.swiftlint.yml

@@ -27,5 +27,5 @@ file_length:
     ignore_comment_only_lines: true
 cyclomatic_complexity:
     warning: 15
-    error: 35
+    error: 45
 reporter: "xcode"

ACKNOWLEDGEMENTS.md

@@ -184,7 +184,11 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-## tunnelkit
+## TunnelKit
+
+Copyright (c) 2022 Davide De Rosa
+
+Full license follows:
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007

AUTHORS

@@ -12,4 +12,4 @@ Juraj Hilje <[email protected]>
 
 # Organizations
 
-Privatus Limited
+IVPN Limited

CHANGELOG.md

@@ -2,9 +2,85 @@
 
 All notable changes to this project will be documented in this file.
 
-## 2.7.0 - Unreleased  
+## 2.12.2 - 2024-04-24  
+
+[IMPROVED] Support for pending payments  
+[IMPROVED] Upgraded payments to StoreKit 2  
+[IMPROVED] Upgraded OpenVPN and OpenSSL libraries  
+[NOTE] Removed support for iOS 14  
+
+## 2.12.1 - 2024-02-24  
+
+[FIXED] In-app payments for legacy accounts  
+
+## 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  
+[NEW] Option to turn off the prompt when connecting or disconnecting VPN from the Widget  
+[FIXED] Control panel not rendering when launching the app in landscape mode on iPad  
+[FIXED] Removed redundant entitlements for V2Ray connections  
+[FIXED] Minor UI fixes and improvements  
+
+## 2.11.0 - 2023-11-16  
+
+[NEW] Obfuscation with V2Ray for WireGuard connections  
+[IMPROVED] Update WireGuard to the latest version  
+[IMPROVED] Update packages/dependencies to the latest version  
+[FIXED] Repeatedly connecting and disconnecting when Network Protection is enabled  
+
+## 2.10.1 - 2023-09-04  
+
+[NEW] Option to disable LAN traffic when connected to VPN  
+[IMPROVED] Added "Advanced" section in the Settings 
+
+## 2.10.0 - 2023-08-08  
+
+[NEW] Post-Quantum Resistant WireGuard Connections  
+[NEW] AntiTracker Plus additional block lists  
+[IMPROVED] WireGuard keys rotation when connected with OpenVPN  
+[NOTE] Kill Switch is removed for iOS 16+ devices; Disable Kill Switch before upgrading to avoid connection issues 
+
+## 2.9.1 - 2023-06-29  
+
+[NOTE] Removed references to Port Forwarding  
+
+## 2.9.0 - 2023-05-24  
+
+[NEW] New Widget implemented with WidgetKit  
+[NEW] Option to prevent a Multi-Hop chain with the same provider  
+[NEW] MTU configuration for WireGuard  
+[IMPROVED] Upgraded OpenVPN and OpenSSL libraries  
+[IMPROVED] Alternative method to obtain diagnostic logs  
+[FIXED] Servers mismatch when selecting individual servers  
+[FIXED] Unable to change the port when switching from WireGuard to OpenVPN  
+[FIXED] Fastest server settings list automatically toggling servers off  
+[FIXED] App remains in "disconnecting" state when using Network Protection  
+[FIXED] Server latency not displayed after logging in  
+[NOTE] Removed support for iOS 12 and 13  
+
+## 2.8.0 - 2023-01-30  
+
+[NEW] Favorite servers  
+[IMPROVED] Option to search and sort in the fastest server configuration list  
+
+## 2.7.1 - 2022-12-08  
+
+[IMPROVED] Support for Split View and Slide Over mode on iPadOS  
+[IMPROVED] Upgraded app diagnostic logs  
+[FIXED] Crash on app launch caused by Ping service  
+[FIXED] Montreal location not showing all available hosts  
+[FIXED] Minor bug fixes  
+
+## 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