X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=6fd722e5e18ec11d5bd0408e03f4748cbc3c3a23;hb=3e883473a0f36c220fc45ecf61d6878c9ac308b4;hp=d35d7f63b2f54a49274617939e9c1cc756cb4d1b;hpb=af4ec4309e8f82aad87a8d574785c12f8763d5f8;p=elogind.git diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index d35d7f63b..6fd722e5e 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -40,7 +40,6 @@ #include "bus-internal.h" #include "bus-message.h" #include "bus-util.h" -#include "bus-internal.h" #include "build.h" #include "strv.h" #include "def.h" @@ -373,6 +372,8 @@ static int synthetic_reply_method_error(sd_bus_message *call, const sd_bus_error _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; + assert(call); + if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) return 0; @@ -387,6 +388,8 @@ static int synthetic_reply_method_errno(sd_bus_message *call, int error, const s _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL; + assert(call); + if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) return 0; @@ -402,6 +405,8 @@ static int synthetic_reply_method_return(sd_bus_message *call, const char *types _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; + assert(call); + if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) return 0; @@ -426,6 +431,8 @@ static int synthetic_reply_return_strv(sd_bus_message *call, char **l) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; + assert(call); + r = sd_bus_message_new_method_return(call, &m); if (r < 0) return synthetic_reply_method_errno(call, r, NULL); @@ -636,27 +643,57 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { return synthetic_reply_method_return(m, NULL); } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "GetConnectionSELinuxSecurityContext")) { + const char *name; _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + + r = sd_bus_message_read(m, "s", &name); + if (r < 0) + return r; - r = get_creds_by_message(a, m, SD_BUS_CREDS_SELINUX_CONTEXT, &creds, NULL); + r = get_creds_by_name(a, name, SD_BUS_CREDS_SELINUX_CONTEXT, &creds, NULL); + if (r == -ESRCH || r == -ENXIO) { + sd_bus_error_setf(&error, SD_BUS_ERROR_NAME_HAS_NO_OWNER, "Could not get security context of name '%s': no such name.", name); + return synthetic_reply_method_errno(m, r, &error); + } if (r < 0) return synthetic_reply_method_errno(m, r, NULL); return synthetic_reply_method_return(m, "y", creds->label, strlen(creds->label)); } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "GetConnectionUnixProcessID")) { + const char *name; _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - r = get_creds_by_message(a, m, SD_BUS_CREDS_PID, &creds, NULL); + r = sd_bus_message_read(m, "s", &name); + if (r < 0) + return r; + + r = get_creds_by_name(a, name, SD_BUS_CREDS_PID, &creds, NULL); + if (r == -ESRCH || r == -ENXIO) { + sd_bus_error_setf(&error, SD_BUS_ERROR_NAME_HAS_NO_OWNER, "Could not get PID of name '%s': no such name.", name); + return synthetic_reply_method_errno(m, r, &error); + } if (r < 0) return synthetic_reply_method_errno(m, r, NULL); return synthetic_reply_method_return(m, "u", (uint32_t) creds->pid); } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "GetConnectionUnixUser")) { + const char *name; _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - r = get_creds_by_message(a, m, SD_BUS_CREDS_UID, &creds, NULL); + r = sd_bus_message_read(m, "s", &name); + if (r < 0) + return r; + + r = get_creds_by_name(a, name, SD_BUS_CREDS_UID, &creds, NULL); + if (r == -ESRCH || r == -ENXIO) { + sd_bus_error_setf(&error, SD_BUS_ERROR_NAME_HAS_NO_OWNER, "Could not get UID of name '%s': no such name.", name); + return synthetic_reply_method_errno(m, r, &error); + } if (r < 0) return synthetic_reply_method_errno(m, r, NULL); @@ -723,8 +760,10 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListQueuedOwners")) { struct kdbus_cmd_name_list cmd = {}; struct kdbus_name_list *name_list; + struct kdbus_cmd_free cmd_free; struct kdbus_cmd_name *name; _cleanup_strv_free_ char **owners = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *arg0; int err = 0; @@ -735,6 +774,14 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { if (!service_name_is_valid(arg0)) return synthetic_reply_method_errno(m, -EINVAL, NULL); + r = sd_bus_get_owner(a, arg0, 0, NULL); + if (r == -ESRCH || r == -ENXIO) { + sd_bus_error_setf(&error, SD_BUS_ERROR_NAME_HAS_NO_OWNER, "Could not get owners of name '%s': no such name.", arg0); + return synthetic_reply_method_errno(m, r, &error); + } + if (r < 0) + return synthetic_reply_method_errno(m, r, NULL); + cmd.flags = KDBUS_NAME_LIST_QUEUED; r = ioctl(a->input_fd, KDBUS_CMD_NAME_LIST, &cmd); if (r < 0) @@ -743,12 +790,15 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset); KDBUS_ITEM_FOREACH(name, name_list, names) { + const char *entry_name = NULL; + struct kdbus_item *item; char *n; - if (name->size <= sizeof(*name)) - continue; + KDBUS_ITEM_FOREACH(item, name, items) + if (item->type == KDBUS_ITEM_NAME) + entry_name = item->str; - if (!streq(name->name, arg0)) + if (!streq_ptr(entry_name, arg0)) continue; if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) { @@ -763,7 +813,10 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { } } - r = ioctl(a->input_fd, KDBUS_CMD_FREE, &cmd.offset); + cmd_free.flags = 0; + cmd_free.offset = cmd.offset; + + r = ioctl(a->input_fd, KDBUS_CMD_FREE, &cmd_free); if (r < 0) return synthetic_reply_method_errno(m, r, NULL); @@ -822,7 +875,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "RequestName")) { const char *name; - uint32_t flags; + uint32_t flags, param; r = sd_bus_message_read(m, "su", &name, &flags); if (r < 0) @@ -833,7 +886,15 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { if ((flags & ~(BUS_NAME_ALLOW_REPLACEMENT|BUS_NAME_REPLACE_EXISTING|BUS_NAME_DO_NOT_QUEUE)) != 0) return synthetic_reply_method_errno(m, -EINVAL, NULL); - r = sd_bus_request_name(a, name, flags); + param = 0; + if (flags & BUS_NAME_ALLOW_REPLACEMENT) + param |= SD_BUS_NAME_ALLOW_REPLACEMENT; + if (flags & BUS_NAME_REPLACE_EXISTING) + param |= SD_BUS_NAME_REPLACE_EXISTING; + if (!(flags & BUS_NAME_DO_NOT_QUEUE)) + param |= SD_BUS_NAME_QUEUE; + + r = sd_bus_request_name(a, name, param); if (r < 0) { if (r == -EEXIST) return synthetic_reply_method_return(m, "u", BUS_NAME_EXISTS); @@ -1132,8 +1193,13 @@ int main(int argc, char *argv[]) { sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0; if (is_unix) { - getpeercred(in_fd, &ucred); - getpeersec(in_fd, &peersec); + r = getpeercred(in_fd, &ucred); + if (r < 0) { + log_error("Failed to get peer creds: %s", strerror(-r)); + goto finish; + } + + (void) getpeersec(in_fd, &peersec); } if (arg_drop_privileges) {