difftreelog
feat properly cancel agent task
in: trunk
3 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -307,16 +307,22 @@
]
[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
name = "bytes"
-version = "1.6.1"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "cc"
-version = "1.1.6"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
[[package]]
name = "cexpr"
@@ -644,9 +650,9 @@
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
dependencies = [
"equivalent",
"hashbrown",
@@ -905,9 +911,12 @@
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "proc-macro-crate"
@@ -968,9 +977,9 @@
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -1089,11 +1098,12 @@
[[package]]
name = "serde_json"
-version = "1.0.120"
+version = "1.0.122"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -1205,12 +1215,13 @@
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
dependencies = [
"cfg-if",
"fastrand",
+ "once_cell",
"rustix",
"windows-sys",
]
@@ -1276,9 +1287,9 @@
[[package]]
name = "toml_datetime"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
@@ -1606,6 +1617,27 @@
]
[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
name = "zvariant"
version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
cmds/remowt-agent/src/main.rsdiffbeforeafterboth2use std::collections::{BTreeMap, HashMap};2use std::collections::{BTreeMap, HashMap};3use std::io::{stdout, Write};3use std::io::{stdout, Write};4use std::marker::PhantomData;4use std::marker::PhantomData;5use std::sync::{Mutex, RwLock};5use std::sync::{Arc, Mutex, OnceLock};6use std::{future, process};6use std::{future, process};778use clap::Parser;8use clap::Parser;9use polkit_shared::{emphasize, BackendRequest, Identity, PidDisplay};9use polkit_shared::{emphasize, BackendRequest, Identity, PidDisplay};10use tokio::runtime::Handle;10use tokio::runtime::Handle;11use tokio::task::{AbortHandle, JoinHandle, LocalSet};11use tokio::task::{AbortHandle, JoinHandle, LocalSet};12use tracing::trace;12use tracing::{info, trace};13use ui_prompt::dbus::DbusPrompterInterface;13use ui_prompt::dbus::DbusPrompterInterface;14use ui_prompt::rofi::RofiPrompter;14use ui_prompt::rofi::RofiPrompter;15use ui_prompt::{PrependSourcePrompter, Prompter, Source};15use ui_prompt::{PrependSourcePrompter, Prompter, Source};58 }58 }59}59}6061struct CancelTaskOnDrop {62 tasks: Arc<Mutex<HashMap<String, AbortHandle>>>,63 handle: String,64}65impl Drop for CancelTaskOnDrop {66 fn drop(&mut self) {67 info!("cancel on drop");68 if let Some(task) = self69 .tasks70 .lock()71 .expect("not poisoned")72 .remove(&self.handle)73 {74 task.abort();75 }76 }77}607861struct Agent {79struct Agent {62 helper: PolkitHelperProxy<'static>,80 helper: PolkitHelperProxy<'static>,63 tasks: Mutex<HashMap<String, AbortHandle>>,81 tasks: Arc<Mutex<HashMap<String, AbortHandle>>>,64 connection: Connection,82 connection: Connection,65}83}66impl Agent {84impl Agent {67 async fn new(connection: Connection) -> anyhow::Result<Self> {85 async fn new(connection: Connection) -> anyhow::Result<Self> {68 Ok(Self {86 Ok(Self {69 helper: PolkitHelperProxy::new(&connection).await?,87 helper: PolkitHelperProxy::new(&connection).await?,70 tasks: Mutex::new(HashMap::new()),88 tasks: Arc::new(Mutex::new(HashMap::new())),71 connection,89 connection,72 })90 })73 }91 }78 /// BeginAuthentication method96 /// BeginAuthentication method79 #[allow(clippy::too_many_arguments)]97 #[allow(clippy::too_many_arguments)]80 async fn begin_authentication(98 async fn begin_authentication(81 &mut self,99 &self,82 action_id: String,100 action_id: String,83 message: String,101 message: String,84 icon_name: String,102 icon_name: String,87 identities: Vec<Identity>,105 identities: Vec<Identity>,88 ) -> zbus::fdo::Result<()> {106 ) -> zbus::fdo::Result<()> {89 use std::fmt::Write;107 use std::fmt::Write;90 trace!("begin auth");108 info!("begin auth");109 let _cancel_guard = Arc::new(OnceLock::new());91 let task = {110 let task = {92 let connection = self.connection.clone();111 let connection = self.connection.clone();93 let helper = self.helper.clone();112 let helper = self.helper.clone();94 let cookie = cookie.clone();113 let cookie = cookie.clone();114 let _cancel_guard = _cancel_guard.clone();95 tokio::task::spawn(async move {115 tokio::task::spawn(async move {116 let _cancel_guard = _cancel_guard.clone();96 trace!("conversation task");117 trace!("conversation task");97 let mut description = format!("{message}\n\n<b>Action id:</b> {action_id}",);118 let mut description = format!("{message}\n\n<b>Action id:</b> {action_id}",);98 if let Some(subject) = details.remove("polkit.caller-pid") {119 if let Some(subject) = details.remove("polkit.caller-pid") {121 identities.iter().map(|v| v.to_string()).collect();142 identities.iter().map(|v| v.to_string()).collect();122 let identity_displays: Vec<&str> =143 let identity_displays: Vec<&str> =123 identity_displays.iter().map(|v| v.as_str()).collect();144 identity_displays.iter().map(|v| v.as_str()).collect();145 info!("choose identity");124 let choosen_identity = match identity_displays.len() {146 let choosen_identity = match identity_displays.len() {125 0 => {147 0 => {126 return Err(fdo::Error::AuthFailed(148 return Err(fdo::Error::AuthFailed(139 .await?161 .await?140 }162 }141 };163 };164 info!("identity chosen");142165143 let _ = write!(166 let _ = write!(144 description,167 description,148 prompter.description = description;171 prompter.description = description;149172150 prompter.source.push(Source(Cow::Borrowed("polkit daemon")));173 prompter.source.push(Source(Cow::Borrowed("polkit daemon")));174 // let connection = Connection::system().await?;175 // let helper = PolkitHelperProxy::new(&connection).await?;151 let prompter = TemporaryPrompterInterface::new(connection, prompter).await;176 let prompter = TemporaryPrompterInterface::new(connection, prompter).await;177 info!("init conv");152 helper178 helper153 .init_conversation(179 .init_conversation(154 BackendRequest {180 BackendRequest {171 .lock()196 .lock()172 .unwrap()197 .unwrap()173 .insert(cookie.clone(), task.abort_handle());198 .insert(cookie.clone(), task.abort_handle());174 let result = task.await.expect("join error");199 info!("abort handle stored");175 // The only way to no reach this line, is to either panic in previous line, or if authorization cancelled,200 let _ = _cancel_guard.set(CancelTaskOnDrop {176 // while cancellation will remove task by itself.177 // TODO: But still it would be better to have abort guard, which will remove it from HashMap178 self.tasks.lock().unwrap().remove(&cookie);201 tasks: self.tasks.clone(),179202 handle: cookie.clone(),180 result203 });204205 let _ = task.await;206207 Ok(())181 }208 }182209183 /// CancelAuthentication method210 /// CancelAuthentication method184 async fn cancel_authentication(&self, cookie: &str) -> zbus::fdo::Result<()> {211 async fn cancel_authentication(&self, cookie: &str) -> zbus::fdo::Result<()> {185 trace!("cancel auth");212 info!("auth cancelled");186 if let Some(abort) = self.tasks.lock().unwrap().remove(cookie) {213 if let Some(abort) = self.tasks.lock().unwrap().remove(cookie) {214 info!("abort handle found");187 abort.abort();215 abort.abort();188 }216 }189 // debug!("Authentication cancled ! {cookie}");217 // debug!("Authentication cancled ! {cookie}");nix/nixos-modules.nixdiffbeforeafterboth--- a/nix/nixos-modules.nix
+++ b/nix/nixos-modules.nix
@@ -10,6 +10,9 @@
];
systemd.services.remowt-polkit-helper = {
aliases = ["dbus-lach.polkit.helper1.service"];
+ # Restarting can kill in-progress auth requests.
+ # It is good to have it restarted for security, but I didn't decided on the flow yet, graceful shutdown?..
+ unitConfig.X-RestartIfChanged = false;
};
};
};