Perform command escaping for "sudo -s" and "sudo -i" after validating

sudoers so the sudoers entries don't need to have all the backslashes.
This commit is contained in:
Todd C. Miller
2011-01-25 09:53:57 -05:00
parent 51515c6c01
commit fc38481663
3 changed files with 48 additions and 30 deletions

View File

@@ -382,38 +382,17 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
memcpy(av + 1, argv, argc * sizeof(char *));
} else {
/* shell -c "command" */
size_t cmnd_size = 1024;
char *cmnd, *src, *dst, **ap;
cmnd = dst = emalloc(cmnd_size);
for (ap = argv; *ap != NULL; ap++) {
for (src = *ap; *src != '\0'; src++) {
/* reserve room for an escaped char + space */
if (cmnd_size < (dst - cmnd) + 3) {
char *new_cmnd;
cmnd_size <<= 1;
new_cmnd = erealloc(cmnd, cmnd_size);
dst = new_cmnd + (dst - cmnd);
cmnd = new_cmnd;
}
if (isalnum((unsigned char)*src) || *src == '_' || *src == '-') {
*dst++ = *src;
} else {
/* quote potential meta character */
*dst++ = '\\';
*dst++ = *src;
}
}
*dst++ = ' ';
}
if (cmnd != dst)
dst--; /* replace last space with a NUL */
*dst = '\0';
char *src, *dst, *end;
size_t cmnd_size = (size_t) (argv[argc - 1] - argv[0]) +
strlen(argv[argc - 1]) + 1;
ac = 3;
av = emalloc2(ac + 1, sizeof(char *));
av[1] = "-c";
av[2] = cmnd;
av[2] = dst = emalloc(cmnd_size);
src = argv[0];
for (end = src + cmnd_size - 1; src < end; src++, dst++)
*dst = *src == '\0' ? ' ' : *src;
*dst = '\0';
}
av[0] = (char *)user_details.shell; /* plugin may override shell */
av[ac] = NULL;