diff options
Diffstat (limited to 'src/machine/machine-dbus.c')
| -rw-r--r-- | src/machine/machine-dbus.c | 125 |
1 files changed, 62 insertions, 63 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 76c5dcf735..600d42f195 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -32,6 +32,8 @@ #include "fileio.h" #include "in-addr-util.h" #include "local-addresses.h" +#include "path-util.h" +#include "bus-internal.h" #include "machine.h" static int property_get_id( @@ -391,99 +393,96 @@ int bus_machine_method_get_os_release(sd_bus *bus, sd_bus_message *message, void } int bus_machine_method_open_pty(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { - _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_free_ char *pty_name = NULL; _cleanup_close_ int master = -1; - union { - struct cmsghdr cmsghdr; - uint8_t buf[CMSG_SPACE(sizeof(int))]; - } control = {}; - struct msghdr mh = { - .msg_control = &control, - .msg_controllen = sizeof(control), - }; Machine *m = userdata; - _cleanup_free_ char *pty_name = NULL; - struct cmsghdr *cmsg; - siginfo_t si; - pid_t child; int r; assert(bus); assert(message); assert(m); - r = namespace_open(m->leader, &pidnsfd, &mntnsfd, NULL, &rootfd); + master = openpt_in_namespace(m->leader, O_RDWR|O_NOCTTY|O_CLOEXEC); + if (master < 0) + return master; + + r = ptsname_malloc(master, &pty_name); if (r < 0) return r; - if (socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) < 0) - return -errno; - - child = fork(); - if (child < 0) - return -errno; - - if (child == 0) { - pair[0] = safe_close(pair[0]); - - r = namespace_enter(pidnsfd, mntnsfd, -1, rootfd); - if (r < 0) - _exit(EXIT_FAILURE); - - master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC); - if (master < 0) - _exit(EXIT_FAILURE); - - cmsg = CMSG_FIRSTHDR(&mh); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - memcpy(CMSG_DATA(cmsg), &master, sizeof(int)); + r = sd_bus_message_new_method_return(message, &reply); + if (r < 0) + return r; - mh.msg_controllen = cmsg->cmsg_len; + r = sd_bus_message_append(reply, "hs", master, pty_name); + if (r < 0) + return r; - if (sendmsg(pair[1], &mh, MSG_NOSIGNAL) < 0) - _exit(EXIT_FAILURE); + return sd_bus_send(bus, reply, NULL); +} - _exit(EXIT_SUCCESS); - } +int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_free_ char *pty_name = NULL, *getty = NULL; + _cleanup_bus_unref_ sd_bus *container_bus = NULL; + _cleanup_close_ int master = -1; + Machine *m = userdata; + const char *p; + int r; - pair[1] = safe_close(pair[1]); + master = openpt_in_namespace(m->leader, O_RDWR|O_NOCTTY|O_CLOEXEC); + if (master < 0) + return master; - r = wait_for_terminate(child, &si); + r = ptsname_malloc(master, &pty_name); if (r < 0) return r; - if (si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS) - return -EIO; - if (recvmsg(pair[0], &mh, MSG_NOSIGNAL|MSG_CMSG_CLOEXEC) < 0) + p = path_startswith(pty_name, "/dev/pts/"); + if (!p) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "PTS name %s is invalid", pty_name); + + if (unlockpt(master) < 0) return -errno; - for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) - if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { - int *fds; - unsigned n_fds; + r = sd_bus_new(&container_bus); + if (r < 0) + return r; - fds = (int*) CMSG_DATA(cmsg); - n_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int); +#ifdef ENABLE_KDBUS + asprintf(&container_bus->address, "x-container-kernel:pid=" PID_FMT ";x-container-unix:pid=" PID_FMT, m->leader, m->leader); +#else + asprintf(&container_bus->address, "x-container-kernel:pid=" PID_FMT, m->leader); +#endif + if (!container_bus->address) + return -ENOMEM; - if (n_fds != 1) { - close_many(fds, n_fds); - return -EIO; - } + container_bus->bus_client = true; + container_bus->trusted = false; + container_bus->is_system = true; - master = fds[0]; - } + r = sd_bus_start(container_bus); + if (r < 0) + return r; - if (master < 0) - return -EIO; + getty = strjoin("container-getty@", p, ".service", NULL); + if (!getty) + return -ENOMEM; - r = ptsname_malloc(master, &pty_name); + r = sd_bus_call_method( + container_bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartUnit", + error, NULL, + "ss", getty, "replace"); if (r < 0) return r; + container_bus = sd_bus_unref(container_bus); + r = sd_bus_message_new_method_return(message, &reply); if (r < 0) return r; |