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

--- 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",

--- 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

--- 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(())
 }
 

--- 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(

--- 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![],

--- 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

--- 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,

--- 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;