checkconfig doesn't return anymore, noted by zhuk

[opendoas.git] / doas.c

diff --git a/doas.c b/doas.c
index 7ede27384eb50bf9c702ce34fc47ad8edcd40d5d..12c65302fd1fc4c04d2449f338f7a7bc834db1d7 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.17 2015/07/21 16:15:20 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.26 2015/07/26 20:47:01 espie Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -152,7 +152,7 @@ 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);
@@ -160,19 +160,26 @@ parseconfig(const char *filename)
 
        yyfp = fopen(filename, "r");
        if (!yyfp) {
-               fprintf(stderr, "doas is not enabled.\n");
+               if (checkperms)
+                       fprintf(stderr, "doas is not enabled.\n");
+               else
+                       warn("could not open config file");
                exit(1);
        }
 
-       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);
+       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
@@ -214,7 +221,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;
@@ -227,7 +234,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;
                                }
                        }
@@ -275,11 +282,33 @@ fail(void)
        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;
+
+       setresuid(uid, uid, uid);
+       parseconfig(confpath, 0);
+       if (!argc)
+               exit(0);
+
+       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)
 {
        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;
@@ -293,18 +322,21 @@ main(int argc, char **argv, char **envp)
        int ngroups;
        int i, ch;
        int sflag = 0;
+       int nflag = 0;
 
-       while ((ch = getopt(argc, argv, "C:su:")) != -1) {
+       uid = getuid();
+       while ((ch = getopt(argc, argv, "C:nsu:")) != -1) {
                switch (ch) {
                case 'C':
-                       target = getuid();
-                       setresuid(target, target, target);
-                       parseconfig(optarg);
-                       exit(0);
+                       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;
@@ -316,11 +348,12 @@ main(int argc, char **argv, char **envp)
        argv += optind;
        argc -= optind;
 
-       if ((!sflag && !argc) || (sflag && argc))
+       if (confpath) {
+               if (sflag)
+                       usage();
+       } else if ((!sflag && !argc) || (sflag && argc))
                usage();
 
-       parseconfig("/etc/doas.conf");
-
        uid = getuid();
        pw = getpwuid(uid);
        if (!pw)
@@ -342,16 +375,24 @@ main(int argc, char **argv, char **envp)
                argc = 1;
        }
 
-       cmd = argv[0];
-       if (strlcpy(cmdline, argv[0], sizeof(cmdline)) >= sizeof(cmdline))
-               errx(1, "command line too long");
+       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))
-                       errx(1, "command line too long");
+                       break;
                if (strlcat(cmdline, argv[i], sizeof(cmdline)) >= sizeof(cmdline))
-                       errx(1, "command line too long");
+                       break;
        }
 
+       cmd = argv[0];
        if (!permit(uid, groups, ngroups, &rule, target, cmd,
            (const char**)argv + 1)) {
                syslog(LOG_AUTHPRIV | LOG_NOTICE,
@@ -360,6 +401,8 @@ main(int argc, char **argv, char **envp)
        }
 
        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);