Decouple app updater/downloader from installer-downloader frontend

Author: dlon

Cargo.lock

@@ -27,6 +27,7 @@ members = [
     "mullvad-setup",
     "mullvad-types",
     "mullvad-types/intersection-derive",
+    "mullvad-update",
     "mullvad-version",
     "talpid-core",
     "talpid-dbus",

Cargo.toml

@@ -1,8 +1,6 @@
 [package]
 name = "installer-downloader"
-description = """
-A secure minimal web installer for the Mullvad app
-"""
+description = "A secure minimal web installer for the Mullvad app"
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
@@ -22,14 +20,11 @@ windows-sys = { version = "0.52.0", features = ["Win32_System", "Win32_System_Li
 
 [dependencies]
 anyhow = "1.0"
-pgp = "0.14.0"
-reqwest = { version = "0.12.9", features = ["blocking", "json"] }
-serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
 tokio = { version = "1", features = ["full"] }
-image = { version = "0.25.5", default-features = false, features = ["png"] }
 async-trait = "0.1"
 
+mullvad-update = { path = "../mullvad-update" }
+
 [target.'cfg(target_os = "windows")'.dependencies]
 native-windows-gui = { version = "1.0.12", features = ["image-decoder"] }
 

installer-downloader/Cargo.toml

@@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex};
 use cacao::{control::Control, layout::Layout};
 
 use super::ui::{Action, AppWindow};
-use crate::controller::{AppDelegate, AppDelegateQueue};
+use crate::delegate::{AppDelegate, AppDelegateQueue};
 
 impl AppDelegate for AppWindow {
     type Queue = Queue;

installer-downloader/src/cacao_impl/delegate.rs

@@ -1,17 +1,16 @@
 //! This module implements the actual logic performed by different UI components.
 
-use super::{AppDelegate, AppDelegateQueue};
+use crate::delegate::{AppDelegate, AppDelegateQueue};
+use crate::ui_downloader::{UiAppDownloader, UiProgressUpdater};
 
-use crate::{
+use mullvad_update::{
     api::{self, VersionInfoProvider},
     app::{self, AppDownloaderFactory, AppDownloaderParameters},
 };
 
 use std::future::Future;
 use tokio::sync::{mpsc, oneshot};
 
-use super::ui_downloader::{UiAppDownloader, UiProgressUpdater};
-
 /// Actions handled by an async worker task in [handle_action_messages].
 enum TaskMessage {
     SetVersionInfo(api::VersionInfo),
@@ -22,6 +21,19 @@ enum TaskMessage {
 /// See the [module-level docs](self).
 pub struct AppController {}
 
+/// Public entry function for registering a [AppDelegate].
+pub fn initialize_controller<T: AppDelegate + 'static>(delegate: &mut T) {
+    use mullvad_update::api::LatestVersionInfoProvider;
+    use mullvad_update::app::HttpAppDownloader;
+
+    // App downloader (factory) to use
+    type DownloaderFactory<T> = HttpAppDownloader<UiProgressUpdater<T>, UiProgressUpdater<T>>;
+    // Version info provider to use
+    type VersionInfoProvider = LatestVersionInfoProvider;
+
+    AppController::initialize::<_, DownloaderFactory<T>, VersionInfoProvider>(delegate)
+}
+
 impl AppController {
     /// Initialize [AppController] using the provided delegate.
     ///

installer-downloader/src/controller/controller.rs installer-downloader/src/controller.rs

@@ -1,11 +1,6 @@
 //! Framework-agnostic module that hooks up a UI to actions
 
-mod controller;
-mod ui_downloader;
-
-pub use ui_downloader::UiProgressUpdater;
-
-use crate::{api::LatestVersionInfoProvider, app::HttpAppDownloader};
+pub use crate::ui_downloader::UiProgressUpdater;
 
 /// Trait implementing high-level UI actions
 pub trait AppDelegate {
@@ -60,15 +55,3 @@ pub trait AppDelegate {
 pub trait AppDelegateQueue<T: ?Sized>: Send {
     fn queue_main<F: FnOnce(&mut T) + 'static + Send>(&self, callback: F);
 }
-
-pub use controller::AppController;
-
-/// Public entry function for registering a [AppDelegate].
-pub fn initialize_controller<T: AppDelegate + 'static>(delegate: &mut T) {
-    // App downloader (factory) to use
-    type DownloaderFactory<T> = HttpAppDownloader<UiProgressUpdater<T>, UiProgressUpdater<T>>;
-    // Version info provider to use
-    type VersionInfoProvider = LatestVersionInfoProvider;
-
-    controller::AppController::initialize::<_, DownloaderFactory<T>, VersionInfoProvider>(delegate)
-}

installer-downloader/src/controller/mod.rs installer-downloader/src/delegate.rs

@@ -1,5 +1,3 @@
-pub mod api;
-pub mod app;
 pub mod controller;
-pub mod fetch;
-pub mod verify;
+pub mod delegate;
+pub mod ui_downloader;

installer-downloader/src/lib.rs

@@ -1,5 +1,6 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 use installer_downloader::controller;
+use installer_downloader::delegate;
 
 #[cfg(target_os = "macos")]
 mod cacao_impl;

installer-downloader/src/main.rs

@@ -1,8 +1,11 @@
 //! This module hooks up [AppDelegate]s to arbitrary implementations of [AppDownloader] and
 //! [fetch::ProgressUpdater].
 
-use super::{AppDelegate, AppDelegateQueue};
-use crate::{app::AppDownloader, fetch};
+use crate::delegate::{AppDelegate, AppDelegateQueue};
+use mullvad_update::{
+    app::{self, AppDownloader},
+    fetch,
+};
 
 /// [AppDownloader] that delegates the actual work to some underlying `downloader` and uses it to
 /// update a UI.
@@ -28,7 +31,7 @@ impl<Delegate: AppDelegate, Downloader: AppDownloader + Send + 'static>
 impl<Delegate: AppDelegate, Downloader: AppDownloader + Send + 'static> AppDownloader
     for UiAppDownloader<Delegate, Downloader>
 {
-    async fn download_signature(&mut self) -> Result<(), crate::app::DownloadError> {
+    async fn download_signature(&mut self) -> Result<(), app::DownloadError> {
         if let Err(error) = self.downloader.download_signature().await {
             self.queue.queue_main(move |self_| {
                 self_.set_status_text("ERROR: Failed to retrieve signature.");
@@ -41,7 +44,7 @@ impl<Delegate: AppDelegate, Downloader: AppDownloader + Send + 'static> AppDownl
         }
     }
 
-    async fn download_executable(&mut self) -> Result<(), crate::app::DownloadError> {
+    async fn download_executable(&mut self) -> Result<(), app::DownloadError> {
         match self.downloader.download_executable().await {
             Ok(()) => {
                 self.queue.queue_main(move |self_| {
@@ -63,7 +66,7 @@ impl<Delegate: AppDelegate, Downloader: AppDownloader + Send + 'static> AppDownl
         }
     }
 
-    async fn verify(&mut self) -> Result<(), crate::app::DownloadError> {
+    async fn verify(&mut self) -> Result<(), app::DownloadError> {
         match self.downloader.verify().await {
             Ok(()) => {
                 self.queue.queue_main(move |self_| {

installer-downloader/src/controller/ui_downloader.rs installer-downloader/src/ui_downloader.rs

@@ -5,7 +5,7 @@ use native_windows_gui::{self as nwg, Event};
 use windows_sys::Win32::UI::WindowsAndMessaging::PostMessageW;
 
 use super::ui::{AppWindow, QUEUE_MESSAGE};
-use crate::controller::{AppDelegate, AppDelegateQueue};
+use crate::delegate::{AppDelegate, AppDelegateQueue};
 
 impl AppDelegate for AppWindow {
     type Queue = Queue;

installer-downloader/src/winapi_impl/delegate.rs

@@ -1,6 +1,6 @@
 use native_windows_gui as nwg;
 
-use crate::controller::{AppDelegate, AppDelegateQueue};
+use crate::delegate::{AppDelegate, AppDelegateQueue};
 
 mod delegate;
 mod ui;

installer-downloader/src/winapi_impl/mod.rs

@@ -1,13 +1,12 @@
 //! Tests for integrations between UI controller and other components
 
-use installer_downloader::api::{Version, VersionInfo, VersionInfoProvider};
-use installer_downloader::app::{
+use installer_downloader::controller::AppController;
+use installer_downloader::delegate::{AppDelegate, AppDelegateQueue, UiProgressUpdater};
+use mullvad_update::api::{Version, VersionInfo, VersionInfoProvider};
+use mullvad_update::app::{
     AppDownloader, AppDownloaderFactory, AppDownloaderParameters, DownloadError,
 };
-use installer_downloader::controller::{
-    AppController, AppDelegate, AppDelegateQueue, UiProgressUpdater,
-};
-use installer_downloader::fetch::ProgressUpdater;
+use mullvad_update::fetch::ProgressUpdater;
 use std::sync::{Arc, LazyLock, Mutex};
 use std::time::Duration;
 use std::vec::Vec;

installer-downloader/tests/controller.rs

@@ -0,0 +1,20 @@
+[package]
+name = "mullvad-update"
+description = "Support functions for securely installing or updating Mullvad VPN"
+authors.workspace = true
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = "1.0"
+pgp = "0.14.0"
+reqwest = { version = "0.12.9", features = ["blocking", "json"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+tokio = { version = "1", features = ["full"] }
+async-trait = "0.1"

mullvad-update/Cargo.toml

@@ -0,0 +1,6 @@
+//! Support functions for securely installing or updating Mullvad VPN
+
+pub mod api;
+pub mod app;
+pub mod fetch;
+pub mod verify;

installer-downloader/src/mullvad-code-signing.gpg mullvad-update/mullvad-code-signing.gpg

@@ -20,7 +20,7 @@ pub trait AppVerifier: 'static + Clone {
 pub struct PgpVerifier;
 
 impl PgpVerifier {
-    const SIGNING_PUBKEY: &[u8] = include_bytes!("mullvad-code-signing.gpg");
+    const SIGNING_PUBKEY: &[u8] = include_bytes!("../mullvad-code-signing.gpg");
 }
 
 impl AppVerifier for PgpVerifier {