b9874d0941
Add redbear-usb-storage-check in-guest binary that validates USB mass storage read and write I/O: discovers /scheme/disk/ devices, writes a test pattern to sector 2048, reads it back, verifies match, restores original content. Updates test-usb-storage-qemu.sh with write-proof verification step. Includes all accumulated Red Bear OS work: kernel patches, relibc patches, driver infrastructure, DRM/GPU, KDE recipes, firmware, validation tooling, build system hardening, and documentation.
175 lines
5.5 KiB
Rust
175 lines
5.5 KiB
Rust
mod interfaces;
|
|
mod inventory;
|
|
|
|
use std::{
|
|
env,
|
|
error::Error,
|
|
process,
|
|
sync::Arc,
|
|
time::Duration,
|
|
};
|
|
|
|
use interfaces::{BlockDeviceInterface, DriveInterface, ObjectManagerRoot, UDisksManager};
|
|
use inventory::{Inventory, MANAGER_PATH, ROOT_PATH};
|
|
use tokio::runtime::Builder as RuntimeBuilder;
|
|
use zbus::{
|
|
Address,
|
|
connection::Builder as ConnectionBuilder,
|
|
zvariant::OwnedObjectPath,
|
|
};
|
|
|
|
const BUS_NAME: &str = "org.freedesktop.UDisks2";
|
|
|
|
enum Command {
|
|
Run,
|
|
Help,
|
|
}
|
|
|
|
fn usage() -> &'static str {
|
|
"Usage: redbear-udisks [--help]"
|
|
}
|
|
|
|
async fn wait_for_dbus_socket() {
|
|
let socket_path = env::var("DBUS_STARTER_ADDRESS")
|
|
.ok()
|
|
.and_then(|addr| addr.strip_prefix("unix:path=").map(String::from))
|
|
.or_else(|| env::var("DBUS_SYSTEM_BUS_ADDRESS").ok()
|
|
.and_then(|addr| addr.strip_prefix("unix:path=").map(String::from)))
|
|
.unwrap_or_else(|| "/run/dbus/system_bus_socket".to_string());
|
|
|
|
for _ in 0..30 {
|
|
if tokio::net::UnixStream::connect(&socket_path).await.is_ok() {
|
|
return;
|
|
}
|
|
tokio::time::sleep(Duration::from_secs(1)).await;
|
|
}
|
|
eprintln!("redbear-udisks: timed out waiting for D-Bus socket at {socket_path}");
|
|
}
|
|
|
|
fn parse_args() -> Result<Command, String> {
|
|
let mut args = env::args().skip(1);
|
|
|
|
match args.next() {
|
|
None => Ok(Command::Run),
|
|
Some(arg) if arg == "--help" || arg == "-h" => {
|
|
if args.next().is_some() {
|
|
return Err(String::from("unexpected extra arguments after --help"));
|
|
}
|
|
|
|
Ok(Command::Help)
|
|
}
|
|
Some(arg) => Err(format!("unrecognized argument '{arg}'")),
|
|
}
|
|
}
|
|
|
|
fn parse_object_path(path: &str) -> Result<OwnedObjectPath, Box<dyn Error>> {
|
|
Ok(OwnedObjectPath::try_from(path.to_owned())?)
|
|
}
|
|
|
|
fn system_connection_builder() -> Result<ConnectionBuilder<'static>, Box<dyn Error>> {
|
|
let addr_str = env::var("DBUS_STARTER_ADDRESS")
|
|
.or_else(|_| env::var("DBUS_SYSTEM_BUS_ADDRESS"))
|
|
.unwrap_or_else(|_| "unix:path=/run/dbus/system_bus_socket".to_string());
|
|
Ok(ConnectionBuilder::address(Address::try_from(addr_str.as_str())?)?)
|
|
}
|
|
|
|
fn spawn_signal_handler(shutdown_tx: tokio::sync::watch::Sender<bool>) {
|
|
tokio::spawn(async move {
|
|
#[cfg(unix)]
|
|
{
|
|
use tokio::signal::unix::{SignalKind, signal};
|
|
if let Ok(mut sigterm) = signal(SignalKind::terminate()) {
|
|
tokio::select! {
|
|
_ = sigterm.recv() => {},
|
|
_ = tokio::signal::ctrl_c() => {},
|
|
}
|
|
} else {
|
|
let _ = tokio::signal::ctrl_c().await;
|
|
}
|
|
}
|
|
#[cfg(not(unix))]
|
|
{
|
|
let _ = tokio::signal::ctrl_c().await;
|
|
}
|
|
let _ = shutdown_tx.send(true);
|
|
});
|
|
}
|
|
|
|
async fn run_daemon() -> Result<(), Box<dyn Error>> {
|
|
wait_for_dbus_socket().await;
|
|
|
|
let (shutdown_tx, mut shutdown_rx) = tokio::sync::watch::channel(false);
|
|
spawn_signal_handler(shutdown_tx);
|
|
|
|
let mut last_err = None;
|
|
for attempt in 1..=5 {
|
|
let _root_path = parse_object_path(ROOT_PATH)?;
|
|
let _manager_path = parse_object_path(MANAGER_PATH)?;
|
|
let inventory = Arc::new(Inventory::scan());
|
|
|
|
let mut builder = system_connection_builder()?
|
|
.name(BUS_NAME)?
|
|
.serve_at(ROOT_PATH, ObjectManagerRoot::new(inventory.clone()))?
|
|
.serve_at(MANAGER_PATH, UDisksManager::new(inventory.clone()))?;
|
|
|
|
for drive in inventory.drives() {
|
|
builder = builder.serve_at(drive.object_path.as_str(), DriveInterface::new(drive.clone()))?;
|
|
}
|
|
|
|
for block in inventory.blocks() {
|
|
builder = builder.serve_at(block.object_path.as_str(), BlockDeviceInterface::new(block.clone()))?;
|
|
}
|
|
|
|
match builder.build().await {
|
|
Ok(connection) => {
|
|
eprintln!(
|
|
"redbear-udisks: registered {BUS_NAME} on the system bus ({} drives, {} blocks)",
|
|
inventory.drives().len(),
|
|
inventory.blocks().len(),
|
|
);
|
|
let _ = shutdown_rx.changed().await;
|
|
eprintln!("redbear-udisks: shutdown signal received, exiting cleanly");
|
|
drop(connection);
|
|
return Ok(());
|
|
}
|
|
Err(err) => {
|
|
if attempt < 5 {
|
|
eprintln!(
|
|
"redbear-udisks: attempt {attempt}/5 failed ({err}), retrying in 2s..."
|
|
);
|
|
tokio::time::sleep(Duration::from_secs(2)).await;
|
|
}
|
|
last_err = Some(err.into());
|
|
}
|
|
}
|
|
}
|
|
Err(last_err.unwrap())
|
|
}
|
|
|
|
fn main() {
|
|
match parse_args() {
|
|
Ok(Command::Help) => {
|
|
println!("{}", usage());
|
|
}
|
|
Ok(Command::Run) => {
|
|
let runtime = match RuntimeBuilder::new_multi_thread().enable_all().build() {
|
|
Ok(runtime) => runtime,
|
|
Err(err) => {
|
|
eprintln!("redbear-udisks: failed to create tokio runtime: {err}");
|
|
process::exit(1);
|
|
}
|
|
};
|
|
|
|
if let Err(err) = runtime.block_on(run_daemon()) {
|
|
eprintln!("redbear-udisks: fatal error: {err}");
|
|
process::exit(1);
|
|
}
|
|
}
|
|
Err(err) => {
|
|
eprintln!("redbear-udisks: {err}");
|
|
eprintln!("{}", usage());
|
|
process::exit(1);
|
|
}
|
|
}
|
|
}
|