-/* $OpenBSD: doas.c,v 1.8 2015/07/18 06:33:23 nicm Exp $ */
+/* $OpenBSD: doas.c,v 1.13 2015/07/20 01:00:48 tedu Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
#include <pwd.h>
#include <grp.h>
#include <syslog.h>
+#include <errno.h>
#include "doas.h"
copyenv(const char **oldenvp, struct rule *rule)
{
const char *safeset[] = {
- "DISPLAY", "HOME", "LOGNAME", "MAIL", "SHELL",
+ "DISPLAY", "HOME", "LOGNAME", "MAIL",
"PATH", "TERM", "USER", "USERNAME",
- NULL,
+ NULL
+ };
+ const char *badset[] = {
+ "ENV",
+ NULL
};
char **envp;
const char **extra;
int ei;
- int i, j;
- int nsafe;
+ int nsafe, nbad;
int nextras = 0;
+ nbad = arraylen(badset);
if ((rule->options & KEEPENV) && !rule->envlist) {
- j = arraylen(oldenvp);
- envp = reallocarray(NULL, j + 1, sizeof(char *));
+ size_t i, ii;
+ size_t oldlen = arraylen(oldenvp);
+ envp = reallocarray(NULL, oldlen + 1, sizeof(char *));
if (!envp)
err(1, "reallocarray");
- for (i = 0; i < j; i++) {
- if (!(envp[i] = strdup(oldenvp[i])))
- err(1, "strdup");
+ for (ii = i = 0; i < oldlen; i++) {
+ size_t j;
+ for (j = 0; j < nbad; j++) {
+ size_t len = strlen(badset[j]);
+ if (strncmp(oldenvp[i], badset[j], len) == 0 &&
+ oldenvp[i][len] == '=') {
+ break;
+ }
+ }
+ if (j == nbad) {
+ if (!(envp[ii] = strdup(oldenvp[i])))
+ err(1, "strdup");
+ ii++;
+ }
}
- envp[i] = NULL;
+ envp[ii] = NULL;
return envp;
}
nsafe = arraylen(safeset);
if ((extra = rule->envlist)) {
+ size_t i;
nextras = arraylen(extra);
for (i = 0; i < nsafe; i++) {
+ size_t j;
for (j = 0; j < nextras; j++) {
if (strcmp(extra[j], safeset[i]) == 0) {
extra[j--] = extra[nextras--];
if (setenv("PATH", safepath, 1) == -1)
err(1, "failed to set PATH '%s'", safepath);
execvpe(cmd, argv, envp);
+ if (errno == ENOENT)
+ errx(1, "%s: command not found", cmd);
err(1, "%s", cmd);
}