X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-util.c;h=bf8fb409059d95266f926fcc69e62a52038bf99b;hp=53be009be2e6c6e11c67d32b1c70bdef815ede79;hb=27e72d6b22890ba4a8cbc05c49667cd1cccf1461;hpb=0f8bd8debb0ff7f5bff7738841931f6c41e40bc1

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 53be009be..bf8fb4090 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -21,13 +21,16 @@
 
 #include <sys/socket.h>
 
-#include "sd-event.h"
-#include "sd-bus.h"
-
 #include "util.h"
+#include "strv.h"
 #include "macro.h"
 #include "def.h"
 
+#include "sd-event.h"
+#include "sd-bus.h"
+#include "bus-error.h"
+#include "bus-message.h"
+
 #include "bus-util.h"
 
 static int quit_callback(sd_bus *bus, sd_bus_message *m, void *userdata) {
@@ -148,7 +151,7 @@ int bus_verify_polkit(
 #ifdef ENABLE_POLKIT
         else {
                 _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
-                unsigned authorized = false, challenge = false;
+                int authorized = false, challenge = false;
 
                 r = sd_bus_call_method(
                                 bus,
@@ -175,9 +178,9 @@ int bus_verify_polkit(
                         return r;
                 }
 
-                r = sd_bus_message_read(reply, "(bb)", &authorized, &challenge);
-                if (r < 0)
-                        return r;
+                r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
+                if (r >= 0)
+                        r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
 
                 if (authorized)
                         return 1;
@@ -267,7 +270,7 @@ int bus_verify_polkit_async(
 #ifdef ENABLE_POLKIT
         q = hashmap_remove(*registry, m);
         if (q) {
-                unsigned authorized, challenge;
+                int authorized, challenge;
 
                 /* This is the second invocation of this function, and
                  * there's already a response from polkit, let's
@@ -437,20 +440,26 @@ int bus_open_system_systemd(sd_bus **_bus) {
         return 0;
 }
 
-int bus_generic_print_property(const char *name, sd_bus_message *property, bool all) {
+int bus_print_property(const char *name, sd_bus_message *property, bool all) {
         char type;
         const char *contents;
+        int r;
 
         assert(name);
         assert(property);
 
-        sd_bus_message_peek_type(property, &type, &contents);
+        r = sd_bus_message_peek_type(property, &type, &contents);
+        if (r < 0)
+                return r;
 
         switch (type) {
 
         case SD_BUS_TYPE_STRING: {
                 const char *s;
-                sd_bus_message_read_basic(property, type, &s);
+
+                r = sd_bus_message_read_basic(property, type, &s);
+                if (r < 0)
+                        return r;
 
                 if (all || !isempty(s))
                         printf("%s=%s\n", name, s);
@@ -461,7 +470,10 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
         case SD_BUS_TYPE_BOOLEAN: {
                 bool b;
 
-                sd_bus_message_read_basic(property, type, &b);
+                r = sd_bus_message_read_basic(property, type, &b);
+                if (r < 0)
+                        return r;
+
                 printf("%s=%s\n", name, yes_no(b));
 
                 return 1;
@@ -470,7 +482,9 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
         case SD_BUS_TYPE_UINT64: {
                 uint64_t u;
 
-                sd_bus_message_read_basic(property, type, &u);
+                r = sd_bus_message_read_basic(property, type, &u);
+                if (r < 0)
+                        return r;
 
                 /* Yes, heuristics! But we can change this check
                  * should it turn out to not be sufficient */
@@ -495,7 +509,9 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
         case SD_BUS_TYPE_UINT32: {
                 uint32_t u;
 
-                sd_bus_message_read_basic(property, type, &u);
+                r = sd_bus_message_read_basic(property, type, &u);
+                if (r < 0)
+                        return r;
 
                 if (strstr(name, "UMask") || strstr(name, "Mode"))
                         printf("%s=%04o\n", name, u);
@@ -508,7 +524,9 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
         case SD_BUS_TYPE_INT32: {
                 int32_t i;
 
-                sd_bus_message_read_basic(property, type, &i);
+                r = sd_bus_message_read_basic(property, type, &i);
+                if (r < 0)
+                        return r;
 
                 printf("%s=%i\n", name, (int) i);
                 return 1;
@@ -517,38 +535,47 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
         case SD_BUS_TYPE_DOUBLE: {
                 double d;
 
-                sd_bus_message_read_basic(property, type, &d);
+                r = sd_bus_message_read_basic(property, type, &d);
+                if (r < 0)
+                        return r;
 
                 printf("%s=%g\n", name, d);
                 return 1;
         }
 
         case SD_BUS_TYPE_ARRAY:
-
                 if (streq(contents, "s")) {
                         bool space = false;
                         char tp;
                         const char *cnt;
 
-                        sd_bus_message_enter_container(property, SD_BUS_TYPE_ARRAY, contents);
+                        r = sd_bus_message_enter_container(property, SD_BUS_TYPE_ARRAY, contents);
+                        if (r < 0)
+                                return r;
+
+                        r = sd_bus_message_peek_type(property, &tp, &cnt);
+                        if (r < 0)
+                                return r;
 
-                        sd_bus_message_peek_type(property, &tp, &cnt);
                         if (all || cnt) {
-				const char *str;
+                                const char *str;
 
                                 printf("%s=", name);
 
-
-                                while(sd_bus_message_read_basic(property, SD_BUS_TYPE_STRING, &str)) {
+                                while((r = sd_bus_message_read_basic(property, SD_BUS_TYPE_STRING, &str)) >= 0) {
                                         printf("%s%s", space ? " " : "", str);
 
                                         space = true;
                                 }
+                                if (r < 0)
+                                        return r;
 
                                 puts("");
                         }
 
-                        sd_bus_message_exit_container(property);
+                        r = sd_bus_message_exit_container(property);
+                        if (r < 0)
+                                return r;
 
                         return 1;
 
@@ -556,7 +583,10 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
                         const uint8_t *u;
                         size_t n;
 
-                        sd_bus_message_read_array(property, SD_BUS_TYPE_BYTE, (const void**) &u, &n);
+                        r = sd_bus_message_read_array(property, SD_BUS_TYPE_BYTE, (const void**) &u, &n);
+                        if (r < 0)
+                                return r;
+
                         if (all || n > 0) {
                                 unsigned int i;
 
@@ -574,7 +604,10 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
                         uint32_t *u;
                         size_t n;
 
-                        sd_bus_message_read_array(property, SD_BUS_TYPE_UINT32, (const void**) &u, &n);
+                        r = sd_bus_message_read_array(property, SD_BUS_TYPE_UINT32, (const void**) &u, &n);
+                        if (r < 0)
+                                return r;
+
                         if (all || n > 0) {
                                 unsigned int i;
 
@@ -594,3 +627,334 @@ int bus_generic_print_property(const char *name, sd_bus_message *property, bool
 
         return 0;
 }
+
+int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool all) {
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        int r;
+
+        assert(bus);
+        assert(path);
+
+        r = sd_bus_call_method(bus,
+                        dest,
+                        path,
+                        "org.freedesktop.DBus.Properties",
+                        "GetAll",
+                        &error,
+                        &reply,
+                        "s", "");
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "{sv}");
+        if (r < 0)
+                return r;
+
+        while ((r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) {
+                const char *name;
+                const char *contents;
+
+                r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_STRING, &name);
+                if (r < 0)
+                        return r;
+
+                if (!filter || strv_find(filter, name)) {
+                        r = sd_bus_message_peek_type(reply, NULL, &contents);
+                        if (r < 0)
+                                return r;
+
+                        r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_VARIANT, contents);
+                        if (r < 0)
+                                return r;
+
+                        r = bus_print_property(name, reply, all);
+                        if (r < 0)
+                                return r;
+                        if (r == 0) {
+                                if (all)
+                                        printf("%s=[unprintable]\n", name);
+                                /* skip what we didn't read */
+                                r = sd_bus_message_skip(reply, contents);
+                                if (r < 0)
+                                        return r;
+                        }
+
+                        r = sd_bus_message_exit_container(reply);
+                        if (r < 0)
+                                return r;
+                } else {
+                        r = sd_bus_message_skip(reply, "v");
+                        if (r < 0)
+                                return r;
+                }
+
+                r = sd_bus_message_exit_container(reply);
+                if (r < 0)
+                        return r;
+        }
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_exit_container(reply);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
+int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+        sd_id128_t *p = userdata;
+        const void *v;
+        size_t n;
+        int r;
+
+        r = sd_bus_message_read_array(m, SD_BUS_TYPE_BYTE, &v, &n);
+        if (r < 0)
+                return r;
+
+        if (n == 0)
+                *p = SD_ID128_NULL;
+        else if (n == 16)
+                memcpy((*p).bytes, v, n);
+        else
+                return -EINVAL;
+
+        return 0;
+}
+
+static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+        char type;
+        int r;
+
+        r = sd_bus_message_peek_type(m, &type, NULL);
+        if (r < 0)
+                return r;
+
+        switch (type) {
+        case SD_BUS_TYPE_STRING: {
+                const char *s;
+                char *str;
+                char **p = userdata;
+
+                r = sd_bus_message_read_basic(m, type, &s);
+                if (r < 0)
+                        break;
+
+                if (isempty(s))
+                        break;
+
+                str = strdup(s);
+                if (!str) {
+                        r = -ENOMEM;
+                        break;
+                }
+                free(*p);
+                *p = str;
+
+                break;
+        }
+
+        case SD_BUS_TYPE_ARRAY: {
+               _cleanup_strv_free_ char **l = NULL;
+               char ***p = userdata;
+
+                r = bus_message_read_strv_extend(m, &l);
+                if (r < 0)
+                        break;
+
+                strv_free(*p);
+                *p = l;
+                l = NULL;
+
+                break;
+        }
+
+        case SD_BUS_TYPE_BOOLEAN: {
+                unsigned b;
+                bool *p = userdata;
+
+                r = sd_bus_message_read_basic(m, type, &b);
+                if (r < 0)
+                        break;
+
+                *p = b;
+
+                break;
+        }
+
+        case SD_BUS_TYPE_UINT32: {
+                uint64_t u;
+                uint32_t *p = userdata;
+
+                r = sd_bus_message_read_basic(m, type, &u);
+                if (r < 0)
+                        break;
+
+                *p = u;
+
+                break;
+        }
+
+        case SD_BUS_TYPE_UINT64: {
+                uint64_t t;
+                uint64_t *p = userdata;
+
+                r = sd_bus_message_read_basic(m, type, &t);
+                if (r < 0)
+                        break;
+
+                *p = t;
+
+                break;
+        }
+
+        default:
+                break;
+        }
+
+        return r;
+}
+
+int bus_map_all_properties(sd_bus *bus,
+                           const char *destination,
+                           const char *path,
+                           const struct bus_properties_map *map,
+                           void *userdata) {
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        int r;
+
+        assert(bus);
+        assert(destination);
+        assert(path);
+        assert(map);
+
+        r = sd_bus_call_method( bus,
+                        destination,
+                        path,
+                        "org.freedesktop.DBus.Properties",
+                        "GetAll",
+                        &error,
+                        &m,
+                        "s", "");
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "{sv}");
+        if (r < 0)
+                return r;
+
+        while ((r = sd_bus_message_enter_container(m, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) {
+                const struct bus_properties_map *prop;
+                const char *member;
+                const char *contents;
+                void *v;
+                unsigned i;
+
+                r = sd_bus_message_read_basic(m, SD_BUS_TYPE_STRING, &member);
+                if (r < 0)
+                        return r;
+
+                for (i = 0, prop = NULL; map[i].member; i++)
+                        if (streq(map[i].member, member)) {
+                                prop = &map[i];
+                                break;
+                        }
+
+                if (prop) {
+                        r = sd_bus_message_peek_type(m, NULL, &contents);
+                        if (r < 0)
+                                return r;
+
+                        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_VARIANT, contents);
+                        if (r < 0)
+                                return r;
+
+                        v = (uint8_t *)userdata + prop->offset;
+                        if (map[i].set)
+                                r = prop->set(bus, member, m, &error, v);
+                        else
+                                r = map_basic(bus, member, m, &error, v);
+
+                        r = sd_bus_message_exit_container(m);
+                        if (r < 0)
+                                return r;
+                } else {
+                        r = sd_bus_message_skip(m, "v");
+                        if (r < 0)
+                                return -r;
+                }
+
+                r = sd_bus_message_exit_container(m);
+                if (r < 0)
+                        return r;
+        }
+
+        return r;
+}
+
+int bus_open_transport(BusTransport transport, const char *host, bool user, sd_bus **bus) {
+        int r;
+
+        assert(transport >= 0);
+        assert(transport < _BUS_TRANSPORT_MAX);
+        assert(bus);
+
+        assert_return((transport == BUS_TRANSPORT_LOCAL) == !host, -EINVAL);
+        assert_return(transport == BUS_TRANSPORT_LOCAL || !user, -ENOTSUP);
+
+        switch (transport) {
+
+        case BUS_TRANSPORT_LOCAL:
+                if (user)
+                        r = sd_bus_open_user(bus);
+                else
+                        r = sd_bus_open_system(bus);
+
+                break;
+
+        case BUS_TRANSPORT_REMOTE:
+                r = sd_bus_open_system_remote(host, bus);
+                break;
+
+        case BUS_TRANSPORT_CONTAINER:
+                r = sd_bus_open_system_container(host, bus);
+                break;
+
+        default:
+                assert_not_reached("Hmm, unknown transport type.");
+        }
+
+        return r;
+}
+
+int bus_property_get_bool(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const char *property,
+                sd_bus_message *reply,
+                sd_bus_error *error,
+                void *userdata) {
+
+        int b = *(bool*) userdata;
+
+        return sd_bus_message_append_basic(reply, 'b', &b);
+}
+
+int bus_property_get_uid(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const char *property,
+                sd_bus_message *reply,
+                sd_bus_error *error,
+                void *userdata) {
+
+        assert_cc(sizeof(uint32_t) == sizeof(uid_t));
+        assert_cc(sizeof(uint32_t) == sizeof(gid_t));
+        assert_cc(sizeof(uint32_t) == sizeof(pid_t));
+
+        return sd_bus_message_append_basic(reply, 'u', userdata);
+}