-/* $OpenBSD: parse.y,v 1.16 2016/06/05 00:46:34 djm Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2015/07/24 06:36:42 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
*/
%{
+#include "config.h"
+
#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"
const char *cmd;
const char **cmdargs;
const char **envlist;
- const char **setenvlist;
};
+ const char **strlist;
const char *str;
};
int lineno;
FILE *yyfp;
struct rule **rules;
-int nrules, maxrules;
+int nrules;
+static int 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 TSETENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV
%token TSTRING
%%
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 = 0;
+ $$.envlist = NULL;
} ;
options: /* none */ {
} | 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;
- } else
- $$.envlist = $2.envlist;
- }
- $$.setenvlist = $1.setenvlist;
- if ($2.setenvlist) {
- if ($$.setenvlist) {
yyerror("can't have two setenv sections");
YYERROR;
} else
- $$.setenvlist = $2.setenvlist;
+ $$.envlist = $2.envlist;
}
} ;
option: TNOPASS {
$$.options = NOPASS;
$$.envlist = NULL;
+ } | TNOLOG {
+ $$.options = NOLOG;
+ $$.envlist = NULL;
+ } | TPERSIST {
+ $$.options = PERSIST;
+ $$.envlist = NULL;
} | TKEEPENV {
$$.options = KEEPENV;
$$.envlist = NULL;
- } | TKEEPENV '{' envlist '}' {
- $$.options = KEEPENV;
- $$.envlist = $3.envlist;
- } | TSETENV '{' setenvlist '}' {
- $$.options = SETENV;
- $$.setenvlist = NULL;
- $$.setenvlist = $3.setenvlist;
+ } | TSETENV '{' strlist '}' {
+ $$.options = 0;
+ $$.envlist = $3.strlist;
} ;
-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,
+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;
- }
-
-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;
- }
+ errx(1, "can't allocate strlist");
+ $$.strlist[nstr] = $2.str;
+ $$.strlist[nstr + 1] = NULL;
+ } ;
ident: TSTRING {
args: /* empty */ {
$$.cmdargs = NULL;
- } | TARGS argslist {
- $$.cmdargs = $2.cmdargs;
- } ;
-
-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 *))))
- errx(1, "can't allocate args");
- $$.cmdargs[nargs] = $2.str;
- $$.cmdargs[nargs + 1] = NULL;
+ } | TARGS strlist {
+ $$.cmdargs = $2.strlist;
} ;
%%
parse_errors++;
}
-struct keyword {
+static struct keyword {
const char *word;
int token;
} keywords[] = {
{ "cmd", TCMD },
{ "args", TARGS },
{ "nopass", TNOPASS },
+ { "nolog", TNOLOG },
+ { "persist", TPERSIST },
{ "keepenv", TKEEPENV },
{ "setenv", TSETENV },
};
/* FALLTHROUGH */
case '{':
case '}':
- case '=':
return c;
case '#':
/* skip comments; NUL is allowed; no continuation */
while ((c = getc(yyfp)) != '\n')
if (c == EOF)
- goto eof;
+ return 0;
yylval.colno = 0;
yylval.lineno++;
return c;
case EOF:
- goto eof;
+ return 0;
}
/* parsing next word */
if (escape) {
nonkw = 1;
escape = 0;
- yylval.colno = 0;
- yylval.lineno++;
continue;
}
goto eow;
case '#':
case ' ':
case '\t':
- case '=':
if (!escape && !quotes)
goto eow;
break;
}
}
*p++ = c;
- if (p == ebuf) {
+ if (p == ebuf)
yyerror("too long line");
- p = buf;
- }
escape = 0;
}
* the main loop.
*/
if (c == EOF)
- goto eof;
+ return 0;
else if (qpos == -1) /* accept, e.g., empty args: cmd foo args "" */
goto repeat;
}
}
}
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;
}