X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnspawn%2Fnspawn.c;h=c003bd4ccc8468bb87142116563e5c4ff4696cce;hp=1f3bda5b4aded530b46484e6202cc0b0f3cd50e1;hb=37c47eb7098cd39733de83c98d06fb67870bb825;hpb=57cb4adf4ed61ab9eeb7f190f94d700a56bafad0 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 1f3bda5b4..c003bd4cc 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -33,16 +33,29 @@ #include #include #include -#include #include #include #include #include #include #include +#include +#include +#include +#include -#include +#ifdef HAVE_SELINUX +#include +#endif + +#ifdef HAVE_SECCOMP +#include +#endif +#include "sd-daemon.h" +#include "sd-bus.h" +#include "sd-id128.h" +#include "sd-rtnl.h" #include "log.h" #include "util.h" #include "mkdir.h" @@ -53,9 +66,18 @@ #include "strv.h" #include "path-util.h" #include "loopback-setup.h" -#include "sd-id128.h" #include "dev-setup.h" #include "fdset.h" +#include "build.h" +#include "fileio.h" +#include "bus-util.h" +#include "bus-error.h" +#include "ptyfwd.h" +#include "bus-kernel.h" +#include "env-util.h" +#include "def.h" +#include "rtnl-util.h" +#include "udev-util.h" typedef enum LinkJournal { LINK_NO, @@ -66,8 +88,11 @@ typedef enum LinkJournal { static char *arg_directory = NULL; static char *arg_user = NULL; -static char **arg_controllers = NULL; -static char *arg_uuid = NULL; +static sd_id128_t arg_uuid = {}; +static char *arg_machine = NULL; +static char *arg_selinux_context = NULL; +static char *arg_selinux_apifs_context = NULL; +static const char *arg_slice = NULL; static bool arg_private_network = false; static bool arg_read_only = false; static bool arg_boot = false; @@ -95,23 +120,64 @@ static uint64_t arg_retain = (1ULL << CAP_SYS_PTRACE) | (1ULL << CAP_SYS_TTY_CONFIG) | (1ULL << CAP_SYS_RESOURCE) | - (1ULL << CAP_SYS_BOOT); + (1ULL << CAP_SYS_BOOT) | + (1ULL << CAP_AUDIT_WRITE) | + (1ULL << CAP_AUDIT_CONTROL) | + (1ULL << CAP_MKNOD); +static char **arg_bind = NULL; +static char **arg_bind_ro = NULL; +static char **arg_setenv = NULL; +static bool arg_quiet = false; +static bool arg_share_system = false; +static bool arg_register = true; +static bool arg_keep_unit = false; +static char **arg_network_interfaces = NULL; +static bool arg_network_veth = false; +static char *arg_network_bridge = NULL; static int help(void) { printf("%s [OPTIONS...] [PATH] [ARGUMENTS...]\n\n" "Spawn a minimal namespace container for debugging, testing and building.\n\n" - " -h --help Show this help\n" - " -D --directory=NAME Root directory for the container\n" - " -b --boot Boot up full system (i.e. invoke init)\n" - " -u --user=USER Run the command under specified user or uid\n" - " -C --controllers=LIST Put the container in specified comma-separated cgroup hierarchies\n" - " --uuid=UUID Set a specific machine UUID for the container\n" - " --private-network Disable network in container\n" - " --read-only Mount the root directory read-only\n" - " --capability=CAP In addition to the default, retain specified capability\n" - " --link-journal=MODE Link up guest journal, one of no, auto, guest, host\n" - " -j Equivalent to --link-journal=host\n", + " -h --help Show this help\n" + " --version Print version string\n" + " -q --quiet Do not show status information\n" + " -D --directory=NAME Root directory for the container\n" + " -b --boot Boot up full system (i.e. invoke init)\n" + " -u --user=USER Run the command under specified user or uid\n" + " -M --machine=NAME Set the machine name for the container\n" + " --uuid=UUID Set a specific machine UUID for the container\n" + " -S --slice=SLICE Place the container in the specified slice\n" + " --private-network Disable network in container\n" + " --network-interface=INTERFACE\n" + " Assign an existing network interface to the\n" + " container\n" + " --network-veth Add a virtual ethernet connection between host\n" + " and container\n" + " --network-bridge=INTERFACE\n" + " Add a virtual ethernet connection between host\n" + " and container and add it to an existing bridge on\n" + " the host\n" + " -Z --selinux-context=SECLABEL\n" + " Set the SELinux security context to be used by\n" + " processes in the container\n" + " -L --selinux-apifs-context=SECLABEL\n" + " Set the SELinux security context to be used by\n" + " API/tmpfs file systems in the container\n" + " --capability=CAP In addition to the default, retain specified\n" + " capability\n" + " --drop-capability=CAP Drop the specified capability from the default set\n" + " --link-journal=MODE Link up guest journal, one of no, auto, guest, host\n" + " -j Equivalent to --link-journal=host\n" + " --read-only Mount the root directory read-only\n" + " --bind=PATH[:PATH] Bind mount a file or directory from the host into\n" + " the container\n" + " --bind-ro=PATH[:PATH] Similar, but creates a read-only bind mount\n" + " --setenv=NAME=VALUE Pass an environment variable to PID 1\n" + " --share-system Share system namespaces with host\n" + " --register=BOOLEAN Register container as machine\n" + " --keep-unit Do not register a scope for the machine, reuse\n" + " the service unit nspawn is running in\n", program_invocation_short_name); return 0; @@ -120,45 +186,76 @@ static int help(void) { static int parse_argv(int argc, char *argv[]) { enum { - ARG_PRIVATE_NETWORK = 0x100, + ARG_VERSION = 0x100, + ARG_PRIVATE_NETWORK, ARG_UUID, ARG_READ_ONLY, ARG_CAPABILITY, - ARG_LINK_JOURNAL + ARG_DROP_CAPABILITY, + ARG_LINK_JOURNAL, + ARG_BIND, + ARG_BIND_RO, + ARG_SETENV, + ARG_SHARE_SYSTEM, + ARG_REGISTER, + ARG_KEEP_UNIT, + ARG_NETWORK_INTERFACE, + ARG_NETWORK_VETH, + ARG_NETWORK_BRIDGE, }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "directory", required_argument, NULL, 'D' }, - { "user", required_argument, NULL, 'u' }, - { "controllers", required_argument, NULL, 'C' }, - { "private-network", no_argument, NULL, ARG_PRIVATE_NETWORK }, - { "boot", no_argument, NULL, 'b' }, - { "uuid", required_argument, NULL, ARG_UUID }, - { "read-only", no_argument, NULL, ARG_READ_ONLY }, - { "capability", required_argument, NULL, ARG_CAPABILITY }, - { "link-journal", required_argument, NULL, ARG_LINK_JOURNAL }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "directory", required_argument, NULL, 'D' }, + { "user", required_argument, NULL, 'u' }, + { "private-network", no_argument, NULL, ARG_PRIVATE_NETWORK }, + { "boot", no_argument, NULL, 'b' }, + { "uuid", required_argument, NULL, ARG_UUID }, + { "read-only", no_argument, NULL, ARG_READ_ONLY }, + { "capability", required_argument, NULL, ARG_CAPABILITY }, + { "drop-capability", required_argument, NULL, ARG_DROP_CAPABILITY }, + { "link-journal", required_argument, NULL, ARG_LINK_JOURNAL }, + { "bind", required_argument, NULL, ARG_BIND }, + { "bind-ro", required_argument, NULL, ARG_BIND_RO }, + { "machine", required_argument, NULL, 'M' }, + { "slice", required_argument, NULL, 'S' }, + { "setenv", required_argument, NULL, ARG_SETENV }, + { "selinux-context", required_argument, NULL, 'Z' }, + { "selinux-apifs-context", required_argument, NULL, 'L' }, + { "quiet", no_argument, NULL, 'q' }, + { "share-system", no_argument, NULL, ARG_SHARE_SYSTEM }, + { "register", required_argument, NULL, ARG_REGISTER }, + { "keep-unit", no_argument, NULL, ARG_KEEP_UNIT }, + { "network-interface", required_argument, NULL, ARG_NETWORK_INTERFACE }, + { "network-veth", no_argument, NULL, ARG_NETWORK_VETH }, + { "network-bridge", required_argument, NULL, ARG_NETWORK_BRIDGE }, + {} }; - int c; + int c, r; + uint64_t plus = 0, minus = 0; assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+hD:u:C:bj", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hD:u:bL:M:jS:Z:q", options, NULL)) >= 0) { switch (c) { case 'h': - help(); + return help(); + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); return 0; case 'D': free(arg_directory); arg_directory = canonicalize_file_name(optarg); if (!arg_directory) { - log_error("Failed to canonicalize root directory."); + log_error("Invalid root directory: %m"); return -ENOMEM; } @@ -166,24 +263,30 @@ static int parse_argv(int argc, char *argv[]) { case 'u': free(arg_user); - if (!(arg_user = strdup(optarg))) { - log_error("Failed to duplicate user name."); - return -ENOMEM; - } + arg_user = strdup(optarg); + if (!arg_user) + return log_oom(); break; - case 'C': - strv_free(arg_controllers); - arg_controllers = strv_split(optarg, ","); - if (!arg_controllers) { - log_error("Failed to split controllers list."); - return -ENOMEM; - } - strv_uniq(arg_controllers); + case ARG_NETWORK_BRIDGE: + arg_network_bridge = strdup(optarg); + if (!arg_network_bridge) + return log_oom(); + + /* fall through */ + case ARG_NETWORK_VETH: + arg_network_veth = true; + arg_private_network = true; break; + case ARG_NETWORK_INTERFACE: + if (strv_push(&arg_network_interfaces, optarg) < 0) + return log_oom(); + + /* fall through */ + case ARG_PRIVATE_NETWORK: arg_private_network = true; break; @@ -193,33 +296,80 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_UUID: - arg_uuid = optarg; + r = sd_id128_from_string(optarg, &arg_uuid); + if (r < 0) { + log_error("Invalid UUID: %s", optarg); + return r; + } + break; + + case 'S': + arg_slice = strdup(optarg); + if (!arg_slice) + return log_oom(); + + break; + + case 'M': + if (isempty(optarg)) { + free(arg_machine); + arg_machine = NULL; + } else { + + if (!hostname_is_valid(optarg)) { + log_error("Invalid machine name: %s", optarg); + return -EINVAL; + } + + free(arg_machine); + arg_machine = strdup(optarg); + if (!arg_machine) + return log_oom(); + + break; + } + + case 'Z': + arg_selinux_context = optarg; + break; + + case 'L': + arg_selinux_apifs_context = optarg; break; case ARG_READ_ONLY: arg_read_only = true; break; - case ARG_CAPABILITY: { + case ARG_CAPABILITY: + case ARG_DROP_CAPABILITY: { char *state, *word; size_t length; FOREACH_WORD_SEPARATOR(word, length, optarg, ",", state) { + _cleanup_free_ char *t; cap_value_t cap; - char *t; t = strndup(word, length); if (!t) return log_oom(); - if (cap_from_name(t, &cap) < 0) { - log_error("Failed to parse capability %s.", t); - free(t); - return -EINVAL; - } + if (streq(t, "all")) { + if (c == ARG_CAPABILITY) + plus = (uint64_t) -1; + else + minus = (uint64_t) -1; + } else { + if (cap_from_name(t, &cap) < 0) { + log_error("Failed to parse capability %s.", t); + return -EINVAL; + } - free(t); - arg_retain |= 1ULL << (uint64_t) cap; + if (c == ARG_CAPABILITY) + plus |= 1ULL << (uint64_t) cap; + else + minus |= 1ULL << (uint64_t) cap; + } } break; @@ -245,15 +395,104 @@ static int parse_argv(int argc, char *argv[]) { break; + case ARG_BIND: + case ARG_BIND_RO: { + _cleanup_free_ char *a = NULL, *b = NULL; + char *e; + char ***x; + + x = c == ARG_BIND ? &arg_bind : &arg_bind_ro; + + e = strchr(optarg, ':'); + if (e) { + a = strndup(optarg, e - optarg); + b = strdup(e + 1); + } else { + a = strdup(optarg); + b = strdup(optarg); + } + + if (!a || !b) + return log_oom(); + + if (!path_is_absolute(a) || !path_is_absolute(b)) { + log_error("Invalid bind mount specification: %s", optarg); + return -EINVAL; + } + + r = strv_extend(x, a); + if (r < 0) + return log_oom(); + + r = strv_extend(x, b); + if (r < 0) + return log_oom(); + + break; + } + + case ARG_SETENV: { + char **n; + + if (!env_assignment_is_valid(optarg)) { + log_error("Environment variable assignment '%s' is not valid.", optarg); + return -EINVAL; + } + + n = strv_env_set(arg_setenv, optarg); + if (!n) + return log_oom(); + + strv_free(arg_setenv); + arg_setenv = n; + break; + } + + case 'q': + arg_quiet = true; + break; + + case ARG_SHARE_SYSTEM: + arg_share_system = true; + break; + + case ARG_REGISTER: + r = parse_boolean(optarg); + if (r < 0) { + log_error("Failed to parse --register= argument: %s", optarg); + return r; + } + + arg_register = r; + break; + + case ARG_KEEP_UNIT: + arg_keep_unit = true; + break; + case '?': return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } + if (arg_share_system) + arg_register = false; + + if (arg_boot && arg_share_system) { + log_error("--boot and --share-system may not be combined."); + return -EINVAL; + } + + if (arg_keep_unit && cg_pid_get_owner_uid(0, NULL) >= 0) { + log_error("--keep-unit may not be used when invoked from a user session."); + return -EINVAL; + } + + arg_retain = (arg_retain | plus | (arg_private_network ? 1ULL << CAP_NET_ADMIN : 0)) & ~minus; + return 1; } @@ -274,7 +513,7 @@ static int mount_all(const char *dest) { { NULL, "/proc/sys", NULL, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ { "sysfs", "/sys", "sysfs", NULL, MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true }, - { "/dev/pts", "/dev/pts", NULL, NULL, MS_BIND, true }, + { "devpts", "/dev/pts", "devpts","newinstance,ptmxmode=0666,mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, true }, { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true }, { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true }, #ifdef HAVE_SELINUX @@ -287,17 +526,16 @@ static int mount_all(const char *dest) { int r = 0; for (k = 0; k < ELEMENTSOF(mount_table); k++) { - char _cleanup_free_ *where = NULL; + _cleanup_free_ char *where = NULL; +#ifdef HAVE_SELINUX + _cleanup_free_ char *options = NULL; +#endif + const char *o; int t; - if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) { - log_oom(); - - if (r == 0) - r = -ENOMEM; - - break; - } + where = strjoin(dest, "/", mount_table[k].where, NULL); + if (!where) + return log_oom(); t = path_is_mount_point(where, true); if (t < 0) { @@ -313,13 +551,26 @@ static int mount_all(const char *dest) { if (mount_table[k].what && t > 0) continue; - mkdir_p_label(where, 0755); + mkdir_p(where, 0755); + +#ifdef HAVE_SELINUX + if (arg_selinux_apifs_context && + (streq_ptr(mount_table[k].what, "tmpfs") || streq_ptr(mount_table[k].what, "devpts"))) { + options = strjoin(mount_table[k].options, ",context=\"", arg_selinux_apifs_context, "\"", NULL); + if (!options) + return log_oom(); + + o = options; + } else +#endif + o = mount_table[k].options; + if (mount(mount_table[k].what, where, mount_table[k].type, mount_table[k].flags, - mount_table[k].options) < 0 && + o) < 0 && mount_table[k].fatal) { log_error("mount(%s) failed: %m", where); @@ -332,6 +583,66 @@ static int mount_all(const char *dest) { return r; } +static int mount_binds(const char *dest, char **l, unsigned long flags) { + char **x, **y; + + STRV_FOREACH_PAIR(x, y, l) { + char *where; + struct stat source_st, dest_st; + int r; + + if (stat(*x, &source_st) < 0) { + log_error("failed to stat %s: %m", *x); + return -errno; + } + + where = strappenda(dest, *y); + r = stat(where, &dest_st); + if (r == 0) { + if ((source_st.st_mode & S_IFMT) != (dest_st.st_mode & S_IFMT)) { + log_error("The file types of %s and %s do not match. Refusing bind mount", + *x, where); + return -EINVAL; + } + } else if (errno == ENOENT) { + r = mkdir_parents_label(where, 0755); + if (r < 0) { + log_error("Failed to bind mount %s: %s", *x, strerror(-r)); + return r; + } + } else { + log_error("Failed to bind mount %s: %s", *x, strerror(errno)); + return -errno; + } + /* Create the mount point, but be conservative -- refuse to create block + * and char devices. */ + if (S_ISDIR(source_st.st_mode)) + mkdir_label(where, 0755); + else if (S_ISFIFO(source_st.st_mode)) + mkfifo(where, 0644); + else if (S_ISSOCK(source_st.st_mode)) + mknod(where, 0644 | S_IFSOCK, 0); + else if (S_ISREG(source_st.st_mode)) + touch(where); + else { + log_error("Refusing to create mountpoint for file: %s", *x); + return -ENOTSUP; + } + + if (mount(*x, where, "bind", MS_BIND, NULL) < 0) { + log_error("mount(%s) failed: %m", where); + return -errno; + } + + if (flags && mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|flags, NULL) < 0) { + log_error("mount(%s) failed: %m", where); + return -errno; + } + } + + return 0; +} + static int setup_timezone(const char *dest) { _cleanup_free_ char *where = NULL, *p = NULL, *q = NULL, *check = NULL, *what = NULL; char *z, *y; @@ -393,7 +704,7 @@ static int setup_timezone(const char *dest) { } static int setup_resolv_conf(const char *dest) { - char *where; + char _cleanup_free_ *where = NULL; assert(dest); @@ -407,22 +718,22 @@ static int setup_resolv_conf(const char *dest) { /* We don't really care for the results of this really. If it * fails, it fails, but meh... */ - if (mount("/etc/resolv.conf", where, "bind", MS_BIND, NULL) >= 0) - mount("/etc/resolv.conf", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); - - free(where); + copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW); return 0; } static int setup_boot_id(const char *dest) { - char _cleanup_free_ *from = NULL, *to = NULL; + _cleanup_free_ char *from = NULL, *to = NULL; sd_id128_t rnd; char as_uuid[37]; int r; assert(dest); + if (arg_share_system) + return 0; + /* Generate a new randomized boot ID, so that each boot-up of * the container gets a new one */ @@ -442,7 +753,7 @@ static int setup_boot_id(const char *dest) { SD_ID128_FORMAT_VAL(rnd)); char_array_0(as_uuid); - r = write_one_line_file(from, as_uuid); + r = write_string_file(from, as_uuid); if (r < 0) { log_error("Failed to write boot id: %s", strerror(-r)); return r; @@ -451,8 +762,8 @@ static int setup_boot_id(const char *dest) { if (mount(from, to, "bind", MS_BIND, NULL) < 0) { log_error("Failed to bind mount boot id: %m"); r = -errno; - } else - mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); + } else if (mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL)) + log_warning("Failed to make boot id read-only: %m"); unlink(from); return r; @@ -466,63 +777,67 @@ static int copy_devnodes(const char *dest) { "full\0" "random\0" "urandom\0" - "tty\0" - "ptmx\0"; + "tty\0"; const char *d; int r = 0; - mode_t _cleanup_umask_ u; + _cleanup_umask_ mode_t u; assert(dest); u = umask(0000); NULSTR_FOREACH(d, devnodes) { + _cleanup_free_ char *from = NULL, *to = NULL; struct stat st; - char _cleanup_free_ *from = NULL, *to = NULL; - asprintf(&from, "/dev/%s", d); - asprintf(&to, "%s/dev/%s", dest, d); - - if (!from || !to) { - log_oom(); - - if (r == 0) - r = -ENOMEM; - - break; - } + from = strappend("/dev/", d); + to = strjoin(dest, "/dev/", d, NULL); + if (!from || !to) + return log_oom(); if (stat(from, &st) < 0) { if (errno != ENOENT) { log_error("Failed to stat %s: %m", from); - if (r == 0) - r = -errno; + return -errno; } } else if (!S_ISCHR(st.st_mode) && !S_ISBLK(st.st_mode)) { log_error("%s is not a char or block device, cannot copy", from); - if (r == 0) - r = -EIO; + return -EIO; } else if (mknod(to, st.st_mode, st.st_rdev) < 0) { log_error("mknod(%s) failed: %m", dest); - if (r == 0) - r = -errno; + return -errno; } } return r; } +static int setup_ptmx(const char *dest) { + _cleanup_free_ char *p = NULL; + + p = strappend(dest, "/dev/ptmx"); + if (!p) + return log_oom(); + + if (symlink("pts/ptmx", p) < 0) { + log_error("Failed to create /dev/ptmx symlink: %m"); + return -errno; + } + + return 0; +} + static int setup_dev_console(const char *dest, const char *console) { struct stat st; - char _cleanup_free_ *to = NULL; + _cleanup_free_ char *to = NULL; int r; - mode_t _cleanup_umask_ u; + _cleanup_umask_ mode_t u; assert(dest); assert(console); @@ -568,14 +883,17 @@ static int setup_dev_console(const char *dest, const char *console) { } static int setup_kmsg(const char *dest, int kmsg_socket) { - char _cleanup_free_ *from = NULL, *to = NULL; + _cleanup_free_ char *from = NULL, *to = NULL; int r, fd, k; - mode_t _cleanup_umask_ u; + _cleanup_umask_ mode_t u; union { struct cmsghdr cmsghdr; uint8_t buf[CMSG_SPACE(sizeof(int))]; - } control; - struct msghdr mh; + } control = {}; + struct msghdr mh = { + .msg_control = &control, + .msg_controllen = sizeof(control), + }; struct cmsghdr *cmsg; assert(dest); @@ -616,12 +934,6 @@ static int setup_kmsg(const char *dest, int kmsg_socket) { return -errno; } - zero(mh); - zero(control); - - mh.msg_control = &control; - mh.msg_controllen = sizeof(control); - cmsg = CMSG_FIRSTHDR(&mh); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; @@ -646,36 +958,22 @@ static int setup_kmsg(const char *dest, int kmsg_socket) { } static int setup_hostname(void) { - char *hn; - int r = 0; - hn = path_get_file_name(arg_directory); - if (hn) { - hn = strdup(hn); - if (!hn) - return -ENOMEM; - - hostname_cleanup(hn); - - if (!isempty(hn)) - if (sethostname(hn, strlen(hn)) < 0) - r = -errno; + if (arg_share_system) + return 0; - free(hn); - } + if (sethostname(arg_machine, strlen(arg_machine)) < 0) + return -errno; - return r; + return 0; } static int setup_journal(const char *directory) { - sd_id128_t machine_id; - char _cleanup_free_ *p = NULL, *b = NULL, *q = NULL, *d = NULL; + sd_id128_t machine_id, this_id; + _cleanup_free_ char *p = NULL, *b = NULL, *q = NULL, *d = NULL; char *id; int r; - if (arg_link_journal == LINK_NO) - return 0; - p = strappend(directory, "/etc/machine-id"); if (!p) return log_oom(); @@ -699,6 +997,24 @@ static int setup_journal(const char *directory) { return r; } + r = sd_id128_get_machine(&this_id); + if (r < 0) { + log_error("Failed to retrieve machine ID: %s", strerror(-r)); + return r; + } + + if (sd_id128_equal(machine_id, this_id)) { + log_full(arg_link_journal == LINK_AUTO ? LOG_WARNING : LOG_ERR, + "Host and machine ids are equal (%s): refusing to link journals", id); + if (arg_link_journal == LINK_AUTO) + return 0; + return + -EEXIST; + } + + if (arg_link_journal == LINK_NO) + return 0; + free(p); p = strappend("/var/log/journal/", id); q = strjoin(directory, "/var/log/journal/", id, NULL); @@ -799,277 +1115,466 @@ static int setup_journal(const char *directory) { return 0; } +static int setup_kdbus(const char *dest, const char *path) { + const char *p; + + if (!path) + return 0; + + p = strappenda(dest, "/dev/kdbus"); + if (mkdir(p, 0755) < 0) { + log_error("Failed to create kdbus path: %m"); + return -errno; + } + + if (mount(path, p, "bind", MS_BIND, NULL) < 0) { + log_error("Failed to mount kdbus domain path: %m"); + return -errno; + } + + return 0; +} + static int drop_capabilities(void) { return capability_bounding_set_drop(~arg_retain, false); } -static int is_os_tree(const char *path) { +static int register_machine(pid_t pid) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_unref_ sd_bus *bus = NULL; int r; - char *p; - /* We use /bin/sh as flag file if something is an OS */ - if (asprintf(&p, "%s/bin/sh", path) < 0) - return -ENOMEM; + if (!arg_register) + return 0; - r = access(p, F_OK); - free(p); + r = sd_bus_default_system(&bus); + if (r < 0) { + log_error("Failed to open system bus: %s", strerror(-r)); + return r; + } + + if (arg_keep_unit) { + r = sd_bus_call_method( + bus, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "RegisterMachine", + &error, + NULL, + "sayssus", + arg_machine, + SD_BUS_MESSAGE_APPEND_ID128(arg_uuid), + "nspawn", + "container", + (uint32_t) pid, + strempty(arg_directory)); + } else { + r = sd_bus_call_method( + bus, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "CreateMachine", + &error, + NULL, + "sayssusa(sv)", + arg_machine, + SD_BUS_MESSAGE_APPEND_ID128(arg_uuid), + "nspawn", + "container", + (uint32_t) pid, + strempty(arg_directory), + !isempty(arg_slice), "Slice", "s", arg_slice); + } - return r < 0 ? 0 : 1; + if (r < 0) { + log_error("Failed to register machine: %s", bus_error_message(&error, r)); + return r; + } + + return 0; } -static int process_pty(int master, pid_t pid, sigset_t *mask) { +static int terminate_machine(pid_t pid) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_unref_ sd_bus *bus = NULL; + const char *path; + int r; - char in_buffer[LINE_MAX], out_buffer[LINE_MAX]; - size_t in_buffer_full = 0, out_buffer_full = 0; - struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev; - bool stdin_readable = false, stdout_writable = false, master_readable = false, master_writable = false; - int ep = -1, signal_fd = -1, r; - bool tried_orderly_shutdown = false; + if (!arg_register) + return 0; - assert(master >= 0); - assert(pid > 0); - assert(mask); + r = sd_bus_default_system(&bus); + if (r < 0) { + log_error("Failed to open system bus: %s", strerror(-r)); + return r; + } - fd_nonblock(STDIN_FILENO, 1); - fd_nonblock(STDOUT_FILENO, 1); - fd_nonblock(master, 1); + r = sd_bus_call_method( + bus, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "GetMachineByPID", + &error, + &reply, + "u", + (uint32_t) pid); + if (r < 0) { + /* Note that the machine might already have been + * cleaned up automatically, hence don't consider it a + * failure if we cannot get the machine object. */ + log_debug("Failed to get machine: %s", bus_error_message(&error, r)); + return 0; + } - signal_fd = signalfd(-1, mask, SFD_NONBLOCK|SFD_CLOEXEC); - if (signal_fd < 0) { - log_error("signalfd(): %m"); - r = -errno; - goto finish; + r = sd_bus_message_read(reply, "o", &path); + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_call_method( + bus, + "org.freedesktop.machine1", + path, + "org.freedesktop.machine1.Machine", + "Terminate", + &error, + NULL, + NULL); + if (r < 0) { + log_debug("Failed to terminate machine: %s", bus_error_message(&error, r)); + return 0; } - ep = epoll_create1(EPOLL_CLOEXEC); - if (ep < 0) { - log_error("Failed to create epoll: %m"); - r = -errno; - goto finish; + return 0; +} + +static int reset_audit_loginuid(void) { + _cleanup_free_ char *p = NULL; + int r; + + if (arg_share_system) + return 0; + + r = read_one_line_file("/proc/self/loginuid", &p); + if (r == -EEXIST) + return 0; + if (r < 0) { + log_error("Failed to read /proc/self/loginuid: %s", strerror(-r)); + return r; } - /* We read from STDIN only if this is actually a TTY, - * otherwise we assume non-interactivity. */ - if (isatty(STDIN_FILENO)) { - zero(stdin_ev); - stdin_ev.events = EPOLLIN|EPOLLET; - stdin_ev.data.fd = STDIN_FILENO; + /* Already reset? */ + if (streq(p, "4294967295")) + return 0; - if (epoll_ctl(ep, EPOLL_CTL_ADD, STDIN_FILENO, &stdin_ev) < 0) { - log_error("Failed to register STDIN in epoll: %m"); - r = -errno; - goto finish; - } + r = write_string_file("/proc/self/loginuid", "4294967295"); + if (r < 0) { + log_error("Failed to reset audit login UID. This probably means that your kernel is too\n" + "old and you have audit enabled. Note that the auditing subsystem is known to\n" + "be incompatible with containers on old kernels. Please make sure to upgrade\n" + "your kernel or to off auditing with 'audit=0' on the kernel command line before\n" + "using systemd-nspawn. Sleeping for 5s... (%s)\n", strerror(-r)); + + sleep(5); } - zero(stdout_ev); - stdout_ev.events = EPOLLOUT|EPOLLET; - stdout_ev.data.fd = STDOUT_FILENO; + return 0; +} + +static int setup_veth(pid_t pid, char iface_name[]) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + int r; - zero(master_ev); - master_ev.events = EPOLLIN|EPOLLOUT|EPOLLET; - master_ev.data.fd = master; + if (!arg_private_network) + return 0; - zero(signal_ev); - signal_ev.events = EPOLLIN; - signal_ev.data.fd = signal_fd; + if (!arg_network_veth) + return 0; - if (epoll_ctl(ep, EPOLL_CTL_ADD, STDOUT_FILENO, &stdout_ev) < 0 || - epoll_ctl(ep, EPOLL_CTL_ADD, master, &master_ev) < 0 || - epoll_ctl(ep, EPOLL_CTL_ADD, signal_fd, &signal_ev) < 0) { - log_error("Failed to register fds in epoll: %m"); - r = -errno; - goto finish; + strncpy(iface_name+3, arg_machine, IFNAMSIZ - 3); + + r = sd_rtnl_open(0, &rtnl); + if (r < 0) { + log_error("Failed to connect to netlink: %s", strerror(-r)); + return r; } - for (;;) { - struct epoll_event ev[16]; - ssize_t k; - int i, nfds; + r = sd_rtnl_message_new_link(RTM_NEWLINK, 0, &m); + if (r < 0) { + log_error("Failed to allocate netlink message: %s", strerror(-r)); + return r; + } - nfds = epoll_wait(ep, ev, ELEMENTSOF(ev), -1); - if (nfds < 0) { + r = sd_rtnl_message_append_string(m, IFLA_IFNAME, iface_name); + if (r < 0) { + log_error("Failed to add netlink interface name: %s", strerror(-r)); + return r; + } - if (errno == EINTR || errno == EAGAIN) - continue; + r = sd_rtnl_message_open_container(m, IFLA_LINKINFO); + if (r < 0) { + log_error("Failed to open netlink container: %s", strerror(-r)); + return r; + } - log_error("epoll_wait(): %m"); - r = -errno; - goto finish; - } + r = sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "veth"); + if (r < 0) { + log_error("Failed to append netlink kind: %s", strerror(-r)); + return r; + } - assert(nfds >= 1); + r = sd_rtnl_message_open_container(m, IFLA_INFO_DATA); + if (r < 0) { + log_error("Failed to open netlink container: %s", strerror(-r)); + return r; + } - for (i = 0; i < nfds; i++) { - if (ev[i].data.fd == STDIN_FILENO) { + r = sd_rtnl_message_open_container(m, VETH_INFO_PEER); + if (r < 0) { + log_error("Failed to open netlink container: %s", strerror(-r)); + return r; + } - if (ev[i].events & (EPOLLIN|EPOLLHUP)) - stdin_readable = true; + r = sd_rtnl_message_append_string(m, IFLA_IFNAME, "host0"); + if (r < 0) { + log_error("Failed to add netlink interface name: %s", strerror(-r)); + return r; + } - } else if (ev[i].data.fd == STDOUT_FILENO) { + r = sd_rtnl_message_append_u32(m, IFLA_NET_NS_PID, pid); + if (r < 0) { + log_error("Failed to add netlink namespace field: %s", strerror(-r)); + return r; + } - if (ev[i].events & (EPOLLOUT|EPOLLHUP)) - stdout_writable = true; + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_error("Failed to close netlink container: %s", strerror(-r)); + return r; + } - } else if (ev[i].data.fd == master) { + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_error("Failed to close netlink container: %s", strerror(-r)); + return r; + } - if (ev[i].events & (EPOLLIN|EPOLLHUP)) - master_readable = true; + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_error("Failed to close netlink container: %s", strerror(-r)); + return r; + } - if (ev[i].events & (EPOLLOUT|EPOLLHUP)) - master_writable = true; + r = sd_rtnl_call(rtnl, m, 0, NULL); + if (r < 0) { + log_error("Failed to add new veth interfaces: %s", strerror(-r)); + return r; + } - } else if (ev[i].data.fd == signal_fd) { - struct signalfd_siginfo sfsi; - ssize_t n; + return 0; +} - n = read(signal_fd, &sfsi, sizeof(sfsi)); - if (n != sizeof(sfsi)) { +static int setup_bridge(const char veth_name[]) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + int r, bridge; - if (n >= 0) { - log_error("Failed to read from signalfd: invalid block size"); - r = -EIO; - goto finish; - } + if (!arg_private_network) + return 0; - if (errno != EINTR && errno != EAGAIN) { - log_error("Failed to read from signalfd: %m"); - r = -errno; - goto finish; - } - } else { + if (!arg_network_veth) + return 0; - if (sfsi.ssi_signo == SIGWINCH) { - struct winsize ws; + if (!arg_network_bridge) + return 0; - /* The window size changed, let's forward that. */ - if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0) - ioctl(master, TIOCSWINSZ, &ws); - } else if (sfsi.ssi_signo == SIGTERM && arg_boot && !tried_orderly_shutdown) { + bridge = (int) if_nametoindex(arg_network_bridge); + if (bridge <= 0) { + log_error("Failed to resolve interface %s: %m", arg_network_bridge); + return -errno; + } - log_info("Trying to halt container. Send SIGTERM again to trigger immediate termination."); + r = sd_rtnl_open(0, &rtnl); + if (r < 0) { + log_error("Failed to connect to netlink: %s", strerror(-r)); + return r; + } - /* This only works for systemd... */ - tried_orderly_shutdown = true; - kill(pid, SIGRTMIN+3); + r = sd_rtnl_message_new_link(RTM_SETLINK, 0, &m); + if (r < 0) { + log_error("Failed to allocate netlink message: %s", strerror(-r)); + return r; + } - } else { - r = 0; - goto finish; - } - } - } - } + r = sd_rtnl_message_append_string(m, IFLA_IFNAME, veth_name); + if (r < 0) { + log_error("Failed to add netlink interface name field: %s", strerror(-r)); + return r; + } - while ((stdin_readable && in_buffer_full <= 0) || - (master_writable && in_buffer_full > 0) || - (master_readable && out_buffer_full <= 0) || - (stdout_writable && out_buffer_full > 0)) { + r = sd_rtnl_message_append_u32(m, IFLA_MASTER, bridge); + if (r < 0) { + log_error("Failed to add netlink master field: %s", strerror(-r)); + return r; + } - if (stdin_readable && in_buffer_full < LINE_MAX) { + r = sd_rtnl_call(rtnl, m, 0, NULL); + if (r < 0) { + log_error("Failed to add veth interface to bridge: %s", strerror(-r)); + return r; + } - k = read(STDIN_FILENO, in_buffer + in_buffer_full, LINE_MAX - in_buffer_full); - if (k < 0) { + return 0; +} - if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) - stdin_readable = false; - else { - log_error("read(): %m"); - r = -errno; - goto finish; - } - } else - in_buffer_full += (size_t) k; - } +static int move_network_interfaces(pid_t pid) { + _cleanup_udev_unref_ struct udev *udev = NULL; + _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + char **i; + int r; - if (master_writable && in_buffer_full > 0) { + if (!arg_private_network) + return 0; - k = write(master, in_buffer, in_buffer_full); - if (k < 0) { + if (strv_isempty(arg_network_interfaces)) + return 0; - if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) - master_writable = false; - else { - log_error("write(): %m"); - r = -errno; - goto finish; - } + r = sd_rtnl_open(0, &rtnl); + if (r < 0) { + log_error("Failed to connect to netlink: %s", strerror(-r)); + return r; + } - } else { - assert(in_buffer_full >= (size_t) k); - memmove(in_buffer, in_buffer + k, in_buffer_full - k); - in_buffer_full -= k; - } - } + udev = udev_new(); + if (!udev) { + log_error("Failed to connect to udev."); + return -ENOMEM; + } - if (master_readable && out_buffer_full < LINE_MAX) { + STRV_FOREACH(i, arg_network_interfaces) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + char ifi_str[2 + DECIMAL_STR_MAX(int)]; + int ifi; - k = read(master, out_buffer + out_buffer_full, LINE_MAX - out_buffer_full); - if (k < 0) { + ifi = (int) if_nametoindex(*i); + if (ifi <= 0) { + log_error("Failed to resolve interface %s: %m", *i); + return -errno; + } - if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) - master_readable = false; - else { - log_error("read(): %m"); - r = -errno; - goto finish; - } - } else - out_buffer_full += (size_t) k; - } + sprintf(ifi_str, "n%i", ifi); + d = udev_device_new_from_device_id(udev, ifi_str); + if (!d) { + log_error("Failed to get udev device for interface %s: %m", *i); + return -errno; + } - if (stdout_writable && out_buffer_full > 0) { + if (udev_device_get_is_initialized(d) <= 0) { + log_error("Network interface %s is not initialized yet.", *i); + return -EBUSY; + } - k = write(STDOUT_FILENO, out_buffer, out_buffer_full); - if (k < 0) { + r = sd_rtnl_message_new_link(RTM_NEWLINK, ifi, &m); + if (r < 0) { + log_error("Failed to allocate netlink message: %s", strerror(-r)); + return r; + } - if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) - stdout_writable = false; - else { - log_error("write(): %m"); - r = -errno; - goto finish; - } + r = sd_rtnl_message_append_u32(m, IFLA_NET_NS_PID, pid); + if (r < 0) { + log_error("Failed to append namespace PID to netlink message: %s", strerror(-r)); + return r; + } - } else { - assert(out_buffer_full >= (size_t) k); - memmove(out_buffer, out_buffer + k, out_buffer_full - k); - out_buffer_full -= k; - } - } + r = sd_rtnl_call(rtnl, m, 0, NULL); + if (r < 0) { + log_error("Failed to move interface %s to namespace: %s", *i, strerror(-r)); + return r; } } -finish: - if (ep >= 0) - close_nointr_nofail(ep); + return 0; +} + +static int audit_still_doesnt_work_in_containers(void) { - if (signal_fd >= 0) - close_nointr_nofail(signal_fd); +#ifdef HAVE_SECCOMP + scmp_filter_ctx seccomp; + int r; + /* + Audit is broken in containers, much of the userspace audit + hookup will fail if running inside a container. We don't + care and just turn off creation of audit sockets. + + This will make socket(AF_NETLINK, *, NETLINK_AUDIT) fail + with EAFNOSUPPORT which audit userspace uses as indication + that audit is disabled in the kernel. + */ + + seccomp = seccomp_init(SCMP_ACT_ALLOW); + if (!seccomp) + return log_oom(); + + r = seccomp_rule_add_exact( + seccomp, + SCMP_ACT_ERRNO(EAFNOSUPPORT), + SCMP_SYS(socket), + 2, + SCMP_A0(SCMP_CMP_EQ, AF_NETLINK), + SCMP_A2(SCMP_CMP_EQ, NETLINK_AUDIT)); + if (r < 0) { + log_error("Failed to add audit seccomp rule: %s", strerror(-r)); + goto finish; + } + + r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_NNP, 0); + if (r < 0) { + log_error("Failed to unset NO_NEW_PRIVS: %s", strerror(-r)); + goto finish; + } + + r = seccomp_load(seccomp); + if (r < 0) + log_error("Failed to install seccomp audit filter: %s", strerror(-r)); + +finish: + seccomp_release(seccomp); return r; +#else + return 0; +#endif + } int main(int argc, char *argv[]) { - pid_t pid = 0; - int r = EXIT_FAILURE, k; - char *oldcg = NULL, *newcg = NULL; - char **controller = NULL; - int master = -1, n_fd_passed; + + _cleanup_close_ int master = -1, kdbus_fd = -1, sync_fd = -1; + _cleanup_close_pipe_ int kmsg_socket_pair[2] = { -1, -1 }; + _cleanup_free_ char *kdbus_domain = NULL; + _cleanup_fdset_free_ FDSet *fds = NULL; const char *console = NULL; - struct termios saved_attr, raw_attr; + int r = EXIT_FAILURE, k; + int n_fd_passed; + pid_t pid = 0; sigset_t mask; - bool saved_attr_valid = false; - struct winsize ws; - int kmsg_socket_pair[2] = { -1, -1 }; - FDSet *fds = NULL; + char veth_name[IFNAMSIZ] = "ve-"; log_parse_environment(); log_open(); - r = parse_argv(argc, argv); - if (r <= 0) + k = parse_argv(argc, argv); + if (k < 0) goto finish; + else if (k == 0) { + r = EXIT_SUCCESS; + goto finish; + } if (arg_directory) { char *p; @@ -1081,12 +1586,26 @@ int main(int argc, char *argv[]) { arg_directory = get_current_dir_name(); if (!arg_directory) { - log_error("Failed to determine path"); + log_error("Failed to determine path, please use -D."); goto finish; } path_kill_slashes(arg_directory); + if (!arg_machine) { + arg_machine = strdup(basename(arg_directory)); + if (!arg_machine) { + log_oom(); + goto finish; + } + + hostname_cleanup(arg_machine, false); + if (isempty(arg_machine)) { + log_error("Failed to determine machine name automatically, please use -M."); + goto finish; + } + } + if (geteuid() != 0) { log_error("Need to be root."); goto finish; @@ -1102,9 +1621,21 @@ int main(int argc, char *argv[]) { goto finish; } - if (is_os_tree(arg_directory) <= 0) { - log_error("Directory %s doesn't look like an OS root directory. Refusing.", arg_directory); - goto finish; + if (arg_boot) { + if (path_is_os_tree(arg_directory) <= 0) { + log_error("Directory %s doesn't look like an OS root directory (/etc/os-release is missing). Refusing.", arg_directory); + goto finish; + } + } else { + const char *p; + + p = strappenda(arg_directory, + argc > optind && path_is_absolute(argv[optind]) ? argv[optind] : "/usr/bin/"); + if (access(p, F_OK) < 0) { + log_error("Directory %s lacks the binary to execute or doesn't look like a binary tree. Refusing.", arg_directory); + goto finish; + + } } log_close(); @@ -1119,29 +1650,6 @@ int main(int argc, char *argv[]) { fdset_close_others(fds); log_open(); - k = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &oldcg); - if (k < 0) { - log_error("Failed to determine current cgroup: %s", strerror(-k)); - goto finish; - } - - if (asprintf(&newcg, "%s/nspawn-%lu", oldcg, (unsigned long) getpid()) < 0) { - log_error("Failed to allocate cgroup path."); - goto finish; - } - - k = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, newcg, 0); - if (k < 0) { - log_error("Failed to create cgroup: %s", strerror(-k)); - goto finish; - } - - STRV_FOREACH(controller, arg_controllers) { - k = cg_create_and_attach(*controller, newcg, 0); - if (k < 0) - log_warning("Failed to create cgroup in controller %s: %s", *controller, strerror(-k)); - } - master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY); if (master < 0) { log_error("Failed to acquire pseudo tty: %m"); @@ -1154,29 +1662,41 @@ int main(int argc, char *argv[]) { goto finish; } - log_info("Spawning namespace container on %s (console is %s).", arg_directory, console); - - if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0) - ioctl(master, TIOCSWINSZ, &ws); + if (!arg_quiet) + log_info("Spawning container %s on %s. Press ^] three times within 1s to abort execution.", arg_machine, arg_directory); if (unlockpt(master) < 0) { log_error("Failed to unlock tty: %m"); goto finish; } - if (tcgetattr(STDIN_FILENO, &saved_attr) >= 0) { - saved_attr_valid = true; + if (access("/dev/kdbus/control", F_OK) >= 0) { + + if (arg_share_system) { + kdbus_domain = strdup("/dev/kdbus"); + if (!kdbus_domain) { + log_oom(); + goto finish; + } + } else { + const char *ns; - raw_attr = saved_attr; - cfmakeraw(&raw_attr); - raw_attr.c_lflag &= ~ECHO; + ns = strappenda("machine-", arg_machine); + kdbus_fd = bus_kernel_create_domain(ns, &kdbus_domain); + if (r < 0) + log_debug("Failed to create kdbus domain: %s", strerror(-r)); + else + log_debug("Successfully created kdbus domain as %s", kdbus_domain); + } } if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_NONBLOCK|SOCK_CLOEXEC, 0, kmsg_socket_pair) < 0) { - log_error("Failed to create kmsg socket pair"); + log_error("Failed to create kmsg socket pair: %m"); goto finish; } + sd_notify(0, "READY=1"); + assert_se(sigemptyset(&mask) == 0); sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1); assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); @@ -1184,14 +1704,16 @@ int main(int argc, char *argv[]) { for (;;) { siginfo_t status; - if (saved_attr_valid) { - if (tcsetattr(STDIN_FILENO, TCSANOW, &raw_attr) < 0) { - log_error("Failed to set terminal attributes: %m"); - goto finish; - } + sync_fd = eventfd(0, EFD_CLOEXEC); + if (sync_fd < 0) { + log_error("Failed to create event fd: %m"); + goto finish; } - pid = syscall(__NR_clone, SIGCHLD|CLONE_NEWIPC|CLONE_NEWNS|CLONE_NEWPID|CLONE_NEWUTS|(arg_private_network ? CLONE_NEWNET : 0), NULL); + pid = syscall(__NR_clone, + SIGCHLD|CLONE_NEWNS| + (arg_share_system ? 0 : CLONE_NEWIPC|CLONE_NEWPID|CLONE_NEWUTS)| + (arg_private_network ? CLONE_NEWNET : 0), NULL); if (pid < 0) { if (errno == EINVAL) log_error("clone() failed, do you have namespace support enabled in your kernel? (You need UTS, IPC, PID and NET namespacing built in): %m"); @@ -1203,13 +1725,12 @@ int main(int argc, char *argv[]) { if (pid == 0) { /* child */ - const char *home = NULL; uid_t uid = (uid_t) -1; gid_t gid = (gid_t) -1; - unsigned n_env = 0; + unsigned n_env = 2; const char *envp[] = { - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + "PATH=" DEFAULT_PATH_SPLIT_USR, "container=systemd-nspawn", /* LXC sets container=lxc, so follow the scheme here */ NULL, /* TERM */ NULL, /* HOME */ @@ -1220,9 +1741,12 @@ int main(int argc, char *argv[]) { NULL, /* LISTEN_PID */ NULL }; + char **env_use; + eventfd_t x; - envp[2] = strv_find_prefix(environ, "TERM="); - n_env = 3; + envp[n_env] = strv_find_prefix(environ, "TERM="); + if (envp[n_env]) + n_env ++; close_nointr_nofail(master); master = -1; @@ -1261,6 +1785,9 @@ int main(int argc, char *argv[]) { goto child_fail; } + if (reset_audit_loginuid() < 0) + goto child_fail; + if (prctl(PR_SET_PDEATHSIG, SIGKILL) < 0) { log_error("PR_SET_PDEATHSIG failed: %m"); goto child_fail; @@ -1292,8 +1819,14 @@ int main(int argc, char *argv[]) { if (copy_devnodes(arg_directory) < 0) goto child_fail; + if (setup_ptmx(arg_directory) < 0) + goto child_fail; + dev_setup(arg_directory); + if (audit_still_doesnt_work_in_containers() < 0) + goto child_fail; + if (setup_dev_console(arg_directory, console) < 0) goto child_fail; @@ -1315,6 +1848,15 @@ int main(int argc, char *argv[]) { if (setup_journal(arg_directory) < 0) goto child_fail; + if (mount_binds(arg_directory, arg_bind, 0) < 0) + goto child_fail; + + if (mount_binds(arg_directory, arg_bind_ro, MS_RDONLY) < 0) + goto child_fail; + + if (setup_kdbus(arg_directory, kdbus_domain) < 0) + goto child_fail; + if (chdir(arg_directory) < 0) { log_error("chdir(%s) failed: %m", arg_directory); goto child_fail; @@ -1337,7 +1879,8 @@ int main(int argc, char *argv[]) { umask(0022); - loopback_setup(); + if (arg_private_network) + loopback_setup(); if (drop_capabilities() < 0) { log_error("drop_capabilities() failed: %m"); @@ -1407,8 +1950,8 @@ int main(int argc, char *argv[]) { goto child_fail; } - if (arg_uuid) { - if (asprintf((char**)(envp + n_env++), "container_uuid=%s", arg_uuid) < 0) { + if (!sd_id128_equal(arg_uuid, SD_ID128_NULL)) { + if (asprintf((char**)(envp + n_env++), "container_uuid=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(arg_uuid)) < 0) { log_oom(); goto child_fail; } @@ -1422,7 +1965,7 @@ int main(int argc, char *argv[]) { } if ((asprintf((char **)(envp + n_env++), "LISTEN_FDS=%u", n_fd_passed) < 0) || - (asprintf((char **)(envp + n_env++), "LISTEN_PID=%lu", (unsigned long) getpid()) < 0)) { + (asprintf((char **)(envp + n_env++), "LISTEN_PID=1") < 0)) { log_oom(); goto child_fail; } @@ -1430,6 +1973,28 @@ int main(int argc, char *argv[]) { setup_hostname(); + eventfd_read(sync_fd, &x); + close_nointr_nofail(sync_fd); + sync_fd = -1; + + if (!strv_isempty(arg_setenv)) { + char **n; + + n = strv_env_merge(2, envp, arg_setenv); + if (!n) { + log_oom(); + goto child_fail; + } + + env_use = n; + } else + env_use = (char**) envp; + +#ifdef HAVE_SELINUX + if (arg_selinux_context) + if (setexeccon(arg_selinux_context) < 0) + log_error("setexeccon(\"%s\") failed: %m", arg_selinux_context); +#endif if (arg_boot) { char **a; size_t l; @@ -1441,18 +2006,19 @@ int main(int argc, char *argv[]) { memcpy(a + 1, argv + optind, l * sizeof(char*)); a[0] = (char*) "/usr/lib/systemd/systemd"; - execve(a[0], a, (char**) envp); + execve(a[0], a, env_use); a[0] = (char*) "/lib/systemd/systemd"; - execve(a[0], a, (char**) envp); + execve(a[0], a, env_use); a[0] = (char*) "/sbin/init"; - execve(a[0], a, (char**) envp); + execve(a[0], a, env_use); } else if (argc > optind) - execvpe(argv[optind], argv + optind, (char**) envp); + execvpe(argv[optind], argv + optind, env_use); else { chdir(home ? home : "/root"); - execle("/bin/bash", "-bash", NULL, (char**) envp); + execle("/bin/bash", "-bash", NULL, env_use); + execle("/bin/sh", "-sh", NULL, env_use); } log_error("execv() failed: %m"); @@ -1464,70 +2030,93 @@ int main(int argc, char *argv[]) { fdset_free(fds); fds = NULL; - if (process_pty(master, pid, &mask) < 0) + r = register_machine(pid); + if (r < 0) goto finish; - if (saved_attr_valid) - tcsetattr(STDIN_FILENO, TCSANOW, &saved_attr); + r = move_network_interfaces(pid); + if (r < 0) + goto finish; - r = wait_for_terminate(pid, &status); - if (r < 0) { + r = setup_veth(pid, veth_name); + if (r < 0) + goto finish; + + r = setup_bridge(veth_name); + if (r < 0) + goto finish; + + eventfd_write(sync_fd, 1); + close_nointr_nofail(sync_fd); + sync_fd = -1; + + k = process_pty(master, &mask, arg_boot ? pid : 0, SIGRTMIN+3); + if (k < 0) { + r = EXIT_FAILURE; + break; + } + + if (!arg_quiet) + putc('\n', stdout); + + /* Kill if it is not dead yet anyway */ + terminate_machine(pid); + + /* Redundant, but better safe than sorry */ + kill(pid, SIGKILL); + + k = wait_for_terminate(pid, &status); + pid = 0; + + if (k < 0) { r = EXIT_FAILURE; break; } if (status.si_code == CLD_EXITED) { + r = status.si_status; if (status.si_status != 0) { - log_error("Container failed with error code %i.", status.si_status); - r = status.si_status; + log_error("Container %s failed with error code %i.", arg_machine, status.si_status); break; } - log_debug("Container exited successfully."); + if (!arg_quiet) + log_debug("Container %s exited successfully.", arg_machine); break; } else if (status.si_code == CLD_KILLED && status.si_status == SIGINT) { - log_info("Container has been shut down."); + + if (!arg_quiet) + log_info("Container %s has been shut down.", arg_machine); r = 0; break; } else if (status.si_code == CLD_KILLED && status.si_status == SIGHUP) { - log_info("Container is being rebooted."); + + if (!arg_quiet) + log_info("Container %s is being rebooted.", arg_machine); continue; } else if (status.si_code == CLD_KILLED || status.si_code == CLD_DUMPED) { - log_error("Container terminated by signal %s.", signal_to_string(status.si_status)); + log_error("Container %s terminated by signal %s.", arg_machine, signal_to_string(status.si_status)); r = EXIT_FAILURE; break; } else { - log_error("Container failed due to unknown reason."); + log_error("Container %s failed due to unknown reason.", arg_machine); r = EXIT_FAILURE; break; } } finish: - if (saved_attr_valid) - tcsetattr(STDIN_FILENO, TCSANOW, &saved_attr); - - if (master >= 0) - close_nointr_nofail(master); - - close_pipe(kmsg_socket_pair); - - if (oldcg) - cg_attach(SYSTEMD_CGROUP_CONTROLLER, oldcg, 0); - - if (newcg) - cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, newcg, true); + if (pid > 0) + kill(pid, SIGKILL); free(arg_directory); - strv_free(arg_controllers); - free(oldcg); - free(newcg); - - fdset_free(fds); + free(arg_machine); + free(arg_setenv); + free(arg_network_interfaces); return r; }