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

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -883,6 +883,7 @@
 name = "polkit-shared"
 version = "0.1.0"
 dependencies = [
+ "nix",
  "serde",
  "zbus",
 ]

--- a/cmds/remowt-agent/src/main.rs
+++ b/cmds/remowt-agent/src/main.rs
@@ -1,19 +1,20 @@
-use std::collections::HashMap;
+use std::borrow::Cow;
+use std::collections::{BTreeMap, HashMap};
 use std::io::{stdout, Write};
 use std::marker::PhantomData;
 use std::sync::{Mutex, RwLock};
 use std::{future, process};
 
 use clap::Parser;
-use polkit_shared::{BackendRequest, Identity};
+use polkit_shared::{emphasize, BackendRequest, Identity, PidDisplay};
 use tokio::runtime::Handle;
 use tokio::task::{AbortHandle, JoinHandle, LocalSet};
 use tracing::trace;
 use ui_prompt::dbus::DbusPrompterInterface;
 use ui_prompt::rofi::RofiPrompter;
-use ui_prompt::Prompter;
+use ui_prompt::{PrependSourcePrompter, Prompter, Source};
 use zbus::zvariant::{OwnedValue, Str};
-use zbus::ObjectServer;
+use zbus::{fdo, ObjectServer};
 use zbus::{interface, proxy, Connection};
 use zbus_polkit::policykit1::Subject;
 
@@ -81,10 +82,11 @@
         action_id: String,
         message: String,
         icon_name: String,
-        details: HashMap<String, String>,
+        mut details: BTreeMap<String, String>,
         cookie: String,
         identities: Vec<Identity>,
     ) -> zbus::fdo::Result<()> {
+        use std::fmt::Write;
         trace!("begin auth");
         let task = {
             let connection = self.connection.clone();
@@ -92,7 +94,61 @@
             let cookie = cookie.clone();
             tokio::task::spawn(async move {
                 trace!("conversation task");
-                let prompter = TemporaryPrompterInterface::new(connection, RofiPrompter).await;
+                let mut description = format!("{message}\n\n<b>Action id:</b> {action_id}",);
+                if let Some(subject) = details.remove("polkit.caller-pid") {
+                    let _ = write!(description, "\n<b>Caller:</b> ");
+                    if let Ok(pid) = subject.parse::<u32>() {
+                        let _ = write!(description, "{}", PidDisplay(pid));
+                    } else {
+                        let _ = write!(description, "{}", emphasize("invalid pid"));
+                    }
+                }
+                if let Some(subject) = details.remove("polkit.subject-pid") {
+                    let _ = write!(description, "\n<b>Subject:</b> ");
+                    if let Ok(pid) = subject.parse::<u32>() {
+                        let _ = write!(description, "{}", PidDisplay(pid));
+                    } else {
+                        let _ = write!(description, "{}", emphasize("invalid pid"));
+                    }
+                }
+                let mut prompter = PrependSourcePrompter {
+                    source: vec![Source(Cow::Borrowed("polkit agent"))],
+                    description: description.clone(),
+                    prompter: RofiPrompter,
+                };
+
+                let identity_displays: Vec<String> =
+                    identities.iter().map(|v| v.to_string()).collect();
+                let identity_displays: Vec<&str> =
+                    identity_displays.iter().map(|v| v.as_str()).collect();
+                let choosen_identity = match identity_displays.len() {
+                    0 => {
+                        return Err(fdo::Error::AuthFailed(
+                            "no identity to authenticate as".to_owned(),
+                        ))
+                    }
+                    1 => 0,
+                    _ => {
+                        prompter
+                            .prompt_enum(
+                                "Identity",
+                                "Select identity to use for polkit authorization",
+                                &identity_displays,
+                                &[],
+                            )
+                            .await?
+                    }
+                };
+
+                let _ = write!(
+                    description,
+                    "\n<b>Identity:</b> {}",
+                    identities[choosen_identity as usize]
+                );
+                prompter.description = description;
+
+                prompter.source.push(Source(Cow::Borrowed("polkit daemon")));
+                let prompter = TemporaryPrompterInterface::new(connection, prompter).await;
                 helper
                     .init_conversation(
                         BackendRequest {
@@ -100,7 +156,7 @@
                             environment: HashMap::new(),
                             prompter_path: prompter.path.clone(),
                             // TODO: Let user choose
-                            identity: identities.get(0).expect("first always exists").clone(),
+                            identity: identities[choosen_identity as usize].clone(),
                         }, // cookie.to_owned(), HashMap::new(), prompter.path.clone()
                     )
                     .await?;
@@ -135,7 +191,7 @@
     }
 }
 
-const OBJ_PATH: &str = "/0lach/polkitAgent";
+const OBJ_PATH: &str = "/org/freedesktop/PolicyKit1/AuthenticationAgent";
 
 #[proxy(
     interface = "lach.PolkitHelper",

--- a/crates/polkit-shared/Cargo.toml
+++ b/crates/polkit-shared/Cargo.toml
@@ -4,5 +4,6 @@
 edition = "2021"
 
 [dependencies]
+nix = "0.29.0"
 serde = { version = "1.0.204", features = ["derive"] }
 zbus = "4.4.0"

--- a/crates/polkit-shared/src/lib.rs
+++ b/crates/polkit-shared/src/lib.rs
@@ -1,14 +1,83 @@
 use std::collections::HashMap;
+use std::{fmt, fs};
 
+use nix::unistd::{Uid, User};
 use serde::{Deserialize, Serialize};
-use zbus::zvariant::{OwnedValue, Type};
+use zbus::zvariant::{OwnedValue, Type, Value};
+
+pub fn emphasize(s: impl AsRef<str>) -> String {
+    format!("<span style=\"italic\">&lt;{}&gt;</span>", escape(s),)
+}
+fn command(s: impl AsRef<str>) -> String {
+    format!("<u><tt>{}</tt></u>", s.as_ref())
+}
+fn escape(s: impl AsRef<str>) -> String {
+    s.as_ref()
+        .replace("&", "&quot;")
+        .replace("<", "&lt;")
+        .replace(">", "&gt;")
+}
 
+pub struct PidDisplay(pub u32);
+impl fmt::Display for PidDisplay {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.0 == 1 {
+            emphasize("init").fmt(f)
+        } else if let Ok(proc) = fs::read_to_string(format!("/proc/{}/cmdline", self.0)) {
+            write!(
+                f,
+                "<sub>command</sub>{}",
+                command(
+                    proc.replace("\0", " ")
+                        .strip_suffix(" ")
+                        .expect("cmdline should end with NUL")
+                )
+            )
+        } else if let Ok(proc) = fs::read_to_string(format!("/proc/{}/comm", self.0)) {
+            write!(f, "<sub>process</sub>{}", command(proc.replace("\0", " ")))
+        } else {
+            emphasize("unknown process").fmt(f)
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Type, PartialEq, Debug)]
 pub struct Identity {
     pub kind: String,
     pub details: HashMap<String, OwnedValue>,
 }
 
+impl fmt::Display for Identity {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.kind.as_str() {
+            "unix-user" => match self.details.get("uid").map(|v| &**v) {
+                Some(Value::U32(uid)) => match User::from_uid(Uid::from_raw(*uid)) {
+                    Ok(Some(u)) => write!(
+                        f,
+                        "<sub>user</sub>{}<sup>{}</sup>{}",
+                        u.name,
+                        u.uid,
+                        if u.gecos.is_empty() {
+                            "".to_owned()
+                        } else {
+                            format!(": {}", escape(u.gecos.to_string_lossy()))
+                        }
+                    ),
+                    Ok(None) => emphasize("not found").fmt(f),
+                    Err(e) => {
+                        let user = format!("could not get user: {e}");
+                        emphasize(&user).fmt(f)?;
+                        Ok(())
+                    }
+                },
+
+                _ => emphasize("unknown uid").fmt(f),
+            },
+            _ => emphasize(format!("identity of unknown kind: {}", self.kind)).fmt(f),
+        }
+    }
+}
+
 impl Clone for Identity {
     fn clone(&self) -> Self {
         Self {

--- a/crates/ui-prompt/src/lib.rs
+++ b/crates/ui-prompt/src/lib.rs
@@ -18,7 +18,7 @@
 
 #[cfg_attr(feature = "dbus", derive(zbus::zvariant::Type))]
 #[derive(serde::Serialize, serde::Deserialize, Clone)]
-pub struct Source(Cow<'static, str>);
+pub struct Source(pub Cow<'static, str>);
 impl fmt::Display for Source {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "<u>{}</u>", self.0)
@@ -79,8 +79,9 @@
 }
 
 pub struct PrependSourcePrompter<P> {
-    prompter: P,
-    source: Vec<Source>,
+    pub prompter: P,
+    pub source: Vec<Source>,
+    pub description: String,
 }
 impl<P> PrependSourcePrompter<P> {
     fn source(&self, input: &[Source]) -> Vec<Source> {
@@ -88,11 +89,31 @@
         out.extend(input.iter().cloned());
         out
     }
+    fn description(&self, input: &str) -> String {
+        if self.description.is_empty() {
+            input.to_owned()
+        } else if input.is_empty() {
+            self.description.to_owned()
+        } else {
+            format!("{input}\n\n{}", self.description)
+        }
+    }
 }
 impl<P> Prompter for PrependSourcePrompter<P>
 where
     P: Prompter + Sync,
 {
+    async fn prompt_radio(
+        &self,
+        prompt: &str,
+        description: &str,
+        source: &[Source],
+    ) -> Result<bool> {
+        self.prompter
+            .prompt_radio(prompt, &self.description(description), &self.source(source))
+            .await
+    }
+
     async fn prompt_enum(
         &self,
         prompt: &str,
@@ -101,7 +122,12 @@
         source: &[Source],
     ) -> Result<u32> {
         self.prompter
-            .prompt_enum(prompt, description, variants, &self.source(source))
+            .prompt_enum(
+                prompt,
+                dbg!(&self.description(description)),
+                variants,
+                &self.source(source),
+            )
             .await
     }
 
@@ -113,13 +139,18 @@
         source: &[Source],
     ) -> Result<String> {
         self.prompter
-            .prompt_text(echo, prompt, description, &self.source(source))
+            .prompt_text(
+                echo,
+                prompt,
+                &self.description(description),
+                &self.source(source),
+            )
             .await
     }
 
     async fn display_text(&self, error: bool, description: &str, source: &[Source]) -> Result<()> {
         self.prompter
-            .display_text(error, description, &self.source(source))
+            .display_text(error, &self.description(description), &self.source(source))
             .await
     }
 }

--- a/crates/ui-prompt/src/rofi.rs
+++ b/crates/ui-prompt/src/rofi.rs
@@ -27,7 +27,10 @@
             description.to_owned()
         } else {
             let mut out = format!("{description}\n\n<b>Requested on ",);
-            for s in source.iter() {
+            for (i, s) in source.iter().enumerate() {
+                if i != 0 {
+                    out.push_str(" -> ");
+                }
                 out.push_str(&s.to_string());
             }
             out.push_str("</b>");
@@ -43,6 +46,7 @@
             fixup_prompt(prompt),
             "-format",
             "i",
+            "-markup-rows",
         ]);
         cmd.stdin(Stdio::piped());
         cmd.stdout(Stdio::piped());
@@ -100,7 +104,10 @@
             description.to_owned()
         } else {
             let mut out = format!("{description}\n\n<b>Requested on ",);
-            for s in source.iter() {
+            for (i, s) in source.iter().enumerate() {
+                if i != 0 {
+                    out.push_str(" -> ");
+                }
                 out.push_str(&s.to_string());
             }
             out.push_str("</b>");