diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-07-16 23:22:09 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-07-16 23:22:09 +0000 |
| commit | 062ba2516a80441c25794e2d897783548d86da9d (patch) | |
| tree | db558592b67d7ff065e9c2ec1fe6a28b684e9dc9 | |
| parent | 00fa9426423438a5d8afd7cb7857ce5d170b96a3 (diff) | |
Fail if /etc/doas.conf is g+w or o+w or is not owned by root. ok tedu
| -rw-r--r-- | usr.bin/doas/doas.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c index 89f78261dba..3570cca1e1b 100644 --- a/usr.bin/doas/doas.c +++ b/usr.bin/doas/doas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: doas.c,v 1.5 2015/07/16 22:11:01 nicm Exp $ */ +/* $OpenBSD: doas.c,v 1.6 2015/07/16 23:22:08 nicm Exp $ */ /* * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> * @@ -14,7 +14,9 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + #include <sys/types.h> +#include <sys/stat.h> #include <limits.h> #include <login_cap.h> @@ -139,12 +141,21 @@ parseconfig(const char *filename) { extern FILE *yyfp; extern int yyparse(void); + struct stat sb; yyfp = fopen(filename, "r"); if (!yyfp) { fprintf(stderr, "doas is not enabled.\n"); exit(1); } + + if (fstat(fileno(yyfp), &sb) != 0) + err(1, "fstat(\"%s\")", filename); + if ((sb.st_mode & (S_IWGRP|S_IWOTH)) != 0) + errx(1, "%s is writable by group or other", filename); + if (sb.st_uid != 0) + errx(1, "%s is not owned by root", filename); + yyparse(); fclose(yyfp); } |