aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2015-07-16 23:22:08 +0000
committerNicholas Marriott <nicm@openbsd.org>2015-07-16 23:22:08 +0000
commita589c5b65e1fb7fb9759c106518c8be3b56caf5b (patch)
tree23ef3b81aed98579a462dcd5e905dd12dbf30d5c
parent5fe12316b511d8392db3bdf9c8a4ac836bd85493 (diff)
downloadopendoas-a589c5b65e1fb7fb9759c106518c8be3b56caf5b.tar.gz
Fail if /etc/doas.conf is g+w or o+w or is not owned by root. ok tedu
-rw-r--r--doas.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/doas.c b/doas.c
index ec727df..47ae35a 100644
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.4 2015/07/16 21:57:54 deraadt Exp $ */
+/* $OpenBSD: doas.c,v 1.5 2015/07/16 22:11:01 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);
}