Attachment 132160 Details for Bug 101567 – driver: Use a data-driven approach to marking methods as privileged

[patch] driver: Use a data-driven approach to marking methods as privileged

0002-driver-Use-a-data-driven-approach-to-marking-methods.patch (text/plain), 3.39 KB, created by Simon McVittie on 2017-06-23 16:10:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-06-23 16:10:37 UTC

Size: 3.39 KB

patch

obsolete

>From ea6435494bb712e6af70857448e6b6414182a4cd Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Fri, 2 Jun 2017 14:50:08 +0100
>Subject: [PATCH 02/49] driver: Use a data-driven approach to marking methods
> as privileged
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> bus/driver.c | 33 +++++++++++++++------------------
> 1 file changed, 15 insertions(+), 18 deletions(-)
>
>diff --git a/bus/driver.c b/bus/driver.c
>index fa1b1b49..92aa642c 100644
>--- a/bus/driver.c
>+++ b/bus/driver.c
>@@ -1083,18 +1083,6 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
> 
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>-#ifdef DBUS_UNIX
>-    {
>-      /* UpdateActivationEnvironment is basically a recipe for privilege
>-       * escalation so let's be extra-careful: do not allow the sysadmin
>-       * to shoot themselves in the foot.
>-       */
>-      if (!bus_driver_check_caller_is_privileged (connection, transaction,
>-                                                  message, error))
>-        return FALSE;
>-    }
>-#endif
>-
>   context = bus_connection_get_context (connection);
> 
>   if (bus_context_get_servicehelper (context) != NULL)
>@@ -2196,10 +2184,6 @@ bus_driver_handle_become_monitor (DBusConnection *connection,
>   if (!bus_apparmor_allows_eavesdropping (connection, bustype, error))
>     goto out;
> 
>-  if (!bus_driver_check_caller_is_privileged (connection, transaction,
>-                                              message, error))
>-    goto out;
>-
>   if (!dbus_message_get_args (message, error,
>         DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &match_rules, &n_match_rules,
>         DBUS_TYPE_UINT32, &flags,
>@@ -2378,6 +2362,11 @@ typedef enum
>    * <https://bugs.freedesktop.org/show_bug.cgi?id=101256> */
>   METHOD_FLAG_ANY_PATH = (1 << 0),
> 
>+  /* If set, callers must be privileged. On Unix, the uid of the connection
>+   * must either be the uid of this process, or 0 (root). On Windows,
>+   * the SID of the connection must be the SID of this process. */
>+  METHOD_FLAG_PRIVILEGED = (1 << 1),
>+
>   METHOD_FLAG_NONE = 0
> } MethodFlags;
> 
>@@ -2430,7 +2419,7 @@ static const MessageHandler dbus_message_handlers[] = {
>     DBUS_TYPE_ARRAY_AS_STRING DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
>     "",
>     bus_driver_handle_update_activation_environment,
>-    METHOD_FLAG_NONE },
>+    METHOD_FLAG_PRIVILEGED },
>   { "NameHasOwner",
>     DBUS_TYPE_STRING_AS_STRING,
>     DBUS_TYPE_BOOLEAN_AS_STRING,
>@@ -2526,7 +2515,7 @@ static const MessageHandler introspectable_message_handlers[] = {
> 
> static const MessageHandler monitoring_message_handlers[] = {
>   { "BecomeMonitor", "asu", "", bus_driver_handle_become_monitor,
>-    METHOD_FLAG_NONE },
>+    METHOD_FLAG_PRIVILEGED },
>   { NULL, NULL, NULL, NULL }
> };
> 
>@@ -2920,6 +2909,14 @@ bus_driver_handle_message (DBusConnection *connection,
> 
>           _dbus_verbose ("Found driver handler for %s\n", name);
> 
>+          if ((mh->flags & METHOD_FLAG_PRIVILEGED) &&
>+              !bus_driver_check_caller_is_privileged (connection, transaction,
>+                                                      message, error))
>+            {
>+              _DBUS_ASSERT_ERROR_IS_SET (error);
>+              return FALSE;
>+            }
>+
>           if (!(is_canonical_path || (mh->flags & METHOD_FLAG_ANY_PATH)))
>             {
>               _DBUS_ASSERT_ERROR_IS_CLEAR (error);
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 101567: 132159 | 132160 | 132164 | 132168 | 132345 | 132346 | 132347

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.