Attachment 136697 Details for Bug 104610 – driver: Factor out bus_driver_fill_connection_credentials

[patch] driver: Factor out bus_driver_fill_connection_credentials

0005-driver-Factor-out-bus_driver_fill_connection_credent.patch (text/plain), 7.31 KB, created by Simon McVittie on 2018-01-12 20:04:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-01-12 20:04:42 UTC

Size: 7.31 KB

patch

obsolete

>From 12ea07d05b829f556caa439623aab49b3e235557 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 10 Jan 2018 15:36:55 +0000
>Subject: [PATCH 5/6] driver: Factor out bus_driver_fill_connection_credentials
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> bus/driver.c | 129 +++++++++++++++++++++++++++++++++++------------------------
> bus/driver.h |   2 +
> 2 files changed, 78 insertions(+), 53 deletions(-)
>
>diff --git a/bus/driver.c b/bus/driver.c
>index eabc7acc..fab1a8ba 100644
>--- a/bus/driver.c
>+++ b/bus/driver.c
>@@ -1903,117 +1903,140 @@ bus_driver_handle_get_connection_selinux_security_context (DBusConnection *conne
>   return FALSE;
> }
> 
>-static dbus_bool_t
>-bus_driver_handle_get_connection_credentials (DBusConnection *connection,
>-                                              BusTransaction *transaction,
>-                                              DBusMessage    *message,
>-                                              DBusError      *error)
>+/*
>+ * Write the credentials of connection @conn (or the bus daemon itself,
>+ * if @conn is #NULL) into the a{sv} @asv_iter. Return #FALSE on OOM.
>+ */
>+dbus_bool_t
>+bus_driver_fill_connection_credentials (DBusConnection  *conn,
>+                                        DBusMessageIter *asv_iter)
> {
>-  DBusConnection *conn;
>-  DBusMessage *reply;
>-  DBusMessageIter reply_iter;
>-  DBusMessageIter array_iter;
>   unsigned long ulong_uid, ulong_pid;
>   char *s;
>   const char *path;
>-  const char *service;
>-  BusDriverFound found;
>-
>-  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
>-
>-  reply = NULL;
> 
>-  found = bus_driver_get_conn_helper (connection, message, "credentials",
>-                                      &service, &conn, error);
>-
>-  switch (found)
>+  if (conn == NULL)
>     {
>-      case BUS_DRIVER_FOUND_SELF:
>-        ulong_pid = _dbus_getpid ();
>-        ulong_uid = _dbus_getuid ();
>-        break;
>-
>-      case BUS_DRIVER_FOUND_PEER:
>-        if (!dbus_connection_get_unix_process_id (conn, &ulong_pid))
>-          ulong_pid = DBUS_PID_UNSET;
>-        if (!dbus_connection_get_unix_user (conn, &ulong_uid))
>-          ulong_uid = DBUS_UID_UNSET;
>-        break;
>-      case BUS_DRIVER_FOUND_ERROR:
>-        /* fall through */
>-      default:
>-        goto failed;
>+      ulong_pid = _dbus_getpid ();
>+      ulong_uid = _dbus_getuid ();
>     }
>+  else
>+    {
>+      if (!dbus_connection_get_unix_process_id (conn, &ulong_pid))
>+        ulong_pid = DBUS_PID_UNSET;
> 
>-  reply = _dbus_asv_new_method_return (message, &reply_iter, &array_iter);
>-  if (reply == NULL)
>-    goto oom;
>+      if (!dbus_connection_get_unix_user (conn, &ulong_uid))
>+        ulong_uid = DBUS_UID_UNSET;
>+    }
> 
>   /* we can't represent > 32-bit pids; if your system needs them, please
>    * add ProcessID64 to the spec or something */
>   if (ulong_pid <= _DBUS_UINT32_MAX && ulong_pid != DBUS_PID_UNSET &&
>-      !_dbus_asv_add_uint32 (&array_iter, "ProcessID", ulong_pid))
>-    goto oom;
>+      !_dbus_asv_add_uint32 (asv_iter, "ProcessID", ulong_pid))
>+    return FALSE;
> 
>   /* we can't represent > 32-bit uids; if your system needs them, please
>    * add UnixUserID64 to the spec or something */
>   if (ulong_uid <= _DBUS_UINT32_MAX && ulong_uid != DBUS_UID_UNSET &&
>-      !_dbus_asv_add_uint32 (&array_iter, "UnixUserID", ulong_uid))
>-    goto oom;
>+      !_dbus_asv_add_uint32 (asv_iter, "UnixUserID", ulong_uid))
>+    return FALSE;
> 
>   /* FIXME: Obtain the Windows user of the bus daemon itself */
>-  if (found == BUS_DRIVER_FOUND_PEER &&
>+  if (conn != NULL &&
>       dbus_connection_get_windows_user (conn, &s))
>     {
>       DBusString str;
>       dbus_bool_t result;
> 
>       if (s == NULL)
>-        goto oom;
>+        return FALSE;
> 
>       _dbus_string_init_const (&str, s);
>       result = _dbus_validate_utf8 (&str, 0, _dbus_string_get_length (&str));
>       _dbus_string_free (&str);
>       if (result)
>         {
>-          if (!_dbus_asv_add_string (&array_iter, "WindowsSID", s))
>+          if (!_dbus_asv_add_string (asv_iter, "WindowsSID", s))
>             {
>               dbus_free (s);
>-              goto oom;
>+              return FALSE;
>             }
>         }
>       dbus_free (s);
>     }
> 
>   /* FIXME: Obtain the security label for the bus daemon itself */
>-  if (found == BUS_DRIVER_FOUND_PEER &&
>+  if (conn != NULL &&
>       _dbus_connection_get_linux_security_label (conn, &s))
>     {
>       if (s == NULL)
>-        goto oom;
>+        return FALSE;
> 
>       /* use the GVariant bytestring convention for strings of unknown
>        * encoding: include the \0 in the payload, for zero-copy reading */
>-      if (!_dbus_asv_add_byte_array (&array_iter, "LinuxSecurityLabel",
>+      if (!_dbus_asv_add_byte_array (asv_iter, "LinuxSecurityLabel",
>                                      s, strlen (s) + 1))
>         {
>           dbus_free (s);
>-          goto oom;
>+          return FALSE;
>         }
> 
>       dbus_free (s);
>     }
> 
>-  if (found == BUS_DRIVER_FOUND_PEER &&
>+  if (conn != NULL &&
>       bus_containers_connection_is_contained (conn, &path, NULL, NULL))
>     {
>-      if (!_dbus_asv_add_object_path (&array_iter,
>+      if (!_dbus_asv_add_object_path (asv_iter,
>                                       DBUS_INTERFACE_CONTAINERS1 ".Instance",
>                                       path))
>-        goto oom;
>+        return FALSE;
>     }
> 
>-  if (!_dbus_asv_close (&reply_iter, &array_iter))
>+  return TRUE;
>+}
>+
>+static dbus_bool_t
>+bus_driver_handle_get_connection_credentials (DBusConnection *connection,
>+                                              BusTransaction *transaction,
>+                                              DBusMessage    *message,
>+                                              DBusError      *error)
>+{
>+  DBusConnection *conn;
>+  DBusMessage *reply;
>+  DBusMessageIter reply_iter;
>+  DBusMessageIter array_iter;
>+  const char *service;
>+  BusDriverFound found;
>+
>+  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
>+
>+  reply = NULL;
>+
>+  found = bus_driver_get_conn_helper (connection, message, "credentials",
>+                                      &service, &conn, error);
>+
>+  switch (found)
>+    {
>+      case BUS_DRIVER_FOUND_SELF:
>+        conn = NULL;
>+        break;
>+
>+      case BUS_DRIVER_FOUND_PEER:
>+        _dbus_assert (conn != NULL);
>+        break;
>+
>+      case BUS_DRIVER_FOUND_ERROR:
>+        /* fall through */
>+      default:
>+        goto failed;
>+    }
>+
>+  reply = _dbus_asv_new_method_return (message, &reply_iter, &array_iter);
>+
>+  if (reply == NULL ||
>+      !bus_driver_fill_connection_credentials (conn, &array_iter) ||
>+      !_dbus_asv_close (&reply_iter, &array_iter))
>     goto oom;
> 
>   if (! bus_transaction_send_from_driver (transaction, connection, reply))
>diff --git a/bus/driver.h b/bus/driver.h
>index ac1289da..d7508bf0 100644
>--- a/bus/driver.h
>+++ b/bus/driver.h
>@@ -55,6 +55,8 @@ dbus_bool_t bus_driver_send_service_owner_changed  (const char     *service_name
> dbus_bool_t bus_driver_generate_introspect_string  (DBusString *xml,
>                                                     dbus_bool_t canonical_path,
>                                                     DBusMessage *message);
>+dbus_bool_t bus_driver_fill_connection_credentials (DBusConnection  *conn,
>+                                                    DBusMessageIter *asv_iter);
> 
> BusDriverFound bus_driver_get_conn_helper (DBusConnection  *connection,
>                                            DBusMessage     *message,
>-- 
>2.15.1
>

Actions: View | Splinter Review

Attachments on bug 104610: 136694 | 136695 | 136696 | 136697 | 136698 | 136725

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.