client: Use async UnixStream

Author: bilelmoussaoui

client/Cargo.toml

@@ -17,6 +17,7 @@ aes = { version = "0.8", features = ["zeroize"], optional = true }
 async-fs = { version = "2.1.0", optional = true }
 async-io = { version = "2.2.2", optional = true }
 async-lock = { version = "3.2.0", optional = true }
+async-net = { version = "2.0.0", optional = true }
 blocking = { version = "1.5.1", optional = true }
 cbc = { version = "0.1", features = ["zeroize"], optional = true }
 cipher = { version = "0.4", features = [
@@ -64,6 +65,7 @@ async-std = [
     "dep:async-fs",
     "dep:async-io",
     "dep:async-lock",
+    "dep:async-net",
     "dep:blocking",
     "dep:futures-lite",
 ]

client/src/portal/secret.rs

@@ -1,14 +1,16 @@
 //! Implementation of the XDG secret portal.
 //!
 //! This is a modified copy from ASHPD.
-use std::{
-    collections::HashMap,
-    io::Read,
-    os::{fd::AsFd, unix::net::UnixStream},
-};
+use std::{collections::HashMap, os::fd::AsFd};
 
+#[cfg(feature = "async-std")]
+use async_net::unix::UnixStream;
+#[cfg(feature = "async-std")]
+use futures_util::AsyncReadExt;
 use futures_util::StreamExt;
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
+#[cfg(feature = "tokio")]
+use tokio::{io::AsyncReadExt, net::UnixStream};
 use zbus::{
     zvariant::{Fd, ObjectPath, OwnedValue, SerializeDict, Type},
     ProxyDefault,
@@ -158,13 +160,11 @@ pub async fn retrieve() -> Result<Secret, Error> {
         Err(e) => Err(e.into()),
     }?;
 
-    // FIXME Use async-std's (tokio's) UnixStream once
-    // https://github.com/async-rs/async-std/pull/1036 is in.
     let (mut x1, x2) = UnixStream::pair()?;
     proxy.retrieve_secret(&x2).await?;
     drop(x2);
     let mut buf = Vec::new();
-    x1.read_to_end(&mut buf)?;
+    x1.read_to_end(&mut buf).await?;
 
     #[cfg(feature = "tracing")]
     tracing::debug!("Secret received from the portal successfully");