Merge branch 'readd-maybenot-machines-v1'

Author: hulthe

.github/workflows/android-app.yml

@@ -325,7 +325,7 @@ jobs:
           path: android/app/build/extraAssets
 
       - name: Copy maybenot machines to asset directory
-        run: cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines
+        run: cp dist-assets/maybenot_machines_v2 android/app/build/extraAssets/
 
       - name: Build app
         uses: burrunan/gradle-cache-action@v1

.github/workflows/android-audit.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Copy maybenot machines to asset directory
         run: |
           mkdir -p android/app/build/extraAssets
-          cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines
+          cp dist-assets/maybenot_machines_v2 android/app/build/extraAssets/
 
       - name: Re-generate lockfile
         run: android/scripts/update-lockfile.sh

android/app/build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
 val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath
 val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get()
 val relayListPath = extraAssetsDirectory.file("relays.json").asFile
-val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines").asFile
+val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines_v2").asFile
 val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/"
 val extraJniDirectory = layout.buildDirectory.dir("extraJni").get()
 

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt

@@ -32,7 +32,7 @@ import org.koin.android.ext.android.getKoin
 import org.koin.core.context.loadKoinModules
 
 private const val RELAY_LIST_ASSET_NAME = "relays.json"
-private const val MAYBENOT_MACHINES_ASSET_NAME = "maybenot_machines"
+private const val MAYBENOT_MACHINES_ASSET_NAME = "maybenot_machines_v2"
 
 class MullvadVpnService : TalpidVpnService() {
 

build-apk.sh

@@ -115,7 +115,7 @@ echo "Updating relays.json..."
 cargo run --bin relay_list "${CARGO_ARGS[@]}" > android/app/build/extraAssets/relays.json
 
 echo "Copying maybenot machines..."
-cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines
+cp dist-assets/maybenot_machines_v2 android/app/build/extraAssets/
 
 cd "$SCRIPT_DIR/android"
 $GRADLE_CMD --console plain "${GRADLE_TASKS[@]}"

dist-assets/maybenot_machines

@@ -1,4 +1,4 @@
-02eNptjLsNwCAQQ++yQRZImTJlRIfYBDEJA7ERJQtQ0iC+dxSIJ1mWLcv5TsLH9wMmF4KLqwkRAawk2yPR00CHX3V3j1GziWvE09NBBWg9Fjk=
-02eNqFjLENwCAMBP8hC2SJlKnTsVr2zBKUaVACNgiBEJxknex/Oezv9fjjRCF8mXLY4pAEbpeFJFlFqJBGA7PqWQ3spCer4l3rnvGDH6+FGlE=
-02eNqFjDkOgDAMBL056PkEJTVdvsY/+URKmojDmwiBUDyStbJ35DLuy5anWRrlqLTDcA0AkTXVkDt01ZAHwLFwludZeMsLLILlRRax4+lKcnrnl/8HJzqIIG0=
-02eNpdjr0LQVEYxt9zGES5o4myKVksFM45lEHKx0LJYDAZ5C+QRTHIaGETViYDKYPp3ijFYLj3KkmGK2WwuVwiv3rrrafnA1Jm16ijKBQ+6NRDGPJ2E0Xe6YnAD0hFD9nm/ObIHumlv4imZ3Mm8DwvtaxB0Jy1IUex0pYIIB30lhuCYkYvwW6nQFSV41R1L8vkmwlgEOONVvEaYt1SwLhdhxn8gdBgEfXU7RFmzeR9YtPPxrbqOVkLsd29XJhIJfbqRomGheLcYUWeFgxQodrq9wcP1E88/w==
+789cd5cfbb0900200c04d08b833886adb889389f5bb9801be811acb58ae2837ce02010c158b070555c9538b6377a64dbb0ceff242c20b79038507dd169fbede9f629bf6f021efa1b66
+789cedd0510a401110856153f665ffbbb1030e991735717890f8eabae22f35e252e31a6c2b6c2bf158ce88010b61b69fed14db7fabd8498ffad17d8fedbf5decc4adde3ab7b0fddb045fa153d3ff09ecdb6c7faf0cd04322e8
+789cedd1510a80200c80617de95addff36dda096e84b209bfe0f1bb40f32297f1056cbdd954eb68d6c9b7ac8e2e33a650176fbdd6ea07df24227b7daaf9effa27df2462768edade766689fa2a093d47aedbf86f6291a3ad1593ffb6e45fb4454795e630ae31d11bd1bedffeb0151b22c62
+789cedd2bd4b82411c07f07b2a48846a089a326889861a9c2452ee12221e0ca2a5201ca5a122fc0bda042544370771f3159c9c0405e51914e45c5414df7d441075f00515c4c553f0117906075f40f0331c77c7ddef8efb1e05a6de8e6f3d96661392ee1c6a9f349b72e6316a6e542c4c980b5dbb24cfbbcccefa1d00d57df145ff44079506a677adacc29623a4780f30288a312e99440f809a7d9b457c4711a1b8cf7249ea2adf75cb698e1b4fb50f19dc4d67e0c95d12d354186ab3b1e74f5b9ab7aecc4e70f332e918bfdef6db03ce9042a2bba491e88324629022ef85a6f1aa95a3ece0efcb5f5223012039997e3b726455cb84a9f82322db96f6ff531dbada6558bb120bdce79915bf6c6bc5f51659febc1141265ee0

dist-assets/maybenot_machines_v2

@@ -0,0 +1,4 @@
+02eNptjLsNwCAQQ++yQRZImTJlRIfYBDEJA7ERJQtQ0iC+dxSIJ1mWLcv5TsLH9wMmF4KLqwkRAawk2yPR00CHX3V3j1GziWvE09NBBWg9Fjk=
+02eNqFjLENwCAMBP8hC2SJlKnTsVr2zBKUaVACNgiBEJxknex/Oezv9fjjRCF8mXLY4pAEbpeFJFlFqJBGA7PqWQ3spCer4l3rnvGDH6+FGlE=
+02eNqFjDkOgDAMBL056PkEJTVdvsY/+URKmojDmwiBUDyStbJ35DLuy5anWRrlqLTDcA0AkTXVkDt01ZAHwLFwludZeMsLLILlRRax4+lKcnrnl/8HJzqIIG0=
+02eNpdjr0LQVEYxt9zGES5o4myKVksFM45lEHKx0LJYDAZ5C+QRTHIaGETViYDKYPp3ijFYLj3KkmGK2WwuVwiv3rrrafnA1Jm16ijKBQ+6NRDGPJ2E0Xe6YnAD0hFD9nm/ObIHumlv4imZ3Mm8DwvtaxB0Jy1IUex0pYIIB30lhuCYkYvwW6nQFSV41R1L8vkmwlgEOONVvEaYt1SwLhdhxn8gdBgEfXU7RFmzeR9YtPPxrbqOVkLsd29XJhIJfbqRomGheLcYUWeFgxQodrq9wcP1E88/w==

gui/tasks/distribution.js

@@ -107,7 +107,7 @@ const config = {
       { from: distAssets('uninstall_macos.sh'), to: './uninstall.sh' },
       { from: buildAssets('shell-completions/_mullvad'), to: '.' },
       { from: buildAssets('shell-completions/mullvad.fish'), to: '.' },
-      { from: distAssets('maybenot_machines'), to: '.' },
+      { from: distAssets('maybenot_machines_v2'), to: '.' },
     ],
   },
 
@@ -179,7 +179,7 @@ const config = {
         ),
         to: '.',
       },
-      { from: distAssets('maybenot_machines'), to: '.' },
+      { from: distAssets('maybenot_machines_v2'), to: '.' },
     ],
   },
 
@@ -208,7 +208,7 @@ const config = {
       { from: distAssets(path.join('linux', 'apparmor_mullvad')), to: '.' },
       { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'openvpn')), to: '.' },
       { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'apisocks5')), to: '.' },
-      { from: distAssets('maybenot_machines'), to: '.' },
+      { from: distAssets('maybenot_machines_v2'), to: '.' },
     ],
   },
 

talpid-wireguard/src/wireguard_go/mod.rs

@@ -219,7 +219,7 @@ impl Tunnel for WgGoTunnel {
     fn start_daita(&mut self) -> Result<()> {
         static MAYBENOT_MACHINES: OnceCell<CString> = OnceCell::new();
         let machines = MAYBENOT_MACHINES.get_or_try_init(|| {
-            let path = self.resource_dir.join("maybenot_machines");
+            let path = self.resource_dir.join("maybenot_machines_v2");
             log::debug!("Reading maybenot machines from {}", path.display());
 
             let machines =

talpid-wireguard/src/wireguard_nt/daita.rs

@@ -251,7 +251,7 @@ impl Machinist {
         static MAYBENOT_MACHINES: OnceCell<Vec<maybenot::Machine>> = OnceCell::new();
 
         let machines = MAYBENOT_MACHINES.get_or_try_init(|| {
-            let path = resource_dir.join("maybenot_machines");
+            let path = resource_dir.join("maybenot_machines_v2");
             log::debug!("Reading maybenot machines from {}", path.display());
 
             let mut machines = vec![];