Fix mullvad-setup relying on old PrepareRestart to exist

Author: MarkusPettersson98

mullvad-daemon/src/management_interface.rs

@@ -101,8 +101,16 @@ impl ManagementService for ManagementServiceImpl {
         Ok(Response::new(UnboundedReceiverStream::new(rx)))
     }
 
-    async fn prepare_restart(&self, shutdown: Request<bool>) -> ServiceResult<()> {
+    async fn prepare_restart(&self, _: Request<()>) -> ServiceResult<()> {
         log::debug!("prepare_restart");
+        // Note: The old `PrepareRestart` behavior never shutdown the daemon.
+        let shutdown = false;
+        self.send_command_to_daemon(DaemonCommand::PrepareRestart(shutdown))?;
+        Ok(Response::new(()))
+    }
+
+    async fn prepare_restart_v2(&self, shutdown: Request<bool>) -> ServiceResult<()> {
+        log::debug!("prepare_restart_v2");
         self.send_command_to_daemon(DaemonCommand::PrepareRestart(shutdown.into_inner()))?;
         Ok(Response::new(()))
     }

mullvad-management-interface/proto/management_interface.proto

@@ -17,7 +17,11 @@ service ManagementService {
 
   // Control the daemon and receive events
   rpc EventsListen(google.protobuf.Empty) returns (stream DaemonEvent) {}
-  rpc PrepareRestart(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}
+  // DEPRECATED: Prefer PrepareRestartV2.
+  rpc PrepareRestart(google.protobuf.Empty) returns (google.protobuf.Empty) {}
+  // Takes a a boolean argument which says whether the daemon should stop after
+  // it is done preparing for a restart.
+  rpc PrepareRestartV2(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}
   rpc FactoryReset(google.protobuf.Empty) returns (google.protobuf.Empty) {}
 
   rpc GetCurrentVersion(google.protobuf.Empty) returns (google.protobuf.StringValue) {}

mullvad-management-interface/src/client.rs

@@ -149,10 +149,22 @@ impl MullvadProxyClient {
         }))
     }
 
-    /// TODO: Document
-    /// - `shutdown`: TODO
-    pub async fn prepare_restart(&mut self, shutdown: bool) -> Result<()> {
-        self.0.prepare_restart(shutdown).await.map_err(Error::Rpc)?;
+    /// DEPRECATED: Prefer to use `prepare_restart_v2`.
+    pub async fn prepare_restart(&mut self) -> Result<()> {
+        self.0.prepare_restart(()).await.map_err(Error::Rpc)?;
+        Ok(())
+    }
+
+    /// Tell the daemon to get ready for a restart by securing a user, i.e. putting firewall rules
+    /// in place.
+    ///
+    /// - `shutdown`: Whether the daemon should shutdown immediately after its prepare-for-restart
+    /// routine.
+    pub async fn prepare_restart_v2(&mut self, shutdown: bool) -> Result<()> {
+        self.0
+            .prepare_restart_v2(shutdown)
+            .await
+            .map_err(Error::Rpc)?;
         Ok(())
     }
 

mullvad-setup/src/main.rs

@@ -128,9 +128,7 @@ async fn prepare_restart() -> Result<(), Error> {
     let mut rpc = MullvadProxyClient::new()
         .await
         .map_err(Error::RpcConnectionError)?;
-    rpc.prepare_restart(false)
-        .await
-        .map_err(Error::DaemonRpcError)?;
+    rpc.prepare_restart().await.map_err(Error::DaemonRpcError)?;
     Ok(())
 }