-/* $OpenBSD: doas.c,v 1.10 2015/07/19 01:19:22 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.20 2015/07/22 16:35:03 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
static void __dead
usage(void)
{
- fprintf(stderr, "usage: doas [-s] [-u user] command [args]\n");
+ fprintf(stderr, "usage: doas [-s] [-C config] [-u user] command [args]\n");
exit(1);
}
static int
match(uid_t uid, gid_t *groups, int ngroups, uid_t target, const char *cmd,
- struct rule *r)
+ const char **cmdargs, struct rule *r)
{
int i;
}
if (r->target && uidcheck(r->target, target) != 0)
return 0;
- if (r->cmd && strcmp(r->cmd, cmd) != 0)
- return 0;
+ if (r->cmd) {
+ if (strcmp(r->cmd, cmd))
+ return 0;
+ if (r->cmdargs) {
+ /* if arguments were given, they should match explicitly */
+ for (i = 0; r->cmdargs[i]; i++) {
+ if (!cmdargs[i])
+ return 0;
+ if (strcmp(r->cmdargs[i], cmdargs[i]))
+ return 0;
+ }
+ if (cmdargs[i])
+ return 0;
+ }
+ }
return 1;
}
static int
permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr,
- uid_t target, const char *cmd)
+ uid_t target, const char *cmd, const char **cmdargs)
{
int i;
*lastr = NULL;
for (i = 0; i < nrules; i++) {
- if (match(uid, groups, ngroups, target, cmd, rules[i]))
+ if (match(uid, groups, ngroups, target, cmd, cmdargs, rules[i]))
*lastr = rules[i];
}
if (!*lastr)
yyparse();
fclose(yyfp);
+ if (parse_errors)
+ exit(1);
}
static int
copyenv(const char **oldenvp, struct rule *rule)
{
const char *safeset[] = {
- "DISPLAY", "HOME", "LOGNAME", "MAIL", "SHELL",
+ "DISPLAY", "HOME", "LOGNAME", "MAIL",
"PATH", "TERM", "USER", "USERNAME",
NULL
};
char **envp;
const char **extra;
int ei;
- int i, ii, j, jj;
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 (ii = i = 0; i < j; i++) {
- for (jj = 0; jj < nbad; jj++) {
- size_t len = strlen(badset[jj]);
- if (strncmp(oldenvp[i], badset[jj], len) == 0) {
+ 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 (jj == nbad) {
+ if (j == nbad) {
if (!(envp[ii] = strdup(oldenvp[i])))
err(1, "strdup");
ii++;
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--];
int i, ch;
int sflag = 0;
- parseconfig("/etc/doas.conf");
-
- while ((ch = getopt(argc, argv, "su:")) != -1) {
+ uid = getuid();
+ while ((ch = getopt(argc, argv, "C:su:")) != -1) {
switch (ch) {
+ case 'C':
+ setresuid(uid, uid, uid);
+ parseconfig(optarg);
+ exit(0);
case 'u':
if (parseuid(optarg, &target) != 0)
errx(1, "unknown user");
if ((!sflag && !argc) || (sflag && argc))
usage();
- uid = getuid();
+ parseconfig("/etc/doas.conf");
+
pw = getpwuid(uid);
if (!pw)
err(1, "getpwuid failed");
errx(1, "command line too long");
}
- if (!permit(uid, groups, ngroups, &rule, target, cmd)) {
+ if (!permit(uid, groups, ngroups, &rule, target, cmd,
+ (const char**)argv + 1)) {
syslog(LOG_AUTHPRIV | LOG_NOTICE,
"failed command for %s: %s", myname, cmdline);
fail();