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

Add a sudoers_context struct that embeds the user and runas structs.

Browse Source
This commit is contained in:
Todd C. Miller
2023-08-20 16:27:08 -06:00
parent 1b9fb405a3
commit 2d2529a15e
36 changed files with 920 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/sudoers/timestamp.c
View File

@@ -405,14 +405,14 @@ ts_init_key(struct timestamp_entry *entry, struct passwd *pw,
} else {
entry->flags |= TS_ANYUID;
}
entry->sid = user_ctx.sid;
entry->sid = ctx.user.sid;
switch (ticket_type) {
default:
/* Unknown time stamp ticket type, treat as tty (should not happen). */
sudo_warnx("unknown time stamp ticket type %d", ticket_type);
FALLTHROUGH;
case tty:
if (user_ctx.ttypath != NULL && stat(user_ctx.ttypath, &sb) == 0) {
if (ctx.user.ttypath != NULL && stat(ctx.user.ttypath, &sb) == 0) {
/* tty-based time stamp */
entry->type = TS_TTY;
entry->u.ttydev = sb.st_rdev;
@@ -1039,7 +1039,7 @@ timestamp_remove(bool unlink_it)
goto done;
}
if (asprintf(&fname, "%s/%s", def_timestampdir, user_ctx.name) == -1) {
if (asprintf(&fname, "%s/%s", def_timestampdir, ctx.user.name) == -1) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
ret = -1;
goto done;
@@ -1047,12 +1047,12 @@ timestamp_remove(bool unlink_it)
/* For "sudo -K" simply unlink the time stamp file. */
if (unlink_it) {
ret = unlinkat(dfd, user_ctx.name, 0) ? -1 : true;
ret = unlinkat(dfd, ctx.user.name, 0) ? -1 : true;
goto done;
}
/* Open time stamp file and lock it for exclusive access. */
fd = ts_openat(dfd, user_ctx.name, O_RDWR);
fd = ts_openat(dfd, ctx.user.name, O_RDWR);
switch (fd) {
case TIMESTAMP_OPEN_ERROR:
if (errno != ENOENT)
@@ -1107,7 +1107,7 @@ already_lectured(void)
dfd = ts_secure_opendir(def_lecture_status_dir, false, true);
if (dfd != -1) {
ret = fstatat(dfd, user_ctx.name, &sb, AT_SYMLINK_NOFOLLOW) == 0;
ret = fstatat(dfd, ctx.user.name, &sb, AT_SYMLINK_NOFOLLOW) == 0;
close(dfd);
}
debug_return_bool(ret);
@@ -1129,7 +1129,7 @@ set_lectured(void)
goto done;
/* Create lecture file. */
fd = ts_openat(dfd, user_ctx.name, O_WRONLY|O_CREAT|O_EXCL);
fd = ts_openat(dfd, ctx.user.name, O_WRONLY|O_CREAT|O_EXCL);
switch (fd) {
case TIMESTAMP_OPEN_ERROR:
/* Failed to open, not a fatal error. */
@@ -1171,7 +1171,7 @@ create_admin_success_flag(struct passwd *pw)
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
debug_return_int(-1);
}
if (!expand_tilde(&flagfile, user_ctx.name)) {
if (!expand_tilde(&flagfile, ctx.user.name)) {
free(flagfile);
debug_return_int(false);
}