add more restrictive permissions and root:root as owner for binary

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index 0307b0f39be9d909c10351f894396a3046919546..6166ceef908353e56ff965b7110dff68aa43f66e 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.10 2015/07/24 06:36:42 zhuk Exp $ */
+/* $OpenBSD: parse.y,v 1.16 2016/06/05 00:46:34 djm Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -18,13 +18,13 @@
 %{
 #include <sys/types.h>
 #include <ctype.h>
-#include <err.h>
+#include <unistd.h>
+#include <stdint.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <err.h>
 
 #include "openbsd.h"
 
@@ -38,6 +38,7 @@ typedef struct {
                        const char *cmd;
                        const char **cmdargs;
                        const char **envlist;
+                       const char **setenvlist;
                };
                const char *str;
        };
@@ -59,7 +60,7 @@ int yyparse(void);
 %}
 
 %token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TKEEPENV
+%token TNOPASS TKEEPENV TSETENV
 %token TSTRING
 
 %%
@@ -78,6 +79,7 @@ rule:         action ident target cmd {
                        r->action = $1.action;
                        r->options = $1.options;
                        r->envlist = $1.envlist;
+                       r->setenvlist = $1.setenvlist;
                        r->ident = $2.str;
                        r->target = $3.str;
                        r->cmd = $4.cmd;
@@ -98,6 +100,7 @@ action:              TPERMIT options {
                        $$.action = PERMIT;
                        $$.options = $2.options;
                        $$.envlist = $2.envlist;
+                       $$.setenvlist = $2.setenvlist;
                } | TDENY {
                        $$.action = DENY;
                } ;
@@ -115,6 +118,14 @@ options:   /* none */ {
                                } else
                                        $$.envlist = $2.envlist;
                        }
+                       $$.setenvlist = $1.setenvlist;
+                       if ($2.setenvlist) {
+                               if ($$.setenvlist) {
+                                       yyerror("can't have two setenv sections");
+                                       YYERROR;
+                               } else
+                                       $$.setenvlist = $2.setenvlist;
+                       }
                } ;
 option:                TNOPASS {
                        $$.options = NOPASS;
@@ -125,10 +136,16 @@ option:           TNOPASS {
                } | TKEEPENV '{' envlist '}' {
                        $$.options = KEEPENV;
                        $$.envlist = $3.envlist;
+               } | TSETENV '{' setenvlist '}' {
+                       $$.options = SETENV;
+                       $$.setenvlist = NULL;
+                       $$.setenvlist = $3.setenvlist;
                } ;
 
 envlist:       /* empty */ {
                        $$.envlist = NULL;
+                       if (!($$.envlist = calloc(1, sizeof(char *))))
+                               errx(1, "can't allocate envlist");
                } | envlist TSTRING {
                        int nenv = arraylen($1.envlist);
                        if (!($$.envlist = reallocarray($1.envlist, nenv + 2,
@@ -138,6 +155,28 @@ envlist:   /* empty */ {
                        $$.envlist[nenv + 1] = NULL;
                }
 
+setenvlist:    /* empty */ {
+                       if (!($$.setenvlist = calloc(1, sizeof(char *))))
+                               errx(1, "can't allocate setenvlist");
+               } | setenvlist TSTRING '=' TSTRING {
+                       int nenv = arraylen($1.setenvlist);
+                       char *cp = NULL;
+
+                       if (*$2.str == '\0' || strchr($2.str, '=') != NULL) {
+                               yyerror("invalid setenv expression");
+                               YYERROR;
+                       }
+                       if (!($$.setenvlist = reallocarray($1.setenvlist,
+                           nenv + 2, sizeof(char *))))
+                               errx(1, "can't allocate envlist");
+                       $$.setenvlist[nenv] = NULL;
+                       if (asprintf(&cp, "%s=%s", $2.str, $4.str) <= 0 ||
+                           cp == NULL)
+                               errx(1,"asprintf failed");
+                       $$.setenvlist[nenv] = cp;
+                       $$.setenvlist[nenv + 1] = NULL;
+               }
+
 
 ident:         TSTRING {
                        $$.str = $1.str;
@@ -165,6 +204,8 @@ args:               /* empty */ {
 
 argslist:      /* empty */ {
                        $$.cmdargs = NULL;
+                       if (!($$.cmdargs = calloc(1, sizeof(char *))))
+                               errx(1, "can't allocate args");
                } | argslist TSTRING {
                        int nargs = arraylen($1.cmdargs);
                        if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2,
@@ -181,6 +222,7 @@ yyerror(const char *fmt, ...)
 {
        va_list va;
 
+       fprintf(stderr, "doas: ");
        va_start(va, fmt);
        vfprintf(stderr, fmt, va);
        va_end(va);
@@ -199,6 +241,7 @@ struct keyword {
        { "args", TARGS },
        { "nopass", TNOPASS },
        { "keepenv", TKEEPENV },
+       { "setenv", TSETENV },
 };
 
 int
@@ -223,17 +266,18 @@ repeat:
                        /* FALLTHROUGH */
                case '{':
                case '}':
+               case '=':
                        return c;
                case '#':
                        /* skip comments; NUL is allowed; no continuation */
                        while ((c = getc(yyfp)) != '\n')
                                if (c == EOF)
-                                       return 0;
+                                       goto eof;
                        yylval.colno = 0;
                        yylval.lineno++;
                        return c;
                case EOF:
-                       return 0;
+                       goto eof;
        }
 
        /* parsing next word */
@@ -256,6 +300,8 @@ repeat:
                        if (escape) {
                                nonkw = 1;
                                escape = 0;
+                               yylval.colno = 0;
+                               yylval.lineno++;
                                continue;
                        }
                        goto eow;
@@ -273,6 +319,7 @@ repeat:
                case '#':
                case ' ':
                case '\t':
+               case '=':
                        if (!escape && !quotes)
                                goto eow;
                        break;
@@ -287,8 +334,10 @@ repeat:
                        }
                }
                *p++ = c;
-               if (p == ebuf)
+               if (p == ebuf) {
                        yyerror("too long line");
+                       p = buf;
+               }
                escape = 0;
        }
 
@@ -303,7 +352,7 @@ eow:
                 * the main loop.
                 */
                if (c == EOF)
-                       return 0;
+                       goto eof;
                else if (qpos == -1)    /* accept, e.g., empty args: cmd foo args "" */
                        goto repeat;
        }
@@ -318,4 +367,9 @@ eow:
                err(1, "strdup");
        yylval.str = str;
        return TSTRING;
+
+eof:
+       if (ferror(yyfp))
+               yyerror("input error reading config");
+       return 0;
 }