feat(adb_client): add remount and verity commands

Maxime LUCE · Maxime LUCE · commit 7e49387da300 · 2025-12-08T15:30:14.000+01:00
diff --git a/adb_client/src/adb_device_ext.rs b/adb_client/src/adb_device_ext.rs
@@ -4,7 +4,7 @@ use std::path::Path;
 use image::{ImageBuffer, ImageFormat, Rgba};
 
 use crate::models::AdbStatResponse;
-use crate::{RebootType, Result};
+use crate::{RebootType, RemountInfo, Result};
 
 /// Trait representing all features available on both [`crate::ADBServerDevice`] and [`crate::ADBUSBDevice`]
 pub trait ADBDeviceExt {
@@ -27,6 +27,9 @@ pub trait ADBDeviceExt {
     /// Reboot the device using given reboot type
     fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
 
+    /// Remount the device partitions as read-write
+    fn remount(&mut self) -> Result<Vec<RemountInfo>>;
+
     /// Run `activity` from `package` on device. Return the command output.
     fn run_activity(&mut self, package: &str, activity: &str) -> Result<Vec<u8>> {
         let mut output = Vec::new();
@@ -44,6 +47,12 @@ pub trait ADBDeviceExt {
     /// Uninstall the package `package` from device.
     fn uninstall(&mut self, package: &str) -> Result<()>;
 
+    /// Enable dm-verity on the device
+    fn enable_verity(&mut self) -> Result<()>;
+
+    /// Disable dm-verity on the device
+    fn disable_verity(&mut self) -> Result<()>;
+
     /// Inner method requesting framebuffer from an Android device
     fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>>;
 
diff --git a/adb_client/src/device/adb_message_device_commands.rs b/adb_client/src/device/adb_message_device_commands.rs
@@ -1,4 +1,6 @@
-use crate::{ADBDeviceExt, ADBMessageTransport, RebootType, Result, models::AdbStatResponse};
+use crate::{
+    ADBDeviceExt, ADBMessageTransport, RebootType, RemountInfo, Result, models::AdbStatResponse,
+};
 use std::{
     io::{Read, Write},
     path::Path,
@@ -31,6 +33,10 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
         self.reboot(reboot_type)
     }
 
+    fn remount(&mut self) -> Result<Vec<RemountInfo>> {
+        self.remount()
+    }
+
     fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
         self.install(apk_path)
     }
@@ -39,6 +45,14 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
         self.uninstall(package)
     }
 
+    fn enable_verity(&mut self) -> Result<()> {
+        self.enable_verity()
+    }
+
+    fn disable_verity(&mut self) -> Result<()> {
+        self.disable_verity()
+    }
+
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.framebuffer_inner()
     }
diff --git a/adb_client/src/device/adb_tcp_device.rs b/adb_client/src/device/adb_tcp_device.rs
@@ -6,7 +6,7 @@ use super::adb_message_device::ADBMessageDevice;
 use super::models::MessageCommand;
 use super::{ADBRsaKey, ADBTransportMessage, get_default_adb_key_path};
 use crate::device::adb_usb_device::read_adb_private_key;
-use crate::{ADBDeviceExt, ADBMessageTransport, ADBTransport, Result, TcpTransport};
+use crate::{ADBDeviceExt, ADBMessageTransport, ADBTransport, RemountInfo, Result, TcpTransport};
 
 /// Represent a device reached and available over TCP.
 #[derive(Debug)]
@@ -122,6 +122,11 @@ impl ADBDeviceExt for ADBTcpDevice {
         self.inner.reboot(reboot_type)
     }
 
+    #[inline]
+    fn remount(&mut self) -> Result<Vec<RemountInfo>> {
+        self.inner.remount()
+    }
+
     #[inline]
     fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
         self.inner.install(apk_path)
@@ -132,6 +137,16 @@ impl ADBDeviceExt for ADBTcpDevice {
         self.inner.uninstall(package)
     }
 
+    #[inline]
+    fn enable_verity(&mut self) -> Result<()> {
+        self.inner.enable_verity()
+    }
+
+    #[inline]
+    fn disable_verity(&mut self) -> Result<()> {
+        self.inner.disable_verity()
+    }
+
     #[inline]
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.inner.framebuffer_inner()
diff --git a/adb_client/src/device/adb_usb_device.rs b/adb_client/src/device/adb_usb_device.rs
@@ -14,7 +14,7 @@ use super::{ADBRsaKey, ADBTransportMessage};
 use crate::ADBDeviceExt;
 use crate::ADBMessageTransport;
 use crate::ADBTransport;
-use crate::{Result, RustADBError, USBTransport};
+use crate::{RemountInfo, Result, RustADBError, USBTransport};
 
 pub fn read_adb_private_key<P: AsRef<Path>>(private_key_path: P) -> Result<Option<ADBRsaKey>> {
     // Try to read the private key file from given path
@@ -233,6 +233,11 @@ impl ADBDeviceExt for ADBUSBDevice {
         self.inner.reboot(reboot_type)
     }
 
+    #[inline]
+    fn remount(&mut self) -> Result<Vec<RemountInfo>> {
+        self.inner.remount()
+    }
+
     #[inline]
     fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
         self.inner.install(apk_path)
@@ -243,6 +248,16 @@ impl ADBDeviceExt for ADBUSBDevice {
         self.inner.uninstall(package)
     }
 
+    #[inline]
+    fn enable_verity(&mut self) -> Result<()> {
+        self.inner.enable_verity()
+    }
+
+    #[inline]
+    fn disable_verity(&mut self) -> Result<()> {
+        self.inner.disable_verity()
+    }
+
     #[inline]
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.inner.framebuffer_inner()
diff --git a/adb_client/src/device/commands/mod.rs b/adb_client/src/device/commands/mod.rs
@@ -3,6 +3,8 @@ mod install;
 mod pull;
 mod push;
 mod reboot;
+mod remount;
 mod shell;
 mod stat;
 mod uninstall;
+mod verity;
diff --git a/adb_client/src/device/commands/remount.rs b/adb_client/src/device/commands/remount.rs
@@ -0,0 +1,34 @@
+use crate::{
+    ADBMessageTransport, RemountInfo, Result, RustADBError,
+    device::{MessageCommand, adb_message_device::ADBMessageDevice},
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn remount(&mut self) -> Result<Vec<RemountInfo>> {
+        let response = self.open_session(format!("remount:\0").as_bytes())?;
+
+        if response.header().command() != MessageCommand::Okay {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "wrong command {}",
+                response.header().command()
+            )));
+        }
+
+        let mut response_str: Vec<String> = Vec::new();
+
+        loop {
+            let response = self.get_transport_mut().read_message()?;
+
+            if response.header().command() != MessageCommand::Write {
+                break;
+            }
+
+            let payload_str = String::from_utf8_lossy(&response.payload());
+            let payload_str = payload_str.trim();
+
+            response_str.push(payload_str.to_string());
+        }
+
+        RemountInfo::from_str_response(&response_str.join("\n"))
+    }
+}
diff --git a/adb_client/src/device/commands/verity.rs b/adb_client/src/device/commands/verity.rs
@@ -0,0 +1,22 @@
+use crate::{
+    ADBMessageTransport, Result,
+    device::{MessageCommand, adb_message_device::ADBMessageDevice},
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn enable_verity(&mut self) -> Result<()> {
+        self.open_session(format!("enable-verity:\0").as_bytes())?;
+
+        self.get_transport_mut()
+            .read_message()
+            .and_then(|message| message.assert_command(MessageCommand::Okay))
+    }
+
+    pub(crate) fn disable_verity(&mut self) -> Result<()> {
+        self.open_session(format!("disable-verity:\0").as_bytes())?;
+
+        self.get_transport_mut()
+            .read_message()
+            .and_then(|message| message.assert_command(MessageCommand::Okay))
+    }
+}
diff --git a/adb_client/src/error.rs b/adb_client/src/error.rs
@@ -54,6 +54,9 @@ pub enum RustADBError {
     /// Indicates that the device must be paired before attempting a connection over WI-FI
     #[error("Device not paired before attempting to connect")]
     ADBDeviceNotPaired,
+    /// Indicates that remount operation failed
+    #[error("Cannot remount filesystem: {0}")]
+    RemountError(String),
     /// An error occurred when getting device's framebuffer image
     #[error(transparent)]
     FramebufferImageError(#[from] image::error::ImageError),
diff --git a/adb_client/src/lib.rs b/adb_client/src/lib.rs
@@ -21,7 +21,7 @@ pub use device::{ADBTcpDevice, ADBUSBDevice, is_adb_device, search_adb_devices};
 pub use emulator_device::ADBEmulatorDevice;
 pub use error::{Result, RustADBError};
 pub use mdns::*;
-pub use models::{AdbStatResponse, RebootType};
+pub use models::{AdbStatResponse, RebootType, RemountInfo};
 pub use server::*;
 pub use server_device::ADBServerDevice;
 pub use transports::*;
diff --git a/adb_client/src/models/adb_server_command.rs b/adb_client/src/models/adb_server_command.rs
@@ -36,6 +36,9 @@ pub(crate) enum AdbServerCommand {
     Reverse(String, String),
     ReverseRemoveAll,
     Reconnect,
+    Remount,
+    DisableVerity,
+    EnableVerity,
     TcpIp(u16),
     Usb,
 }
@@ -82,6 +85,9 @@ impl Display for AdbServerCommand {
             AdbServerCommand::ServerStatus => write!(f, "host:server-status"),
             AdbServerCommand::Reconnect => write!(f, "reconnect"),
             AdbServerCommand::ReconnectOffline => write!(f, "host:reconnect-offline"),
+            AdbServerCommand::Remount => write!(f, "remount:"),
+            AdbServerCommand::DisableVerity => write!(f, "disable-verity:"),
+            AdbServerCommand::EnableVerity => write!(f, "enable-verity:"),
             AdbServerCommand::TcpIp(port) => {
                 write!(f, "tcpip:{port}")
             }
diff --git a/adb_client/src/models/mod.rs b/adb_client/src/models/mod.rs
@@ -4,6 +4,7 @@ mod adb_stat_response;
 mod framebuffer_info;
 mod host_features;
 mod reboot_type;
+mod remount_info;
 mod sync_command;
 
 pub use adb_request_status::AdbRequestStatus;
@@ -12,4 +13,5 @@ pub use adb_stat_response::AdbStatResponse;
 pub(crate) use framebuffer_info::{FrameBufferInfoV1, FrameBufferInfoV2};
 pub use host_features::HostFeatures;
 pub use reboot_type::RebootType;
+pub use remount_info::RemountInfo;
 pub use sync_command::SyncCommand;
diff --git a/adb_client/src/models/remount_info.rs b/adb_client/src/models/remount_info.rs
@@ -0,0 +1,39 @@
+use crate::Result;
+
+#[derive(Debug)]
+/// Information about remount operation
+pub struct RemountInfo {
+    /// Path that was remounted
+    pub path: String,
+    /// Mode that was used for remounting
+    pub mode: String,
+}
+
+impl RemountInfo {
+    pub(crate) fn from_str(s: &str) -> Result<Self> {
+        let parts: Vec<&str> = s.split_whitespace().collect();
+        if parts.len() == 4 && parts[0] == "Using" && parts[2] == "for" {
+            Ok(RemountInfo {
+                path: parts[1].to_string(),
+                mode: parts[3].to_string(),
+            })
+        } else {
+            Err(crate::RustADBError::RemountError(s.to_string()))
+        }
+    }
+
+    pub(crate) fn from_str_response(s: &str) -> Result<Vec<Self>> {
+        if !s.ends_with("remount succeeded") {
+            return Err(crate::RustADBError::RemountError(s.to_string()));
+        }
+
+        let mut infos = Vec::new();
+        for line in s.lines() {
+            if line.starts_with("Using") {
+                infos.push(Self::from_str(line)?);
+            }
+        }
+
+        Ok(infos)
+    }
+}
diff --git a/adb_client/src/server_device/adb_server_device_commands.rs b/adb_client/src/server_device/adb_server_device_commands.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use crate::{
-    ADBDeviceExt, Result, RustADBError,
+    ADBDeviceExt, RemountInfo, Result, RustADBError,
     constants::BUFFER_SIZE,
     models::{AdbServerCommand, AdbStatResponse, HostFeatures},
 };
@@ -104,6 +104,19 @@ impl ADBDeviceExt for ADBServerDevice {
         self.reboot(reboot_type)
     }
 
+    fn remount(&mut self) -> Result<Vec<RemountInfo>> {
+        self.remount()?;
+        Ok(Vec::new())
+    }
+
+    fn enable_verity(&mut self) -> Result<()> {
+        self.enable_verity()
+    }
+
+    fn disable_verity(&mut self) -> Result<()> {
+        self.disable_verity()
+    }
+
     fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()> {
         self.push(stream, path)
     }
diff --git a/adb_client/src/server_device/commands/mod.rs b/adb_client/src/server_device/commands/mod.rs
@@ -7,10 +7,12 @@ mod logcat;
 mod reboot;
 mod reconnect;
 mod recv;
+mod remount;
 mod reverse;
 mod send;
 mod stat;
 mod tcpip;
 mod transport;
 mod uninstall;
 mod usb;
+mod verity;
diff --git a/adb_client/src/server_device/commands/remount.rs b/adb_client/src/server_device/commands/remount.rs
@@ -0,0 +1,20 @@
+use crate::{ADBServerDevice, Result, models::AdbServerCommand};
+
+impl ADBServerDevice {
+    /// Remounts the device filesystem as read-write
+    pub fn remount(&mut self) -> Result<()> {
+        self.set_serial_transport()?;
+
+        let response = self
+            .transport
+            .proxy_connection(AdbServerCommand::Remount, true)?;
+
+        match String::from_utf8(response) {
+            Ok(s) => {
+                println!("{s}");
+                Ok(())
+            }
+            Err(e) => Err(e.into()),
+        }
+    }
+}
diff --git a/adb_client/src/server_device/commands/verity.rs b/adb_client/src/server_device/commands/verity.rs
