Merge branch 'main' into set-up-a-github-actions-runner-on-the-macbook-ios-484

Author: niklasberglund

.github/ISSUE_TEMPLATE/1-bug-desktop.yml

@@ -17,7 +17,7 @@ body:
         please contact support instead of filing a bug report. Go to
         `Settings (cogwheel) -> Support -> Report a problem`.
         That way the support team gets redacted logs from your app and can help you out better.
-        You can also just email them at support@mullvad.net.
+        You can also just email them at support@mullvadvpn.net.
       options:
         - label: I know this is an issue with the app, and contacting Mullvad support is not relevant.
           required: true

.github/ISSUE_TEMPLATE/2-bug-android.yml

@@ -17,7 +17,7 @@ body:
         please contact support instead of filing a bug report. Go to
         `Settings (cogwheel) -> Support -> Report a problem`.
         That way the support team gets redacted logs from your app and can help you out better.
-        You can also just email them at support@mullvad.net.
+        You can also just email them at support@mullvadvpn.net.
       options:
         - label: I know this is an issue with the app, and contacting Mullvad support is not relevant.
           required: true

.github/ISSUE_TEMPLATE/3-bug-ios.yml

@@ -17,7 +17,7 @@ body:
         please contact support instead of filing a bug report. Go to
         `Settings (cogwheel) -> Report a problem`.
         That way the support team gets redacted logs from your app and can help you out better.
-        You can also just email them at support@mullvad.net.
+        You can also just email them at support@mullvadvpn.net.
       options:
         - label: I know this is an issue with the app, and contacting Mullvad support is not relevant.
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -4,7 +4,7 @@ contact_links:
   - name: Questions and issues not directly related to our VPN application
     about: >
       If your question is not related to our VPN application specifically,
-      please contact our support team at support@mullvad.net or visit our help center
+      please contact our support team at support@mullvadvpn.net or visit our help center
       at https://mullvad.net/help instead of filing an issue.
       This includes questions/issues about our service, infrastructure, DNS and more.
     url: https://mullvad.net/help

.github/workflows/android-app.yml

@@ -304,14 +304,20 @@ jobs:
 
   instrumented-tests:
     name: Run instrumented tests
-    runs-on: [self-hosted, android-emulator]
+    runs-on: [self-hosted, android-device]
     timeout-minutes: 30
     needs: [build-app]
     strategy:
       fail-fast: false
       matrix:
-        test-type: [app, mockapi]
+        test-type: [app] # Temporarily disabled: mockapi
     steps:
+      - name: Set report path variable
+        id: determine-report-path
+        env:
+          UNIQUE_RUN_ID: ${{ matrix.test-type }}-${{ github.run_id }}-${{ github.run_attempt }}
+        run: echo "report_path=/tmp/$UNIQUE_RUN_ID" >> $GITHUB_OUTPUT
+
       - name: Checkout repository
         uses: actions/checkout@v3
 
@@ -327,21 +333,23 @@ jobs:
           TEST_TYPE: ${{ matrix.test-type }}
           BILLING_FLAVOR: oss
           INFRA_FLAVOR: prod
+          REPORT_DIR: ${{ steps.determine-report-path.outputs.report_path }}
         run: |
+          mkdir -p $REPORT_DIR
           ./android/scripts/run-instrumented-tests.sh
 
       - name: Upload instrumentation report (${{ matrix.test-type }})
         uses: actions/upload-artifact@v3
         if: always()
         with:
           name: ${{ matrix.test-type }}-instrumentation-report
-          path: /tmp/mullvad-${{ matrix.test-type }}-instrumentation-report
+          path: ${{ steps.determine-report-path.outputs.report_path }}
           if-no-files-found: ignore
           retention-days: 7
 
   instrumented-e2e-tests:
     name: Run instrumented e2e tests
-    runs-on: [self-hosted, android-emulator]
+    runs-on: [self-hosted, android-device]
     if: github.event_name == 'schedule' || github.event.inputs.run_e2e_tests == 'true'
     timeout-minutes: 30
     needs: [build-app]

.github/workflows/cargo-audit.yml

@@ -24,6 +24,10 @@ jobs:
         with:
           file: Cargo.lock
           denyWarnings: true
+          # Ignored audit issues. This list should be kept short, and effort should be
+          # put into removing items from the list.
+          # RUSTSEC-2023-0079 - KyberSlash in `pqc_kyber`.
+          ignore: RUSTSEC-2023-0079
 
       - uses: actions-rust-lang/audit@v1.1.11
         name: Audit testrunner Rust Dependencies
@@ -33,4 +37,5 @@ jobs:
           # Ignored audit issues. This list should be kept short, and effort should be
           # put into removing items from the list.
           # RUSTSEC-2023-0057,RUSTSEC-2023-0058 - Unsoundness in `inventory`.
-          ignore: RUSTSEC-2023-0057,RUSTSEC-2023-0058
+          # RUSTSEC-2023-0079 - KyberSlash in `pqc_kyber`.
+          ignore: RUSTSEC-2023-0057,RUSTSEC-2023-0058,RUSTSEC-2023-0079

.github/workflows/daemon.yml

@@ -57,11 +57,7 @@ jobs:
 
     strategy:
       matrix:
-        # FIXME: Temporarily disable nightly builds due to an issue with curve25519-dalek
-        # Once this has been fixed, enable nightly builds again:
-        # https://github.com/dalek-cryptography/curve25519-dalek/pull/619
-        #rust: [stable, beta, nightly]
-        rust: [stable, beta]
+        rust: [stable, beta, nightly]
     continue-on-error: true
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:

.github/workflows/frontend.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Read volta info
         id: volta
-        uses: zoexx/github-action-json-file-properties@release
+        uses: zoexx/github-action-json-file-properties@1.0.6
         with:
           file_path: 'gui/package.json'
           prop_path: 'volta'

.github/workflows/ios-validate-build-schemas.yml

@@ -56,14 +56,15 @@ jobs:
           cp PacketTunnel.xcconfig.template PacketTunnel.xcconfig
           cp Screenshots.xcconfig.template Screenshots.xcconfig
           cp Api.xcconfig.template Api.xcconfig
+          cp UITests.xcconfig.template UITests.xcconfig
         working-directory: ios/Configurations
 
       - name: Install xcbeautify
         run: |
           brew update
           brew install xcbeautify
 
-      - name: Run build validation for Staging and MockRelease configurations
+      - name: Run build validation for Staging and MockRelease configurations as well as the MullvadVPNUITests target
         run: |
           set -o pipefail && env NSUnbufferedIO=YES xcodebuild \
             -project MullvadVPN.xcodeproj \
@@ -79,4 +80,11 @@ jobs:
             -destination "platform=iOS Simulator,name=iPhone 15" \
             -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
             build
+          set -o pipefail && env NSUnbufferedIO=YES xcodebuild \
+            -project MullvadVPN.xcodeproj \
+            -scheme MullvadVPNUITests \
+            -configuration Debug \
+            -destination "platform=iOS Simulator,name=iPhone 15" \
+            -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
+            build
         working-directory: ios/

.github/workflows/rust-unused-dependencies.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 env:
   # Pinning nightly just to avoid random breakage. It's fine to bump this at any time
-  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-01-07
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-02-06
 jobs:
   prepare-containers:
     runs-on: ubuntu-latest

.github/workflows/translations.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Read volta info
         id: volta
-        uses: zoexx/github-action-json-file-properties@release
+        uses: zoexx/github-action-json-file-properties@1.0.6
         with:
           file_path: 'gui/package.json'
           prop_path: 'volta'

CHANGELOG.md

@@ -32,9 +32,11 @@ Line wrap the file at 100 chars.                                              Th
   circumvent censorship by proxying API traffic.
 - Add confirmation dialog when deleting a custom list.
 - Add support for custom SOCKS5 OpenVPN bridges running locally.
+- Add ability to import server IP overrides in GUI.
 
 #### Android
 - Add support for all screen orientations.
+- Add toggle for enabling or disabling split tunneling.
 
 ### Fixed
 - Fix connectivity issues that would occur when using quantum-resistant tunnels with an incorrectly
@@ -62,6 +64,7 @@ Line wrap the file at 100 chars.                                              Th
 - Update Electron from 26.3.0 to 28.1.3.
 - Improve the "Connecting to system service"-view with information about the situation and
   troubleshooting tips.
+- Update support email address to new email address, support@mullvadvpn.net.
 
 #### Android
 - Migrate to Compose Navigation which also improves screen transition animations.

CONTRIBUTING.md

@@ -10,7 +10,7 @@ The Mullvad VPN app is open sourced for many reasons, but primarily we want to
 
 If you find a bug in the app's code, please report it on GitHub in the issue tracker. Please send
 all other problems or questions (those not directly related to the app's development) to
-[support@mullvad.net](mailto:support@mullvad.net). This includes connection issues, questions
+[support@mullvadvpn.net](mailto:support@mullvadvpn.net). This includes connection issues, questions
 regarding your account, and problems with the Mullvad VPN infrastructure or servers.