set PAM_USER, PAM_RUSER and PAM_TTY if available

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index bd7d7e61713008fa0b8ad604aeb2b02fbb2ebf72..0307b0f39be9d909c10351f894396a3046919546 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.8 2015/07/21 16:12:04 tedu Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2015/07/24 06:36:42 zhuk Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -18,12 +18,15 @@
 %{
 #include <sys/types.h>
 #include <ctype.h>
-#include <unistd.h>
-#include <stdint.h>
+#include <err.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
-#include <err.h>
+#include <unistd.h>
+
+#include "openbsd.h"
 
 #include "doas.h"
 
@@ -38,6 +41,8 @@ typedef struct {
                };
                const char *str;
        };
+       int lineno;
+       int colno;
 } yystype;
 #define YYSTYPE yystype
 
@@ -45,6 +50,7 @@ FILE *yyfp;
 
 struct rule **rules;
 int nrules, maxrules;
+int parse_errors = 0;
 
 void yyerror(const char *, ...);
 int yylex(void);
@@ -61,6 +67,7 @@ int yyparse(void);
 grammar:       /* empty */
                | grammar '\n'
                | grammar rule '\n'
+               | error '\n'
                ;
 
 rule:          action ident target cmd {
@@ -95,29 +102,33 @@ action:            TPERMIT options {
                        $$.action = DENY;
                } ;
 
-options:       /* none */
-               | options option {
+options:       /* none */ {
+                       $$.options = 0;
+                       $$.envlist = NULL;
+               } | options option {
                        $$.options = $1.options | $2.options;
                        $$.envlist = $1.envlist;
                        if ($2.envlist) {
-                               if ($$.envlist)
-                                       errx(1, "can't have two keepenv sections");
-                               else
+                               if ($$.envlist) {
+                                       yyerror("can't have two keepenv sections");
+                                       YYERROR;
+                               } else
                                        $$.envlist = $2.envlist;
                        }
                } ;
 option:                TNOPASS {
                        $$.options = NOPASS;
+                       $$.envlist = NULL;
                } | TKEEPENV {
                        $$.options = KEEPENV;
+                       $$.envlist = NULL;
                } | TKEEPENV '{' envlist '}' {
                        $$.options = KEEPENV;
                        $$.envlist = $3.envlist;
                } ;
 
 envlist:       /* empty */ {
-                       if (!($$.envlist = calloc(1, sizeof(char *))))
-                               errx(1, "can't allocate envlist");
+                       $$.envlist = NULL;
                } | envlist TSTRING {
                        int nenv = arraylen($1.envlist);
                        if (!($$.envlist = reallocarray($1.envlist, nenv + 2,
@@ -153,11 +164,11 @@ args:             /* empty */ {
                } ;
 
 argslist:      /* empty */ {
-                       if (!($$.cmdargs = calloc(1, sizeof(char *))))
-                               errx(1, "can't allocate args");
+                       $$.cmdargs = NULL;
                } | argslist TSTRING {
                        int nargs = arraylen($1.cmdargs);
-                       if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2, sizeof(char *))))
+                       if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2,
+                           sizeof(char *))))
                                errx(1, "can't allocate args");
                        $$.cmdargs[nargs] = $2.str;
                        $$.cmdargs[nargs + 1] = NULL;
@@ -171,7 +182,10 @@ yyerror(const char *fmt, ...)
        va_list va;
 
        va_start(va, fmt);
-       verrx(1, fmt, va);
+       vfprintf(stderr, fmt, va);
+       va_end(va);
+       fprintf(stderr, " at line %d\n", yylval.lineno + 1);
+       parse_errors++;
 }
 
 struct keyword {
@@ -190,10 +204,8 @@ struct keyword {
 int
 yylex(void)
 {
-       static int colno = 1, lineno = 1;
-
        char buf[1024], *ebuf, *p, *str;
-       int i, c, quotes = 0, escape = 0, qpos = 0, nonkw = 0;
+       int c, quotes = 0, escape = 0, qpos = -1, nonkw = 0;
 
        p = buf;
        ebuf = buf + sizeof(buf);
@@ -201,13 +213,13 @@ yylex(void)
 repeat:
        /* skip whitespace first */
        for (c = getc(yyfp); c == ' ' || c == '\t'; c = getc(yyfp))
-               colno++;
+               yylval.colno++;
 
        /* check for special one-character constructions */
        switch (c) {
                case '\n':
-                       colno = 1;
-                       lineno++;
+                       yylval.colno = 0;
+                       yylval.lineno++;
                        /* FALLTHROUGH */
                case '{':
                case '}':
@@ -217,19 +229,19 @@ repeat:
                        while ((c = getc(yyfp)) != '\n')
                                if (c == EOF)
                                        return 0;
-                       colno = 1;
-                       lineno++;
+                       yylval.colno = 0;
+                       yylval.lineno++;
                        return c;
                case EOF:
                        return 0;
        }
 
        /* parsing next word */
-       for (;; c = getc(yyfp), colno++) {
+       for (;; c = getc(yyfp), yylval.colno++) {
                switch (c) {
                case '\0':
-                       yyerror("unallowed character NUL at "
-                           "line %d, column %d", lineno, colno);
+                       yyerror("unallowed character NUL in column %d",
+                           yylval.colno + 1);
                        escape = 0;
                        continue;
                case '\\':
@@ -239,8 +251,8 @@ repeat:
                        break;
                case '\n':
                        if (quotes)
-                               yyerror("unterminated quotes at line %d, column %d",
-                                   lineno, qpos);
+                               yyerror("unterminated quotes in column %d",
+                                   qpos + 1);
                        if (escape) {
                                nonkw = 1;
                                escape = 0;
@@ -249,11 +261,12 @@ repeat:
                        goto eow;
                case EOF:
                        if (escape)
-                               yyerror("unterminated escape at line %d, column %d",
-                                   lineno, colno - 1);
+                               yyerror("unterminated escape in column %d",
+                                   yylval.colno);
                        if (quotes)
-                               yyerror("unterminated quotes at line %d, column %d",
-                                   lineno, qpos);
+                               yyerror("unterminated quotes in column %d",
+                                   qpos + 1);
+                       goto eow;
                        /* FALLTHROUGH */
                case '{':
                case '}':
@@ -268,14 +281,14 @@ repeat:
                                quotes = !quotes;
                                if (quotes) {
                                        nonkw = 1;
-                                       qpos = colno;
+                                       qpos = yylval.colno;
                                }
                                continue;
                        }
                }
                *p++ = c;
                if (p == ebuf)
-                       yyerror("too long line %d", lineno);
+                       yyerror("too long line");
                escape = 0;
        }
 
@@ -285,15 +298,17 @@ eow:
                ungetc(c, yyfp);
        if (p == buf) {
                /*
-                * There could be a number of reasons for empty buffer, and we handle
-                * all of them here, to avoid cluttering the main loop.
+                * There could be a number of reasons for empty buffer,
+                * and we handle all of them here, to avoid cluttering
+                * the main loop.
                 */
                if (c == EOF)
                        return 0;
-               else if (!qpos)    /* accept, e.g., empty args: cmd foo args "" */
+               else if (qpos == -1)    /* accept, e.g., empty args: cmd foo args "" */
                        goto repeat;
        }
        if (!nonkw) {
+               size_t i;
                for (i = 0; i < sizeof(keywords) / sizeof(keywords[0]); i++) {
                        if (strcmp(buf, keywords[i].word) == 0)
                                return keywords[i].token;