X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fsd-bus.c;h=15180d042354621bff69831dcd8c41879d301e2b;hp=8f97a582d77513617a1bb6019e8c7c988ce539ae;hb=52cd587789b9452e6e7d5f2f9b2ea652f9ad036e;hpb=fb6d9b77a71a5f007392b754bf7d8e06a6bed69a diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 8f97a582d..15180d042 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -756,7 +756,7 @@ static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { } static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) { - _cleanup_free_ char *machine = NULL; + _cleanup_free_ char *machine = NULL, *pid = NULL; int r; assert(b); @@ -777,18 +777,36 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) else if (r > 0) continue; + r = parse_address_key(p, "pid", &pid); + if (r < 0) + return r; + else if (r > 0) + continue; + skip_address_key(p); } - if (!machine) + if (!machine == !pid) return -EINVAL; - if (!machine_name_is_valid(machine)) - return -EINVAL; + if (machine) { + if (!machine_name_is_valid(machine)) + return -EINVAL; - free(b->machine); - b->machine = machine; - machine = NULL; + free(b->machine); + b->machine = machine; + machine = NULL; + } else { + free(b->machine); + b->machine = NULL; + } + + if (pid) { + r = parse_pid(pid, &b->nspid); + if (r < 0) + return r; + } else + b->nspid = 0; b->sockaddr.un.sun_family = AF_UNIX; strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); @@ -798,7 +816,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) } static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid) { - _cleanup_free_ char *machine = NULL; + _cleanup_free_ char *machine = NULL, *pid = NULL; int r; assert(b); @@ -819,18 +837,36 @@ static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid else if (r > 0) continue; + r = parse_address_key(p, "pid", &pid); + if (r < 0) + return r; + else if (r > 0) + continue; + skip_address_key(p); } - if (!machine) + if (!machine == !pid) return -EINVAL; - if (!machine_name_is_valid(machine)) - return -EINVAL; + if (machine) { + if (!machine_name_is_valid(machine)) + return -EINVAL; - free(b->machine); - b->machine = machine; - machine = NULL; + free(b->machine); + b->machine = machine; + machine = NULL; + } else { + free(b->machine); + b->machine = NULL; + } + + if (pid) { + r = parse_pid(pid, &b->nspid); + if (r < 0) + return r; + } else + b->nspid = 0; free(b->kernel); b->kernel = strdup("/sys/fs/kdbus/0-system/bus"); @@ -854,6 +890,7 @@ static void bus_reset_parsed_address(sd_bus *b) { b->kernel = NULL; free(b->machine); b->machine = NULL; + b->nspid = 0; } static int bus_parse_next_address(sd_bus *b) { @@ -913,17 +950,17 @@ static int bus_parse_next_address(sd_bus *b) { return r; break; - } else if (startswith(a, "x-container-unix:")) { + } else if (startswith(a, "x-machine-unix:")) { - a += 17; + a += 15; r = parse_container_unix_address(b, &a, &guid); if (r < 0) return r; break; - } else if (startswith(a, "x-container-kernel:")) { + } else if (startswith(a, "x-machine-kernel:")) { - a += 19; + a += 17; r = parse_container_kernel_address(b, &a, &guid); if (r < 0) return r; @@ -958,9 +995,9 @@ static int bus_start_address(sd_bus *b) { if (b->exec_path) r = bus_socket_exec(b); - else if (b->machine && b->kernel) + else if ((b->nspid > 0 || b->machine) && b->kernel) r = bus_container_connect_kernel(b); - else if (b->machine && b->sockaddr.sa.sa_family != AF_UNSPEC) + else if ((b->nspid > 0 || b->machine) && b->sockaddr.sa.sa_family != AF_UNSPEC) r = bus_container_connect_socket(b); else if (b->kernel) r = bus_kernel_connect(b); @@ -1119,7 +1156,7 @@ int bus_set_address_system(sd_bus *b) { if (e) return sd_bus_set_address(b, e); - return sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_PATH); + return sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_ADDRESS); } _public_ int sd_bus_open_system(sd_bus **ret) { @@ -1175,13 +1212,13 @@ int bus_set_address_user(sd_bus *b) { return -ENOMEM; #ifdef ENABLE_KDBUS - (void) asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee); + (void) asprintf(&b->address, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, getuid(), ee); #else - (void) asprintf(&b->address, UNIX_USER_BUS_FMT, ee); + (void) asprintf(&b->address, UNIX_USER_BUS_ADDRESS_FMT, ee); #endif } else { #ifdef ENABLE_KDBUS - (void) asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid()); + (void) asprintf(&b->address, KERNEL_USER_BUS_ADDRESS_FMT, getuid()); #else return -ECONNREFUSED; #endif @@ -1283,6 +1320,7 @@ _public_ int sd_bus_open_system_remote(sd_bus **ret, const char *host) { bus->bus_client = true; bus->trusted = false; + bus->is_system = true; r = sd_bus_start(bus); if (r < 0) @@ -1296,7 +1334,7 @@ fail: return r; } -int bus_set_address_system_container(sd_bus *b, const char *machine) { +int bus_set_address_system_machine(sd_bus *b, const char *machine) { _cleanup_free_ char *e = NULL; assert(b); @@ -1307,9 +1345,9 @@ int bus_set_address_system_container(sd_bus *b, const char *machine) { return -ENOMEM; #ifdef ENABLE_KDBUS - b->address = strjoin("x-container-kernel:machine=", e, ";x-container-unix:machine=", e, NULL); + b->address = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL); #else - b->address = strjoin("x-container-unix:machine=", e, NULL); + b->address = strjoin("x-machine-unix:machine=", e, NULL); #endif if (!b->address) return -ENOMEM; @@ -1317,7 +1355,7 @@ int bus_set_address_system_container(sd_bus *b, const char *machine) { return 0; } -_public_ int sd_bus_open_system_container(sd_bus **ret, const char *machine) { +_public_ int sd_bus_open_system_machine(sd_bus **ret, const char *machine) { sd_bus *bus; int r; @@ -1329,12 +1367,13 @@ _public_ int sd_bus_open_system_container(sd_bus **ret, const char *machine) { if (r < 0) return r; - r = bus_set_address_system_container(bus, machine); + r = bus_set_address_system_machine(bus, machine); if (r < 0) goto fail; bus->bus_client = true; bus->trusted = false; + bus->is_system = true; r = sd_bus_start(bus); if (r < 0) @@ -1440,7 +1479,7 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -_public_ int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id) { +_public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) { int r; assert_return(bus, -EINVAL); @@ -1489,6 +1528,16 @@ int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) { assert(b); assert(m); + /* Fake some timestamps, if they were requested, and not + * already initialized */ + if (b->attach_flags & KDBUS_ATTACH_TIMESTAMP) { + if (m->realtime <= 0) + m->realtime = now(CLOCK_REALTIME); + + if (m->monotonic <= 0) + m->monotonic = now(CLOCK_MONOTONIC); + } + /* The bus specification says the serial number cannot be 0, * hence let's fill something in for synthetic messages. Since * synthetic messages might have a fake sender and we don't @@ -1496,7 +1545,6 @@ int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) { * pick a fixed, artificial one. We use (uint32_t) -1 rather * than (uint64_t) -1 since dbus1 only had 32bit identifiers, * even though kdbus can do 64bit. */ - return bus_message_seal(m, 0xFFFFFFFFULL, 0); } @@ -2101,8 +2149,6 @@ static int process_timeout(sd_bus *bus) { if (r < 0) return r; - m->sender = "org.freedesktop.DBus"; - r = bus_seal_synthetic_message(bus, m); if (r < 0) return r; @@ -2200,6 +2246,11 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) { if (r < 0) return r; + /* Copy over original timestamp */ + synthetic_reply->realtime = m->realtime; + synthetic_reply->monotonic = m->monotonic; + synthetic_reply->seqnum = m->seqnum; + r = bus_seal_synthetic_message(bus, synthetic_reply); if (r < 0) return r; @@ -2505,15 +2556,6 @@ null_message: return r; } -static void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m) { - assert(bus); - assert(m); - - m->sender = m->creds.unique_name = (char*) "org.freedesktop.DBus.Local"; - m->creds.well_known_names_local = true; - m->creds.mask |= (SD_BUS_CREDS_UNIQUE_NAME|SD_BUS_CREDS_WELL_KNOWN_NAMES) & bus->creds_mask; -} - static int process_closing(sd_bus *bus, sd_bus_message **ret) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; struct reply_callback *c; @@ -2711,7 +2753,7 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { if (need_more) /* The caller really needs some more data, he doesn't * care about what's already read, or any timeouts - * except its own.*/ + * except its own. */ e |= POLLIN; else { usec_t until; @@ -3376,3 +3418,101 @@ int bus_get_root_path(sd_bus *bus) { return r; } + +_public_ int sd_bus_get_scope(sd_bus *bus, const char **scope) { + int r; + + assert_return(bus, -EINVAL); + assert_return(scope, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (bus->is_kernel) { + _cleanup_free_ char *n = NULL; + const char *dash; + + r = bus_kernel_get_bus_name(bus, &n); + if (r < 0) + return r; + + if (streq(n, "0-system")) { + *scope = "system"; + return 0; + } + + dash = strchr(n, '-'); + if (streq_ptr(dash, "-user")) { + *scope = "user"; + return 0; + } + } + + if (bus->is_user) { + *scope = "user"; + return 0; + } + + if (bus->is_system) { + *scope = "system"; + return 0; + } + + return -ENODATA; +} + +_public_ int sd_bus_get_address(sd_bus *bus, const char **address) { + + assert_return(bus, -EINVAL); + assert_return(address, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (bus->address) { + *address = bus->address; + return 0; + } + + return -ENODATA; +} + +int sd_bus_get_creds_mask(sd_bus *bus, uint64_t *mask) { + assert_return(bus, -EINVAL); + assert_return(mask, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + *mask = bus->creds_mask; + return 0; +} + +int sd_bus_is_bus_client(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return bus->bus_client; +} + +int sd_bus_is_server(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return bus->is_server; +} + +int sd_bus_is_anonymous(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return bus->anonymous_auth; +} + +int sd_bus_is_trusted(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return bus->trusted; +} + +int sd_bus_is_monitor(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return !!(bus->hello_flags & KDBUS_HELLO_MONITOR); +}