X-Git-Url: https://git.armaanb.net/?p=opendoas.git;a=blobdiff_plain;f=doas.c;h=d348d2554b6f23a5c364ccccc8c8ce64cc09bf58;hp=1fd0e9a9c455ab62e32b738019cc2f3fbb14a947;hb=HEAD;hpb=dbc7d06b5bbf01652744423bd8825ea7b5e92f73 diff --git a/doas.c b/doas.c index 1fd0e9a..d348d25 100644 --- a/doas.c +++ b/doas.c @@ -15,14 +15,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + #include #include #include #include -#if __OpenBSD__ -# include -# include +#ifdef HAVE_LOGIN_CAP_H +#include #endif #include #include @@ -33,19 +34,17 @@ #include #include #include +#include +#include -#include "includes.h" - +#include "openbsd.h" #include "doas.h" static void __dead usage(void) { - fprintf(stderr, "usage: doas [-Lns] " -#ifdef __OpenBSD__ - "[-a style] " -#endif - "[-C config] [-u user] command [args]\n"); + fprintf(stderr, "usage: doas [-Lns] [-C config] [-u user]" + " command [args]\n"); exit(1); } @@ -57,9 +56,11 @@ 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; @@ -85,9 +86,11 @@ parsegid(const char *s, gid_t *gid) 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; @@ -137,7 +140,7 @@ static int permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr, uid_t target, const char *cmd, const char **cmdargs) { - int i; + size_t i; *lastr = NULL; for (i = 0; i < nrules; i++) { @@ -200,55 +203,51 @@ checkconfig(const char *confpath, int argc, char **argv, } } -#ifdef USE_BSD_AUTH -static void -authuser(char *myname, char *login_style, int persist) +int +mygetpwuid_r(uid_t uid, struct passwd *pwd, struct passwd **result) { - char *challenge = NULL, *response, rbuf[1024], cbuf[128]; - auth_session_t *as; - int fd = -1; - - if (persist) - fd = open("/dev/tty", O_RDWR); - if (fd != -1) { - if (ioctl(fd, TIOCCHKVERAUTH) == 0) - goto good; + 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; } - if (!(as = auth_userchallenge(myname, login_style, "auth-doas", - &challenge))) - errx(1, "Authorization failed"); - if (!challenge) { - char host[HOST_NAME_MAX + 1]; - if (gethostname(host, sizeof(host))) - snprintf(host, sizeof(host), "?"); - snprintf(cbuf, sizeof(cbuf), - "\rdoas (%.32s@%.32s) password: ", myname, host); - challenge = cbuf; - } - response = readpassphrase(challenge, rbuf, sizeof(rbuf), - RPP_REQUIRE_TTY); - if (response == NULL && errno == ENOTTY) { - syslog(LOG_AUTHPRIV | LOG_NOTICE, - "tty required for %s", myname); - errx(1, "a tty is required"); - } - if (!auth_userresponse(as, response, 0)) { - explicit_bzero(rbuf, sizeof(rbuf)); - syslog(LOG_AUTHPRIV | LOG_NOTICE, - "failed auth for %s", myname); - errx(1, "Authorization failed"); - } - explicit_bzero(rbuf, sizeof(rbuf)); -good: - if (fd != -1) { - int secs = 5 * 60; - ioctl(fd, TIOCSETVERAUTH, &secs); - close(fd); - } + return rv; } + +void +authfail(int opt) +{ + +#ifdef DOAS_INSULTS + if (opt) + printf("%s\n", getinsult()); #endif + errx(1, "Authentication failed"); +} + int main(int argc, char **argv) { @@ -257,13 +256,9 @@ main(int argc, char **argv) const char *confpath = NULL; char *shargv[] = { NULL, NULL }; char *sh; + const char *p; const char *cmd; char cmdline[LINE_MAX]; -#ifdef __OpenBSD__ - char mypwbuf[_PW_BUF_LEN], targpwbuf[_PW_BUF_LEN]; -#else - char *mypwbuf = NULL, *targpwbuf = NULL; -#endif struct passwd mypwstore, targpwstore; struct passwd *mypw, *targpw; const struct rule *rule; @@ -277,9 +272,11 @@ main(int argc, char **argv) char cwdpath[PATH_MAX]; const char *cwd; char **envp; -#ifdef USE_BSD_AUTH - char *login_style = NULL; -#endif + + if (argc <= 0 || argv == NULL || argv[0] == NULL) { + fprintf(stderr, "doas: executed without argv\n"); + exit(1); + } setprogname("doas"); @@ -287,29 +284,13 @@ main(int argc, char **argv) uid = getuid(); -#ifdef USE_BSD_AUTH -# define OPTSTRING "a:C:Lnsu:" -#else -# define OPTSTRING "+C:Lnsu:" -#endif - - while ((ch = getopt(argc, argv, OPTSTRING)) != -1) { + while ((ch = getopt(argc, argv, "+C:Lnsu:")) != -1) { switch (ch) { -#ifdef USE_BSD_AUTH - case 'a': - login_style = optarg; - break; -#endif case 'C': confpath = optarg; break; case 'L': -#if defined(USE_BSD_AUTH) - i = open("/dev/tty", O_RDWR); - if (i != -1) - ioctl(i, TIOCCLRVERAUTH); - exit(i == -1); -#elif defined(USE_TIMESTAMP) +#if defined(USE_TIMESTAMP) exit(timestamp_clear() == -1); #else exit(0); @@ -338,22 +319,9 @@ main(int argc, char **argv) } else if ((!sflag && !argc) || (sflag && argc)) usage(); -#ifdef __OpenBSD__ - rv = getpwuid_r(uid, &mypwstore, mypwbuf, sizeof(mypwbuf), &mypw); + rv = mygetpwuid_r(uid, &mypwstore, &mypw); if (rv != 0) err(1, "getpwuid_r failed"); -#else - for (size_t sz = 1024; sz <= 16*1024; sz *= 2) { - mypwbuf = reallocarray(mypwbuf, sz, sizeof (char)); - if (mypwbuf == NULL) - errx(1, "can't allocate mypwbuf"); - rv = getpwuid_r(uid, &mypwstore, mypwbuf, sz, &mypw); - if (rv != ERANGE) - break; - } - if (rv != 0) - err(1, "getpwuid_r failed"); -#endif if (mypw == NULL) errx(1, "no passwd entry for self"); ngroups = getgroups(NGROUPS_MAX, groups); @@ -380,7 +348,7 @@ main(int argc, char **argv) if (geteuid()) errx(1, "not installed setuid"); - parseconfig("/etc/doas.conf", 1); + parseconfig(DOAS_CONF, 1); /* cmdline is used only for logging, no need to abort on truncate */ (void)strlcpy(cmdline, argv[0], sizeof(cmdline)); @@ -395,60 +363,38 @@ main(int argc, char **argv) if (!permit(uid, groups, ngroups, &rule, target, cmd, (const char **)argv + 1)) { syslog(LOG_AUTHPRIV | LOG_NOTICE, - "failed command for %s: %s", mypw->pw_name, cmdline); + "command not permitted for %s: %s", mypw->pw_name, cmdline); errc(1, EPERM, NULL); } -#if defined(__OpenBSD__) || defined(USE_SHADOW) if (!(rule->options & NOPASS)) { if (nflag) - errx(1, "Authorization required"); + errx(1, "Authentication required"); -# ifdef __OpenBSD__ - authuser(mypw->pw_name, login_style, rule->options & PERSIST); -# else - shadowauth(mypw->pw_name, rule->options & PERSIST); -# endif + int ret = shadowauth(mypw->pw_name, rule->options & PERSIST); + if (ret == 5) + authfail(rule->options & INSULT); } -# ifdef __OpenBSD__ - if (pledge("stdio rpath getpw exec id", NULL) == -1) - err(1, "pledge"); -# endif + if ((p = getenv("PATH")) != NULL) + formerpath = strdup(p); + if (formerpath == NULL) + formerpath = ""; -#elif !defined(USE_PAM) - (void) nflag; - if (!(rule->options & NOPASS)) { - errx(1, "Authorization required"); + if (rule->cmd) { + if (setenv("PATH", safepath, 1) == -1) + err(1, "failed to set PATH '%s'", safepath); } -#endif /* !(__OpenBSD__ || USE_SHADOW) && !USE_PAM */ -#ifdef __OpenBSD__ - rv = getpwuid_r(target, &targpwstore, targpwbuf, sizeof(targpwbuf), &targpw); - if (rv != 0) - errx(1, "no passwd entry for target"); -#else - for (size_t sz = 1024; sz <= 16*1024; sz *= 2) { - targpwbuf = reallocarray(targpwbuf, sz, sizeof (char)); - if (targpwbuf == NULL) - errx(1, "can't allocate targpwbuf"); - rv = getpwuid_r(target, &targpwstore, targpwbuf, sz, &targpw); - if (rv != ERANGE) - break; - } + rv = mygetpwuid_r(target, &targpwstore, &targpw); if (rv != 0) err(1, "getpwuid_r failed"); -#endif if (targpw == NULL) - err(1, "getpwuid_r failed"); - -#if defined(USE_PAM) - pamauth(targpw->pw_name, mypw->pw_name, !nflag, rule->options & NOPASS, - rule->options & PERSIST); -#endif + errx(1, "no passwd entry for target"); -#ifdef HAVE_SETUSERCONTEXT +#ifdef HAVE_LOGIN_CAP_H if (setusercontext(NULL, targpw, target, LOGIN_SETGROUP | + LOGIN_SETPATH | LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | LOGIN_SETUMASK | LOGIN_SETUSER) != 0) errx(1, "failed to set user context for target"); @@ -459,11 +405,8 @@ main(int argc, char **argv) err(1, "initgroups"); if (setresuid(target, target, target) != 0) err(1, "setresuid"); -#endif - -#ifdef __OpenBSD__ - if (pledge("stdio rpath exec", NULL) == -1) - err(1, "pledge"); + if (setenv("PATH", safepath, 1) == -1) + err(1, "failed to set PATH '%s'", safepath); #endif if (getcwd(cwdpath, sizeof(cwdpath)) == NULL) @@ -471,19 +414,21 @@ main(int argc, char **argv) else cwd = cwdpath; -#ifdef __OpenBSD__ - if (pledge("stdio exec", NULL) == -1) - err(1, "pledge"); -#endif - - syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command %s as %s from %s", - mypw->pw_name, cmdline, targpw->pw_name, cwd); + if (!(rule->options & NOLOG)) { + syslog(LOG_AUTHPRIV | LOG_INFO, + "%s ran command %s as %s from %s", + mypw->pw_name, cmdline, targpw->pw_name, cwd); + } - envp = prepenv(rule); + 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)