-/* $OpenBSD: doas.c,v 1.33 2015/07/30 17:04:33 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.52 2016/04/28 04:48:56 tedu Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <limits.h>
-#include <login_cap.h>
-#include <bsd_auth.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <grp.h>
#include <syslog.h>
#include <errno.h>
+#include <fcntl.h>
+#include "includes.h"
#include "doas.h"
static void __dead
usage(void)
{
- fprintf(stderr, "usage: doas [-ns] [-C config] [-u user] command [args]\n");
+ fprintf(stderr, "usage: doas [-Lns] [-C config] [-u user]"
+ " command [args]\n");
exit(1);
}
-size_t
-arraylen(const char **arr)
-{
- size_t cnt = 0;
-
- while (*arr) {
- cnt++;
- arr++;
- }
- return cnt;
-}
-
static int
parseuid(const char *s, uid_t *uid)
{
if ((pw = getpwnam(s)) != NULL) {
*uid = pw->pw_uid;
+ if (*uid == UID_MAX)
+ return -1;
return 0;
}
- *uid = strtonum(s, 0, UID_MAX, &errstr);
+ *uid = strtonum(s, 0, UID_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
if ((gr = getgrnam(s)) != NULL) {
*gid = gr->gr_gid;
+ if (*gid == GID_MAX)
+ return -1;
return 0;
}
- *gid = strtonum(s, 0, GID_MAX, &errstr);
+ *gid = strtonum(s, 0, GID_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
}
static int
-permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr,
+permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
uid_t target, const char *cmd, const char **cmdargs)
{
int i;
struct stat sb;
yyfp = fopen(filename, "r");
- if (!yyfp) {
- if (checkperms)
- fprintf(stderr, "doas is not enabled.\n");
- else
- warn("could not open config file");
- exit(1);
- }
+ if (!yyfp)
+ err(1, checkperms ? "doas is not enabled, %s" :
+ "could not open config file %s", filename);
if (checkperms) {
if (fstat(fileno(yyfp), &sb) != 0)
exit(1);
}
-/*
- * Copy the environment variables in safeset from oldenvp to envp.
- */
-static int
-copyenvhelper(const char **oldenvp, const char **safeset, int nsafe,
- char **envp, int ei)
-{
- int i;
-
- for (i = 0; i < nsafe; i++) {
- const char **oe = oldenvp;
- while (*oe) {
- size_t len = strlen(safeset[i]);
- if (strncmp(*oe, safeset[i], len) == 0 &&
- (*oe)[len] == '=') {
- if (!(envp[ei++] = strdup(*oe)))
- err(1, "strdup");
- break;
- }
- oe++;
- }
- }
- return ei;
-}
-
-static char **
-copyenv(const char **oldenvp, struct rule *rule)
-{
- const char *safeset[] = {
- "DISPLAY", "HOME", "LOGNAME", "MAIL",
- "PATH", "TERM", "USER", "USERNAME",
- NULL
- };
- const char *badset[] = {
- "ENV",
- NULL
- };
- char **envp;
- const char **extra;
- int ei;
- int nsafe, nbad;
- int nextras = 0;
-
- /* if there was no envvar whitelist, pass all except badset ones */
- nbad = arraylen(badset);
- if ((rule->options & KEEPENV) && !rule->envlist) {
- size_t iold, inew;
- size_t oldlen = arraylen(oldenvp);
- envp = reallocarray(NULL, oldlen + 1, sizeof(char *));
- if (!envp)
- err(1, "reallocarray");
- for (inew = iold = 0; iold < oldlen; iold++) {
- size_t ibad;
- for (ibad = 0; ibad < nbad; ibad++) {
- size_t len = strlen(badset[ibad]);
- if (strncmp(oldenvp[iold], badset[ibad], len) == 0 &&
- oldenvp[iold][len] == '=') {
- break;
- }
- }
- if (ibad == nbad) {
- if (!(envp[inew] = strdup(oldenvp[iold])))
- err(1, "strdup");
- inew++;
- }
- }
- envp[inew] = NULL;
- return envp;
- }
-
- nsafe = arraylen(safeset);
- if ((extra = rule->envlist)) {
- size_t isafe;
- nextras = arraylen(extra);
- for (isafe = 0; isafe < nsafe; isafe++) {
- size_t iextras;
- for (iextras = 0; iextras < nextras; iextras++) {
- if (strcmp(extra[iextras], safeset[isafe]) == 0) {
- nextras--;
- extra[iextras] = extra[nextras];
- extra[nextras] = NULL;
- iextras--;
- }
- }
- }
- }
-
- envp = reallocarray(NULL, nsafe + nextras + 1, sizeof(char *));
- if (!envp)
- err(1, "can't allocate new environment");
-
- ei = 0;
- ei = copyenvhelper(oldenvp, safeset, nsafe, envp, ei);
- ei = copyenvhelper(oldenvp, rule->envlist, nextras, envp, ei);
- envp[ei] = NULL;
-
- return envp;
-}
-
-static void __dead
-fail(void)
-{
- fprintf(stderr, "Permission denied\n");
- exit(1);
-}
-
static void __dead
checkconfig(const char *confpath, int argc, char **argv,
uid_t uid, gid_t *groups, int ngroups, uid_t target)
{
- struct rule *rule;
+ const struct rule *rule;
+
+ if (setresuid(uid, uid, uid) != 0)
+ err(1, "setresuid");
- setresuid(uid, uid, uid);
parseconfig(confpath, 0);
if (!argc)
exit(0);
}
int
-main(int argc, char **argv, char **envp)
+mygetpwuid_r(uid_t uid, struct passwd *pwd, struct passwd **result)
+{
+ int rv;
+ char *buf;
+ static long pwsz = 0;
+ size_t buflen;
+
+ *result = NULL;
+
+ if (pwsz == 0)
+ pwsz = sysconf(_SC_GETPW_R_SIZE_MAX);
+
+ buflen = pwsz > 0 ? pwsz : 1024;
+
+ buf = malloc(buflen);
+ if (buf == NULL)
+ return errno;
+
+ while ((rv = getpwuid_r(uid, pwd, buf, buflen, result)) == ERANGE) {
+ size_t newsz;
+ newsz = buflen * 2;
+ if (newsz < buflen)
+ return rv;
+ buflen = newsz;
+ buf = realloc(buf, buflen);
+ if (buf == NULL)
+ return errno;
+ }
+
+ return rv;
+}
+
+int
+main(int argc, char **argv)
{
const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:"
"/usr/local/bin:/usr/local/sbin";
const char *confpath = NULL;
char *shargv[] = { NULL, NULL };
char *sh;
+ const char *p;
const char *cmd;
char cmdline[LINE_MAX];
- char myname[_PW_NAME_LEN + 1];
- struct passwd *pw;
- struct rule *rule;
+ struct passwd mypwstore, targpwstore;
+ struct passwd *mypw, *targpw;
+ const struct rule *rule;
uid_t uid;
uid_t target = 0;
gid_t groups[NGROUPS_MAX + 1];
int ngroups;
- int i, ch;
+ int i, ch, rv;
int sflag = 0;
int nflag = 0;
+ char cwdpath[PATH_MAX];
+ const char *cwd;
+ char **envp;
+
+ setprogname("doas");
+
+ closefrom(STDERR_FILENO + 1);
uid = getuid();
- while ((ch = getopt(argc, argv, "C:nsu:")) != -1) {
+ while ((ch = getopt(argc, argv, "+C:Lnsu:")) != -1) {
switch (ch) {
case 'C':
confpath = optarg;
break;
+ case 'L':
+#if defined(USE_TIMESTAMP)
+ exit(timestamp_clear() == -1);
+#else
+ exit(0);
+#endif
case 'u':
if (parseuid(optarg, &target) != 0)
errx(1, "unknown user");
} else if ((!sflag && !argc) || (sflag && argc))
usage();
- pw = getpwuid(uid);
- if (!pw)
- err(1, "getpwuid failed");
- if (strlcpy(myname, pw->pw_name, sizeof(myname)) >= sizeof(myname))
- errx(1, "pw_name too long");
+ rv = mygetpwuid_r(uid, &mypwstore, &mypw);
+ if (rv != 0)
+ err(1, "getpwuid_r failed");
+ if (mypw == NULL)
+ errx(1, "no passwd entry for self");
ngroups = getgroups(NGROUPS_MAX, groups);
if (ngroups == -1)
err(1, "can't get groups");
if (sflag) {
sh = getenv("SHELL");
- if (sh == NULL || *sh == '\0')
- shargv[0] = pw->pw_shell;
- else
+ if (sh == NULL || *sh == '\0') {
+ shargv[0] = mypw->pw_shell;
+ } else
shargv[0] = sh;
argv = shargv;
argc = 1;
exit(1); /* fail safe */
}
+ if (geteuid())
+ errx(1, "not installed setuid");
+
parseconfig("/etc/doas.conf", 1);
/* cmdline is used only for logging, no need to abort on truncate */
- (void) strlcpy(cmdline, argv[0], sizeof(cmdline));
+ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));
for (i = 1; i < argc; i++) {
if (strlcat(cmdline, " ", sizeof(cmdline)) >= sizeof(cmdline))
break;
cmd = argv[0];
if (!permit(uid, groups, ngroups, &rule, target, cmd,
- (const char**)argv + 1)) {
+ (const char **)argv + 1)) {
syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "failed command for %s: %s", myname, cmdline);
- fail();
+ "failed command for %s: %s", mypw->pw_name, cmdline);
+ errc(1, EPERM, NULL);
}
+#if defined(USE_SHADOW)
if (!(rule->options & NOPASS)) {
if (nflag)
errx(1, "Authorization required");
- if (!auth_userokay(myname, NULL, NULL, NULL)) {
- syslog(LOG_AUTHPRIV | LOG_NOTICE,
- "failed password for %s", myname);
- fail();
- }
+
+ shadowauth(mypw->pw_name, rule->options & PERSIST);
+ }
+#elif !defined(USE_PAM)
+ /* no authentication provider, only allow NOPASS rules */
+ (void) nflag;
+ if (!(rule->options & NOPASS))
+ errx(1, "Authorization required");
+#endif
+
+ if ((p = getenv("PATH")) != NULL)
+ formerpath = strdup(p);
+ if (formerpath == NULL)
+ formerpath = "";
+
+ if (rule->cmd) {
+ if (setenv("PATH", safepath, 1) == -1)
+ err(1, "failed to set PATH '%s'", safepath);
}
- envp = copyenv((const char **)envp, rule);
- pw = getpwuid(target);
- if (!pw)
+ rv = mygetpwuid_r(target, &targpwstore, &targpw);
+ if (rv != 0)
+ err(1, "getpwuid_r failed");
+ if (targpw == NULL)
errx(1, "no passwd entry for target");
- if (setusercontext(NULL, pw, target, LOGIN_SETGROUP |
- LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | LOGIN_SETUMASK |
- LOGIN_SETUSER) != 0)
- errx(1, "failed to set user context for target");
-
- syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command as %s: %s",
- myname, pw->pw_name, cmdline);
- if (setenv("PATH", safepath, 1) == -1)
- err(1, "failed to set PATH '%s'", safepath);
+
+#if defined(USE_PAM)
+ pamauth(targpw->pw_name, mypw->pw_name, !nflag, rule->options & NOPASS,
+ rule->options & PERSIST);
+#endif
+
+ if (setresgid(targpw->pw_gid, targpw->pw_gid, targpw->pw_gid) != 0)
+ err(1, "setresgid");
+ if (initgroups(targpw->pw_name, targpw->pw_gid) != 0)
+ err(1, "initgroups");
+ if (setresuid(target, target, target) != 0)
+ err(1, "setresuid");
+
+ if (getcwd(cwdpath, sizeof(cwdpath)) == NULL)
+ cwd = "(failed)";
+ else
+ cwd = cwdpath;
+
+ syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command %s as %s from %s",
+ mypw->pw_name, cmdline, targpw->pw_name, cwd);
+
+ envp = prepenv(rule, mypw, targpw);
+
+ /* setusercontext set path for the next process, so reset it for us */
+ if (rule->cmd) {
+ if (setenv("PATH", safepath, 1) == -1)
+ err(1, "failed to set PATH '%s'", safepath);
+ } else {
+ if (setenv("PATH", formerpath, 1) == -1)
+ err(1, "failed to set PATH '%s'", formerpath);
+ }
execvpe(cmd, argv, envp);
if (errno == ENOENT)
errx(1, "%s: command not found", cmd);