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
308308
309[[package]]309[[package]]
310name = "bifrostlink"310name = "bifrostlink"
311version = "0.2.3"311version = "0.2.4"
312source = "registry+https://github.com/rust-lang/crates.io-index"312source = "registry+https://github.com/rust-lang/crates.io-index"
313checksum = "704657867d2107831c57edd363726440c86675464b5fc113702854e17062cafc"313checksum = "ad2d0e30a2aa432b78f41f9676572f88201d4dc73bc2b7bc90704d2e02b7d062"
314dependencies = [314dependencies = [
315 "async-trait",315 "async-trait",
316 "async_fn_traits",316 "async_fn_traits",
327327
328[[package]]328[[package]]
329name = "bifrostlink-macros"329name = "bifrostlink-macros"
330version = "0.2.3"330version = "0.2.4"
331source = "registry+https://github.com/rust-lang/crates.io-index"331source = "registry+https://github.com/rust-lang/crates.io-index"
332checksum = "158308eb569b467c0116680f79d0ecc389f4d540f6d5a0c9279bfe79b1cd5bdb"332checksum = "e2121559c45cbe89c4f8d1d741360d5b028577254f6beca053dc02332da85b43"
333dependencies = [333dependencies = [
334 "proc-macro2",334 "proc-macro2",
335 "quote",335 "quote",
338338
339[[package]]339[[package]]
340name = "bifrostlink-ports"340name = "bifrostlink-ports"
341version = "0.2.3"341version = "0.2.4"
342source = "registry+https://github.com/rust-lang/crates.io-index"342source = "registry+https://github.com/rust-lang/crates.io-index"
343checksum = "7612993f0bd8bc6a71867461266567212a35a716b2a5aef5f9967ab08c891782"343checksum = "e9395c4ccca497b0c50583e6de57aca921c046ae0c10f56030cd2c5a20db05f8"
344dependencies = [344dependencies = [
345 "bifrostlink",345 "bifrostlink",
346 "bytes",346 "bytes",
18351835
1836[[package]]1836[[package]]
1837name = "polkit-backend"1837name = "polkit-backend"
1838version = "0.1.3"1838version = "0.1.4"
1839dependencies = [1839dependencies = [
1840 "anyhow",1840 "anyhow",
1841 "clap",1841 "clap",
20552055
2056[[package]]2056[[package]]
2057name = "remowt-agent"2057name = "remowt-agent"
2058version = "0.1.3"2058version = "0.1.4"
2059dependencies = [2059dependencies = [
2060 "anyhow",2060 "anyhow",
2061 "bifrostlink",2061 "bifrostlink",
20832083
2084[[package]]2084[[package]]
2085name = "remowt-client"2085name = "remowt-client"
2086version = "0.1.3"2086version = "0.1.4"
2087dependencies = [2087dependencies = [
2088 "anyhow",2088 "anyhow",
2089 "bifrostlink",2089 "bifrostlink",
21062106
2107[[package]]2107[[package]]
2108name = "remowt-endpoints"2108name = "remowt-endpoints"
2109version = "0.1.3"2109version = "0.1.4"
2110dependencies = [2110dependencies = [
2111 "anyhow",2111 "anyhow",
2112 "bifrostlink",2112 "bifrostlink",
21242124
2125[[package]]2125[[package]]
2126name = "remowt-link-shared"2126name = "remowt-link-shared"
2127version = "0.1.3"2127version = "0.1.4"
2128dependencies = [2128dependencies = [
2129 "bifrostlink",2129 "bifrostlink",
2130 "bytes",2130 "bytes",
21382138
2139[[package]]2139[[package]]
2140name = "remowt-plugin"2140name = "remowt-plugin"
2141version = "0.1.3"2141version = "0.1.4"
2142dependencies = [2142dependencies = [
2143 "anyhow",2143 "anyhow",
2144 "bifrostlink",2144 "bifrostlink",
21522152
2153[[package]]2153[[package]]
2154name = "remowt-polkit-shared"2154name = "remowt-polkit-shared"
2155version = "0.1.3"2155version = "0.1.4"
2156dependencies = [2156dependencies = [
2157 "nix",2157 "nix",
2158 "serde",2158 "serde",
21612161
2162[[package]]2162[[package]]
2163name = "remowt-ssh"2163name = "remowt-ssh"
2164version = "0.1.3"2164version = "0.1.4"
2165dependencies = [2165dependencies = [
2166 "anyhow",2166 "anyhow",
2167 "async-trait",2167 "async-trait",
21892189
2190[[package]]2190[[package]]
2191name = "remowt-ui-prompt"2191name = "remowt-ui-prompt"
2192version = "0.1.3"2192version = "0.1.4"
2193dependencies = [2193dependencies = [
2194 "anyhow",
2194 "bifrostlink",2195 "bifrostlink",
2195 "bifrostlink-macros",2196 "bifrostlink-macros",
2196 "serde",2197 "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
--- a/crates/remowt-ui-prompt/src/dbus.rs
+++ b/crates/remowt-ui-prompt/src/dbus.rs
@@ -5,17 +5,25 @@
 use crate::{BlockingPrompter, Result};
 use crate::{Error, Prompter};
 
+pub const BUS_NAME: &str = "lach.RemowtAskpass";
+pub const PROMPTER_PATH: &str = "/lach/Askpass";
+
 pub struct DbusPrompterInterface<P>(pub P);
 
 #[interface(name = "lach.PolkitInputHandler")]
 impl<P: Prompter + Send + Sync + 'static> DbusPrompterInterface<P> {
-	async fn prompt_radio(
+	async fn prompt_enum(
 		&self,
 		prompt: &str,
 		description: &str,
+		variants: Vec<String>,
 		source: Vec<Source>,
-	) -> fdo::Result<bool> {
-		Ok(self.0.prompt_radio(prompt, description, &source).await?)
+	) -> fdo::Result<u32> {
+		let variants: Vec<&str> = variants.iter().map(|v| v.as_str()).collect();
+		Ok(self
+			.0
+			.prompt_enum(prompt, description, &variants, &source)
+			.await?)
 	}
 	async fn prompt_text(
 		&self,
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;