git.delta.rocks / remowt / refs/commits / eadb0bb3c19e

difftreelog

feat auto prompter

ymurrvruYaroslav Bolyukin4 days agoparent: #751b8f1.patch.diff
in: trunk

9 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -308,9 +308,9 @@
 
 [[package]]
 name = "bifrostlink"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704657867d2107831c57edd363726440c86675464b5fc113702854e17062cafc"
+checksum = "ad2d0e30a2aa432b78f41f9676572f88201d4dc73bc2b7bc90704d2e02b7d062"
 dependencies = [
  "async-trait",
  "async_fn_traits",
@@ -327,9 +327,9 @@
 
 [[package]]
 name = "bifrostlink-macros"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158308eb569b467c0116680f79d0ecc389f4d540f6d5a0c9279bfe79b1cd5bdb"
+checksum = "e2121559c45cbe89c4f8d1d741360d5b028577254f6beca053dc02332da85b43"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -338,9 +338,9 @@
 
 [[package]]
 name = "bifrostlink-ports"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7612993f0bd8bc6a71867461266567212a35a716b2a5aef5f9967ab08c891782"
+checksum = "e9395c4ccca497b0c50583e6de57aca921c046ae0c10f56030cd2c5a20db05f8"
 dependencies = [
  "bifrostlink",
  "bytes",
@@ -1835,7 +1835,7 @@
 
 [[package]]
 name = "polkit-backend"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "clap",
@@ -2055,7 +2055,7 @@
 
 [[package]]
 name = "remowt-agent"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "bifrostlink",
@@ -2083,7 +2083,7 @@
 
 [[package]]
 name = "remowt-client"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "bifrostlink",
@@ -2106,7 +2106,7 @@
 
 [[package]]
 name = "remowt-endpoints"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "bifrostlink",
@@ -2124,7 +2124,7 @@
 
 [[package]]
 name = "remowt-link-shared"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "bifrostlink",
  "bytes",
@@ -2138,7 +2138,7 @@
 
 [[package]]
 name = "remowt-plugin"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "bifrostlink",
@@ -2152,7 +2152,7 @@
 
 [[package]]
 name = "remowt-polkit-shared"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "nix",
  "serde",
@@ -2161,7 +2161,7 @@
 
 [[package]]
 name = "remowt-ssh"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2189,8 +2189,9 @@
 
 [[package]]
 name = "remowt-ui-prompt"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
+ "anyhow",
  "bifrostlink",
  "bifrostlink-macros",
  "serde",
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@
 resolver = "2"
 
 [workspace.package]
-version = "0.1.3"
+version = "0.1.4"
 license = "MIT"
 edition = "2021"
 repository = "https://git.delta.rocks/r/remowt"
@@ -52,7 +52,6 @@
 thiserror = "2.0.18"
 
 [profile.release]
-strip = true
 panic = "abort"
 opt-level = "z"
 lto = true
modifiedcmds/remowt-agent/src/askpass.rsdiffbeforeafterboth
--- a/cmds/remowt-agent/src/askpass.rs
+++ b/cmds/remowt-agent/src/askpass.rs
@@ -2,24 +2,25 @@
 use std::io::Write as _;
 
 use anyhow::Context as _;
-use remowt_ui_prompt::bifrost::PromptEndpointsClient;
-use remowt_ui_prompt::dbus::{DbusPrompterInterface, DbusPrompterProxy};
-use remowt_ui_prompt::Source;
+use remowt_ui_prompt::dbus::{DbusPrompterInterface, DbusPrompterProxy, BUS_NAME, PROMPTER_PATH};
+use remowt_ui_prompt::{Prompter, Source};
+use tracing::debug;
 use zbus::Connection;
-
-use remowt_link_shared::BifConfig;
-
-const BUS_NAME: &str = "lach.RemowtAskpass";
-const PROMPTER_PATH: &str = "/lach/Askpass";
 
-pub async fn serve(
-	conn: &Connection,
-	prompter: PromptEndpointsClient<BifConfig>,
-) -> anyhow::Result<()> {
+pub async fn serve<P>(conn: &Connection, prompter: P) -> anyhow::Result<()>
+where
+	P: Prompter + 'static,
+{
 	conn.object_server()
 		.at(PROMPTER_PATH, DbusPrompterInterface(prompter))
 		.await?;
-	conn.request_name(BUS_NAME).await?;
+	match conn.request_name(BUS_NAME).await {
+		Ok(()) => {}
+		Err(zbus::Error::NameTaken) => {
+			debug!("{BUS_NAME} already owned, chaining to upstream");
+		}
+		Err(e) => return Err(e.into()),
+	}
 	Ok(())
 }
modifiedcmds/remowt-agent/src/main.rsdiffbeforeafterboth
--- a/cmds/remowt-agent/src/main.rs
+++ b/cmds/remowt-agent/src/main.rs
@@ -11,7 +11,9 @@
 use bifrostlink_ports::stdio::from_stdio;
 use bifrostlink_ports::unix_socket::from_socket;
 use clap::Parser;
-use remowt_endpoints::{fs::Fs, nix_daemon::NixDaemon, pty::Pty, subprocess::Subprocess, systemd::Systemd};
+use remowt_endpoints::{
+	fs::Fs, nix_daemon::NixDaemon, pty::Pty, subprocess::Subprocess, systemd::Systemd,
+};
 use remowt_link_shared::{editor::EditorEndpointsClient, Address, BifConfig};
 use remowt_polkit_shared::{emphasize, BackendRequest, Identity, PidDisplay};
 use remowt_ui_prompt::bifrost::PromptEndpointsClient;
@@ -250,13 +252,16 @@
 	}
 }
 async fn main_real() -> anyhow::Result<()> {
-	let conn = Connection::system().await?;
+	let system_conn = Connection::system().await?;
 	let helper = SocketHelper {
 		fallback: SuidHelper,
 	};
-	register_auth_agent(&conn, Agent::new(helper, RofiPrompter)).await?;
+	register_auth_agent(&system_conn, Agent::new(helper, RofiPrompter)).await?;
+
+	let session_conn = Connection::session().await?;
+	askpass::serve(&session_conn, RofiPrompter).await?;
 
-	let _conn = conn;
+	let _keep_alive = (system_conn, session_conn);
 	pending().await
 }
 async fn main_real_agent(
modifiedcmds/remowt-ssh/src/main.rsdiffbeforeafterboth
--- a/cmds/remowt-ssh/src/main.rs
+++ b/cmds/remowt-ssh/src/main.rs
@@ -13,8 +13,8 @@
 use remowt_client::editor::SshEditor;
 use remowt_client::{AgentBundle, Remowt};
 use remowt_link_shared::editor::serve_editor;
+use remowt_ui_prompt::auto::AutoPrompter;
 use remowt_ui_prompt::bifrost::serve_prompts;
-use remowt_ui_prompt::rofi::RofiPrompter;
 use remowt_ui_prompt::{PrependSourcePrompter, Source};
 use tokio::io::unix::AsyncFd;
 use tokio::io::{AsyncRead, ReadBuf};
@@ -61,7 +61,7 @@
 	serve_prompts(
 		&mut rpc,
 		PrependSourcePrompter {
-			prompter: RofiPrompter,
+			prompter: AutoPrompter::new().await,
 			source: match opts {
 				Opts::Ssh { host, .. } => vec![Source(Cow::Owned(format!("ssh host: {}", host)))],
 				Opts::Local { .. } => vec![],
modifiedcrates/remowt-ui-prompt/Cargo.tomldiffbeforeafterboth
--- a/crates/remowt-ui-prompt/Cargo.toml
+++ b/crates/remowt-ui-prompt/Cargo.toml
@@ -6,6 +6,7 @@
 license.workspace = true
 
 [dependencies]
+anyhow.workspace = true
 bifrostlink.workspace = true
 bifrostlink-macros.workspace = true
 serde.workspace = true
addedcrates/remowt-ui-prompt/src/auto.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/remowt-ui-prompt/src/auto.rs
@@ -0,0 +1,83 @@
+use anyhow::bail;
+use tracing::debug;
+use zbus::fdo::DBusProxy;
+use zbus::names::BusName;
+
+use crate::dbus::{DbusPrompterProxy, BUS_NAME, PROMPTER_PATH};
+use crate::rofi::RofiPrompter;
+use crate::{Prompter, Result, Source};
+
+pub struct AutoPrompter {
+	dbus: Option<DbusPrompterProxy<'static>>,
+	fallback: RofiPrompter,
+}
+
+impl AutoPrompter {
+	pub async fn new() -> Self {
+		let dbus = match Self::try_dbus().await {
+			Ok(p) => Some(p),
+			Err(e) => {
+				debug!("dbus prompter unavailable, falling back to rofi: {e}");
+				None
+			}
+		};
+		Self {
+			dbus,
+			fallback: RofiPrompter,
+		}
+	}
+
+	async fn try_dbus() -> anyhow::Result<DbusPrompterProxy<'static>> {
+		let conn = zbus::Connection::session().await?;
+		let dbus = DBusProxy::new(&conn).await?;
+		let name = BusName::try_from(BUS_NAME)?;
+		if !dbus.name_has_owner(name).await? {
+			bail!("{BUS_NAME} not registered on session bus");
+		}
+		let proxy = DbusPrompterProxy::builder(&conn)
+			.destination(BUS_NAME)?
+			.path(PROMPTER_PATH)?
+			.build()
+			.await?;
+		Ok(proxy)
+	}
+}
+
+impl Prompter for AutoPrompter {
+	async fn prompt_enum(
+		&self,
+		prompt: &str,
+		description: &str,
+		variants: &[&str],
+		source: &[Source],
+	) -> Result<u32> {
+		if let Some(dbus) = &self.dbus {
+			return Prompter::prompt_enum(dbus, prompt, description, variants, source).await;
+		}
+		self.fallback
+			.prompt_enum(prompt, description, variants, source)
+			.await
+	}
+
+	async fn prompt_text(
+		&self,
+		echo: bool,
+		prompt: &str,
+		description: &str,
+		source: &[Source],
+	) -> Result<String> {
+		if let Some(dbus) = &self.dbus {
+			return Prompter::prompt_text(dbus, echo, prompt, description, source).await;
+		}
+		self.fallback
+			.prompt_text(echo, prompt, description, source)
+			.await
+	}
+
+	async fn display_text(&self, error: bool, description: &str, source: &[Source]) -> Result<()> {
+		if let Some(dbus) = &self.dbus {
+			return Prompter::display_text(dbus, error, description, source).await;
+		}
+		self.fallback.display_text(error, description, source).await
+	}
+}
modifiedcrates/remowt-ui-prompt/src/dbus.rsdiffbeforeafterboth
after · crates/remowt-ui-prompt/src/dbus.rs
1use zbus::interface;2use zbus::{fdo, proxy};34use crate::Source;5use crate::{BlockingPrompter, Result};6use crate::{Error, Prompter};78pub const BUS_NAME: &str = "lach.RemowtAskpass";9pub const PROMPTER_PATH: &str = "/lach/Askpass";1011pub struct DbusPrompterInterface<P>(pub P);1213#[interface(name = "lach.PolkitInputHandler")]14impl<P: Prompter + Send + Sync + 'static> DbusPrompterInterface<P> {15	async fn prompt_enum(16		&self,17		prompt: &str,18		description: &str,19		variants: Vec<String>,20		source: Vec<Source>,21	) -> fdo::Result<u32> {22		let variants: Vec<&str> = variants.iter().map(|v| v.as_str()).collect();23		Ok(self24			.025			.prompt_enum(prompt, description, &variants, &source)26			.await?)27	}28	async fn prompt_text(29		&self,30		echo: bool,31		prompt: &str,32		description: &str,33		source: Vec<Source>,34	) -> fdo::Result<String> {35		Ok(self36			.037			.prompt_text(echo, prompt, description, &source)38			.await?)39	}40	async fn display_text(41		&self,42		error: bool,43		description: &str,44		source: Vec<Source>,45	) -> fdo::Result<()> {46		Ok(self.0.display_text(error, description, &source).await?)47	}48}4950#[proxy(interface = "lach.PolkitInputHandler")]51pub trait DbusPrompter {52	async fn prompt_enum(53		&self,54		prompt: &str,55		description: &str,56		variants: &[&str],57		source: &[Source],58	) -> fdo::Result<u32>;59	async fn prompt_text(60		&self,61		echo: bool,62		prompt: &str,63		description: &str,64		source: &[Source],65	) -> fdo::Result<String>;66	async fn display_text(67		&self,68		error: bool,69		description: &str,70		source: &[Source],71	) -> fdo::Result<()>;72}7374impl Prompter for DbusPrompterProxy<'_> {75	async fn prompt_enum(76		&self,77		prompt: &str,78		description: &str,79		variants: &[&str],80		source: &[Source],81	) -> Result<u32> {82		Ok(self83			.prompt_enum(prompt, description, variants, source)84			.await?)85	}8687	async fn prompt_text(88		&self,89		echo: bool,90		prompt: &str,91		description: &str,92		source: &[Source],93	) -> Result<String> {94		Ok(self.prompt_text(echo, prompt, description, source).await?)95	}9697	async fn display_text(&self, error: bool, description: &str, source: &[Source]) -> Result<()> {98		Ok(self.display_text(error, description, source).await?)99	}100}101impl BlockingPrompter for DbusPrompterProxyBlocking<'_> {102	fn prompt_enum(103		&self,104		prompt: &str,105		description: &str,106		variants: &[&str],107		source: &[Source],108	) -> Result<u32> {109		Ok(self.prompt_enum(prompt, description, variants, source)?)110	}111112	fn prompt_text(113		&self,114		echo: bool,115		prompt: &str,116		description: &str,117		source: &[Source],118	) -> Result<String> {119		Ok(self.prompt_text(echo, prompt, description, source)?)120	}121122	fn display_text(&self, error: bool, description: &str, source: &[Source]) -> Result<()> {123		Ok(self.display_text(error, description, source)?)124	}125}126127impl From<fdo::Error> for Error {128	fn from(value: fdo::Error) -> Self {129		if matches!(value, fdo::Error::NoReply(_)) {130			return Self::Cancel;131		}132		Self::InputError(format!("{value}"))133	}134}135impl From<Error> for fdo::Error {136	fn from(value: Error) -> Self {137		match value {138			Error::Cancel => fdo::Error::NoReply("input was cancelled".to_owned()),139			Error::Remote(e) => fdo::Error::NoReply(format!("remote error occured: {e}")),140			Error::InputError(e) => fdo::Error::Failed(e),141		}142	}143}
modifiedcrates/remowt-ui-prompt/src/lib.rsdiffbeforeafterboth
--- a/crates/remowt-ui-prompt/src/lib.rs
+++ b/crates/remowt-ui-prompt/src/lib.rs
@@ -3,6 +3,7 @@
 use std::future::Future;
 use std::result;
 
+pub mod auto;
 pub mod bifrost;
 pub mod dbus;
 pub mod rofi;