X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=parse.y;h=388c2a57f988a3b4e550f8332f08c3228968be13;hb=9474e418d2184e86408f0dce09ca250e36138672;hp=7b1b45ac84e8249eee46f8caf2e30191432648dc;hpb=18b4161e2a80d9367477194085d52c61ab6eb5b0;p=opendoas.git

diff --git a/parse.y b/parse.y
index 7b1b45a..388c2a5 100644
--- a/parse.y
+++ b/parse.y
@@ -16,6 +16,8 @@
  */
 
 %{
+#include "config.h"
+
 #include <sys/types.h>
 #include <ctype.h>
 #include <err.h>
@@ -39,6 +41,7 @@ typedef struct {
 			const char **cmdargs;
 			const char **envlist;
 		};
+		const char **strlist;
 		const char *str;
 	};
 	int lineno;
@@ -49,17 +52,30 @@ typedef struct {
 FILE *yyfp;
 
 struct rule **rules;
-int nrules, maxrules;
+size_t nrules;
+static size_t maxrules;
+
 int parse_errors = 0;
 
-void yyerror(const char *, ...);
-int yylex(void);
-int yyparse(void);
+static void yyerror(const char *, ...);
+static int yylex(void);
+
+static size_t
+arraylen(const char **arr)
+{
+	size_t cnt = 0;
+
+	while (*arr) {
+		cnt++;
+		arr++;
+	}
+	return cnt;
+}
 
 %}
 
 %token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TKEEPENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV
 %token TSTRING
 
 %%
@@ -84,12 +100,12 @@ rule:		action ident target cmd {
 			r->cmdargs = $4.cmdargs;
 			if (nrules == maxrules) {
 				if (maxrules == 0)
-					maxrules = 63;
-				else
-					maxrules *= 2;
-				if (!(rules = reallocarray(rules, maxrules,
-				    sizeof(*rules))))
+					maxrules = 32;
+				rules = reallocarray(rules, maxrules,
+				    2 * sizeof(*rules));
+				if (!rules)
 					errx(1, "can't allocate rules");
+				maxrules *= 2;
 			}
 			rules[nrules++] = r;
 		} ;
@@ -100,15 +116,23 @@ action:		TPERMIT options {
 			$$.envlist = $2.envlist;
 		} | TDENY {
 			$$.action = DENY;
+			$$.options = 0;
+			$$.envlist = NULL;
 		} ;
 
-options:	/* none */
-		| options option {
+options:	/* none */ {
+			$$.options = 0;
+			$$.envlist = NULL;
+		} | options option {
 			$$.options = $1.options | $2.options;
 			$$.envlist = $1.envlist;
+			if (($$.options & (NOPASS|PERSIST)) == (NOPASS|PERSIST)) {
+				yyerror("can't combine nopass and persist");
+				YYERROR;
+			}
 			if ($2.envlist) {
 				if ($$.envlist) {
-					yyerror("can't have two keepenv sections");
+					yyerror("can't have two setenv sections");
 					YYERROR;
 				} else
 					$$.envlist = $2.envlist;
@@ -116,24 +140,32 @@ options:	/* none */
 		} ;
 option:		TNOPASS {
 			$$.options = NOPASS;
+			$$.envlist = NULL;
+		} | TNOLOG {
+			$$.options = NOLOG;
+			$$.envlist = NULL;
+		} | TPERSIST {
+			$$.options = PERSIST;
+			$$.envlist = NULL;
 		} | TKEEPENV {
 			$$.options = KEEPENV;
-		} | TKEEPENV '{' envlist '}' {
-			$$.options = KEEPENV;
-			$$.envlist = $3.envlist;
+			$$.envlist = NULL;
+		} | TSETENV '{' strlist '}' {
+			$$.options = 0;
+			$$.envlist = $3.strlist;
 		} ;
 
-envlist:	/* empty */ {
-			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,
+strlist:	/* empty */ {
+			if (!($$.strlist = calloc(1, sizeof(char *))))
+				errx(1, "can't allocate strlist");
+		} | strlist TSTRING {
+			int nstr = arraylen($1.strlist);
+			if (!($$.strlist = reallocarray($1.strlist, nstr + 2,
 			    sizeof(char *))))
-				errx(1, "can't allocate envlist");
-			$$.envlist[nenv] = $2.str;
-			$$.envlist[nenv + 1] = NULL;
-		}
+				errx(1, "can't allocate strlist");
+			$$.strlist[nstr] = $2.str;
+			$$.strlist[nstr + 1] = NULL;
+		} ;
 
 
 ident:		TSTRING {
@@ -156,20 +188,8 @@ cmd:		/* optional */ {
 
 args:		/* empty */ {
 			$$.cmdargs = NULL;
-		} | TARGS argslist {
-			$$.cmdargs = $2.cmdargs;
-		} ;
-
-argslist:	/* empty */ {
-			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,
-			    sizeof(char *))))
-				errx(1, "can't allocate args");
-			$$.cmdargs[nargs] = $2.str;
-			$$.cmdargs[nargs + 1] = NULL;
+		} | TARGS strlist {
+			$$.cmdargs = $2.strlist;
 		} ;
 
 %%
@@ -179,6 +199,7 @@ yyerror(const char *fmt, ...)
 {
 	va_list va;
 
+	fprintf(stderr, "doas: ");
 	va_start(va, fmt);
 	vfprintf(stderr, fmt, va);
 	va_end(va);
@@ -186,7 +207,7 @@ yyerror(const char *fmt, ...)
 	parse_errors++;
 }
 
-struct keyword {
+static struct keyword {
 	const char *word;
 	int token;
 } keywords[] = {
@@ -196,7 +217,10 @@ struct keyword {
 	{ "cmd", TCMD },
 	{ "args", TARGS },
 	{ "nopass", TNOPASS },
+	{ "nolog", TNOLOG },
+	{ "persist", TPERSIST },
 	{ "keepenv", TKEEPENV },
+	{ "setenv", TSETENV },
 };
 
 int
@@ -204,6 +228,7 @@ yylex(void)
 {
 	char buf[1024], *ebuf, *p, *str;
 	int c, quotes = 0, escape = 0, qpos = -1, nonkw = 0;
+	size_t i;
 
 	p = buf;
 	ebuf = buf + sizeof(buf);
@@ -226,12 +251,12 @@ repeat:
 			/* 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 */
@@ -254,6 +279,8 @@ repeat:
 			if (escape) {
 				nonkw = 1;
 				escape = 0;
+				yylval.colno = 0;
+				yylval.lineno++;
 				continue;
 			}
 			goto eow;
@@ -285,8 +312,10 @@ repeat:
 			}
 		}
 		*p++ = c;
-		if (p == ebuf)
+		if (p == ebuf) {
 			yyerror("too long line");
+			p = buf;
+		}
 		escape = 0;
 	}
 
@@ -301,19 +330,23 @@ 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;
 	}
 	if (!nonkw) {
-		unsigned i;
 		for (i = 0; i < sizeof(keywords) / sizeof(keywords[0]); i++) {
 			if (strcmp(buf, keywords[i].word) == 0)
 				return keywords[i].token;
 		}
 	}
 	if ((str = strdup(buf)) == NULL)
-		err(1, "strdup");
+		err(1, "%s", __func__);
 	yylval.str = str;
 	return TSTRING;
+
+eof:
+	if (ferror(yyfp))
+		yyerror("input error reading config");
+	return 0;
 }