From bb64b55b0bfefc961ff34f030b4335956cf3d330 Mon Sep 17 00:00:00 2001
From: Ron Waldon-Howe <jokeyrhyme@jokeyrhy.me>
Date: Mon, 18 Nov 2024 17:57:40 +1100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Support=20`<(allow|deny)=20(send?=
 =?UTF-8?q?|recieve)=5Fmember=3D`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/dbus2/busd/issues/79#issuecomment-2482782721
---
 src/config.rs   | 38 ++++++++++++--------------------------
 tests/config.rs | 22 +++++++++++++++++++++-
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 3437aaa..d3900f4 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -275,14 +275,6 @@ impl TryFrom<RuleAttributes> for OptionalOperation {
             return Err(Error::msg(format!("`send_destination_prefix` cannot be combined with `send_destination` in the same rule: {value:?}")));
         }
 
-        // https://github.com/dbus2/busd/issues/79
-        if value.receive_member.is_some() {
-            warn!("warning: busd does not implement `<(allow|deny) receive_member=...`: {value:?}");
-        }
-        if value.send_member.is_some() {
-            warn!("warning: busd does not implement `<(allow|deny) send_member=...`: {value:?}");
-        }
-
         if has_connect {
             Ok(Some(Operation::Connect(ConnectOperation::from(value))))
         } else if has_own {
@@ -396,6 +388,7 @@ pub struct ReceiveOperation {
     pub error: Option<String>,
     pub interface: Option<String>,
     pub max_fds: Option<u32>,
+    pub member: Option<String>,
     pub min_fds: Option<u32>,
     pub path: Option<String>,
     pub sender: Option<String>,
@@ -407,6 +400,7 @@ impl From<RuleAttributes> for ReceiveOperation {
             error: value.receive_error,
             interface: value.receive_interface,
             max_fds: value.max_fds,
+            member: value.receive_member,
             min_fds: value.min_fds,
             path: value.receive_path,
             sender: value.receive_sender,
@@ -525,6 +519,7 @@ pub struct SendOperation {
     pub error: Option<String>,
     pub interface: Option<String>,
     pub max_fds: Option<u32>,
+    pub member: Option<String>,
     pub min_fds: Option<u32>,
     pub path: Option<String>,
     pub r#type: Option<MessageType>,
@@ -555,6 +550,7 @@ impl From<RuleAttributes> for SendOperation {
             error: value.send_error,
             interface: value.send_interface,
             max_fds: value.max_fds,
+            member: value.send_member,
             min_fds: value.min_fds,
             path: value.send_path,
             r#type: value.send_type,
@@ -805,6 +801,7 @@ mod tests {
                     send_destination="org.freedesktop.DBus"
                     send_error="something bad"
                     send_interface="org.freedesktop.systemd1.Activator"
+                    send_member="DoSomething"
                     send_path="/org/freedesktop"
                     send_type="signal"
                     max_fds="128"
@@ -813,6 +810,7 @@ mod tests {
                 <allow
                     receive_error="something bad"
                     receive_interface="org.freedesktop.systemd1.Activator"
+                    receive_member="DoSomething"
                     receive_path="/org/freedesktop"
                     receive_sender="org.freedesktop.DBus"
                     receive_type="signal"
@@ -878,6 +876,7 @@ mod tests {
                                         "org.freedesktop.systemd1.Activator"
                                     )),
                                     max_fds: Some(128),
+                                    member: Some(String::from("DoSomething")),
                                     min_fds: Some(12),
                                     path: Some(String::from("/org/freedesktop")),
                                     r#type: Some(MessageType::Signal),
@@ -891,6 +890,7 @@ mod tests {
                                         "org.freedesktop.systemd1.Activator"
                                     )),
                                     max_fds: Some(128),
+                                    member: Some(String::from("DoSomething")),
                                     min_fds: Some(12),
                                     path: Some(String::from("/org/freedesktop")),
                                     sender: Some(String::from("org.freedesktop.DBus")),
@@ -912,6 +912,7 @@ mod tests {
                                     error: None,
                                     interface: None,
                                     max_fds: None,
+                                    member: Some(String::from("DoSomething")),
                                     min_fds: None,
                                     path: None,
                                     r#type: None
@@ -925,6 +926,7 @@ mod tests {
                                     error: None,
                                     interface: None,
                                     max_fds: None,
+                                    member: Some(String::from("DoSomething")),
                                     min_fds: None,
                                     path: None,
                                     r#type: None
@@ -941,6 +943,7 @@ mod tests {
                             error: None,
                             interface: None,
                             max_fds: None,
+                            member: None,
                             min_fds: None,
                             path: None,
                             r#type: None
@@ -980,9 +983,6 @@ mod tests {
                 <allow send_requested_reply="false" send_type="method_return"/>
                 <deny receive_requested_reply="true" receive_type="error"/>
                 <allow receive_requested_reply="false" receive_type="error"/>
-                <allow send_destination="org.gnome.DisplayManager"
-                    send_interface="org.gnome.DisplayManager.Manager"
-                    send_member="GetRemoteHostname"/>
             </policy>
             <policy at_console="true">
                 <allow send_destination="org.freedesktop.DBus" send_interface="org.freedesktop.systemd1.Activator"/>
@@ -1006,6 +1006,7 @@ mod tests {
                                 error: None,
                                 interface: None,
                                 max_fds: None,
+                                member: None,
                                 min_fds: None,
                                 path: None,
                                 r#type: None
@@ -1017,21 +1018,6 @@ mod tests {
                         // `<allow send_requested_reply="false" ...` is completely ignored
                         // `<deny receive_requested_reply="true" ...` is completely ignored
                         // `<allow receive_requested_reply="false" ...` is completely ignored
-                        (
-                            Access::Allow,
-                            Operation::Send(SendOperation {
-                                broadcast: None,
-                                destination: Some(Name::Exact(String::from(
-                                    "org.gnome.DisplayManager"
-                                ))),
-                                interface: Some(String::from("org.gnome.DisplayManager.Manager")),
-                                error: None,
-                                max_fds: None,
-                                min_fds: None,
-                                path: None,
-                                r#type: None
-                            }),
-                        ),
                     ]),
                     // `<policy at_console="true">` is completely ignored
                 ],
diff --git a/tests/config.rs b/tests/config.rs
index 7b6f760..f228144 100644
--- a/tests/config.rs
+++ b/tests/config.rs
@@ -72,6 +72,7 @@ fn config_read_file_example_session_disable_stats_conf_ok() {
                     error: None,
                     interface: Some(String::from("org.freedesktop.DBus.Debug.Stats")),
                     max_fds: None,
+                    member: None,
                     min_fds: None,
                     path: None,
                     r#type: None
@@ -99,6 +100,7 @@ fn config_read_file_example_system_enable_stats_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Debug.Stats")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None
@@ -135,6 +137,7 @@ fn config_read_file_session_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -183,6 +186,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: Some(MessageType::MethodCall),
@@ -196,6 +200,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: Some(MessageType::Signal),
@@ -209,6 +214,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: Some(MessageType::MethodReturn),
@@ -222,6 +228,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: Some(MessageType::Error),
@@ -233,6 +240,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         sender: None,
@@ -245,6 +253,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         sender: None,
@@ -257,6 +266,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         sender: None,
@@ -269,6 +279,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: None,
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         sender: None,
@@ -283,6 +294,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -296,6 +308,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Introspectable")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -309,6 +322,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Properties")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -322,13 +336,13 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Containers1")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
                     }),
                 ),
                 (
-                    // TODO: this is a mistake, deny with send_member rule should be omitted
                     Access::Deny,
                     Operation::Send(SendOperation {
                         broadcast: None,
@@ -336,6 +350,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus")),
                         max_fds: None,
+                        member: Some(String::from("UpdateActivationEnvironment")),
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -349,6 +364,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Debug.Stats")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -362,6 +378,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.systemd1.Activator")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -377,6 +394,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.systemd1.Activator")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -393,6 +411,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Monitoring")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,
@@ -409,6 +428,7 @@ fn config_read_file_system_conf_ok() {
                         error: None,
                         interface: Some(String::from("org.freedesktop.DBus.Debug.Stats")),
                         max_fds: None,
+                        member: None,
                         min_fds: None,
                         path: None,
                         r#type: None,