Index: projects/jailconf/usr.sbin/jail/command.c =================================================================== --- projects/jailconf/usr.sbin/jail/command.c (revision 214782) +++ projects/jailconf/usr.sbin/jail/command.c (revision 214783) @@ -1,675 +1,668 @@ /*- * Copyright (c) 2010 James Gritton * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "jailp.h" #define COMSTRING_DUMMY ((struct cfstring *)1) #define DEFAULT_STOP_TIMEOUT 10 #define PHASH_SIZE 256 LIST_HEAD(phhead, phash); struct phash { LIST_ENTRY(phash) le; struct cfjail *j; pid_t pid; }; extern char **environ; static int get_user_info(struct cfjail *j, const char *username, const struct passwd **pwdp, login_cap_t **lcapp); static void add_proc(struct cfjail *j, pid_t pid); static void clear_procs(struct cfjail *j); static struct cfjail *find_proc(pid_t pid); static struct cfjails sleeping = TAILQ_HEAD_INITIALIZER(sleeping); static struct cfjails runnable = TAILQ_HEAD_INITIALIZER(runnable); static struct phhead phash[PHASH_SIZE]; static int kq; /* * Run a command associated with a jail, possibly inside the jail. */ int run_command(struct cfjail *j, int *plimit, enum intparam comparam) { const struct passwd *pwd; struct cfstring *comstring, *s; login_cap_t *lcap; char **argv; char *cs, *addr, *comcs; const char *jidstr, *conslog, *path, *ruleset, *term, *username; size_t comlen; pid_t pid; int argc, bg, clean, consfd, down, fib, i, injail, sjuser, timeout; static char *cleanenv; if (comparam) { if (comparam == IP_MOUNT_DEVFS ? !bool_param(j->intparams[IP_MOUNT_DEVFS]) : j->intparams[comparam] == NULL) return 0; j->comparam = comparam; j->comstring = comparam == IP_MOUNT_DEVFS ? COMSTRING_DUMMY : STAILQ_FIRST(&j->intparams[comparam]->val); } else { comparam = j->comparam; if (!(j->flags & JF_RUNQ)) j->comstring = j->comstring == COMSTRING_DUMMY ? NULL : STAILQ_NEXT(j->comstring, tq); } comstring = j->comstring; if (comstring == NULL || (comstring != COMSTRING_DUMMY && comstring->len == 0)) return 0; if (plimit && *plimit == 0) { j->flags |= JF_RUNQ; requeue(j, &runnable); return 1; } j->flags &= ~(JF_RUNQ | JF_BACKGROUND); /* * Collect exec arguments. Internal commands for network and * mounting build their own argument lists (XXX they should be * truly internal). */ bg = j->flags & JF_FAILED; down = j->flags & (JF_STOP | JF_FAILED); if (comparam == IP__IP4_IFADDR) { argv = alloca(8 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; if ((cs = strchr(comstring->s, '|'))) { argv[1] = alloca(cs - comstring->s + 1); strlcpy(argv[1], comstring->s, cs - comstring->s + 1); addr = cs + 1; } else { *(const char **)&argv[1] = string_param(j->intparams[IP_INTERFACE]); addr = comstring->s; } *(const char **)&argv[2] = "inet"; if (!(cs = strchr(addr, '/'))) { argv[3] = addr; *(const char **)&argv[4] = "netmask"; *(const char **)&argv[5] = "255.255.255.255"; argc = 6; } else if (strchr(cs + 1, '.')) { argv[3] = alloca(cs - addr + 1); strlcpy(argv[3], addr, cs - addr + 1); *(const char **)&argv[4] = "netmask"; *(const char **)&argv[5] = cs + 1; argc = 6; } else { argv[3] = addr; argc = 4; } *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; j->flags |= JF_IFUP; #ifdef INET6 } else if (comparam == IP__IP6_IFADDR) { argv = alloca(8 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; if ((cs = strchr(comstring->s, '|'))) { argv[1] = alloca(cs - comstring->s + 1); strlcpy(argv[1], comstring->s, cs - comstring->s + 1); addr = cs + 1; } else { *(const char **)&argv[1] = string_param(j->intparams[IP_INTERFACE]); addr = comstring->s; } *(const char **)&argv[2] = "inet6"; argv[3] = addr; if (!(cs = strchr(addr, '/'))) { *(const char **)&argv[4] = "prefixlen"; *(const char **)&argv[5] = "128"; argc = 6; } else argc = 4; *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; j->flags |= JF_IFUP; #endif } else if (comparam == IP_VNET_INTERFACE) { argv = alloca(5 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; argv[1] = comstring->s; *(const char **)&argv[2] = down ? "-vnet" : "vnet"; jidstr = string_param(j->intparams[KP_JID]); *(const char **)&argv[3] = jidstr ? jidstr : string_param(j->intparams[KP_NAME]); argv[4] = NULL; j->flags |= JF_IFUP; - } else if (comparam == IP_MOUNT) { + } else if (comparam == IP_MOUNT || comparam == IP__MOUNT_FROM_FSTAB) { argv = alloca(8 * sizeof(char *)); comcs = alloca(comstring->len + 1); strcpy(comcs, comstring->s); argc = 0; for (cs = strtok(comcs, " \t\f\v\r\n"); cs && argc < 4; cs = strtok(NULL, " \t\f\v\r\n")) argv[argc++] = cs; if (argc < 3) { - jail_warnx(j, "mount: %s: missing information", - comstring->s); + jail_warnx(j, "%s: %s: missing information", + j->intparams[comparam]->name, comstring->s); failed(j); return -1; } if (down) { argv[4] = NULL; argv[3] = argv[1]; *(const char **)&argv[0] = "/sbin/umount"; } else { if (argc == 4) { argv[7] = NULL; argv[6] = argv[1]; argv[5] = argv[0]; argv[4] = argv[3]; *(const char **)&argv[3] = "-o"; } else { argv[5] = NULL; argv[4] = argv[1]; argv[3] = argv[0]; } *(const char **)&argv[0] = _PATH_MOUNT; } *(const char **)&argv[1] = "-t"; - j->flags |= JF_MOUNTED; - } else if (comparam == IP_MOUNT_FSTAB) { - argv = alloca(4 * sizeof(char *)); - *(const char **)&argv[0] = down ? "/sbin/umount" : _PATH_MOUNT; - *(const char **)&argv[1] = "-aF"; - argv[2] = comstring->s; - argv[3] = NULL; j->flags |= JF_MOUNTED; } else if (comparam == IP_MOUNT_DEVFS) { path = string_param(j->intparams[KP_PATH]); if (path == NULL) { jail_warnx(j, "mount.devfs: no path"); failed(j); return -1; } if (down) { argv = alloca(3 * sizeof(char *)); *(const char **)&argv[0] = "/sbin/umount"; argv[1] = alloca(strlen(path) + 5); sprintf(argv[1], "%s/dev", path); argv[2] = NULL; } else { argv = alloca(4 * sizeof(char *)); *(const char **)&argv[0] = _PATH_BSHELL; *(const char **)&argv[1] = "-c"; ruleset = string_param(j->intparams [IP_MOUNT_DEVFS_RULESET]); argv[2] = alloca(strlen(path) + (ruleset ? strlen(ruleset) + 1 : 0) + 56); sprintf(argv[2], ". /etc/rc.subr; load_rc_config .; " "devfs_mount_jail %s/dev%s%s", path, ruleset ? " " : "", ruleset ? ruleset : ""); argv[3] = NULL; } j->flags |= JF_MOUNTED; } else if (comparam == IP_COMMAND && j->name == NULL) { argc = 0; STAILQ_FOREACH(s, &j->intparams[IP_COMMAND]->val, tq) argc++; argv = alloca((argc + 1) * sizeof(char *)); argc = 0; STAILQ_FOREACH(s, &j->intparams[IP_COMMAND]->val, tq) argv[argc++] = s->s; argv[argc] = NULL; j->comstring = NULL; } else if ((cs = strpbrk(comstring->s, "!\"$&'()*;<>?[\\]`{|}~")) && !(cs[0] == '&' && cs[1] == '\0')) { argv = alloca(4 * sizeof(char *)); *(const char **)&argv[0] = _PATH_BSHELL; *(const char **)&argv[1] = "-c"; argv[2] = comstring->s; argv[3] = NULL; } else { if (cs) { *cs = 0; bg = 1; } comcs = alloca(comstring->len + 1); strcpy(comcs, comstring->s); argc = 0; for (cs = strtok(comcs, " \t\f\v\r\n"); cs; cs = strtok(NULL, " \t\f\v\r\n")) argc++; argv = alloca((argc + 1) * sizeof(char *)); strcpy(comcs, comstring->s); argc = 0; for (cs = strtok(comcs, " \t\f\v\r\n"); cs; cs = strtok(NULL, " \t\f\v\r\n")) argv[argc++] = cs; argv[argc] = NULL; } if (argv[0] == NULL) return 0; j->pstatus = 0; if (int_param(j->intparams[IP_EXEC_TIMEOUT], &timeout) && timeout != 0) { clock_gettime(CLOCK_REALTIME, &j->timeout); j->timeout.tv_sec += timeout; } else j->timeout.tv_sec = 0; injail = comparam == IP_EXEC_START || comparam == IP_COMMAND || comparam == IP_EXEC_STOP; clean = bool_param(j->intparams[IP_EXEC_CLEAN]); username = string_param(j->intparams[injail ? IP_EXEC_JAIL_USER : IP_EXEC_SYSTEM_USER]); sjuser = bool_param(j->intparams[IP_EXEC_SYSTEM_JAIL_USER]); consfd = 0; if (injail && (conslog = string_param(j->intparams[IP_EXEC_CONSOLELOG]))) { consfd = open(conslog, O_WRONLY | O_CREAT | O_APPEND, DEFFILEMODE); if (consfd < 0) { jail_warnx(j, "open %s: %s", conslog, strerror(errno)); failed(j); return -1; } } comlen = 0; for (i = 0; argv[i]; i++) comlen += strlen(argv[i]) + 1; j->comline = cs = emalloc(comlen); for (i = 0; argv[i]; i++) { strcpy(cs, argv[i]); if (argv[i + 1]) { cs += strlen(argv[i]) + 1; cs[-1] = ' '; } } if (verbose > 0) jail_note(j, "run command%s%s%s: %s\n", injail ? " in jail" : "", username ? " as " : "", username ? username : "", j->comline); pid = fork(); if (pid < 0) err(1, "fork"); if (pid > 0) { if (bg) { j->flags |= JF_BACKGROUND; requeue(j, &ready); } else { --*plimit; add_proc(j, pid); } return 1; } if (bg) setsid(); pwd = NULL; lcap = NULL; if ((clean || username) && injail && sjuser && get_user_info(j, username, &pwd, &lcap) < 0) exit(1); if (injail) { /* jail_attach won't chdir along with its chroot. */ path = string_param(j->intparams[KP_PATH]); if (path && chdir(path) < 0) { jail_warnx(j, "chdir %s: %s", path, strerror(errno)); exit(1); } if (int_param(j->intparams[IP_EXEC_FIB], &fib) && setfib(fib) < 0) { jail_warnx(j, "setfib: %s", strerror(errno)); exit(1); } if (jail_attach(j->jid) < 0) { jail_warnx(j, "jail_attach: %s", strerror(errno)); exit(1); } } if (clean || username) { if (!(injail && sjuser) && get_user_info(j, username, &pwd, &lcap) < 0) exit(1); if (clean) { term = getenv("TERM"); environ = &cleanenv; setenv("PATH", "/bin:/usr/bin", 0); setenv("TERM", term, 1); } if (setusercontext(lcap, pwd, pwd->pw_uid, username ? LOGIN_SETALL & ~LOGIN_SETGROUP & ~LOGIN_SETLOGIN : LOGIN_SETPATH | LOGIN_SETENV) < 0) { jail_warnx(j, "setusercontext %s: %s", pwd->pw_name, strerror(errno)); exit(1); } login_close(lcap); setenv("USER", pwd->pw_name, 1); setenv("HOME", pwd->pw_dir, 1); setenv("SHELL", *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); if (clean && chdir(pwd->pw_dir) < 0) { jail_warnx(j, "chdir %s: %s", pwd->pw_dir, strerror(errno)); exit(1); } endpwent(); } if (consfd != 0 && (dup2(consfd, 1) < 0 || dup2(consfd, 2) < 0)) { jail_warnx(j, "exec.consolelog: %s", strerror(errno)); exit(1); } closefrom(3); execvp(argv[0], argv); jail_warnx(j, "exec %s: %s", argv[0], strerror(errno)); exit(1); } /* * Check command exit status */ int finish_command(struct cfjail *j, int *plimit) { int error; if (j->flags & (JF_RUNQ | JF_BACKGROUND)) return 0; ++*plimit; if (!TAILQ_EMPTY(&runnable)) requeue(TAILQ_FIRST(&runnable), &ready); error = 0; if (j->flags & JF_TIMEOUT) { j->flags &= ~JF_TIMEOUT; if (j->comparam != IP_STOP_TIMEOUT) { jail_warnx(j, "%s: timed out", j->comline); failed(j); error = -1; } else if (verbose > 0) jail_note(j, "timed out\n"); } else if (j->pstatus != 0) { if (WIFSIGNALED(j->pstatus)) jail_warnx(j, "%s: exited on signal %d", j->comline, WTERMSIG(j->pstatus)); else jail_warnx(j, "%s: failed", j->comline); failed(j); error = -1; } free(j->comline); return error; } /* * Check for finished processed or timeouts. */ struct cfjail * next_proc(int nonblock) { struct kevent ke; struct timespec ts; struct timespec *tsp; struct cfjail *j; if (!TAILQ_EMPTY(&sleeping)) { again: tsp = NULL; if ((j = TAILQ_FIRST(&sleeping)) && j->timeout.tv_sec) { clock_gettime(CLOCK_REALTIME, &ts); ts.tv_sec = j->timeout.tv_sec - ts.tv_sec; ts.tv_nsec = j->timeout.tv_nsec - ts.tv_nsec; if (ts.tv_nsec < 0) { ts.tv_sec--; ts.tv_nsec += 1000000000; } if (ts.tv_sec < 0 || (ts.tv_sec == 0 && ts.tv_nsec == 0)) { j->flags |= JF_TIMEOUT; clear_procs(j); return j; } tsp = &ts; } if (nonblock) { ts.tv_sec = 0; ts.tv_nsec = 0; tsp = &ts; } switch (kevent(kq, NULL, 0, &ke, 1, tsp)) { case -1: if (errno != EINTR) err(1, "kevent"); goto again; case 0: if (!nonblock) { j = TAILQ_FIRST(&sleeping); j->flags |= JF_TIMEOUT; clear_procs(j); return j; } break; case 1: (void)waitpid(ke.ident, NULL, WNOHANG); if ((j = find_proc(ke.ident))) { j->pstatus = ke.data; return j; } goto again; } } return NULL; } /* * Send SIGTERM to all processes in a jail and wait for them to die. */ int term_procs(struct cfjail *j) { struct kinfo_proc *ki; int i, noted, pcnt, timeout; static kvm_t *kd; if (!int_param(j->intparams[IP_STOP_TIMEOUT], &timeout)) timeout = DEFAULT_STOP_TIMEOUT; else if (timeout == 0) return 0; if (kd == NULL) { kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "jail"); if (kd == NULL) exit(1); } ki = kvm_getprocs(kd, KERN_PROC_PROC, 0, &pcnt); if (ki == NULL) exit(1); noted = 0; for (i = 0; i < pcnt; i++) if (ki[i].ki_jid == j->jid && kill(ki[i].ki_pid, SIGTERM) == 0) { add_proc(j, ki[i].ki_pid); if (verbose > 0) { if (!noted) { noted = 1; jail_note(j, "sent SIGTERM to:"); } printf(" %d", ki[i].ki_pid); } } if (noted) printf("\n"); if (j->nprocs > 0) { clock_gettime(CLOCK_REALTIME, &j->timeout); j->timeout.tv_sec += timeout; return 1; } return 0; } /* * Add a process to the hash, tied to a jail. */ static void add_proc(struct cfjail *j, pid_t pid) { struct kevent ke; struct cfjail *tj; struct phash *ph; if (!kq && (kq = kqueue()) < 0) err(1, "kqueue"); EV_SET(&ke, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL); if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0) err(1, "kevent"); ph = emalloc(sizeof(struct phash)); ph->j = j; ph->pid = pid; LIST_INSERT_HEAD(&phash[pid % PHASH_SIZE], ph, le); j->nprocs++; if (j->timeout.tv_sec) { TAILQ_REMOVE(j->queue, j, tq); TAILQ_FOREACH(tj, &sleeping, tq) { if (!tj->timeout.tv_sec || j->timeout.tv_sec < tj->timeout.tv_sec || (j->timeout.tv_sec == tj->timeout.tv_sec && j->timeout.tv_nsec <= tj->timeout.tv_nsec)) { TAILQ_INSERT_BEFORE(tj, j, tq); break; } } if (tj == NULL) TAILQ_INSERT_TAIL(&sleeping, j, tq); j->queue = &sleeping; } else requeue(j, &sleeping); } /* * Remove any processes from the hash that correspond to a jail. */ static void clear_procs(struct cfjail *j) { struct kevent ke; struct phash *ph, *tph; int i; j->nprocs = 0; for (i = 0; i < PHASH_SIZE; i++) LIST_FOREACH_SAFE(ph, &phash[i], le, tph) if (ph->j == j) { EV_SET(&ke, ph->pid, EVFILT_PROC, EV_DELETE, NOTE_EXIT, 0, NULL); (void)kevent(kq, &ke, 1, NULL, 0, NULL); LIST_REMOVE(ph, le); free(ph); } } /* * Find the jail that corresponds to an exited process. */ static struct cfjail * find_proc(pid_t pid) { struct cfjail *j; struct phash *ph; LIST_FOREACH(ph, &phash[pid % PHASH_SIZE], le) if (ph->pid == pid) { j = ph->j; LIST_REMOVE(ph, le); free(ph); return --j->nprocs ? NULL : j; } return NULL; } /* * Look up a user in the passwd and login.conf files. */ static int get_user_info(struct cfjail *j, const char *username, const struct passwd **pwdp, login_cap_t **lcapp) { const struct passwd *pwd; *pwdp = pwd = username ? getpwnam(username) : getpwuid(getuid()); if (pwd == NULL) { if (errno) jail_warnx(j, "getpwnam%s%s: %s", username ? " " : "", username ? username : "", strerror(errno)); else if (username) jail_warnx(j, "%s: no such user", username); else jail_warnx(j, "unknown uid %d", getuid()); return -1; } *lcapp = login_getpwclass(pwd); if (*lcapp == NULL) { jail_warnx(j, "getpwclass %s: %s", pwd->pw_name, strerror(errno)); return -1; } /* Set the groups while the group file is still available */ if (initgroups(pwd->pw_name, pwd->pw_gid) < 0) { jail_warnx(j, "initgroups %s: %s", pwd->pw_name, strerror(errno)); return -1; } return 0; } Index: projects/jailconf/usr.sbin/jail/config.c =================================================================== --- projects/jailconf/usr.sbin/jail/config.c (revision 214782) +++ projects/jailconf/usr.sbin/jail/config.c (revision 214783) @@ -1,772 +1,809 @@ /*- * Copyright (c) 2010 James Gritton * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include +#include #include #include #include #include #include #include #include #include #include #include "jailp.h" struct ipspec { const char *name; unsigned flags; }; extern FILE *yyin; extern int yynerrs; struct cfjails cfjails = TAILQ_HEAD_INITIALIZER(cfjails); static void free_param(struct cfparams *pp, struct cfparam *p); static void free_param_strings(struct cfparam *p); static const struct ipspec intparams[] = { [IP_ALLOW_DYING] = {"allow.dying", PF_INTERNAL | PF_BOOL}, [IP_COMMAND] = {"command", PF_INTERNAL}, [IP_DEPEND] = {"depend", PF_INTERNAL}, [IP_EXEC_CLEAN] = {"exec.clean", PF_INTERNAL | PF_BOOL}, [IP_EXEC_CONSOLELOG] = {"exec.consolelog", PF_INTERNAL}, [IP_EXEC_FIB] = {"exec.fib", PF_INTERNAL | PF_INT}, [IP_EXEC_JAIL_USER] = {"exec.jail_user", PF_INTERNAL}, [IP_EXEC_POSTSTART] = {"exec.poststart", PF_INTERNAL}, [IP_EXEC_POSTSTOP] = {"exec.poststop", PF_INTERNAL}, [IP_EXEC_PRESTART] = {"exec.prestart", PF_INTERNAL}, [IP_EXEC_PRESTOP] = {"exec.prestop", PF_INTERNAL}, [IP_EXEC_START] = {"exec.start", PF_INTERNAL}, [IP_EXEC_STOP] = {"exec.stop", PF_INTERNAL}, [IP_EXEC_SYSTEM_JAIL_USER]= {"exec.system_jail_user", PF_INTERNAL | PF_BOOL}, [IP_EXEC_SYSTEM_USER] = {"exec.system_user", PF_INTERNAL}, [IP_EXEC_TIMEOUT] = {"exec.timeout", PF_INTERNAL | PF_INT}, [IP_INTERFACE] = {"interface", PF_INTERNAL}, [IP_IP_HOSTNAME] = {"ip_hostname", PF_INTERNAL | PF_BOOL}, [IP_MOUNT] = {"mount", PF_INTERNAL}, [IP_MOUNT_DEVFS] = {"mount.devfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_DEVFS_RULESET]= {"mount.devfs.ruleset", PF_INTERNAL}, [IP_MOUNT_FSTAB] = {"mount.fstab", PF_INTERNAL}, [IP_STOP_TIMEOUT] = {"stop.timeout", PF_INTERNAL | PF_INT}, [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL}, [IP__IP4_IFADDR] = {"ip4.addr", PF_INTERNAL | PF_CONV}, #ifdef INET6 [IP__IP6_IFADDR] = {"ip6.addr", PF_INTERNAL | PF_CONV}, #endif + [IP__MOUNT_FROM_FSTAB] = {"mount.fstab", PF_INTERNAL | PF_CONV}, [KP_ALLOW_CHFLAGS] = {"allow.chflags", 0}, [KP_ALLOW_MOUNT] = {"allow.mount", 0}, [KP_ALLOW_RAW_SOCKETS] = {"allow.raw_sockets", 0}, [KP_ALLOW_SET_HOSTNAME]= {"allow.set_hostname", 0}, [KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0}, [KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0}, [KP_ENFORCE_STATFS] = {"enforce_statfs", 0}, [KP_HOST_HOSTNAME] = {"host.hostname", 0}, [KP_IP4_ADDR] = {"ip4.addr", 0}, #ifdef INET6 [KP_IP6_ADDR] = {"ip6.addr", 0}, #endif [KP_JID] = {"jid", 0}, [KP_NAME] = {"name", 0}, [KP_PATH] = {"path", 0}, [KP_PERSIST] = {"persist", 0}, [KP_SECURELEVEL] = {"securelevel", 0}, [KP_VNET] = {"vnet", 0}, }; /* * Parse the jail configuration file. */ void load_config(void) { struct cfjails wild; struct cfparams opp; struct cfjail *j, *tj, *wj; struct cfparam *p, *vp, *tp; struct cfstring *s, *vs, *ns; struct cfvar *v; char *ep; size_t varoff; int did_self, jseq, pgen; if (!strcmp(cfname, "-")) { cfname = "STDIN"; yyin = stdin; } else { yyin = fopen(cfname, "r"); if (!yyin) err(1, "%s", cfname); } if (yyparse() || yynerrs) exit(1); /* Separate the wildcard jails out from the actual jails. */ jseq = 0; TAILQ_INIT(&wild); TAILQ_FOREACH_SAFE(j, &cfjails, tq, tj) { j->seq = ++jseq; if (wild_jail_name(j->name)) requeue(j, &wild); } TAILQ_FOREACH(j, &cfjails, tq) { /* Set aside the jail's parameters. */ TAILQ_INIT(&opp); TAILQ_CONCAT(&opp, &j->params, tq); /* * The jail name implies its "name" or "jid" parameter, * though they may also be explicitly set later on. */ add_param(j, NULL, strtol(j->name, &ep, 10) && !*ep ? KP_JID : KP_NAME, j->name); /* * Collect parameters for the jail, global parameters/variables, * and any matching wildcard jails. */ did_self = 0; TAILQ_FOREACH(wj, &wild, tq) { if (j->seq < wj->seq && !did_self) { TAILQ_FOREACH(p, &opp, tq) add_param(j, p, 0, NULL); did_self = 1; } if (wild_jail_match(j->name, wj->name)) TAILQ_FOREACH(p, &wj->params, tq) add_param(j, p, 0, NULL); } if (!did_self) TAILQ_FOREACH(p, &opp, tq) add_param(j, p, 0, NULL); /* Resolve any variable substitutions. */ pgen = 0; TAILQ_FOREACH(p, &j->params, tq) { p->gen = ++pgen; find_vars: STAILQ_FOREACH(s, &p->val, tq) { varoff = 0; while ((v = STAILQ_FIRST(&s->vars))) { TAILQ_FOREACH(vp, &j->params, tq) if (!strcmp(vp->name, v->name)) break; if (!vp) { jail_warnx(j, "%s: variable \"%s\" not found", p->name, v->name); bad_var: j->flags |= JF_FAILED; TAILQ_FOREACH(vp, &j->params, tq) if (vp->gen == pgen) vp->flags |= PF_BAD; goto free_var; } if (vp->flags & PF_BAD) goto bad_var; if (vp->gen == pgen) { jail_warnx(j, "%s: variable loop", v->name); goto bad_var; } STAILQ_FOREACH(vs, &vp->val, tq) if (!STAILQ_EMPTY(&vs->vars)) { vp->gen = pgen; TAILQ_REMOVE(&j->params, vp, tq); TAILQ_INSERT_BEFORE(p, vp, tq); p = vp; goto find_vars; } vs = STAILQ_FIRST(&vp->val); if (STAILQ_NEXT(vs, tq) != NULL && (s->s[0] != '\0' || STAILQ_NEXT(v, tq))) { jail_warnx(j, "%s: array cannot be " "substituted inline", p->name); goto bad_var; } s->s = erealloc(s->s, s->len + vs->len + 1); memmove(s->s + v->pos + varoff + vs->len, s->s + v->pos + varoff, s->len - (v->pos + varoff) + 1); memcpy(s->s + v->pos + varoff, vs->s, vs->len); varoff += vs->len; s->len += vs->len; while ((vs = STAILQ_NEXT(vs, tq))) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(vs->s); ns->len = vs->len; STAILQ_INIT(&ns->vars); STAILQ_INSERT_AFTER(&p->val, s, ns, tq); s = ns; } free_var: free(v->name); STAILQ_REMOVE_HEAD(&s->vars, tq); free(v); } } } /* Free the jail's original parameter list and any variables. */ while ((p = TAILQ_FIRST(&opp))) free_param(&opp, p); TAILQ_FOREACH_SAFE(p, &j->params, tq, tp) if (p->flags & PF_VAR) free_param(&j->params, p); } while ((wj = TAILQ_FIRST(&wild))) { free(wj->name); while ((p = TAILQ_FIRST(&wj->params))) free_param(&wj->params, p); TAILQ_REMOVE(&wild, wj, tq); } } /* * Create a new jail record. */ struct cfjail * add_jail(void) { struct cfjail *j; j = emalloc(sizeof(struct cfjail)); memset(j, 0, sizeof(struct cfjail)); TAILQ_INIT(&j->params); STAILQ_INIT(&j->dep[DEP_FROM]); STAILQ_INIT(&j->dep[DEP_TO]); j->queue = &cfjails; TAILQ_INSERT_TAIL(&cfjails, j, tq); return j; } /* * Add a parameter to a jail. */ void add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, const char *value) { struct cfstrings nss; struct cfparam *dp, *np; struct cfstring *s, *ns; struct cfvar *v, *nv; struct ipspec *ips; const char *name; char *cs, *tname; unsigned flags; if (j == NULL) { /* Create a single anonymous jail if one doesn't yet exist. */ j = TAILQ_LAST(&cfjails, cfjails); if (j == NULL) j = add_jail(); } STAILQ_INIT(&nss); if (p != NULL) { name = p->name; flags = p->flags; /* * Make a copy of the parameter's string list, * which may be freed if it's overridden later. */ STAILQ_FOREACH(s, &p->val, tq) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(s->s); ns->len = s->len; STAILQ_INIT(&ns->vars); STAILQ_FOREACH(v, &s->vars, tq) { nv = emalloc(sizeof(struct cfvar)); nv->name = strdup(v->name); nv->pos = v->pos; STAILQ_INSERT_TAIL(&ns->vars, nv, tq); } STAILQ_INSERT_TAIL(&nss, ns, tq); } } else { flags = PF_APPEND; if (ipnum != 0) { name = intparams[ipnum].name; flags |= intparams[ipnum].flags; } else if ((cs = strchr(value, '='))) { tname = alloca(cs - value + 1); strlcpy(tname, value, cs - value + 1); name = tname; value = cs + 1; } else { name = value; value = NULL; } if (value != NULL) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(value); ns->len = strlen(value); STAILQ_INIT(&ns->vars); STAILQ_INSERT_TAIL(&nss, ns, tq); } } /* See if this parameter has already been added. */ if (ipnum != 0) dp = j->intparams[ipnum]; else TAILQ_FOREACH(dp, &j->params, tq) if (!(dp->flags & PF_CONV) && equalopts(dp->name, name)) break; if (dp != NULL) { /* Found it - append or replace. */ if (strcmp(dp->name, name)) { free(dp->name); dp->name = estrdup(name); } if (!(flags & PF_APPEND) || STAILQ_EMPTY(&nss)) free_param_strings(dp); STAILQ_CONCAT(&dp->val, &nss); dp->flags |= flags; } else { /* Not found - add it. */ np = emalloc(sizeof(struct cfparam)); np->name = estrdup(name); STAILQ_INIT(&np->val); STAILQ_CONCAT(&np->val, &nss); np->flags = flags; np->gen = 0; TAILQ_INSERT_TAIL(&j->params, np, tq); if (ipnum != 0) j->intparams[ipnum] = np; else for (ipnum = 1; ipnum < IP_NPARAM; ipnum++) if (!(intparams[ipnum].flags & PF_CONV) && equalopts(name, intparams[ipnum].name)) { j->intparams[ipnum] = np; np->flags |= intparams[ipnum].flags; break; } } } /* * Return if a boolean parameter exists and is true. */ int bool_param(const struct cfparam *p) { const char *cs; if (p == NULL) return 0; cs = strrchr(p->name, '.'); return !strncmp(cs ? cs + 1 : p->name, "no", 2) ^ (STAILQ_EMPTY(&p->val) || !strcasecmp(STAILQ_LAST(&p->val, cfstring, tq)->s, "true") || (strtol(STAILQ_LAST(&p->val, cfstring, tq)->s, NULL, 10))); } /* * Set an integer if a parameter if it exists. */ int int_param(const struct cfparam *p, int *ip) { if (p == NULL || STAILQ_EMPTY(&p->val)) return 0; *ip = strtol(STAILQ_LAST(&p->val, cfstring, tq)->s, NULL, 10); return 1; } /* * Return the string value of a scalar parameter if it exists. */ const char * string_param(const struct cfparam *p) { return (p && !STAILQ_EMPTY(&p->val) ? STAILQ_LAST(&p->val, cfstring, tq)->s : NULL); } /* * Check syntax and values of internal parameters. Set some internal * parameters based on the values of others. */ int check_intparams(struct cfjail *j) { struct in_addr addr4; struct addrinfo hints; struct addrinfo *ai0, *ai; struct cfparam *p; struct cfstring *s, *ns; + FILE *f; const char *hostname, *val; - char *cs, *ep; - size_t size; + char *cs, *ep, *ln; + size_t size, lnlen; int error, gicode, ip4ok, defif, prefix; int mib[4]; char avalue4[INET_ADDRSTRLEN]; #ifdef INET6 struct in6_addr addr6; int ip6ok, isip6; char avalue6[INET6_ADDRSTRLEN]; #endif error = 0; /* Check format of boolan and integer values. */ TAILQ_FOREACH(p, &j->params, tq) { if (!STAILQ_EMPTY(&p->val) && (p->flags & (PF_BOOL | PF_INT))) { val = STAILQ_LAST(&p->val, cfstring, tq)->s; if (p->flags & PF_BOOL) { if (strcasecmp(val, "false") && strcasecmp(val, "true") && ((void)strtol(val, &ep, 10), *ep)) { jail_warnx(j, "%s: unknown boolean value \"%s\"", p->name, val); error = -1; } } else { (void)strtol(val, &ep, 10); if (ep == val || *ep) { jail_warnx(j, "%s: non-integer value \"%s\"", p->name, val); error = -1; } } } } /* * The ip_hostname parameter looks up the hostname, and adds parameters * for any IP addresses it finds. */ if (((j->flags & JF_OP_MASK) != JF_STOP || j->intparams[IP_INTERFACE] != NULL) && bool_param(j->intparams[IP_IP_HOSTNAME]) && (hostname = string_param(j->intparams[KP_HOST_HOSTNAME]))) { j->intparams[IP_IP_HOSTNAME] = NULL; /* * Silently ignore unsupported address families from * DNS lookups. */ size = 4; ip4ok = sysctlnametomib("security.jail.param.ip4", mib, &size) == 0; #ifdef INET6 size = 4; ip6ok = sysctlnametomib("security.jail.param.ip6", mib, &size) == 0; #endif if (ip4ok #ifdef INET6 || ip6ok #endif ) { /* Look up the hostname (or get the address) */ memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_family = #ifdef INET6 ip6ok ? (ip4ok ? PF_UNSPEC : PF_INET6) : #endif PF_INET; gicode = getaddrinfo(hostname, NULL, &hints, &ai0); if (gicode != 0) { jail_warnx(j, "host.hostname %s: %s", hostname, gai_strerror(gicode)); error = -1; } else { /* * Convert the addresses to ASCII so jailparam * can convert them back. Errors are not * expected here. */ for (ai = ai0; ai; ai = ai->ai_next) switch (ai->ai_family) { case AF_INET: memcpy(&addr4, &((struct sockaddr_in *) (void *)ai->ai_addr)-> sin_addr, sizeof(addr4)); if (inet_ntop(AF_INET, &addr4, avalue4, INET_ADDRSTRLEN) == NULL) err(1, "inet_ntop"); add_param(j, NULL, KP_IP4_ADDR, avalue4); break; #ifdef INET6 case AF_INET6: memcpy(&addr6, &((struct sockaddr_in6 *) (void *)ai->ai_addr)-> sin6_addr, sizeof(addr6)); if (inet_ntop(AF_INET6, &addr6, avalue6, INET6_ADDRSTRLEN) == NULL) err(1, "inet_ntop"); add_param(j, NULL, KP_IP6_ADDR, avalue6); break; #endif } freeaddrinfo(ai0); } } } /* * IP addresses may include an interface to set that address on, * and a netmask/suffix for that address. */ defif = string_param(j->intparams[IP_INTERFACE]) != NULL; #ifdef INET6 for (isip6 = 0; isip6 <= 1; isip6++) #else #define isip6 0 do #endif { if (j->intparams[KP_IP4_ADDR + isip6] == NULL) continue; STAILQ_FOREACH(s, &j->intparams[KP_IP4_ADDR + isip6]->val, tq) { cs = strchr(s->s, '|'); if (cs || defif) add_param(j, NULL, IP__IP4_IFADDR + isip6, s->s); if (cs) { strcpy(s->s, cs + 1); s->len -= cs + 1 - s->s; } if ((cs = strchr(s->s, '/'))) { prefix = strtol(cs + 1, &ep, 10); if ( #ifdef INET6 !isip6 && #endif *ep == '.' ? inet_pton(AF_INET, cs + 1, &addr4) != 1 : *ep || prefix < 0 || prefix > ( #ifdef INET6 isip6 ? 128 : #endif 32)) { jail_warnx(j, #ifdef INET6 isip6 ? "ip6.addr: bad prefixlen \"%s\"" : #endif "ip4.addr: bad netmask \"%s\"", cs); error = -1; } *cs = '\0'; s->len = cs - s->s + 1; } } } #ifndef INET6 while (0); #endif + + /* + * Read mount.fstab file(s), and treat each line as its own mount + * parameter. + */ + if (j->intparams[IP_MOUNT_FSTAB] != NULL) { + STAILQ_FOREACH(s, &j->intparams[IP_MOUNT_FSTAB]->val, tq) { + if (s->len == 0) + continue; + f = fopen(s->s, "r"); + if (f == NULL) { + jail_warnx(j, "mount.fstab: %s: %s", + s->s, strerror(errno)); + error = -1; + continue; + } + while ((ln = fgetln(f, &lnlen))) { + if ((cs = memchr(ln, '#', lnlen - 1))) + lnlen = cs - ln + 1; + if (ln[lnlen - 1] == '\n' || + ln[lnlen - 1] == '#') + ln[lnlen - 1] = '\0'; + else { + cs = alloca(lnlen + 1); + strlcpy(cs, ln, lnlen + 1); + ln = cs; + } + add_param(j, NULL, IP__MOUNT_FROM_FSTAB, ln); + } + fclose(f); + } + } + if (error) + failed(j); return error; } /* * Import parameters into libjail's binary jailparam format. */ int import_params(struct cfjail *j) { struct cfparam *p; struct cfstring *s, *ts; struct jailparam *jp; char *value, *cs; size_t vallen; int error; error = 0; j->njp = 0; TAILQ_FOREACH(p, &j->params, tq) if (!(p->flags & PF_INTERNAL)) j->njp++; j->jp = jp = emalloc(j->njp * sizeof(struct jailparam)); TAILQ_FOREACH(p, &j->params, tq) { if (p->flags & PF_INTERNAL) continue; if (jailparam_init(jp, p->name) < 0) { error = -1; jail_warnx(j, "%s", jail_errmsg); continue; } if (STAILQ_EMPTY(&p->val)) value = NULL; else if (!jp->jp_elemlen || !STAILQ_NEXT(STAILQ_FIRST(&p->val), tq)) { /* * Scalar parameters silently discard multiple (array) * values, keeping only the last value added. This * lets values added from the command line append to * arrays wthout pre-checking the type. */ value = STAILQ_LAST(&p->val, cfstring, tq)->s; } else { /* * Convert arrays into comma-separated strings, which * jailparam_import will then convert back into arrays. */ vallen = 0; STAILQ_FOREACH(s, &p->val, tq) vallen += s->len + 1; value = alloca(vallen); cs = value; STAILQ_FOREACH_SAFE(s, &p->val, tq, ts) { strcpy(cs, s->s); if (ts != NULL) { cs += s->len + 1; cs[-1] = ','; } } } if (jailparam_import(jp, value) < 0) { error = -1; jail_warnx(j, "%s", jail_errmsg); } jp++; } if (error) { jailparam_free(j->jp, j->njp); free(j->jp); j->jp = NULL; failed(j); } return error; } /* * Check if options are equal (with or without the "no" prefix). */ int equalopts(const char *opt1, const char *opt2) { char *p; /* "opt" vs. "opt" or "noopt" vs. "noopt" */ if (strcmp(opt1, opt2) == 0) return (1); /* "noopt" vs. "opt" */ if (strncmp(opt1, "no", 2) == 0 && strcmp(opt1 + 2, opt2) == 0) return (1); /* "opt" vs. "noopt" */ if (strncmp(opt2, "no", 2) == 0 && strcmp(opt1, opt2 + 2) == 0) return (1); while ((p = strchr(opt1, '.')) != NULL && !strncmp(opt1, opt2, ++p - opt1)) { opt2 += p - opt1; opt1 = p; /* "foo.noopt" vs. "foo.opt" */ if (strncmp(opt1, "no", 2) == 0 && strcmp(opt1 + 2, opt2) == 0) return (1); /* "foo.opt" vs. "foo.noopt" */ if (strncmp(opt2, "no", 2) == 0 && strcmp(opt1, opt2 + 2) == 0) return (1); } return (0); } /* * See if a jail name matches a wildcard. */ int wild_jail_match(const char *jname, const char *wname) { const char *jc, *jd, *wc, *wd; /* * A non-final "*" component in the wild name matches a single jail * component, and a final "*" matches one or more jail components. */ for (jc = jname, wc = wname; (jd = strchr(jc, '.')) && (wd = strchr(wc, '.')); jc = jd + 1, wc = wd + 1) if (strncmp(jc, wc, jd - jc + 1) && strncmp(wc, "*.", 2)) return 0; return (!strcmp(jc, wc) || !strcmp(wc, "*")); } /* * Return if a jail name is a wildcard. */ int wild_jail_name(const char *wname) { const char *wc; for (wc = strchr(wname, '*'); wc; wc = strchr(wc + 1, '*')) if ((wc == wname || wc[-1] == '.') && (wc[1] == '\0' || wc[1] == '.')) return 1; return 0; } /* * Free a parameter record and all its strings and variables. */ static void free_param(struct cfparams *pp, struct cfparam *p) { free(p->name); free_param_strings(p); TAILQ_REMOVE(pp, p, tq); free(p); } static void free_param_strings(struct cfparam *p) { struct cfstring *s; struct cfvar *v; while ((s = STAILQ_FIRST(&p->val))) { free(s->s); while ((v = STAILQ_FIRST(&s->vars))) { free(v->name); STAILQ_REMOVE_HEAD(&s->vars, tq); free(v); } STAILQ_REMOVE_HEAD(&p->val, tq); free(s); } } Index: projects/jailconf/usr.sbin/jail/jail.c =================================================================== --- projects/jailconf/usr.sbin/jail/jail.c (revision 214782) +++ projects/jailconf/usr.sbin/jail/jail.c (revision 214783) @@ -1,1041 +1,1043 @@ /*- * Copyright (c) 1999 Poul-Henning Kamp. * Copyright (c) 2009-2010 James Gritton * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include "jailp.h" #define JP_RDTUN(jp) (((jp)->jp_ctltype & CTLFLAG_RDTUN) == CTLFLAG_RDTUN) struct permspec { const char *name; enum intparam ipnum; int rev; }; const char *cfname; int verbose; static int create_jail(struct cfjail *j); static void clear_persist(struct cfjail *j); static int update_jail(struct cfjail *j); static int rdtun_params(struct cfjail *j, int dofail); static void running_jid(struct cfjail *j, int dflag); static int jailparam_set_note(const struct cfjail *j, struct jailparam *jp, unsigned njp, int flags); static void print_jail(FILE *fp, struct cfjail *j, int oldcl); static void print_param(FILE *fp, const struct cfparam *p, int sep, int doname); static void quoted_print(FILE *fp, char *str); static void usage(void); static struct permspec perm_sysctl[] = { { "security.jail.set_hostname_allowed", KP_ALLOW_SET_HOSTNAME, 0 }, { "security.jail.sysvipc_allowed", KP_ALLOW_SYSVIPC, 0 }, { "security.jail.allow_raw_sockets", KP_ALLOW_RAW_SOCKETS, 0 }, { "security.jail.chflags_allowed", KP_ALLOW_CHFLAGS, 0 }, { "security.jail.mount_allowed", KP_ALLOW_MOUNT, 0 }, { "security.jail.socket_unixiproute_only", KP_ALLOW_SOCKET_AF, 1 }, }; int main(int argc, char **argv) { #ifdef INET6 struct in6_addr addr6; #endif struct stat st; FILE *jfp; struct cfjail *j; char *cs, *ncs, *JidFile; size_t sysvallen; unsigned op, pi; int ch, docf, error, i, oldcl, sysval; int dflag, iflag, plimit, Rflag; char enforce_statfs[4]; op = 0; plimit = -1; dflag = iflag = Rflag = 0; docf = 1; cfname = CONF_FILE; JidFile = NULL; while ((ch = getopt(argc, argv, "cdf:hiJ:lmn:p:qrRs:U:v")) != -1) { switch (ch) { case 'c': op |= JF_START; break; case 'd': dflag = 1; break; case 'f': cfname = optarg; break; case 'h': add_param(NULL, NULL, IP_IP_HOSTNAME, NULL); docf = 0; break; case 'i': iflag = 1; verbose = -1; break; case 'J': JidFile = optarg; break; case 'l': add_param(NULL, NULL, IP_EXEC_CLEAN, NULL); docf = 0; break; case 'm': op |= JF_SET; break; case 'n': add_param(NULL, NULL, KP_NAME, optarg); docf = 0; break; case 'p': plimit = strtol(optarg, NULL, 10); if (plimit == 0) plimit = -1; break; case 'q': verbose = -1; break; case 'r': op |= JF_STOP; break; case 'R': op |= JF_STOP; Rflag = 1; break; case 's': add_param(NULL, NULL, KP_SECURELEVEL, optarg); docf = 0; break; case 'u': add_param(NULL, NULL, IP_EXEC_JAIL_USER, optarg); add_param(NULL, NULL, IP_EXEC_SYSTEM_JAIL_USER, NULL); docf = 0; break; case 'U': add_param(NULL, NULL, IP_EXEC_JAIL_USER, optarg); add_param(NULL, NULL, IP_EXEC_SYSTEM_JAIL_USER, "false"); docf = 0; break; case 'v': verbose = 1; break; default: usage(); } } argc -= optind; argv += optind; /* Find out which of the four command line styles this is. */ oldcl = 0; if (!op) { /* Old-style command line with four fixed parameters */ if (argc < 4 || argv[0][0] != '/') usage(); op = JF_START; docf = 0; oldcl = 1; add_param(NULL, NULL, KP_PATH, argv[0]); add_param(NULL, NULL, KP_HOST_HOSTNAME, argv[1]); if (argv[2][0] != '\0') { for (cs = argv[2];; cs = ncs + 1) { ncs = strchr(cs, ','); if (ncs) *ncs = '\0'; add_param(NULL, NULL, #ifdef INET6 inet_pton(AF_INET6, cs, &addr6) == 1 ? KP_IP6_ADDR : #endif KP_IP4_ADDR, cs); if (!ncs) break; } } for (i = 3; i < argc; i++) add_param(NULL, NULL, IP_COMMAND, argv[i]); /* Emulate the defaults from security.jail.* sysctls. */ sysvallen = sizeof(sysval); if (sysctlbyname("security.jail.jailed", &sysval, &sysvallen, NULL, 0) == 0 && sysval == 0) { for (pi = 0; pi < sizeof(perm_sysctl) / sizeof(perm_sysctl[0]); pi++) { sysvallen = sizeof(sysval); if (sysctlbyname(perm_sysctl[pi].name, &sysval, &sysvallen, NULL, 0) == 0) add_param(NULL, NULL, perm_sysctl[pi].ipnum, (sysval ? 1 : 0) ^ perm_sysctl[pi].rev ? NULL : "false"); } sysvallen = sizeof(sysval); if (sysctlbyname("security.jail.enforce_statfs", &sysval, &sysvallen, NULL, 0) == 0) { snprintf(enforce_statfs, sizeof(enforce_statfs), "%d", sysval); add_param(NULL, NULL, KP_ENFORCE_STATFS, enforce_statfs); } } } else if (op == JF_STOP) { /* Jail remove, perhaps using the config file */ if (!docf || argc == 0) usage(); if (!Rflag) for (i = 0; i < argc; i++) if (strchr(argv[i], '=')) usage(); if ((docf = !Rflag && (!strcmp(cfname, "-") || stat(cfname, &st) == 0))) load_config(); } else if (argc > 1 || (argc == 1 && strchr(argv[0], '='))) { /* Single jail specified on the command line */ if (Rflag) usage(); docf = 0; for (i = 0; i < argc; i++) { if (!strncmp(argv[i], "command", 7) && (argv[i][7] == '\0' || argv[i][7] == '=')) { if (argv[i][7] == '=') add_param(NULL, NULL, IP_COMMAND, argv[i] + 8); for (i++; i < argc; i++) add_param(NULL, NULL, IP_COMMAND, argv[i]); break; } add_param(NULL, NULL, 0, argv[i]); } } else { /* From the config file, perhaps with a specified jail */ if (Rflag || !docf) usage(); load_config(); } /* Find out which jails will be run. */ dep_setup(docf); error = 0; if (op == JF_STOP) { for (i = 0; i < argc; i++) if (start_state(argv[i], op, Rflag) < 0) error = 1; } else { if (start_state(docf ? argv[0] : NULL, op, 0) < 0) exit(1); } jfp = NULL; if (JidFile != NULL) { jfp = fopen(JidFile, "w"); if (jfp == NULL) err(1, "open %s", JidFile); setlinebuf(jfp); } setlinebuf(stdout); /* * The main loop: Get an available jail and perform the required * operation on it. When that is done, the jail may be finished, * or it may go back for the next step. */ while ((j = next_jail())) { if (j->flags & JF_FAILED) { clear_persist(j); if (j->flags & JF_MOUNTED) { (void)run_command(j, NULL, IP_MOUNT_DEVFS); - if (run_command(j, NULL, IP_MOUNT_FSTAB)) + if (run_command(j, NULL, IP__MOUNT_FROM_FSTAB)) while (run_command(j, NULL, 0)) ; if (run_command(j, NULL, IP_MOUNT)) while (run_command(j, NULL, 0)) ; } if (j->flags & JF_IFUP) { if (run_command(j, NULL, IP__IP4_IFADDR)) while (run_command(j, NULL, 0)) ; #ifdef INET6 if (run_command(j, NULL, IP__IP6_IFADDR)) while (run_command(j, NULL, 0)) ; #endif } error = 1; dep_done(j, 0); continue; } if (!(j->flags & JF_PARAMS)) { j->flags |= JF_PARAMS; if (dflag) add_param(j, NULL, IP_ALLOW_DYING, NULL); if (check_intparams(j) < 0) continue; if ((j->flags & (JF_START | JF_SET)) && import_params(j) < 0) continue; } if (!j->jid) running_jid(j, (j->flags & (JF_SET | JF_DEPEND)) == JF_SET ? dflag || bool_param(j->intparams[IP_ALLOW_DYING]) : 0); if (j->comstring != NULL && (finish_command(j, &plimit) || run_command(j, &plimit, 0))) continue; switch (j->flags & JF_OP_MASK) { /* * These operations just turn into a different op * depending on the jail's current status. */ case JF_START_SET: j->flags = j->jid < 0 ? JF_START : JF_SET; break; case JF_SET_RESTART: if (j->jid < 0) { warnx("\"%s\" not found", j->name); failed(j); continue; } j->flags = rdtun_params(j, 0) ? JF_RESTART : JF_SET; if (j->flags == JF_RESTART) dep_reset(j); break; case JF_START_SET_RESTART: j->flags = j->jid < 0 ? JF_START : rdtun_params(j, 0) ? JF_RESTART : JF_SET; if (j->flags == JF_RESTART) dep_reset(j); } switch (j->flags & JF_OP_MASK) { case JF_START: /* * 1: check existence and dependencies * 2: configure IP addresses * 3: run any exec.prestart commands * 4: create the jail * 5: configure vnet interfaces * 6: run any exec.start or "command" commands * 7: run any exec.poststart commands */ switch (j->comparam) { default: if (j->jid > 0 && !(j->flags & (JF_DEPEND | JF_WILD))) { warnx("\"%s\" already exists", j->name); failed(j); continue; } if (dep_check(j)) continue; if (j->jid > 0) goto jail_create_done; if (run_command(j, &plimit, IP__IP4_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP4_IFADDR: #ifdef INET6 if (run_command(j, &plimit, IP__IP6_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP6_IFADDR: #endif if (run_command(j, &plimit, IP_MOUNT)) continue; /* FALLTHROUGH */ case IP_MOUNT: - if (run_command(j, &plimit, IP_MOUNT_FSTAB)) + if (run_command(j, &plimit, + IP__MOUNT_FROM_FSTAB)) continue; /* FALLTHROUGH */ - case IP_MOUNT_FSTAB: + case IP__MOUNT_FROM_FSTAB: if (run_command(j, &plimit, IP_MOUNT_DEVFS)) continue; /* FALLTHROUGH */ case IP_MOUNT_DEVFS: if (run_command(j, &plimit, IP_EXEC_PRESTART)) continue; /* FALLTHROUGH */ case IP_EXEC_PRESTART: if (create_jail(j) < 0) continue; if (iflag) printf("%d\n", j->jid); if (jfp != NULL) print_jail(jfp, j, oldcl); if (verbose >= 0 && (j->name || verbose > 0)) jail_note(j, "created\n"); dep_done(j, DF_LIGHT); if (bool_param(j->intparams[KP_VNET]) && run_command(j, &plimit, IP_VNET_INTERFACE)) continue; /* FALLTHROUGH */ case IP_VNET_INTERFACE: if (run_command(j, &plimit, IP_EXEC_START)) continue; /* FALLTHROUGH */ case IP_EXEC_START: if (run_command(j, &plimit, IP_COMMAND)) continue; /* FALLTHROUGH */ case IP_COMMAND: if (run_command(j, &plimit, IP_EXEC_POSTSTART)) continue; /* FALLTHROUGH */ case IP_EXEC_POSTSTART: jail_create_done: clear_persist(j); dep_done(j, 0); } break; case JF_SET: /* * 1: check existence and dependencies * 2: update the jail */ if (j->jid < 0 && !(j->flags & JF_DEPEND)) { warnx("\"%s\" not found", j->name); failed(j); continue;; } if (dep_check(j)) continue; if (!(j->flags & JF_DEPEND)) { if (rdtun_params(j, 1) < 0 || update_jail(j) < 0) continue; if (verbose >= 0 && (j->name || verbose > 0)) jail_note(j, "updated\n"); } dep_done(j, 0); break; case JF_STOP: case JF_RESTART: /* * 1: check dependencies and existence (note order) * 2: run any exec.prestop commands * 3: run any exec.stop commands * 4: send SIGTERM to all jail processes * 5: remove the jail * 6: run any exec.poststop commands * 7: take down IP addresses */ switch (j->comparam) { default: if (dep_check(j)) continue; if (j->jid < 0) { if (!(j->flags & (JF_DEPEND | JF_WILD)) && verbose >= 0) warnx("\"%s\" not found", j->name); goto jail_remove_done; } if (run_command(j, &plimit, IP_EXEC_PRESTOP)) continue; /* FALLTHROUGH */ case IP_EXEC_PRESTOP: if (run_command(j, &plimit, IP_EXEC_STOP)) continue; /* FALLTHROUGH */ case IP_EXEC_STOP: j->comparam = IP_STOP_TIMEOUT; if (term_procs(j)) continue; /* FALLTHROUGH */ case IP_STOP_TIMEOUT: (void)jail_remove(j->jid); j->jid = -1; if (verbose >= 0 && (docf || argc > 1 || wild_jail_name(argv[0]) || verbose > 0)) jail_note(j, "removed\n"); dep_done(j, DF_LIGHT); if (run_command(j, &plimit, IP_EXEC_POSTSTOP)) continue; /* FALLTHROUGH */ case IP_EXEC_POSTSTOP: if (run_command(j, &plimit, IP_MOUNT_DEVFS)) continue; /* FALLTHROUGH */ case IP_MOUNT_DEVFS: - if (run_command(j, &plimit, IP_MOUNT_FSTAB)) + if (run_command(j, &plimit, + IP__MOUNT_FROM_FSTAB)) continue; /* FALLTHROUGH */ - case IP_MOUNT_FSTAB: + case IP__MOUNT_FROM_FSTAB: if (run_command(j, &plimit, IP_MOUNT)) continue; /* FALLTHROUGH */ case IP_MOUNT: if (run_command(j, &plimit, IP__IP4_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP4_IFADDR: #ifdef INET6 if (run_command(j, &plimit, IP__IP6_IFADDR)) continue; /* FALLTHROUGH */ case IP__IP6_IFADDR: #endif jail_remove_done: dep_done(j, 0); if (j->flags & JF_START) { j->comparam = 0; j->flags &= ~JF_STOP; dep_reset(j); requeue(j, j->ndeps ? &waiting : &ready); } } break; } } if (jfp != NULL) fclose(jfp); exit(error); } /* * Mark a jail's failure for future handling. */ void failed(struct cfjail *j) { j->flags |= JF_FAILED; TAILQ_REMOVE(j->queue, j, tq); TAILQ_INSERT_HEAD(&ready, j, tq); j->queue = &ready; } /* * Exit slightly more gracefully when out of memory. */ void * emalloc(size_t size) { void *p; p = malloc(size); if (!p) err(1, "malloc"); return p; } void * erealloc(void *ptr, size_t size) { void *p; p = realloc(ptr, size); if (!p) err(1, "malloc"); return p; } char * estrdup(const char *str) { char *ns; ns = strdup(str); if (!ns) err(1, "malloc"); return ns; } /* * Print a message including an optional jail name. */ void jail_note(const struct cfjail *j, const char *fmt, ...) { va_list ap, tap; char *cs; size_t len; va_start(ap, fmt); va_copy(tap, ap); len = vsnprintf(NULL, 0, fmt, tap); va_end(tap); cs = alloca(len + 1); (void)vsnprintf(cs, len + 1, fmt, ap); va_end(ap); if (j->name) printf("%s: %s", j->name, cs); else printf("%s", cs); } /* * Print a warning message including an optional jail name. */ void jail_warnx(const struct cfjail *j, const char *fmt, ...) { va_list ap, tap; char *cs; size_t len; va_start(ap, fmt); va_copy(tap, ap); len = vsnprintf(NULL, 0, fmt, tap); va_end(tap); cs = alloca(len + 1); (void)vsnprintf(cs, len + 1, fmt, ap); va_end(ap); if (j->name) warnx("%s: %s", j->name, cs); else warnx("%s", cs); } /* * Create a new jail. */ static int create_jail(struct cfjail *j) { struct iovec jiov[4]; struct stat st; struct jailparam *jp, *setparams, *setparams2, *sjp; const char *path; int dopersist, ns, jid, dying, didfail; /* * Check the jail's path, with a better error message than jail_set * gives. */ if ((path = string_param(j->intparams[KP_PATH]))) { if (stat(path, &st) < 0) { jail_warnx(j, "path %s: %s", path, strerror(errno)); failed(j); return -1; } if (!S_ISDIR(st.st_mode)) { jail_warnx(j, "path %s: %s", path, strerror(ENOTDIR)); failed(j); return -1; } } /* * Copy all the parameters, except that "persist" is always set when * there are commands to run later. */ dopersist = !bool_param(j->intparams[KP_PERSIST]) && (j->intparams[IP_EXEC_START] || j->intparams[IP_COMMAND] || j->intparams[IP_EXEC_POSTSTART]); sjp = setparams = alloca((j->njp + dopersist) * sizeof(struct jailparam)); if (dopersist && jailparam_init(sjp++, "persist") < 0) { jail_warnx(j, "%s", jail_errmsg); failed(j); return -1; } for (jp = j->jp; jp < j->jp + j->njp; jp++) if (!dopersist || !equalopts(jp->jp_name, "persist")) *sjp++ = *jp; ns = sjp - setparams; didfail = 0; j->jid = jailparam_set_note(j, setparams, ns, JAIL_CREATE); if (j->jid < 0 && errno == EEXIST && bool_param(j->intparams[IP_ALLOW_DYING]) && int_param(j->intparams[KP_JID], &jid) && jid != 0) { /* * The jail already exists, but may be dying. * Make sure it is, in which case an update is appropriate. */ *(const void **)&jiov[0].iov_base = "jid"; jiov[0].iov_len = sizeof("jid"); jiov[1].iov_base = &jid; jiov[1].iov_len = sizeof(jid); *(const void **)&jiov[2].iov_base = "dying"; jiov[2].iov_len = sizeof("dying"); jiov[3].iov_base = &dying; jiov[3].iov_len = sizeof(dying); if (jail_get(jiov, 4, JAIL_DYING) < 0) { /* * It could be that the jail just barely finished * dying, or it could be that the jid never existed * but the name does. In either case, another try * at creating the jail should do the right thing. */ if (errno == ENOENT) j->jid = jailparam_set_note(j, setparams, ns, JAIL_CREATE); } else if (dying) { j->jid = jid; if (rdtun_params(j, 1) < 0) { j->jid = -1; didfail = 1; } else { sjp = setparams2 = alloca((j->njp + dopersist) * sizeof(struct jailparam)); for (jp = setparams; jp < setparams + ns; jp++) if (!JP_RDTUN(jp) || !strcmp(jp->jp_name, "jid")) *sjp++ = *jp; j->jid = jailparam_set_note(j, setparams2, sjp - setparams2, JAIL_UPDATE | JAIL_DYING); /* * Again, perhaps the jail just finished dying. */ if (j->jid < 0 && errno == ENOENT) j->jid = jailparam_set_note(j, setparams, ns, JAIL_CREATE); } } } if (j->jid < 0 && !didfail) { jail_warnx(j, "%s", jail_errmsg); failed(j); } if (dopersist) { jailparam_free(setparams, 1); if (j->jid > 0) j->flags |= JF_PERSIST; } return j->jid; } /* * Remove a temporarily set "persist" parameter. */ static void clear_persist(struct cfjail *j) { struct iovec jiov[4]; int jid; if (!(j->flags & JF_PERSIST)) return; j->flags &= ~JF_PERSIST; *(const void **)&jiov[0].iov_base = "jid"; jiov[0].iov_len = sizeof("jid"); jiov[1].iov_base = &j->jid; jiov[1].iov_len = sizeof(j->jid); *(const void **)&jiov[2].iov_base = "nopersist"; jiov[2].iov_len = sizeof("nopersist"); jiov[3].iov_base = NULL; jiov[3].iov_len = 0; jid = jail_set(jiov, 4, JAIL_UPDATE); if (verbose > 0) jail_note(j, "jail_set(JAIL_UPDATE) jid=%d nopersist%s%s\n", j->jid, jid < 0 ? ": " : "", jid < 0 ? strerror(errno) : ""); } /* * Set a jail's parameters. */ static int update_jail(struct cfjail *j) { struct jailparam *jp, *setparams, *sjp; int ns, jid; ns = 0; for (jp = j->jp; jp < j->jp + j->njp; jp++) if (!JP_RDTUN(jp)) ns++; if (ns == 0) return 0; sjp = setparams = alloca(++ns * sizeof(struct jailparam)); if (jailparam_init(sjp, "jid") < 0 || jailparam_import_raw(sjp, &j->jid, sizeof j->jid) < 0) { jail_warnx(j, "%s", jail_errmsg); failed(j); return -1; } for (jp = j->jp; jp < j->jp + j->njp; jp++) if (!JP_RDTUN(jp)) *++sjp = *jp; jid = jailparam_set_note(j, setparams, ns, bool_param(j->intparams[IP_ALLOW_DYING]) ? JAIL_UPDATE | JAIL_DYING : JAIL_UPDATE); if (jid < 0) { jail_warnx(j, "%s", jail_errmsg); failed(j); } jailparam_free(setparams, 1); return jid; } /* * Return if a jail set would change any create-only parameters. */ static int rdtun_params(struct cfjail *j, int dofail) { struct jailparam *jp, *rtparams, *rtjp; int nrt, rval; if (j->flags & JF_RDTUN) return 0; j->flags |= JF_RDTUN; nrt = 0; for (jp = j->jp; jp < j->jp + j->njp; jp++) if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) nrt++; if (nrt == 0) return 0; rtjp = rtparams = alloca(++nrt * sizeof(struct jailparam)); if (jailparam_init(rtjp, "jid") < 0 || jailparam_import_raw(rtjp, &j->jid, sizeof j->jid) < 0) { jail_warnx(j, "%s", jail_errmsg); exit(1); } for (jp = j->jp; jp < j->jp + j->njp; jp++) if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) *++rtjp = *jp; rval = 0; if (jailparam_get(rtparams, nrt, bool_param(j->intparams[IP_ALLOW_DYING]) ? JAIL_DYING : 0) > 0) { rtjp = rtparams + 1; for (jp = j->jp, rtjp = rtparams + 1; rtjp < rtparams + nrt; jp++) { if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) { if (!((jp->jp_flags & (JP_BOOL | JP_NOBOOL)) && jp->jp_valuelen == 0 && *(int *)jp->jp_value) && !(rtjp->jp_valuelen == jp->jp_valuelen && !memcmp(rtjp->jp_value, jp->jp_value, jp->jp_valuelen))) { if (dofail) { jail_warnx(j, "%s cannot be " "changed after creation", jp->jp_name); failed(j); rval = -1; } else rval = 1; break; } rtjp++; } } } for (rtjp = rtparams + 1; rtjp < rtparams + nrt; rtjp++) rtjp->jp_name = NULL; jailparam_free(rtparams, nrt); return rval; } /* * Get the jail's jid if it is running. */ static void running_jid(struct cfjail *j, int dflag) { struct iovec jiov[2]; const char *pval; char *ep; int jid; if ((pval = string_param(j->intparams[KP_JID]))) { if (!(jid = strtol(pval, &ep, 10)) || *ep) { j->jid = -1; return; } *(const void **)&jiov[0].iov_base = "jid"; jiov[0].iov_len = sizeof("jid"); jiov[1].iov_base = &jid; jiov[1].iov_len = sizeof(jid); } else if ((pval = string_param(j->intparams[KP_NAME]))) { *(const void **)&jiov[0].iov_base = "name"; jiov[0].iov_len = sizeof("name"); jiov[1].iov_len = strlen(pval) + 1; jiov[1].iov_base = alloca(jiov[1].iov_len); strcpy(jiov[1].iov_base, pval); } else { j->jid = -1; return; } j->jid = jail_get(jiov, 2, dflag ? JAIL_DYING : 0); } /* * Set jail parameters and possible print them out. */ static int jailparam_set_note(const struct cfjail *j, struct jailparam *jp, unsigned njp, int flags) { char *value; int jid; unsigned i; jid = jailparam_set(jp, njp, flags); if (verbose > 0) { jail_note(j, "jail_set(%s%s)", (flags & (JAIL_CREATE | JAIL_UPDATE)) == JAIL_CREATE ? "JAIL_CREATE" : "JAIL_UPDATE", (flags & JAIL_DYING) ? " | JAIL_DYING" : ""); for (i = 0; i < njp; i++) { printf(" %s", jp[i].jp_name); if (jp[i].jp_value == NULL) continue; putchar('='); value = jailparam_export(jp + i); if (value == NULL) err(1, "jailparam_export"); quoted_print(stdout, value); free(value); } if (jid < 0) printf(": %s", strerror(errno)); printf("\n"); } return jid; } /* * Print a jail record. */ static void print_jail(FILE *fp, struct cfjail *j, int oldcl) { struct cfparam *p; if (oldcl) { fprintf(fp, "%d\t", j->jid); print_param(fp, j->intparams[KP_PATH], ',', 0); putc('\t', fp); print_param(fp, j->intparams[KP_HOST_HOSTNAME], ',', 0); putc('\t', fp); print_param(fp, j->intparams[KP_IP4_ADDR], ',', 0); #ifdef INET6 if (j->intparams[KP_IP6_ADDR] && !STAILQ_EMPTY(&j->intparams[KP_IP6_ADDR]->val)) { if (j->intparams[KP_IP4_ADDR] && !STAILQ_EMPTY(&j->intparams[KP_IP4_ADDR]->val)) putc(',', fp); print_param(fp, j->intparams[KP_IP6_ADDR], ',', 0); } #endif putc('\t', fp); print_param(fp, j->intparams[IP_COMMAND], ' ', 0); } else { fprintf(fp, "jid=%d", j->jid); TAILQ_FOREACH(p, &j->params, tq) if (strcmp(p->name, "jid")) { putc(' ', fp); print_param(fp, p, ',', 1); } } putc('\n', fp); } /* * Print a parameter value, or a name=value pair. */ static void print_param(FILE *fp, const struct cfparam *p, int sep, int doname) { const struct cfstring *s, *ts; if (doname) fputs(p->name, fp); if (p == NULL || STAILQ_EMPTY(&p->val)) return; if (doname) putc('=', fp); STAILQ_FOREACH_SAFE(s, &p->val, tq, ts) { quoted_print(fp, s->s); if (ts != NULL) putc(sep, fp); } } /* * Print a string with quotes around spaces. */ static void quoted_print(FILE *fp, char *str) { int c, qc; char *p = str; qc = !*p ? '"' : strchr(p, '\'') ? '"' : strchr(p, '"') ? '\'' : strchr(p, ' ') || strchr(p, '\t') ? '"' : 0; if (qc) putc(qc, fp); while ((c = *p++)) { if (c == '\\' || c == qc) putc('\\', fp); putc(c, fp); } if (qc) putc(qc, fp); } static void usage(void) { (void)fprintf(stderr, "usage: jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n" " -[cmr] param=value ... [command=command ...]\n" " jail [-dqv] [-f file] -[cmr] [jail]\n" " jail [-qv] [-f file] -[rR] ['*' | jail ...]\n" " jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n" " [-n jailname] [-s securelevel]\n" " path hostname [ip[,...]] command ...\n"); exit(1); } Index: projects/jailconf/usr.sbin/jail/jailp.h =================================================================== --- projects/jailconf/usr.sbin/jail/jailp.h (revision 214782) +++ projects/jailconf/usr.sbin/jail/jailp.h (revision 214783) @@ -1,224 +1,225 @@ /*- * Copyright (c) 2010 James Gritton. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #include #include #include #include #include #include #define CONF_FILE "/etc/jail.conf" #define DEP_FROM 0 #define DEP_TO 1 #define DF_SEEN 0x01 /* Dependency has been followed */ #define DF_LIGHT 0x02 /* Implied dependency on jail existence only */ #define DF_NOFAIL 0x04 /* Don't propigate failed jails */ #define PF_VAR 0x01 /* This is a variable, not a true parameter */ #define PF_APPEND 0x02 /* Append to existing parameter list */ #define PF_BAD 0x04 /* Unable to resolve parameter value */ #define PF_INTERNAL 0x08 /* Internal parameter, not passed to kernel */ #define PF_BOOL 0x10 /* Boolean parameter */ #define PF_INT 0x20 /* Integer parameter */ #define PF_CONV 0x40 /* Parameter duplicated in converted form */ #define JF_START 0x0001 /* -c */ #define JF_SET 0x0002 /* -m */ #define JF_STOP 0x0004 /* -r */ #define JF_DEPEND 0x0008 /* Operation required by dependency */ #define JF_WILD 0x0010 /* Not specified on the command line */ #define JF_FAILED 0x0020 /* Operation failed */ #define JF_PARAMS 0x0040 /* Parameters checked and imported */ #define JF_RDTUN 0x0080 /* Create-only parameter check has been done */ #define JF_IFUP 0x0100 /* IP addresses have been configured */ #define JF_MOUNTED 0x0200 /* Filesystems have been mounted */ #define JF_PERSIST 0x0400 /* Jail is temporarily persistent */ #define JF_TIMEOUT 0x0800 /* A command (or process kill) timed out */ #define JF_RUNQ 0x1000 /* Jail was in the run qeueue */ #define JF_BACKGROUND 0x2000 /* Command was run in the background */ #define JF_OP_MASK (JF_START | JF_SET | JF_STOP) #define JF_RESTART (JF_START | JF_STOP) #define JF_START_SET (JF_START | JF_SET) #define JF_SET_RESTART (JF_SET | JF_STOP) #define JF_START_SET_RESTART (JF_START | JF_SET | JF_STOP) #define JF_DO_STOP(js) (((js) & (JF_SET | JF_STOP)) == JF_STOP) enum intparam { IP_ALLOW_DYING = 1, /* Allow making changes to a dying jail */ IP_COMMAND, /* Command run inside jail at creation */ IP_DEPEND, /* Jail starts after (stops before) another */ IP_EXEC_CLEAN, /* Run commands in a clean environment */ IP_EXEC_CONSOLELOG, /* Redirect optput for commands run in jail */ IP_EXEC_FIB, /* Run jailed commands with this FIB */ IP_EXEC_JAIL_USER, /* Run jailed commands as this user */ IP_EXEC_POSTSTART, /* Commands run outside jail after creating */ IP_EXEC_POSTSTOP, /* Commands run outside jail after removing */ IP_EXEC_PRESTART, /* Commands run outside jail before creating */ IP_EXEC_PRESTOP, /* Commands run outside jail before removing */ IP_EXEC_START, /* Commands run inside jail on creation */ IP_EXEC_STOP, /* Commands run inside jail on removal */ IP_EXEC_SYSTEM_JAIL_USER,/* Get jail_user from system passwd file */ IP_EXEC_SYSTEM_USER, /* Run non-jailed commands as this user */ IP_EXEC_TIMEOUT, /* Time to wait for a command to complete */ IP_INTERFACE, /* Add IP addresses to this interface */ IP_IP_HOSTNAME, /* Get jail IP address(es) from hostname */ IP_MOUNT, /* Mount points in fstab(5) form */ IP_MOUNT_DEVFS, /* Mount /dev under prison root */ IP_MOUNT_DEVFS_RULESET, /* Ruleset for the devfs mount */ IP_MOUNT_FSTAB, /* A standard fstab(5) file */ IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */ IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */ IP__IP4_IFADDR, /* Copy of ip4.addr with interface/netmask */ #ifdef INET6 IP__IP6_IFADDR, /* Copy of ip6.addr with interface/prefixlen */ #endif + IP__MOUNT_FROM_FSTAB, /* Line from mount.fstab file */ KP_ALLOW_CHFLAGS, KP_ALLOW_MOUNT, KP_ALLOW_RAW_SOCKETS, KP_ALLOW_SET_HOSTNAME, KP_ALLOW_SOCKET_AF, KP_ALLOW_SYSVIPC, KP_ENFORCE_STATFS, KP_HOST_HOSTNAME, KP_IP4_ADDR, #ifdef INET6 KP_IP6_ADDR, #endif KP_JID, KP_NAME, KP_PATH, KP_PERSIST, KP_SECURELEVEL, KP_VNET, IP_NPARAM }; STAILQ_HEAD(cfvars, cfvar); struct cfvar { STAILQ_ENTRY(cfvar) tq; char *name; size_t pos; }; STAILQ_HEAD(cfstrings, cfstring); struct cfstring { STAILQ_ENTRY(cfstring) tq; char *s; size_t len; struct cfvars vars; }; TAILQ_HEAD(cfparams, cfparam); struct cfparam { TAILQ_ENTRY(cfparam) tq; char *name; struct cfstrings val; unsigned flags; int gen; }; TAILQ_HEAD(cfjails, cfjail); STAILQ_HEAD(cfdepends, cfdepend); struct cfjail { TAILQ_ENTRY(cfjail) tq; char *name; char *comline; struct cfparams params; struct cfdepends dep[2]; struct cfjails *queue; struct cfparam *intparams[IP_NPARAM]; struct cfstring *comstring; struct jailparam *jp; struct timespec timeout; enum intparam comparam; unsigned flags; int jid; int seq; int pstatus; int ndeps; int njp; int nprocs; }; struct cfdepend { STAILQ_ENTRY(cfdepend) tq[2]; struct cfjail *j[2]; unsigned flags; }; extern void *emalloc(size_t); extern void *erealloc(void *, size_t); extern char *estrdup(const char *); extern void failed(struct cfjail *j); extern void jail_note(const struct cfjail *j, const char *fmt, ...); extern void jail_warnx(const struct cfjail *j, const char *fmt, ...); extern int run_command(struct cfjail *j, int *plimit, enum intparam comparam); extern int finish_command(struct cfjail *j, int *plimit); extern struct cfjail *next_proc(int nonblock); extern int term_procs(struct cfjail *j); extern void load_config(void); extern struct cfjail *add_jail(void); extern void add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, const char *value); extern int bool_param(const struct cfparam *p); extern int int_param(const struct cfparam *p, int *ip); extern const char *string_param(const struct cfparam *p); extern int check_intparams(struct cfjail *j); extern int import_params(struct cfjail *j); extern int equalopts(const char *opt1, const char *opt2); extern int wild_jail_name(const char *wname); extern int wild_jail_match(const char *jname, const char *wname); extern void dep_setup(int docf); extern int dep_check(struct cfjail *j); extern void dep_done(struct cfjail *j, unsigned flags); extern void dep_reset(struct cfjail *j); extern struct cfjail *next_jail(void); extern int start_state(const char *target, unsigned state, int running); extern void requeue(struct cfjail *j, struct cfjails *queue); extern void yyerror(const char *); extern int yylex(void); extern int yyparse(void); extern struct cfjails cfjails; extern struct cfjails ready; extern struct cfjails waiting; extern const char *cfname; extern int verbose;