util: close all fds before freezing execution

[elogind.git] / src / dbus-common.c

diff --git a/src/dbus-common.c b/src/dbus-common.c
index 628efae4cfdcb0a16d3118c09bbf8347b66c3925..809ea0f67a9ec310d0b9165167f6e0cae879ca40 100644 (file)
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -27,6 +27,7 @@
 
 #include "log.h"
 #include "dbus-common.h"
+#include "util.h"
 
 int bus_check_peercred(DBusConnection *c) {
         int fd;
@@ -59,19 +60,57 @@ int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private, DBusError *
 
         assert(_bus);
 
+#define TIMEOUT_USEC (60*USEC_PER_SEC)
+
         /* If we are root, then let's not go via the bus */
         if (geteuid() == 0 && t == DBUS_BUS_SYSTEM) {
+                usec_t begin, tstamp;
 
                 if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", error)))
                         return -EIO;
 
                 if (bus_check_peercred(bus) < 0) {
+                        dbus_connection_close(bus);
                         dbus_connection_unref(bus);
 
                         dbus_set_error_const(error, DBUS_ERROR_ACCESS_DENIED, "Failed to verify owner of bus.");
                         return -EACCES;
                 }
 
+                /* This complexity should probably move into D-Bus itself:
+                 *
+                 * https://bugs.freedesktop.org/show_bug.cgi?id=35189 */
+                begin = tstamp = now(CLOCK_MONOTONIC);
+                for (;;) {
+
+                        if (tstamp > begin + TIMEOUT_USEC)
+                                break;
+
+                        if (dbus_connection_get_is_authenticated(bus))
+                                break;
+
+                        if (!dbus_connection_read_write_dispatch(bus, ((begin + TIMEOUT_USEC - tstamp) + USEC_PER_MSEC - 1) / USEC_PER_MSEC))
+                                break;
+
+                        tstamp = now(CLOCK_MONOTONIC);
+                }
+
+                if (!dbus_connection_get_is_connected(bus)) {
+                        dbus_connection_close(bus);
+                        dbus_connection_unref(bus);
+
+                        dbus_set_error_const(error, DBUS_ERROR_NO_SERVER, "Connection terminated during authentication.");
+                        return -ECONNREFUSED;
+                }
+
+                if (!dbus_connection_get_is_authenticated(bus)) {
+                        dbus_connection_close(bus);
+                        dbus_connection_unref(bus);
+
+                        dbus_set_error_const(error, DBUS_ERROR_TIMEOUT, "Failed to authenticate in time.");
+                        return -EACCES;
+                }
+
                 if (private)
                         *private = true;
 
@@ -88,3 +127,14 @@ int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private, DBusError *
         *_bus = bus;
         return 0;
 }
+
+const char *bus_error_message(const DBusError *error) {
+        assert(error);
+
+        /* Sometimes the D-Bus server is a little bit too verbose with
+         * its error messages, so let's override them here */
+        if (dbus_error_has_name(error, DBUS_ERROR_ACCESS_DENIED))
+                return "Access denied";
+
+        return error->message;
+}