Attachment 21255 Details for Bug 19141 – further patch

[patch] further patch

dbus-syslog-extra-2.patch (text/plain), 7.57 KB, created by Colin Walters on 2008-12-17 16:31:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2008-12-17 16:31:38 UTC

Size: 7.57 KB

patch

obsolete

>commit 3af94cf25081502b6b55ff291e350f2685eef526
>Author: Colin Walters <walters@verbum.org>
>Date:   Wed Dec 17 19:29:39 2008 -0500
>
>    Add requested_reply to send denials, and connection loginfo to "would deny"
>    
>    The requested_reply field is necessary in send denials too because
>    it's used in the policy language.  The connection loginfo lack in
>    "would deny" was just an oversight.
>
>diff --git a/bus/bus.c b/bus/bus.c
>index b8354e2..1412ea2 100644
>--- a/bus/bus.c
>+++ b/bus/bus.c
>@@ -1368,7 +1368,7 @@ bus_context_check_security_policy (BusContext     *context,
>                                          message, &toggles, &log))
>     {
>       const char *msg = "Rejected send message, %d matched rules; "
>-                        "type=\"%s\", sender=\"%s\" (%s) interface=\"%s\" member=\"%s\" error name=\"%s\" destination=\"%s\" (%s))";
>+                        "type=\"%s\", sender=\"%s\" (%s) interface=\"%s\" member=\"%s\" error name=\"%s\" requested_reply=%d destination=\"%s\" (%s))";
> 
>       dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, msg,
>                       toggles,
>@@ -1381,22 +1381,25 @@ bus_context_check_security_policy (BusContext     *context,
>                       dbus_message_get_member (message) : "(unset)",
>                       dbus_message_get_error_name (message) ?
>                       dbus_message_get_error_name (message) : "(unset)",
>+                      requested_reply,
>                       dest ? dest : DBUS_SERVICE_DBUS,
>                       proposed_recipient_loginfo);
>       /* Needs to be duplicated to avoid calling malloc and having to handle OOM */
>-      bus_context_log_security (context, msg,
>-                                toggles,
>-                                dbus_message_type_to_string (dbus_message_get_type (message)),
>-                                sender_name ? sender_name : "(unset)",
>-                                sender_loginfo,
>-                                dbus_message_get_interface (message) ?
>-                                dbus_message_get_interface (message) : "(unset)",
>-                                dbus_message_get_member (message) ?
>-                                dbus_message_get_member (message) : "(unset)",
>-                                dbus_message_get_error_name (message) ?
>-                                dbus_message_get_error_name (message) : "(unset)",
>-                                dest ? dest : DBUS_SERVICE_DBUS,
>-                                proposed_recipient_loginfo);
>+      if (addressed_recipient == proposed_recipient)      
>+        bus_context_log_security (context, msg,
>+                                  toggles,
>+                                  dbus_message_type_to_string (dbus_message_get_type (message)),
>+                                  sender_name ? sender_name : "(unset)",
>+                                  sender_loginfo,
>+                                  dbus_message_get_interface (message) ?
>+                                  dbus_message_get_interface (message) : "(unset)",
>+                                  dbus_message_get_member (message) ?
>+                                  dbus_message_get_member (message) : "(unset)",
>+                                  dbus_message_get_error_name (message) ?
>+                                  dbus_message_get_error_name (message) : "(unset)",
>+                                  requested_reply,
>+                                  dest ? dest : DBUS_SERVICE_DBUS,
>+                                  proposed_recipient_loginfo);
>       _dbus_verbose ("security policy disallowing message due to sender policy\n");
>       return FALSE;
>     }
>@@ -1404,17 +1407,20 @@ bus_context_check_security_policy (BusContext     *context,
>   if (log)
>     bus_context_log_security (context, 
>                               "Would reject message, %d matched rules; "
>-                              "type=\"%s\", sender=\"%s\" interface=\"%s\" member=\"%s\" error name=\"%s\" destination=\"%s\")",
>+                              "type=\"%s\", sender=\"%s\" (%s) interface=\"%s\" member=\"%s\" error name=\"%s\" requested_reply=%d destination=\"%s\" (%s))",
>                               toggles,
>                               dbus_message_type_to_string (dbus_message_get_type (message)),
>                               sender_name ? sender_name : "(unset)",
>+                              sender_loginfo,
>                               dbus_message_get_interface (message) ?
>                               dbus_message_get_interface (message) : "(unset)",
>                               dbus_message_get_member (message) ?
>                               dbus_message_get_member (message) : "(unset)",
>                               dbus_message_get_error_name (message) ?
>                               dbus_message_get_error_name (message) : "(unset)",
>-                              dest ? dest : DBUS_SERVICE_DBUS);
>+                              requested_reply,                               
>+                              dest ? dest : DBUS_SERVICE_DBUS,
>+                              proposed_recipient_loginfo);
> 
>   if (recipient_policy &&
>       !bus_client_policy_check_can_receive (recipient_policy,
>@@ -1443,21 +1449,22 @@ bus_context_check_security_policy (BusContext     *context,
>                       dest ? dest : DBUS_SERVICE_DBUS,
>                       proposed_recipient_loginfo);
>       /* Needs to be duplicated to avoid calling malloc and having to handle OOM */
>-      bus_context_log_security (context, msg,
>-                                toggles,
>-                                dbus_message_type_to_string (dbus_message_get_type (message)),
>-                                sender_name ? sender_name : "(unset)",
>-                                sender_loginfo,
>-                                dbus_message_get_interface (message) ?
>-                                dbus_message_get_interface (message) : "(unset)",
>-                                dbus_message_get_member (message) ?
>-                                dbus_message_get_member (message) : "(unset)",
>-                                dbus_message_get_error_name (message) ?
>-                                dbus_message_get_error_name (message) : "(unset)",
>-                                dbus_message_get_reply_serial (message),
>-                                requested_reply,
>-                                dest ? dest : DBUS_SERVICE_DBUS,
>-                                proposed_recipient_loginfo);
>+      if (addressed_recipient == proposed_recipient)      
>+        bus_context_log_security (context, msg,
>+                                  toggles,
>+                                  dbus_message_type_to_string (dbus_message_get_type (message)),
>+                                  sender_name ? sender_name : "(unset)",
>+                                  sender_loginfo,
>+                                  dbus_message_get_interface (message) ?
>+                                  dbus_message_get_interface (message) : "(unset)",
>+                                  dbus_message_get_member (message) ?
>+                                  dbus_message_get_member (message) : "(unset)",
>+                                  dbus_message_get_error_name (message) ?
>+                                  dbus_message_get_error_name (message) : "(unset)",
>+                                  dbus_message_get_reply_serial (message),
>+                                  requested_reply,
>+                                  dest ? dest : DBUS_SERVICE_DBUS,
>+                                  proposed_recipient_loginfo);
>       _dbus_verbose ("security policy disallowing message due to recipient policy\n");
>       return FALSE;
>     }

Actions: View | Splinter Review

Attachments on bug 19141: 21250 | 21255

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.