]> git.armaanb.net Git - opendoas.git/blobdiff - doas.c
bump version 0.3
[opendoas.git] / doas.c
diff --git a/doas.c b/doas.c
index 7c800bd15c146204e3c48bb85720dabd8c76ab52..33be571de3bd542fe9eef95303f612380e357a54 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: doas.c,v 1.52 2016/04/28 04:48:56 tedu Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
 #include <sys/types.h>
+#include <sys/stat.h>
 
 #include <limits.h>
-#include <login_cap.h>
-#include <bsd_auth.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pwd.h>
 #include <grp.h>
 #include <syslog.h>
+#include <errno.h>
+#if HAVE_SHADOW_H
+#include <shadow.h>
+#endif
+
+#include "includes.h"
 
 #include "doas.h"
 
+static void __dead
+version(void)
+{
+       fprintf(stderr, "doas: version %s built %s\n", VERSION, __DATE__);
+       exit(1);
+}
+
 static void __dead
 usage(void)
 {
-       fprintf(stderr, "usage: doas [-u user] command [args]\n");
+       fprintf(stderr, "usage: doas [-nsv] [-a style] [-C config] [-u user]"
+           " command [args]\n");
        exit(1);
 }
 
@@ -41,9 +55,12 @@ size_t
 arraylen(const char **arr)
 {
        size_t cnt = 0;
-       while (*arr) {
-               cnt++;
-               arr++;
+
+       if (arr) {
+               while (*arr) {
+                       cnt++;
+                       arr++;
+               }
        }
        return cnt;
 }
@@ -76,30 +93,31 @@ uidcheck(const char *s, uid_t desired)
        return 0;
 }
 
-static gid_t
-strtogid(const char *s)
+static int
+parsegid(const char *s, gid_t *gid)
 {
        struct group *gr;
        const char *errstr;
-       gid_t gid;
 
-       if ((gr = getgrnam(s)) != NULL)
-               return gr->gr_gid;
-       gid = strtonum(s, 0, GID_MAX, &errstr);
+       if ((gr = getgrnam(s)) != NULL) {
+               *gid = gr->gr_gid;
+               return 0;
+       }
+       *gid = strtonum(s, 0, GID_MAX, &errstr);
        if (errstr)
                return -1;
-       return gid;
+       return 0;
 }
 
 static int
 match(uid_t uid, gid_t *groups, int ngroups, uid_t target, const char *cmd,
-    struct rule *r)
+    const char **cmdargs, struct rule *r)
 {
        int i;
 
        if (r->ident[0] == ':') {
-               gid_t rgid = strtogid(r->ident + 1);
-               if (rgid == -1)
+               gid_t rgid;
+               if (parsegid(r->ident + 1, &rgid) == -1)
                        return 0;
                for (i = 0; i < ngroups; i++) {
                        if (rgid == groups[i])
@@ -113,20 +131,34 @@ match(uid_t uid, gid_t *groups, int ngroups, uid_t target, const char *cmd,
        }
        if (r->target && uidcheck(r->target, target) != 0)
                return 0;
-       if (r->cmd && strcmp(r->cmd, cmd) != 0)
-               return 0;
+       if (r->cmd) {
+               if (strcmp(r->cmd, cmd))
+                       return 0;
+               if (r->cmdargs) {
+                       /* if arguments were given, they should match explicitly */
+                       for (i = 0; r->cmdargs[i]; i++) {
+                               if (!cmdargs[i])
+                                       return 0;
+                               if (strcmp(r->cmdargs[i], cmdargs[i]))
+                                       return 0;
+                       }
+                       if (cmdargs[i])
+                               return 0;
+               }
+       }
        return 1;
 }
 
 static int
 permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr,
-    uid_t target, const char *cmd)
+    uid_t target, const char *cmd, const char **cmdargs)
 {
        int i;
 
        *lastr = NULL;
        for (i = 0; i < nrules; i++) {
-               if (match(uid, groups, ngroups, target, cmd, rules[i]))
+               if (match(uid, groups, ngroups, target, cmd,
+                   cmdargs, rules[i]))
                        *lastr = rules[i];
        }
        if (!*lastr)
@@ -135,136 +167,121 @@ permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr,
 }
 
 static void
-parseconfig(const char *filename)
+parseconfig(const char *filename, int checkperms)
 {
        extern FILE *yyfp;
        extern int yyparse(void);
+       struct stat sb;
 
        yyfp = fopen(filename, "r");
-       if (!yyfp) {
-               fprintf(stderr, "doas is not enabled.\n");
-               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)
+                       err(1, "fstat(\"%s\")", filename);
+               if ((sb.st_mode & (S_IWGRP|S_IWOTH)) != 0)
+                       errx(1, "%s is writable by group or other", filename);
+               if (sb.st_uid != 0)
+                       errx(1, "%s is not owned by root", filename);
        }
+
        yyparse();
        fclose(yyfp);
+       if (parse_errors)
+               exit(1);
 }
 
-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)
+static void __dead
+checkconfig(const char *confpath, int argc, char **argv,
+    uid_t uid, gid_t *groups, int ngroups, uid_t target)
 {
-       const char *safeset[] = {
-               "DISPLAY", "HOME", "LOGNAME", "MAIL", "SHELL",
-               "PATH", "TERM", "USER", "USERNAME",
-               NULL,
-       };
-       int nsafe;
-       int nextras = 0;
-       char **envp;
-       const char **extra;
-       int ei;
-       int i, j;
-       
-       if ((rule->options & KEEPENV) && !rule->envlist) {
-               j = arraylen(oldenvp);
-               envp = reallocarray(NULL, j + 1, sizeof(char *));
-               for (i = 0; i < j; i++) {
-                       if (!(envp[i] = strdup(oldenvp[i])))
-                               err(1, "strdup");
-               }
-               envp[i] = NULL;
-               return envp;
-       }
-
-       nsafe = arraylen(safeset);
-       if ((extra = rule->envlist)) {
-               nextras = arraylen(extra);
-               for (i = 0; i < nsafe; i++) {
-                       for (j = 0; j < nextras; j++) {
-                               if (strcmp(extra[j], safeset[i]) == 0) {
-                                       extra[j--] = extra[nextras--];
-                                       extra[nextras] = NULL;
-                               }
-                       }
-               }
-       }
-
-       envp = reallocarray(NULL, nsafe + nextras + 1, sizeof(char *));
-       if (!envp)
-               err(1, "can't allocate new environment");
+       struct rule *rule;
 
-       ei = 0;
-       ei = copyenvhelper(oldenvp, safeset, nsafe, envp, ei);
-       ei = copyenvhelper(oldenvp, rule->envlist, nextras, envp, ei);
-       envp[ei] = NULL;
+       if (setresuid(uid, uid, uid) != 0)
+               err(1, "setresuid");
 
-       return envp;
-}
+       parseconfig(confpath, 0);
+       if (!argc)
+               exit(0);
 
-static void __dead
-fail(void)
-{
-       const char *msgs[] = {
-               "No lollygagging!",
-               "Better luck next time.",
-               "PEBKAC detected.",
-               "That's what happens when you're lazy.",
-               "It is clear that this has not been thought through.",
-               "That's the most ridiculous thing I've heard in the last two or three minutes!",
-               "No sane people allowed here.  Go home.",
-               "I would explain, but I am too drunk.",
-               "You're not allowed to have an opinion.",
-               "Complaint forms are handled in another department.",
-       };
-       const char *m;
-
-       m = msgs[arc4random_uniform(sizeof(msgs) / sizeof(msgs[0]))];
-       fprintf(stderr, m);
-       fprintf(stderr, "\n");
-       exit(1);
+       if (permit(uid, groups, ngroups, &rule, target, argv[0],
+           (const char **)argv + 1)) {
+               printf("permit%s\n", (rule->options & NOPASS) ? " nopass" : "");
+               exit(0);
+       } else {
+               printf("deny\n");
+               exit(1);
+       }
 }
 
 int
-main(int argc, char **argv, char **envp)
+main(int argc, char **argv)
 {
-       char cmdline[1024];
-       char myname[32];
-       uid_t uid, target = 0;
-       gid_t groups[NGROUPS_MAX + 1];
-       int ngroups;
+       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 *cmd;
+       char cmdline[LINE_MAX];
+       char myname[_PW_NAME_LEN + 1];
        struct passwd *pw;
        struct rule *rule;
-       const char *cmd;
+       uid_t uid;
+       uid_t target = 0;
+       gid_t groups[NGROUPS_MAX + 1];
+       int ngroups;
        int i, ch;
-       const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
+       int sflag = 0;
+       int nflag = 0;
+       int vflag = 0;
+       char cwdpath[PATH_MAX];
+       const char *cwd;
+       char **envp;
+#ifdef HAVE_BSD_AUTH_H
+       char *login_style = NULL;
+#endif
 
-       parseconfig("/etc/doas.conf");
+       setprogname("doas");
 
-       while ((ch = getopt(argc, argv, "u:")) != -1) {
+       if (pledge("stdio rpath getpw tty proc exec id", NULL) == -1)
+               err(1, "pledge");
+
+       /* closefrom(STDERR_FILENO + 1); */
+
+       uid = getuid();
+
+#ifdef HAVE_BSD_AUTH_H
+# define OPTSTRING "a:C:nsu:v"
+#else
+# define OPTSTRING "C:nsu:v"
+#endif
+
+       while ((ch = getopt(argc, argv, OPTSTRING)) != -1) {
                switch (ch) {
+#ifdef HAVE_BSD_AUTH_H
+               case 'a':
+                       login_style = optarg;
+                       break;
+#endif
+               case 'C':
+                       confpath = optarg;
+                       break;
                case 'u':
                        if (parseuid(optarg, &target) != 0)
                                errx(1, "unknown user");
                        break;
+               case 'n':
+                       nflag = 1;
+                       break;
+               case 's':
+                       sflag = 1;
+                       break;
+               case 'v':
+                       vflag = 1;
+                       break;
                default:
                        usage();
                        break;
@@ -273,49 +290,185 @@ main(int argc, char **argv, char **envp)
        argv += optind;
        argc -= optind;
 
-       if (!argc)
-               usage();
+       if (vflag)
+               version();
 
-       cmd = argv[0];
-       strlcpy(cmdline, argv[0], sizeof(cmdline));
-       for (i = 1; i < argc; i++) {
-               strlcat(cmdline, " ", sizeof(cmdline));
-               strlcat(cmdline, argv[i], sizeof(cmdline));
-       }
+       if (confpath) {
+               if (sflag)
+                       usage();
+       } else if ((!sflag && !argc) || (sflag && argc))
+               usage();
 
-       uid = getuid();
        pw = getpwuid(uid);
        if (!pw)
                err(1, "getpwuid failed");
-       strlcpy(myname, pw->pw_name, sizeof(myname));
+       if (strlcpy(myname, pw->pw_name, sizeof(myname)) >= sizeof(myname))
+               errx(1, "pw_name too long");
        ngroups = getgroups(NGROUPS_MAX, groups);
        if (ngroups == -1)
                err(1, "can't get groups");
        groups[ngroups++] = getgid();
 
-       if (!permit(uid, groups, ngroups, &rule, target, cmd)) {
-               syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed command for %s: %s", myname, cmdline);
-               fail();
+       if (sflag) {
+               sh = getenv("SHELL");
+               if (sh == NULL || *sh == '\0')
+                       shargv[0] = pw->pw_shell;
+               else
+                       shargv[0] = sh;
+               argv = shargv;
+               argc = 1;
+       }
+
+       if (confpath) {
+               checkconfig(confpath, argc, argv, uid, groups, ngroups,
+                   target);
+               exit(1);        /* fail safe */
        }
 
+       parseconfig("/etc/doas.conf", 1);
+
+       /* cmdline is used only for logging, no need to abort on truncate */
+       (void) strlcpy(cmdline, argv[0], sizeof(cmdline));
+       for (i = 1; i < argc; i++) {
+               if (strlcat(cmdline, " ", sizeof(cmdline)) >= sizeof(cmdline))
+                       break;
+               if (strlcat(cmdline, argv[i], sizeof(cmdline)) >= sizeof(cmdline))
+                       break;
+       }
+
+       cmd = argv[0];
+       if (!permit(uid, groups, ngroups, &rule, target, cmd,
+           (const char**)argv + 1)) {
+               syslog(LOG_AUTHPRIV | LOG_NOTICE,
+                   "failed command for %s: %s", myname, cmdline);
+               errc(1, EPERM, NULL);
+       }
+
+#ifdef HAVE_BSD_AUTH_H
        if (!(rule->options & NOPASS)) {
-               if (!auth_userokay(myname, NULL, NULL, NULL)) {
-                       syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed password for %s", myname);
-                       fail();
+               if (nflag)
+                       errx(1, "Authorization required");
+
+               char *challenge = NULL, *response, rbuf[1024], cbuf[128];
+               auth_session_t *as;
+
+               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)) {
+                       syslog(LOG_AUTHPRIV | LOG_NOTICE,
+                           "failed auth for %s", myname);
+                       errc(1, EPERM, NULL);
+               }
+               explicit_bzero(rbuf, sizeof(rbuf));
        }
-       envp = copyenv((const char **)envp, rule);
+#elif HAVE_PAM_APPL_H
+       pw = getpwuid(target);
+       if (!pw)
+               errx(1, "no passwd entry for target");
+
+       if (!pamauth(pw->pw_name, myname, !nflag, rule->options & NOPASS)) {
+               syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
+               errc(1, EPERM, NULL);
+       }
+#elif HAVE_SHADOW_H
+       const char *pass;
+
+       if (!(rule->options & NOPASS)) {
+               if (nflag)
+                       errx(1, "Authorization required");
+
+               pass = pw->pw_passwd;
+               if (pass[0] == 'x' && pass[1] == '\0') {
+                       struct spwd *sp;
+                       if (!(sp = getspnam(myname)))
+                               errx(1, "Authorization failed");
+                       pass = sp->sp_pwdp;
+               }
+
+               char *challenge, *response, rbuf[1024], cbuf[128], 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 (strcmp(crypt(response, pass), pass) != 0) {
+                       syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
+                       errc(1, EPERM, NULL);
+               }
+               explicit_bzero(rbuf, sizeof(rbuf));
+       }
+#else
+       if (!(rule->options & NOPASS))
+               errx(1, "Authorization required");
+#endif /* HAVE_BSD_AUTH_H */
+
+       if (pledge("stdio rpath getpw exec id", NULL) == -1)
+               err(1, "pledge");
 
        pw = getpwuid(target);
        if (!pw)
                errx(1, "no passwd entry for target");
+
+#ifdef HAVE_BSD_AUTH_H
        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);
-       setenv("PATH", safepath, 1);
+#else
+       warn(pw->pw_name);
+       if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) != 0)
+               errx(1, "setresgid");
+       if (initgroups(pw->pw_name, pw->pw_gid) != 0)
+               errx(1, "initgroups");
+       if (setresuid(target, target, target) != 0)
+               errx(1, "setresuid");
+#endif
+
+       if (pledge("stdio rpath exec", NULL) == -1)
+               err(1, "pledge");
+
+       if (getcwd(cwdpath, sizeof(cwdpath)) == NULL)
+               cwd = "(failed)";
+       else
+               cwd = cwdpath;
+
+       if (pledge("stdio exec", NULL) == -1)
+               err(1, "pledge");
+
+       syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command %s as %s from %s",
+           myname, cmdline, pw->pw_name, cwd);
+
+       envp = prepenv(rule);
+
+       if (rule->cmd) {
+               if (setenv("PATH", safepath, 1) == -1)
+                       err(1, "failed to set PATH '%s'", safepath);
+       }
        execvpe(cmd, argv, envp);
+       if (errno == ENOENT)
+               errx(1, "%s: command not found", cmd);
        err(1, "%s", cmd);
 }