difftreelog
feat socket polkit helper
in: trunk
5 files changed
cmds/remowt-agent/src/helper/dbus.rsdiffbeforeafterboth2use std::marker::PhantomData;2use std::marker::PhantomData;334use polkit_shared::{BackendRequest, Identity};4use polkit_shared::{BackendRequest, Identity};5use tokio::runtime::Handle;6use ui_prompt::dbus::DbusPrompterInterface;5use ui_prompt::dbus::DbusPrompterInterface;7use ui_prompt::Prompter;6use ui_prompt::Prompter;8use zbus::Connection;7use zbus::Connection;36}34}37impl<P: Prompter + Send + Sync + 'static> Drop for TemporaryPrompterInterface<P> {35impl<P: Prompter + Send + Sync + 'static> Drop for TemporaryPrompterInterface<P> {38 fn drop(&mut self) {36 fn drop(&mut self) {39 // FIXME: block_in_place prevents to moving to current_thread runtime37 // Removal is async because of async RwLock used inside...40 // There should be a blocking way to remove ObjectServer listener.38 // We should not care about its reuse41 // As far as I can see, it is only async because of async RwLock, shouldn't it be39 let connection = self.connection.clone();42 // just a sync lock?40 let path = std::mem::take(&mut self.path);43 tokio::task::block_in_place(move || {41 tokio::spawn(async move {44 Handle::current().block_on(async {45 let _ = self42 let _ = connection46 .connection47 .object_server()43 .object_server()48 .remove::<DbusPrompterInterface<P>, String>(self.path.clone())44 .remove::<DbusPrompterInterface<P>, String>(path)49 .await;45 .await;50 });51 });46 });52 }47 }53}48}544950#[derive(Clone)]55pub struct DbusHelper {51pub struct DbusHelper {56 connection: Connection,52 connection: Connection,57 helper: PolkitHelperProxy<'static>,53 helper: PolkitHelperProxy<'static>,58}54}55impl DbusHelper {56 pub async fn new(connection: Connection) -> zbus::Result<Self> {57 let helper = PolkitHelperProxy::new(&connection).await?;58 Ok(Self { connection, helper })59 }60}59impl Helper for DbusHelper {61impl Helper for DbusHelper {60 async fn help_me<P: Prompter + Send + Sync + 'static>(62 async fn help_me<P: Prompter + Send + Sync + 'static>(61 &self,63 &self,cmds/remowt-agent/src/helper/mod.rsdiffbeforeafterboth--- a/cmds/remowt-agent/src/helper/mod.rs
+++ b/cmds/remowt-agent/src/helper/mod.rs
@@ -2,17 +2,20 @@
use polkit_shared::Identity;
use ui_prompt::Prompter;
-mod suid;
mod dbus;
+mod protocol;
+mod socket;
+mod suid;
+pub use dbus::DbusHelper;
+pub use socket::SocketHelper;
pub use suid::SuidHelper;
-pub use dbus::DbusHelper;
pub trait Helper {
- fn help_me<P: Prompter + Send + Sync + 'static>(
- &self,
- cookie: &str,
- prompt: P,
- identity: Identity,
- ) -> impl Future<Output = anyhow::Result<()>> + Send;
+ fn help_me<P: Prompter + Send + Sync + 'static>(
+ &self,
+ cookie: &str,
+ prompt: P,
+ identity: Identity,
+ ) -> impl Future<Output = anyhow::Result<()>> + Send;
}
cmds/remowt-agent/src/helper/protocol.rsdiffbeforeafterboth--- /dev/null
+++ b/cmds/remowt-agent/src/helper/protocol.rs
@@ -0,0 +1,50 @@
+use std::pin::pin;
+
+use anyhow::bail;
+use futures::stream::Peekable;
+use futures::StreamExt as _;
+use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt as _};
+use tokio::select;
+use tokio_util::codec::{FramedRead, LinesCodec};
+use ui_prompt::Prompter;
+
+pub async fn run_conversation<R, W, P>(reader: R, mut writer: W, prompt: P) -> anyhow::Result<()>
+where
+ R: AsyncRead,
+ W: AsyncWrite + Unpin,
+ P: Prompter,
+{
+ let mut lines = pin!(FramedRead::new(reader, LinesCodec::new()).peekable());
+
+ while let Some(line) = lines.next().await {
+ let line = line?;
+ let res = if let Some(prompt_text) = line.strip_prefix("PAM_PROMPT_ECHO_OFF ") {
+ prompt.prompt_text(false, prompt_text, "", &[]).await?
+ } else if let Some(prompt_text) = line.strip_prefix("PAM_PROMPT_ECHO_ON ") {
+ prompt.prompt_text(true, prompt_text, "", &[]).await?
+ } else if let Some(msg_text) = line.strip_prefix("PAM_ERROR_MSG ") {
+ prompt.display_text(true, msg_text, &[]).await?;
+ String::new()
+ } else if let Some(msg_text) = line.strip_prefix("PAM_TEXT_INFO ") {
+ select! {
+ _ = Peekable::peek(lines.as_mut()) => {},
+ r = prompt.display_text(false, msg_text, &[]) => {r?}
+ }
+ String::new()
+ } else if line == "SUCCESS" {
+ return Ok(());
+ } else if line == "FAILURE" {
+ bail!("helper reported failure")
+ } else {
+ bail!("unknown agent request: {line}")
+ };
+
+ if res.contains('\n') {
+ bail!("response should not include newline")
+ }
+
+ writer.write_all(res.as_bytes()).await?;
+ writer.write_all(b"\n").await?;
+ }
+ bail!("agent finished unexpectedly")
+}
cmds/remowt-agent/src/helper/socket.rsdiffbeforeafterboth--- /dev/null
+++ b/cmds/remowt-agent/src/helper/socket.rs
@@ -0,0 +1,53 @@
+use anyhow::{anyhow, bail};
+use nix::unistd::User;
+use polkit_shared::Identity;
+use tokio::io::AsyncWriteExt as _;
+use tokio::net::UnixStream;
+use tracing::debug;
+use ui_prompt::Prompter;
+
+use super::protocol::run_conversation;
+use super::Helper;
+
+/// Polkit 127 introduced an alternative backend similar to `lach.PolkitHelper`
+const SOCKET_PATH: &str = "/run/polkit/agent-helper.socket";
+
+#[derive(Clone)]
+pub struct SocketHelper<F> {
+ pub fallback: F,
+}
+
+impl<F: Helper + Sync> Helper for SocketHelper<F> {
+ async fn help_me<P: Prompter + Send + Sync + 'static>(
+ &self,
+ cookie: &str,
+ prompt: P,
+ identity: Identity,
+ ) -> anyhow::Result<()> {
+ let Some(uid) = identity.uid() else {
+ bail!("can't process identity");
+ };
+
+ let stream = match UnixStream::connect(SOCKET_PATH).await {
+ Ok(stream) => stream,
+ Err(e) => {
+ debug!("agent-helper.socket unavailable ({e}), using fallback helper");
+ return self.fallback.help_me(cookie, prompt, identity).await;
+ }
+ };
+
+ let user = User::from_uid(uid)
+ .map_err(|e| anyhow!("error querying user: {e}"))?
+ .ok_or_else(|| anyhow!("user not found"))?;
+
+ assert!(!cookie.contains('\n'));
+ let (reader, mut writer) = stream.into_split();
+
+ writer.write_all(user.name.as_bytes()).await?;
+ writer.write_all(b"\n").await?;
+ writer.write_all(cookie.as_bytes()).await?;
+ writer.write_all(b"\n").await?;
+
+ run_conversation(reader, writer, prompt).await
+ }
+}
cmds/remowt-agent/src/helper/suid.rsdiffbeforeafterboth--- a/cmds/remowt-agent/src/helper/suid.rs
+++ b/cmds/remowt-agent/src/helper/suid.rs
@@ -1,83 +1,46 @@
-use std::pin::pin;
use std::process::Stdio;
-use anyhow::{bail, anyhow};
-use futures::stream::Peekable;
-use futures::StreamExt as _;
+use anyhow::{anyhow, bail};
use nix::unistd::User;
use polkit_shared::Identity;
use tokio::io::AsyncWriteExt as _;
use tokio::process::Command;
-use tokio::select;
-use tokio_util::codec::{FramedRead, LinesCodec};
use ui_prompt::Prompter;
+use super::protocol::run_conversation;
use super::Helper;
#[derive(Clone)]
pub struct SuidHelper;
impl Helper for SuidHelper {
- async fn help_me<P: Prompter + 'static>(
- &self,
- cookie: &str,
- prompt: P,
- identity: Identity,
- ) -> anyhow::Result<()> {
- let Some(uid) = dbg!(identity.uid()) else {
- bail!("can't process identity");
- };
- let user = User::from_uid(dbg!(uid))
- .map_err(|e| anyhow!("error querying user: {e}"))?
- .ok_or_else(|| anyhow!("user not found"))?;
-
- let mut cmd = Command::new("polkit-agent-helper-1");
- cmd.arg(user.name);
- cmd.stdin(Stdio::piped());
- cmd.stdout(Stdio::piped());
- cmd.kill_on_drop(true);
- let mut child = cmd.spawn()?;
- let mut stdin = child.stdin.take().expect("piped");
- let mut stdout =
- pin!(
- FramedRead::new(child.stdout.take().expect("piped"), LinesCodec::new()).peekable()
- );
-
- assert!(!cookie.contains("\n"));
- stdin.write_all(cookie.as_bytes()).await?;
- stdin.write_all(b"\n").await?;
+ async fn help_me<P: Prompter + 'static>(
+ &self,
+ cookie: &str,
+ prompt: P,
+ identity: Identity,
+ ) -> anyhow::Result<()> {
+ let Some(uid) = identity.uid() else {
+ bail!("can't process identity");
+ };
+ let user = User::from_uid(uid)
+ .map_err(|e| anyhow!("error querying user: {e}"))?
+ .ok_or_else(|| anyhow!("user not found"))?;
- while let Some(line) = stdout.next().await {
- let line = dbg!(line?);
- // TODO: Dedicated codec?
- let res = if let Some(prompt_text) = line.strip_prefix("PAM_PROMPT_ECHO_OFF ") {
- prompt.prompt_text(false, prompt_text, "", &[]).await?
- } else if let Some(prompt_text) = line.strip_prefix("PAM_PROMPT_ECHO_ON ") {
- prompt.prompt_text(true, prompt_text, "", &[]).await?
- } else if let Some(msg_text) = line.strip_prefix("PAM_ERROR_MSG ") {
- prompt.display_text(true, msg_text, &[]).await?;
- String::new()
- } else if let Some(msg_text) = line.strip_prefix("PAM_TEXT_INFO ") {
- select! {
- _ = Peekable::peek(stdout.as_mut()) => {},
- r = prompt.display_text(false, msg_text, &[]) => {r?}
- }
- String::new()
- } else if line == "SUCCESS" {
- return Ok(());
- } else if line == "FAILURE" {
- bail!("helper binary reported failure")
- } else {
- // TODO: Success/failure handling
- bail!("unknown agent request");
- };
+ let mut cmd = Command::new("polkit-agent-helper-1");
+ cmd.arg(user.name);
+ cmd.stdin(Stdio::piped());
+ cmd.stdout(Stdio::piped());
+ cmd.kill_on_drop(true);
+ let mut child = cmd.spawn()?;
+ let mut stdin = child.stdin.take().expect("piped");
+ let stdout = child.stdout.take().expect("piped");
- if res.contains("\n") {
- bail!("response should not include newline")
- }
+ assert!(!cookie.contains('\n'));
+ stdin.write_all(cookie.as_bytes()).await?;
+ stdin.write_all(b"\n").await?;
- stdin.write_all(res.as_bytes()).await?;
- stdin.write_all(b"\n").await?;
- }
- bail!("agent finished unexpectedly")
- }
+ let res = run_conversation(stdout, stdin, prompt).await;
+ drop(child);
+ res
+ }
}