X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=28e8b44ccd499a26e4e6daf2a9056c0d520f6052;hb=ab9001a1e3dc6e60d0cdf53363dc5d18dcc382fd;hp=a425fd2facf764f281dcc1549c5cf83304304cb5;hpb=94a6ce5b7c0ef1de16d67ef01374cbc08459d29e;p=elogind.git diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index a425fd2fa..28e8b44cc 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -40,17 +40,9 @@ #include "bus-util.h" #include "build.h" #include "strv.h" +#include "def.h" -#define UNIX_BUS_PATH "unix:path=/run/dbus/system_bus_socket" -#define KERNEL_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus" - -#ifdef ENABLE_KDBUS -# define DEFAULT_BUS_PATH KERNEL_BUS_PATH ";" UNIX_BUS_PATH -#else -# define DEFAULT_BUS_PATH UNIX_BUS_PATH -#endif - -static const char *arg_address = DEFAULT_BUS_PATH; +static const char *arg_address = DEFAULT_SYSTEM_BUS_PATH; static char *arg_command_line_buffer = NULL; static int help(void) { @@ -60,7 +52,7 @@ static int help(void) { " -h --help Show this help\n" " --version Show package version\n" " --address=ADDRESS Connect to the bus specified by ADDRESS\n" - " (default: " DEFAULT_BUS_PATH ")\n", + " (default: " DEFAULT_SYSTEM_BUS_PATH ")\n", program_invocation_short_name); return 0; @@ -123,7 +115,7 @@ static int parse_argv(int argc, char *argv[]) { return 1; } -static int rename_service(sd_bus *b) { +static int rename_service(sd_bus *a, sd_bus *b) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; _cleanup_free_ char *p = NULL, *name = NULL; const char *comm; @@ -132,6 +124,7 @@ static int rename_service(sd_bus *b) { pid_t pid; int r; + assert(a); assert(b); r = sd_bus_get_peer_creds(b, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_CMDLINE|SD_BUS_CREDS_COMM, &creds); @@ -182,6 +175,11 @@ static int rename_service(sd_bus *b) { memset(arg_command_line_buffer + w, 0, m - w); } + log_debug("Running on behalf of PID %lu (%s), UID %lu (%s), %s", + (unsigned long) pid, p, + (unsigned long) uid, name, + a->unique_name); + ; return 0; } @@ -252,6 +250,45 @@ static int synthesize_name_acquired(sd_bus *a, sd_bus *b, sd_bus_message *m) { return sd_bus_send(b, n, NULL); } +static int process_policy(sd_bus *a, sd_bus *b, sd_bus_message *m) { + _cleanup_bus_message_unref_ sd_bus_message *n = NULL; + int r; + + assert(a); + assert(b); + assert(m); + + if (!sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "GetAll")) + return 0; + + if (!streq_ptr(m->path, "/org/gnome/DisplayManager/Slave")) + return 0; + + r = sd_bus_message_new_method_errorf(m, &n, SD_BUS_ERROR_ACCESS_DENIED, "gdm, you are stupid"); + if (r < 0) + return r; + + r = bus_message_append_sender(n, "org.freedesktop.DBus"); + if (r < 0) { + log_error("Failed to append sender to gdm reply: %s", strerror(-r)); + return r; + } + + r = bus_seal_synthetic_message(b, n); + if (r < 0) { + log_error("Failed to seal gdm reply: %s", strerror(-r)); + return r; + } + + r = sd_bus_send(b, n, NULL); + if (r < 0) { + log_error("Failed to send gdm reply: %s", strerror(-r)); + return r; + } + + return 1; +} + static int process_hello(sd_bus *a, sd_bus *b, sd_bus_message *m, bool *got_hello) { _cleanup_bus_message_unref_ sd_bus_message *n = NULL; bool is_hello; @@ -365,6 +402,8 @@ int main(int argc, char *argv[]) { int r, in_fd, out_fd; bool got_hello = false; bool is_unix; + struct ucred ucred = {}; + _cleanup_free_ char *peersec = NULL; log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); log_parse_environment(); @@ -382,7 +421,7 @@ int main(int argc, char *argv[]) { in_fd = SD_LISTEN_FDS_START; out_fd = SD_LISTEN_FDS_START; } else { - log_error("Illegal number of file descriptors passed\n"); + log_error("Illegal number of file descriptors passed"); goto finish; } @@ -390,6 +429,11 @@ int main(int argc, char *argv[]) { sd_is_socket(in_fd, AF_UNIX, 0, 0) > 0 && sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0; + if (is_unix) { + getpeercred(in_fd, &ucred); + getpeersec(in_fd, &peersec); + } + r = sd_bus_new(&a); if (r < 0) { log_error("Failed to allocate bus: %s", strerror(-r)); @@ -408,6 +452,20 @@ int main(int argc, char *argv[]) { goto finish; } + if (ucred.pid > 0) { + a->fake_creds.pid = ucred.pid; + a->fake_creds.uid = ucred.uid; + a->fake_creds.gid = ucred.gid; + a->fake_creds_valid = true; + } + + if (peersec) { + a->fake_label = peersec; + peersec = NULL; + } + + a->manual_peer_interface = true; + r = sd_bus_start(a); if (r < 0) { log_error("Failed to start bus client: %s", strerror(-r)); @@ -450,13 +508,15 @@ int main(int argc, char *argv[]) { goto finish; } + b->manual_peer_interface = true; + r = sd_bus_start(b); if (r < 0) { log_error("Failed to start bus client: %s", strerror(-r)); goto finish; } - r = rename_service(b); + r = rename_service(a, b); if (r < 0) log_debug("Failed to rename process: %s", strerror(-r)); @@ -585,6 +645,12 @@ int main(int argc, char *argv[]) { if (k > 0) r = k; else { + k = process_policy(a, b, m); + if (k < 0) { + r = k; + goto finish; + } + k = sd_bus_send(a, m, NULL); if (k < 0) { r = k;