-/* $OpenBSD: parse.y,v 1.8 2015/07/21 16:12:04 tedu Exp $ */
+/* $OpenBSD: parse.y,v 1.16 2016/06/05 00:46:34 djm Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
#include <stdint.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <err.h>
+#include "openbsd.h"
+
#include "doas.h"
typedef struct {
const char *cmd;
const char **cmdargs;
const char **envlist;
+ const char **setenvlist;
};
const char *str;
};
+ int lineno;
+ int colno;
} yystype;
#define YYSTYPE yystype
struct rule **rules;
int nrules, maxrules;
+int parse_errors = 0;
void yyerror(const char *, ...);
int yylex(void);
%}
%token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TKEEPENV
+%token TNOPASS TKEEPENV TSETENV
%token TSTRING
%%
grammar: /* empty */
| grammar '\n'
| grammar rule '\n'
+ | error '\n'
;
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;
$$.action = PERMIT;
$$.options = $2.options;
$$.envlist = $2.envlist;
+ $$.setenvlist = $2.setenvlist;
} | TDENY {
$$.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;
}
+ $$.setenvlist = $1.setenvlist;
+ if ($2.setenvlist) {
+ if ($$.setenvlist) {
+ yyerror("can't have two setenv sections");
+ YYERROR;
+ } else
+ $$.setenvlist = $2.setenvlist;
+ }
} ;
option: TNOPASS {
$$.options = NOPASS;
+ $$.envlist = NULL;
} | TKEEPENV {
$$.options = KEEPENV;
+ $$.envlist = NULL;
} | 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 {
$$.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;
} ;
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, 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;
{
va_list va;
+ fprintf(stderr, "doas: ");
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 {
{ "args", TARGS },
{ "nopass", TNOPASS },
{ "keepenv", TKEEPENV },
+ { "setenv", TSETENV },
};
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);
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 '}':
+ case '=':
return c;
case '#':
/* skip comments; NUL is allowed; no continuation */
while ((c = getc(yyfp)) != '\n')
if (c == EOF)
- return 0;
- colno = 1;
- lineno++;
+ goto eof;
+ yylval.colno = 0;
+ yylval.lineno++;
return c;
case EOF:
- return 0;
+ goto eof;
}
/* 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 '\\':
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;
+ yylval.colno = 0;
+ yylval.lineno++;
continue;
}
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 '}':
case '#':
case ' ':
case '\t':
+ case '=':
if (!escape && !quotes)
goto eow;
break;
quotes = !quotes;
if (quotes) {
nonkw = 1;
- qpos = colno;
+ qpos = yylval.colno;
}
continue;
}
}
*p++ = c;
- if (p == ebuf)
- yyerror("too long line %d", lineno);
+ if (p == ebuf) {
+ yyerror("too long line");
+ p = buf;
+ }
escape = 0;
}
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 "" */
+ goto eof;
+ 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;
err(1, "strdup");
yylval.str = str;
return TSTRING;
+
+eof:
+ if (ferror(yyfp))
+ yyerror("input error reading config");
+ return 0;
}
projects / opendoas.git / blobdiff