Further improve syntax error reporting in doas:

[opendoas.git] / doas.c

diff --git a/doas.c b/doas.c
index b07059c84fe6f383906bc89962e98689870d8fcc..00292e3de3dbd125708e342279b5d28f9258a6a3 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.12 2015/07/20 00:57:53 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.20 2015/07/22 16:35:03 zhuk Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -36,7 +36,7 @@
 static void __dead
 usage(void)
 {
-       fprintf(stderr, "usage: doas [-s] [-u user] command [args]\n");
+       fprintf(stderr, "usage: doas [-s] [-C config] [-u user] command [args]\n");
        exit(1);
 }
 
@@ -97,7 +97,7 @@ strtogid(const char *s)
 
 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;
 
@@ -117,20 +117,33 @@ 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)
@@ -160,6 +173,8 @@ parseconfig(const char *filename)
 
        yyparse();
        fclose(yyfp);
+       if (parse_errors)
+               exit(1);
 }
 
 static int
@@ -188,7 +203,7 @@ static char **
 copyenv(const char **oldenvp, struct rule *rule)
 {
        const char *safeset[] = {
-               "DISPLAY", "HOME", "LOGNAME", "MAIL", "SHELL",
+               "DISPLAY", "HOME", "LOGNAME", "MAIL",
                "PATH", "TERM", "USER", "USERNAME",
                NULL
        };
@@ -201,7 +216,7 @@ copyenv(const char **oldenvp, struct rule *rule)
        int ei;
        int nsafe, nbad;
        int nextras = 0;
-       
+
        nbad = arraylen(badset);
        if ((rule->options & KEEPENV) && !rule->envlist) {
                size_t i, ii;
@@ -214,7 +229,7 @@ copyenv(const char **oldenvp, struct rule *rule)
                        for (j = 0; j < nbad; j++) {
                                size_t len = strlen(badset[j]);
                                if (strncmp(oldenvp[i], badset[j], len) == 0 &&
-                                   oldenvp[i][len] == '=') {
+                                   oldenvp[i][len] == '=') {
                                        break;
                                }
                        }
@@ -281,10 +296,13 @@ main(int argc, char **argv, char **envp)
        int i, ch;
        int sflag = 0;
 
-       parseconfig("/etc/doas.conf");
-
-       while ((ch = getopt(argc, argv, "su:")) != -1) {
+       uid = getuid();
+       while ((ch = getopt(argc, argv, "C:su:")) != -1) {
                switch (ch) {
+               case 'C':
+                       setresuid(uid, uid, uid);
+                       parseconfig(optarg);
+                       exit(0);
                case 'u':
                        if (parseuid(optarg, &target) != 0)
                                errx(1, "unknown user");
@@ -303,7 +321,8 @@ main(int argc, char **argv, char **envp)
        if ((!sflag && !argc) || (sflag && argc))
                usage();
 
-       uid = getuid();
+       parseconfig("/etc/doas.conf");
+
        pw = getpwuid(uid);
        if (!pw)
                err(1, "getpwuid failed");
@@ -334,7 +353,8 @@ main(int argc, char **argv, char **envp)
                        errx(1, "command line too long");
        }
 
-       if (!permit(uid, groups, ngroups, &rule, target, cmd)) {
+       if (!permit(uid, groups, ngroups, &rule, target, cmd,
+           (const char**)argv + 1)) {
                syslog(LOG_AUTHPRIV | LOG_NOTICE,
                    "failed command for %s: %s", myname, cmdline);
                fail();