else/clan-sidebus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add FileTransfer (drag & drop / copy & paste files)

Browse source 
Host->Guest is easy; Guest->Host is not there yet because we have to do
something for the (O_PATH) fd passing such as converting to inode numbers
and getting an O_PATH fd back through the VMM, which requires modifying
libkrun/muvm to have a connection channel.. Or we should switch this from
vsock to a virtgpu channel where it would be easier to handle.
This commit is contained in:
Val Packett 2026-02-06 00:31:15 -03:00
parent 762dd2dd84
commit 2561342e0c
5 changed files with 216 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
sidebus-broker/src/main.rs
View file

@ -144,6 +144,12 @@ async fn main() -> eyre::Result<()> {
let priv_bus_conn = priv_bus.lock().await.connect_channel(false).await?;
let host_session_conn = zbus::connection::Builder::session()?.build().await?;
let file_chooser_imp = portal::file_chooser::FileChooser::new(
&host_session_conn,
&priv_bus_conn,
cli.guest_mountpoint.clone(),
)
.await?;
let file_transfer_imp = portal::file_transfer::FileTransfer::new(
&host_session_conn,
&priv_bus_conn,
cli.guest_mountpoint,
@ -154,6 +160,7 @@ async fn main() -> eyre::Result<()> {
async fn on_vm_bus_connected(
vm_bus_conn: zbus::Connection,
file_chooser: portal::file_chooser::FileChooser,
file_transfer: portal::file_transfer::FileTransfer,
settings: portal::settings::Settings,
) -> Result<(), eyre::Report> {
if !vm_bus_conn
@ -163,6 +170,28 @@ async fn main() -> eyre::Result<()> {
{
error!("org.freedesktop.portal.FileChooser already provided");
};
if !vm_bus_conn
.object_server()
.at("/org/freedesktop/portal/documents", file_transfer)
.await?
{
error!("org.freedesktop.portal.FileTransfer already provided");
};
let file_transfer_ref = vm_bus_conn
.object_server()
.interface::<_, portal::file_transfer::FileTransfer>(
"/org/freedesktop/portal/documents",
)
.await?;
tokio::spawn(async move {
let file_transfer = file_transfer_ref.get().await;
let emitter = file_transfer_ref.signal_emitter();
if let Err(err) = file_transfer.forward_transfer_closed(emitter.clone()).await {
error!(%err, "forwarding forward_transfer_closed changes ended");
}
});
if !vm_bus_conn
.object_server()
.at("/org/freedesktop/portal/desktop", settings)
@ -181,21 +210,23 @@ async fn main() -> eyre::Result<()> {
error!(%err, "forwarding settings changes ended");
}
});
// XXX: no method for "wait until the conn dies"?
Ok(std::future::pending::<()>().await)
}
if let Some(path) = cli.unix_path {
let vm_unix_listener = UnixListener::bind(path)?;
server_tasks.spawn(enclose!((file_chooser_imp, settings_imp) async move {
server_tasks.spawn(enclose!((file_chooser_imp, file_transfer_imp, settings_imp) async move {
while let Ok((socket, remote_addr)) = vm_unix_listener.accept().await {
let f = enclose!((file_chooser_imp, settings_imp) async move {
let f = enclose!((file_chooser_imp, file_transfer_imp, settings_imp) async move {
let client_conn = zbus::connection::Builder::unix_stream(socket)
.auth_mechanism(zbus::AuthMechanism::Anonymous)
.name("org.freedesktop.portal.Desktop")?
.name("org.freedesktop.portal.Documents")?
.build()
.await?;
on_vm_bus_connected(client_conn, file_chooser_imp, settings_imp).await
on_vm_bus_connected(client_conn, file_chooser_imp, file_transfer_imp, settings_imp).await
});
tokio::spawn(
async {
@ -216,10 +247,10 @@ async fn main() -> eyre::Result<()> {
vsock::ListenerBuilder::new(vsock::VsockAddr::new(vsock::VMADDR_CID_HOST, port))
.with_label("VM Bus")
.listen(move |client| {
enclose!((file_chooser_imp, settings_imp) async move {
enclose!((file_chooser_imp, file_transfer_imp, settings_imp) async move {
// TODO: Not necessary to go through the channel, add vsock support to the Peer too?
let client_conn = client.build().await?;
on_vm_bus_connected(client_conn, file_chooser_imp, settings_imp).await
on_vm_bus_connected(client_conn, file_chooser_imp, file_transfer_imp, settings_imp).await
})
})
.map_ok_or_else(