isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Overhaul visudo for editing multiple files:

Browse Source 
o visudo has been broken out into functions (more work needed here)
 o each file is now edited before sudoers is re-parsed
 o if a #include line is added that file will be edited too

TODO:
 o cleanup temp files when exiting via err() or errx()
 o continue breaking things out into separate functions
This commit is contained in:
Todd C. Miller
2004-09-29 18:41:38 +00:00
parent cbcb60b184
commit f2ae53323e
1 changed files with 413 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

722
visudo.c
View File

@@ -77,6 +77,15 @@
static const char rcsid[] = "$Sudo$"; static const char rcsid[] = "$Sudo$";
#endif /* lint */ #endif /* lint */
struct sudoersfile {
char *path;
int fd;
char *tpath;
int tfd;
int modified;
struct sudoersfile *next;
};
/* /*
* Function prototypes * Function prototypes
*/ */
@@ -86,7 +95,9 @@ static RETSIGTYPE Exit __P((int));
static void setup_signals __P((void)); static void setup_signals __P((void));
static int run_command __P((char *, char **)); static int run_command __P((char *, char **));
static int check_syntax __P((char *)); static int check_syntax __P((char *));
static int edit_sudoers __P((char *, char *)); static int edit_sudoers __P((struct sudoersfile *, char *, int));
static int reparse_sudoers __P((char *editor));
static char *get_editor __P((void));
int command_matches __P((char *, char *)); int command_matches __P((char *, char *));
int addr_matches __P((char *)); int addr_matches __P((char *));
int hostname_matches __P((char *, char *, char *)); int hostname_matches __P((char *, char *, char *));
@@ -100,10 +111,11 @@ void yyrestart __P((FILE *));
* External globals exported by the parser * External globals exported by the parser
*/ */
extern FILE *yyin, *yyout; extern FILE *yyin, *yyout;
extern char *sudoers;
extern char *errorfile;
extern int errorlineno; extern int errorlineno;
extern int pedantic; extern int pedantic;
extern int quiet; extern int quiet;
/* For getopt(3) */ /* For getopt(3) */
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@@ -114,12 +126,6 @@ extern int optind;
char **Argv; char **Argv;
struct sudo_user sudo_user; struct sudo_user sudo_user;
int Argc, parse_error = FALSE; int Argc, parse_error = FALSE;
static char *stmp;
struct sudoersfile {
char *path;
struct sudoersfile *next;
};
static struct sudoerslist { static struct sudoerslist {
struct sudoersfile *first; struct sudoersfile *first;
@@ -132,14 +138,10 @@ main(argc, argv)
int argc; int argc;
char **argv; char **argv;
{ {
struct sudoersfile sudoers, *sp; struct sudoersfile *sp;
char *Editor, *UserEditor, *EditorPath; char *editor, *sudoers_path;
int ch, checkonly; int ch, checkonly;
sudoers.path = _PATH_SUDOERS;
sudoers.next = NULL;
sudoerslist.first = sudoerslist.last = &sudoers;
/* Warn about aliases that are used before being defined. */ /* Warn about aliases that are used before being defined. */
pedantic = 1; pedantic = 1;
@@ -151,6 +153,7 @@ main(argc, argv)
* Arg handling. * Arg handling.
*/ */
checkonly = 0; checkonly = 0;
sudoers_path = _PATH_SUDOERS;
while ((ch = getopt(argc, argv, "Vcf:sq")) != -1) { while ((ch = getopt(argc, argv, "Vcf:sq")) != -1) {
switch (ch) { switch (ch) {
case 'V': case 'V':
@@ -160,7 +163,7 @@ main(argc, argv)
checkonly++; /* check mode */ checkonly++; /* check mode */
break; break;
case 'f': case 'f':
sudoers.path = optarg; /* sudoers file path */ sudoers_path = optarg; /* sudoers file path */
break; break;
case 's': case 's':
pedantic++; /* strict mode */ pedantic++; /* strict mode */
@@ -186,337 +189,301 @@ main(argc, argv)
init_defaults(); init_defaults();
if (checkonly) if (checkonly)
exit(check_syntax(sudoers.path)); exit(check_syntax(sudoers_path));
/* /*
* Check VISUAL and EDITOR environment variables to see which editor * Parse the existing sudoers file(s) in quiet mode to highlight any
* the user wants to use (we may not end up using it though). * existing errors and to pull in editor and env_editor conf values.
* If the path is not fully-qualified, make it so and check that
* the specified executable actually exists.
*/ */
if ((UserEditor = getenv("VISUAL")) == NULL || *UserEditor == '\0') if ((yyin = open_sudoers(sudoers_path, NULL)) == NULL)
UserEditor = getenv("EDITOR"); err(1, "%s", sudoers_path);
if (UserEditor && *UserEditor == '\0') if (!lock_file(fileno(yyin), SUDO_TLOCK))
UserEditor = NULL; errx(1, "%s busy, try again later", sudoers_path);
else if (UserEditor) { yyout = stdout;
if (find_path(UserEditor, &Editor, NULL, getenv("PATH")) == FOUND) { ch = quiet;
UserEditor = Editor; quiet = 1;
} else { init_parser(sudoers_path);
if (def_env_editor) { yyparse();
/* If we are honoring $EDITOR this is a fatal error. */ parse_error = FALSE;
warnx("specified editor (%s) doesn't exist!", UserEditor); quiet = ch;
Exit(-1);
} else {
/* Otherwise, just ignore $EDITOR. */
UserEditor = NULL;
}
}
}
/* editor = get_editor();
* See if we can use the user's choice of editors either because
* we allow any $EDITOR or because $EDITOR is in the allowable list.
*/
Editor = EditorPath = NULL;
if (def_env_editor && UserEditor)
Editor = UserEditor;
else if (UserEditor) {
struct stat editor_sb;
struct stat user_editor_sb;
char *base, *userbase;
if (stat(UserEditor, &user_editor_sb) != 0) { /* Install signal handlers to clean up temp files if we are killed. */
/* Should never happen since we already checked above. */
warn("unable to stat editor (%s)", UserEditor);
Exit(-1);
}
EditorPath = estrdup(def_editor);
Editor = strtok(EditorPath, ":");
do {
/*
* Both Editor and UserEditor should be fully qualified but
* check anyway...
*/
if ((base = strrchr(Editor, '/')) == NULL)
continue;
if ((userbase = strrchr(UserEditor, '/')) == NULL) {
Editor = NULL;
break;
}
base++, userbase++;
/*
* We compare the basenames first and then use stat to match
* for sure.
*/
if (strcmp(base, userbase) == 0) {
if (stat(Editor, &editor_sb) == 0 && S_ISREG(editor_sb.st_mode)
&& (editor_sb.st_mode & 0000111) &&
editor_sb.st_dev == user_editor_sb.st_dev &&
editor_sb.st_ino == user_editor_sb.st_ino)
break;
}
} while ((Editor = strtok(NULL, ":")));
}
/*
* Can't use $EDITOR, try each element of def_editor until we
* find one that exists, is regular, and is executable.
*/
if (Editor == NULL || *Editor == '\0') {
if (EditorPath != NULL)
free(EditorPath);
EditorPath = estrdup(def_editor);
Editor = strtok(EditorPath, ":");
do {
if (sudo_goodpath(Editor, NULL))
break;
} while ((Editor = strtok(NULL, ":")));
/* Bleah, none of the editors existed! */
if (Editor == NULL || *Editor == '\0') {
warnx("no editor found (editor path = %s)", def_editor);
Exit(-1);
}
}
/* Install signal handlers to clean up stmp if we are killed. */
setup_signals(); setup_signals();
/* Edit the sudoers file(s) */
for (sp = sudoerslist.first; sp != NULL; sp = sp->next) { for (sp = sudoerslist.first; sp != NULL; sp = sp->next) {
/* XXX - ask whether user wants to edit included files */ if (sp != sudoerslist.first) {
edit_sudoers(sp->path, Editor); printf("press return to edit %s: ", sp->path);
while ((ch = getchar()) != EOF && ch != '\n')
continue;
}
edit_sudoers(sp, editor, -1);
} }
/* Check edited files for a parse error and re-edit any that fail. */
reparse_sudoers(editor);
exit(0); exit(0);
} }
/*
* Edit each sudoers file.
* Returns TRUE on success, else FALSE.
*/
static int static int
edit_sudoers(sudoers_path, editor) edit_sudoers(sp, editor, lineno)
char *sudoers_path; struct sudoersfile *sp;
char *editor; char *editor;
int lineno;
{ {
int sudoers_fd; /* sudoers file descriptor */ int tfd; /* sudoers temp file descriptor */
int stmp_fd; /* stmp file descriptor */
int n; /* length parameter */ int n; /* length parameter */
int modified; /* was the file modified? */
char buf[PATH_MAX*2]; /* buffer used for copying files */ char buf[PATH_MAX*2]; /* buffer used for copying files */
char linestr[64]; /* string version of lineno */
char *av[4]; /* argument vector for run_command */ char *av[4]; /* argument vector for run_command */
struct timespec ts1, ts2; /* time before and after edit */ struct timespec ts1, ts2; /* time before and after edit */
struct timespec sudoers_mtim; /* starting mtime of sudoers file */ struct timespec orig_mtim; /* starting mtime of sudoers file */
off_t sudoers_size; /* starting size of sudoers file */ off_t orig_size; /* starting size of sudoers file */
struct stat sb; /* stat buffer */ struct stat sb; /* stat buffer */
/*
* Open sudoers_path, lock it and stat it.
* sudoers_fd must remain open throughout in order to hold the lock.
*/
sudoers_fd = open(sudoers_path, O_RDWR | O_CREAT, SUDOERS_MODE);
if (sudoers_fd == -1)
err(1, "%s", sudoers_path);
if (!lock_file(sudoers_fd, SUDO_TLOCK))
errx(1, "sudoers file busy, try again later");
#ifdef HAVE_FSTAT #ifdef HAVE_FSTAT
if (fstat(sudoers_fd, &sb) == -1) if (fstat(sp->fd, &sb) == -1)
#else #else
if (stat(sudoers_path, &sb) == -1) if (stat(sp->path, &sb) == -1)
#endif #endif
err(1, "can't stat %s", sudoers_path); err(1, "can't stat %s", sp->path);
sudoers_size = sb.st_size; orig_size = sb.st_size;
sudoers_mtim.tv_sec = mtim_getsec(sb); orig_mtim.tv_sec = mtim_getsec(sb);
sudoers_mtim.tv_nsec = mtim_getnsec(sb); orig_mtim.tv_nsec = mtim_getnsec(sb);
/* /* Create the temp file if needed and set timestamp. */
* Open sudoers temp file. if (sp->tpath == NULL) {
*/ easprintf(&sp->tpath, "%s.tmp", sp->path);
easprintf(&stmp, "%s.tmp", sudoers_path); tfd = open(sp->tpath, O_WRONLY | O_CREAT | O_TRUNC, 0600);
stmp_fd = open(stmp, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (tfd < 0)
if (stmp_fd < 0) err(1, "%s", sp->tpath);
err(1, "%s", stmp);
/* Copy sudoers_path -> stmp and reset the mtime */ /* Copy sp->path -> sp->tpath and reset the mtime. */
if (sudoers_size) { if (orig_size != 0) {
while ((n = read(sudoers_fd, buf, sizeof(buf))) > 0) (void) lseek(sp->fd, (off_t)0, SEEK_SET);
if (write(stmp_fd, buf, n) != n) while ((n = read(sp->fd, buf, sizeof(buf))) > 0)
err(1, "write error"); if (write(tfd, buf, n) != n)
err(1, "write error");
/* Add missing newline at EOF if needed. */
if (n > 0 && buf[n - 1] != '\n') {
buf[0] = '\n';
write(stmp_fd, buf, 1);
}
(void) touch(stmp_fd, stmp, &sudoers_mtim);
(void) close(stmp_fd);
/* Parse sudoers_path to pull in editor and env_editor conf values. */
if ((yyin = fopen(stmp, "r"))) {
yyout = stdout;
n = quiet;
quiet = 1;
init_parser(sudoers_path);
yyparse();
parse_error = FALSE;
quiet = n;
fclose(yyin);
}
} else
(void) close(stmp_fd);
/*
* Edit the temp file and parse it (for sanity checking)
*/
do {
char linestr[64];
/* Build up argument vector for the command */
if ((av[0] = strrchr(editor, '/')) != NULL)
av[0]++;
else
av[0] = editor;
n = 1;
if (parse_error == TRUE) {
(void) snprintf(linestr, sizeof(linestr), "+%d", errorlineno);
av[n++] = linestr;
}
av[n++] = stmp;
av[n++] = NULL;
/*
* Do the edit:
* We cannot check the editor's exit value against 0 since
* XPG4 specifies that vi's exit value is a function of the
* number of errors during editing (?!?!).
*/
gettime(&ts1);
if (run_command(editor, av) != -1) {
gettime(&ts2);
/*
* Sanity checks.
*/
if (stat(stmp, &sb) < 0) {
warnx("cannot stat temporary file (%s), %s unchanged",
stmp, sudoers_path);
Exit(-1);
}
if (sb.st_size == 0) {
warnx("zero length temporary file (%s), %s unchanged",
stmp, sudoers_path);
Exit(-1);
}
/*
* Passed sanity checks so reopen stmp file and check
* for parse errors.
*/
yyout = stdout;
yyin = fopen(stmp, "r+");
if (yyin == NULL) {
warnx("can't re-open temporary file (%s), %s unchanged.",
stmp, sudoers_path);
Exit(-1);
}
/* Add missing newline at EOF if needed. */ /* Add missing newline at EOF if needed. */
if (fseek(yyin, -1, SEEK_END) == 0 && (n = fgetc(yyin)) != '\n') if (n > 0 && buf[n - 1] != '\n') {
fputc('\n', yyin); buf[0] = '\n';
rewind(yyin); write(tfd, buf, 1);
/* Clean slate for each parse */
user_runas = NULL;
init_defaults();
init_parser(sudoers_path);
/* Parse the sudoers temp file */
yyrestart(yyin);
if (yyparse() && parse_error != TRUE) {
warnx("unabled to parse temporary file (%s), unknown error",
stmp);
parse_error = TRUE;
}
fclose(yyin);
} else {
warnx("editor (%s) failed, %s unchanged", editor, sudoers_path);
Exit(-1);
}
/*
* Got an error, prompt the user for what to do now
*/
if (parse_error == TRUE) {
switch (whatnow()) {
case 'Q' : parse_error = FALSE; /* ignore parse error */
break;
case 'x' : if (sudoers_size == 0)
unlink(sudoers_path);
Exit(0);
break;
} }
} }
} while (parse_error == TRUE); (void) close(tfd);
}
(void) touch(-1, sp->tpath, &orig_mtim);
/* Build up argument vector for the command */
if ((av[0] = strrchr(editor, '/')) != NULL)
av[0]++;
else
av[0] = editor;
n = 1;
if (lineno > 0) {
(void) snprintf(linestr, sizeof(linestr), "+%d", lineno);
av[n++] = linestr;
}
av[n++] = sp->tpath;
av[n++] = NULL;
/* /*
* If the user didn't change the temp file, just unlink it. * Do the edit:
* We cannot check the editor's exit value against 0 since
* XPG4 specifies that vi's exit value is a function of the
* number of errors during editing (?!?!).
*/ */
if (sudoers_size == sb.st_size && gettime(&ts1);
sudoers_mtim.tv_sec == mtim_getsec(sb) && if (run_command(editor, av) != -1) {
sudoers_mtim.tv_nsec == mtim_getnsec(sb)) { gettime(&ts2);
/*
* Sanity checks.
*/
if (stat(sp->tpath, &sb) < 0) {
warnx("cannot stat temporary file (%s), %s unchanged",
sp->tpath, sp->path);
return(FALSE);
}
if (sb.st_size == 0 && orig_size != 0) {
warnx("zero length temporary file (%s), %s unchanged",
sp->tpath, sp->path);
sp->modified = TRUE;
return(FALSE);
}
} else {
warnx("editor (%s) failed, %s unchanged", editor, sp->path);
return(FALSE);
}
/* Set modified bit if use changed the file. */
modified = TRUE;
if (orig_size == sb.st_size &&
orig_mtim.tv_sec == mtim_getsec(sb) &&
orig_mtim.tv_nsec == mtim_getnsec(sb)) {
/* /*
* If mtime and size match but the user spent no measurable * If mtime and size match but the user spent no measurable
* time in the editor we can't tell if the file was changed. * time in the editor we can't tell if the file was changed.
*/ */
timespecsub(&ts1, &ts2, &ts2); timespecsub(&ts1, &ts2, &ts2);
if (timespecisset(&ts2)) { if (timespecisset(&ts2))
warnx("%s unchanged", sudoers_path); modified = FALSE;
Exit(0); }
/*
* If modified in this edit session, mark as modified.
*/
if (modified)
sp->modified = modified;
else
warnx("%s unchanged", sp->tpath);
return(TRUE);
}
/*
* Parse sudoers after editing and re-edit any ones that caused a parse error.
*/
static int
reparse_sudoers(editor)
char *editor;
{
struct sudoersfile *sp, *last;
FILE *fp;
int ch;
/*
* Parse the edited sudoers files and do sanity checking
*/
do {
sp = sudoerslist.first;
last = sudoerslist.last;
fp = fopen(sp->tpath, "r+");
if (fp == NULL) {
warnx("can't re-open temporary file (%s), %s unchanged.",
sp->tpath, sp->path);
return(FALSE);
} }
}
/* /* Clean slate for each parse */
* Change mode and ownership of temp file so when user_runas = NULL;
* we move it to sudoers_path things are kosher. init_defaults();
*/ init_parser(sp->path);
if (chown(stmp, SUDOERS_UID, SUDOERS_GID)) {
warn("unable to set (uid, gid) of %s to (%d, %d)",
stmp, SUDOERS_UID, SUDOERS_GID);
Exit(-1);
}
if (chmod(stmp, SUDOERS_MODE)) {
warn("unable to change mode of %s to 0%o", stmp, SUDOERS_MODE);
Exit(-1);
}
/* /* Parse the sudoers temp file */
* Now that we have a sane stmp file (parses ok) it needs to be yyout = stdout;
* rename(2)'d to sudoers_path. If the rename(2) fails we try using yyrestart(fp);
* mv(1) in case stmp and sudoers_path are on different file systems. if (yyparse() && parse_error != TRUE) {
*/ warnx("unabled to parse temporary file (%s), unknown error",
if (rename(stmp, sudoers_path)) { sp->tpath);
if (errno == EXDEV) { parse_error = TRUE;
warnx("%s and %s not on the same file system, using mv to rename", }
stmp, sudoers_path); fclose(yyin);
/* Build up argument vector for the command */ /*
if ((av[0] = strrchr(_PATH_MV, '/')) != NULL) * Got an error, prompt the user for what to do now
av[0]++; */
else if (parse_error) {
av[0] = _PATH_MV; switch (whatnow()) {
av[1] = stmp; case 'Q' : parse_error = FALSE; /* ignore parse error */
av[2] = sudoers_path; break;
av[3] = NULL; case 'x' : /* if (orig_size == 0)
unlink(sp->path);*/ /* XXX rm new file */
/* And run it... */ return(TRUE); /* XXX */
if (run_command(_PATH_MV, av)) { break;
warnx("command failed: '%s %s %s', %s unchanged",
_PATH_MV, stmp, sudoers_path, sudoers_path);
Exit(-1);
} }
}
if (parse_error) {
/* Edit file with the parse error */
for (sp = sudoerslist.first; sp != NULL; sp = sp->next) {
if (strcmp(sp->path, errorfile) == 0) {
edit_sudoers(sp, editor, errorlineno);
break;
}
}
if (sp == NULL)
errx(1, "internal error, can't find %s in list!", sudoers);
}
/* If any new #include directives were added, edit them too. */
for (sp = last->next; sp != NULL; sp = sp->next) {
printf("press return to edit %s: ", sp->path);
while ((ch = getchar()) != EOF && ch != '\n')
continue;
edit_sudoers(sp, editor, errorlineno);
}
} while (parse_error);
for (sp = sudoerslist.first; sp != NULL; sp = sp->next) {
if (!sp->modified) {
(void) unlink(sp->tpath);
continue;
}
/*
* Change mode and ownership of temp file so when
* we move it to sp->path things are kosher.
*/
if (chown(sp->tpath, SUDOERS_UID, SUDOERS_GID) != 0) {
warn("unable to set (uid, gid) of %s to (%d, %d)",
sp->tpath, SUDOERS_UID, SUDOERS_GID);
return(FALSE);
}
if (chmod(sp->tpath, SUDOERS_MODE) != 0) {
warn("unable to change mode of %s to 0%o", sp->tpath, SUDOERS_MODE);
return(FALSE);
}
/*
* Now that sp->tpath is sane (parses ok) it needs to be
* rename(2)'d to sp->path. If the rename(2) fails we try using
* mv(1) in case sp->tpath and sp->path are on different file systems.
*/
if (rename(sp->tpath, sp->path) == 0) {
free(sp->tpath);
sp->tpath = NULL;
} else { } else {
warn("error renaming %s, %s unchanged", stmp, sudoers_path); if (errno == EXDEV) {
Exit(-1); char *av[4];
warnx("%s and %s not on the same file system, using mv to rename",
sp->tpath, sp->path);
/* Build up argument vector for the command */
if ((av[0] = strrchr(_PATH_MV, '/')) != NULL)
av[0]++;
else
av[0] = _PATH_MV;
av[1] = sp->tpath;
av[2] = sp->path;
av[3] = NULL;
/* And run it... */
if (run_command(_PATH_MV, av)) {
warnx("command failed: '%s %s %s', %s unchanged",
_PATH_MV, sp->tpath, sp->path, sp->path);
(void) unlink(sp->tpath);
free(sp->tpath);
sp->tpath = NULL;
return(FALSE);
}
free(sp->tpath);
sp->tpath = NULL;
} else {
warn("error renaming %s, %s unchanged", sp->tpath, sp->path);
(void) unlink(sp->tpath);
return(FALSE);
}
} }
} }
free(stmp); return(TRUE);
stmp = NULL;
} }
/* /*
@@ -726,18 +693,152 @@ open_sudoers(path, keepopen)
const char *path; const char *path;
int *keepopen; int *keepopen;
{ {
struct sudoersfile *entry;
FILE *fp; FILE *fp;
struct sudoersfile *newfile;
if ((fp = fopen(path, "r")) != NULL) { /* Check for existing entry */
newfile = emalloc(sizeof(*newfile)); for (entry = sudoerslist.first; entry != NULL; entry = entry->next) {
newfile->path = estrdup(path); if (strcmp(path, entry->path) == 0)
newfile->next = NULL; break;
sudoerslist.last->next = newfile; }
if (entry == NULL) {
/* XXX - better cleanup on failure! */
entry = emalloc(sizeof(*entry));
entry->path = estrdup(path);
entry->modified = 0;
entry->next = NULL;
entry->fd = open(entry->path, O_RDWR | O_CREAT, SUDOERS_MODE);
entry->tpath = NULL;
if (entry->fd == -1) {
warn("%s", entry->path);
return(NULL);
}
/* XXX - wrap errx */
if (!lock_file(entry->fd, SUDO_TLOCK))
errx(1, "%s busy, try again later", entry->path);
if ((fp = fdopen(entry->fd, "r")) == NULL)
err(1, "%s", entry->path);
if (sudoerslist.last == NULL)
sudoerslist.first = sudoerslist.last = entry;
else {
sudoerslist.last->next = entry;
sudoerslist.last = entry;
}
if (keepopen != NULL)
*keepopen = TRUE;
} else {
/* Already exists, open .tmp version if there is one. */
if (entry->tpath != NULL) {
if ((fp = fopen(entry->tpath, "r")) == NULL)
err(1, "%s", entry->tpath);
} else {
if ((fp = fdopen(entry->fd, "r")) == NULL)
err(1, "%s", entry->path);
}
} }
return(fp); return(fp);
} }
static char *
get_editor()
{
char *Editor, *UserEditor, *EditorPath;
/*
* Check VISUAL and EDITOR environment variables to see which editor
* the user wants to use (we may not end up using it though).
* If the path is not fully-qualified, make it so and check that
* the specified executable actually exists.
*/
if ((UserEditor = getenv("VISUAL")) == NULL || *UserEditor == '\0')
UserEditor = getenv("EDITOR");
if (UserEditor && *UserEditor == '\0')
UserEditor = NULL;
else if (UserEditor) {
if (find_path(UserEditor, &Editor, NULL, getenv("PATH")) == FOUND) {
UserEditor = Editor;
} else {
if (def_env_editor) {
/* If we are honoring $EDITOR this is a fatal error. */
warnx("specified editor (%s) doesn't exist!", UserEditor);
Exit(-1);
} else {
/* Otherwise, just ignore $EDITOR. */
UserEditor = NULL;
}
}
}
/*
* See if we can use the user's choice of editors either because
* we allow any $EDITOR or because $EDITOR is in the allowable list.
*/
Editor = EditorPath = NULL;
if (def_env_editor && UserEditor)
Editor = UserEditor;
else if (UserEditor) {
struct stat editor_sb;
struct stat user_editor_sb;
char *base, *userbase;
if (stat(UserEditor, &user_editor_sb) != 0) {
/* Should never happen since we already checked above. */
warn("unable to stat editor (%s)", UserEditor);
Exit(-1);
}
EditorPath = estrdup(def_editor);
Editor = strtok(EditorPath, ":");
do {
/*
* Both Editor and UserEditor should be fully qualified but
* check anyway...
*/
if ((base = strrchr(Editor, '/')) == NULL)
continue;
if ((userbase = strrchr(UserEditor, '/')) == NULL) {
Editor = NULL;
break;
}
base++, userbase++;
/*
* We compare the basenames first and then use stat to match
* for sure.
*/
if (strcmp(base, userbase) == 0) {
if (stat(Editor, &editor_sb) == 0 && S_ISREG(editor_sb.st_mode)
&& (editor_sb.st_mode & 0000111) &&
editor_sb.st_dev == user_editor_sb.st_dev &&
editor_sb.st_ino == user_editor_sb.st_ino)
break;
}
} while ((Editor = strtok(NULL, ":")));
}
/*
* Can't use $EDITOR, try each element of def_editor until we
* find one that exists, is regular, and is executable.
*/
if (Editor == NULL || *Editor == '\0') {
if (EditorPath != NULL)
free(EditorPath);
EditorPath = estrdup(def_editor);
Editor = strtok(EditorPath, ":");
do {
if (sudo_goodpath(Editor, NULL))
break;
} while ((Editor = strtok(NULL, ":")));
/* Bleah, none of the editors existed! */
if (Editor == NULL || *Editor == '\0') {
warnx("no editor found (editor path = %s)", def_editor);
Exit(-1);
}
}
return(Editor);
}
/* /*
* Unlink the sudoers temp file (if it exists) and exit. * Unlink the sudoers temp file (if it exists) and exit.
* Used in place of a normal exit() and as a signal handler. * Used in place of a normal exit() and as a signal handler.
@@ -747,11 +848,14 @@ static RETSIGTYPE
Exit(sig) Exit(sig)
int sig; int sig;
{ {
struct sudoersfile *sp;
for (sp = sudoerslist.first; sp != NULL; sp = sp->next) {
if (sp->tpath != NULL)
(void) unlink(sp->tpath);
}
#define emsg " exiting due to signal.\n" #define emsg " exiting due to signal.\n"
if (stmp != NULL)
(void) unlink(stmp);
if (sig > 0) { if (sig > 0) {
write(STDERR_FILENO, getprogname(), strlen(getprogname())); write(STDERR_FILENO, getprogname(), strlen(getprogname()));
write(STDERR_FILENO, emsg, sizeof(emsg) - 1); write(STDERR_FILENO, emsg, sizeof(emsg) - 1);