X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=91472d93f1976aea0c26bb839a39626207596a71;hb=b2bb3469fd01cec57f1f1726edb5b851ff8427ad;hp=f391fbf42bec3b178968842adb07a634724858d3;hpb=683fc3a4480645fd2201e5f7c2e1fee277b3eaa0;p=elogind.git diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index f391fbf42..91472d93f 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -39,19 +39,24 @@ #include "bus-message.h" #include "bus-util.h" #include "build.h" +#include "strv.h" -#define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket" +#ifdef ENABLE_KDBUS +static const char *arg_address = "kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket"; +#else +static const char *arg_address = "unix:path=/run/dbus/system_bus_socket"; +#endif -const char *arg_bus_path = DEFAULT_BUS_PATH; +static char *arg_command_line_buffer = NULL; static int help(void) { printf("%s [OPTIONS...]\n\n" - "STDIO or socket-activatable proxy to a given DBus endpoint.\n\n" + "Connect STDIO or a socket to a given bus address.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " -p --bus-path=PATH Path to the kernel bus (default: %s)\n", - program_invocation_short_name, DEFAULT_BUS_PATH); + " --address=ADDRESS Connect to bus specified by address\n", + program_invocation_short_name); return 0; } @@ -60,12 +65,14 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, + ARG_ADDRESS, }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "bus-path", required_argument, NULL, 'p' }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "address", required_argument, NULL, ARG_ADDRESS }, + { NULL, 0, NULL, 0 } }; int c; @@ -86,27 +93,42 @@ static int parse_argv(int argc, char *argv[]) { puts(SYSTEMD_FEATURES); return 0; + case ARG_ADDRESS: + arg_address = optarg; + break; + case '?': return -EINVAL; - case 'p': - arg_bus_path = optarg; - break; - default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } + /* If the first command line argument is only "x" characters + * we'll write who we are talking to into it, so that "ps" is + * explanatory */ + arg_command_line_buffer = argv[optind]; + if (argc > optind + 1 || + (arg_command_line_buffer && arg_command_line_buffer[strspn(arg_command_line_buffer, "x")] != 0)) { + log_error("Too many arguments"); + return -EINVAL; + } + return 1; } int main(int argc, char *argv[]) { + + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; _cleanup_bus_unref_ sd_bus *a = NULL, *b = NULL; sd_id128_t server_id; - bool is_unix; int r, in_fd, out_fd; + char **cmdline; + const char *comm; + bool is_unix; + uid_t uid; + pid_t pid; log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); log_parse_environment(); @@ -138,7 +160,7 @@ int main(int argc, char *argv[]) { goto finish; } - r = sd_bus_set_address(a, arg_bus_path); + r = sd_bus_set_address(a, arg_address); if (r < 0) { log_error("Failed to set address to connect to: %s", strerror(-r)); goto finish; @@ -198,21 +220,76 @@ int main(int argc, char *argv[]) { goto finish; } + if (sd_bus_get_peer_creds(b, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_CMDLINE|SD_BUS_CREDS_COMM, &creds) >= 0 && + sd_bus_creds_get_uid(creds, &uid) >= 0 && + sd_bus_creds_get_pid(creds, &pid) >= 0 && + sd_bus_creds_get_cmdline(creds, &cmdline) >= 0 && + sd_bus_creds_get_comm(creds, &comm) >= 0) { + _cleanup_free_ char *p = NULL, *name = NULL; + + name = uid_to_name(uid); + if (!name) { + r = log_oom(); + goto finish; + } + + p = strv_join(cmdline, " "); + if (!p) { + r = log_oom(); + goto finish; + } + + /* The status string gets the full command line ... */ + sd_notifyf(false, + "STATUS=Processing requests from client PID %lu (%s); UID %lu (%s)", + (unsigned long) pid, p, + (unsigned long) uid, name); + + /* ... and the argv line only the short comm */ + if (arg_command_line_buffer) { + size_t m, w; + + m = strlen(arg_command_line_buffer); + w = snprintf(arg_command_line_buffer, m, + "[PID %lu/%s; UID %lu/%s]", + (unsigned long) pid, comm, + (unsigned long) uid, name); + + if (m > w) + memset(arg_command_line_buffer + w, 0, m - w); + + } + } + for (;;) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int events_a, events_b, fd; uint64_t timeout_a, timeout_b, t; struct timespec _ts, *ts; + struct pollfd *pollfd; + int k; r = sd_bus_process(a, &m); if (r < 0) { - log_error("Failed to process bus a: %s", strerror(-r)); + /* treat 'connection reset by peer' as clean exit condition */ + if (r == -ECONNRESET) + r = 0; + else + log_error("Failed to process bus a: %s", strerror(-r)); + goto finish; } if (m) { - r = sd_bus_send(b, m, NULL); - if (r < 0) { + /* We officially got EOF, let's quit */ + if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) { + r = 0; + goto finish; + } + + k = sd_bus_send(b, m, NULL); + if (k < 0) { + r = k; log_error("Failed to send message: %s", strerror(-r)); goto finish; } @@ -226,13 +303,22 @@ int main(int argc, char *argv[]) { /* treat 'connection reset by peer' as clean exit condition */ if (r == -ECONNRESET) r = 0; + else + log_error("Failed to process bus b: %s", strerror(-r)); goto finish; } if (m) { - r = sd_bus_send(a, m, NULL); - if (r < 0) { + /* We officially got EOF, let's quit */ + if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) { + r = 0; + goto finish; + } + + k = sd_bus_send(a, m, NULL); + if (k < 0) { + r = k; log_error("Failed to send message: %s", strerror(-r)); goto finish; } @@ -289,14 +375,13 @@ int main(int argc, char *argv[]) { ts = timespec_store(&_ts, t); } - { - struct pollfd p[3] = { - {.fd = fd, .events = events_a, }, - {.fd = STDIN_FILENO, .events = events_b & POLLIN, }, - {.fd = STDOUT_FILENO, .events = events_b & POLLOUT, }}; + pollfd = (struct pollfd[3]) { + {.fd = fd, .events = events_a, }, + {.fd = in_fd, .events = events_b & POLLIN, }, + {.fd = out_fd, .events = events_b & POLLOUT, } + }; - r = ppoll(p, ELEMENTSOF(p), ts, NULL); - } + r = ppoll(pollfd, 3, ts, NULL); if (r < 0) { log_error("ppoll() failed: %m"); goto finish; @@ -306,5 +391,8 @@ int main(int argc, char *argv[]) { r = 0; finish: + sd_bus_flush(a); + sd_bus_flush(b); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }