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

Sprinkle some debugging around uid/gid setting in sudoedit.

Browse Source
This commit is contained in:
Todd C. Miller
2014-08-21 15:42:35 -06:00
parent db35c7c0e4
commit a8f63191ef
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sudo_edit.c
View File

@@ -109,6 +109,9 @@ switch_user(uid_t euid, gid_t egid, int ngroups, GETGROUPS_T *groups)
int serrno = errno; int serrno = errno;
debug_decl(switch_user, SUDO_DEBUG_EDIT) debug_decl(switch_user, SUDO_DEBUG_EDIT)
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"set uid:gid to %u:%u(%u)", euid, egid, ngroups ? groups[0] : egid);
/* When restoring root, change euid first; otherwise change it last. */ /* When restoring root, change euid first; otherwise change it last. */
if (euid == ROOT_UID) { if (euid == ROOT_UID) {
if (seteuid(ROOT_UID) != 0) if (seteuid(ROOT_UID) != 0)
@@ -138,6 +141,7 @@ static int
sudo_edit_mktemp(const char *ofile, char **tfile) sudo_edit_mktemp(const char *ofile, char **tfile)
{ {
const char *cp, *suff; const char *cp, *suff;
int tfd;
debug_decl(sudo_edit_mktemp, SUDO_DEBUG_EDIT) debug_decl(sudo_edit_mktemp, SUDO_DEBUG_EDIT)
if ((cp = strrchr(ofile, '/')) != NULL) if ((cp = strrchr(ofile, '/')) != NULL)
@@ -151,7 +155,10 @@ sudo_edit_mktemp(const char *ofile, char **tfile)
} else { } else {
sudo_easprintf(tfile, "%s/%s.XXXXXXXX", edit_tmpdir, cp); sudo_easprintf(tfile, "%s/%s.XXXXXXXX", edit_tmpdir, cp);
} }
debug_return_int(mkstemps(*tfile, suff ? strlen(suff) : 0)); tfd = mkstemps(*tfile, suff ? strlen(suff) : 0);
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"%s -> %s, fd %d", ofile, *tfile, tfd);
debug_return_int(tfd);
} }
/* /*
@@ -201,9 +208,13 @@ sudo_edit_create_tfiles(struct command_details *command_details,
tf[j].ofile = files[i]; tf[j].ofile = files[i];
tf[j].osize = sb.st_size; tf[j].osize = sb.st_size;
mtim_get(&sb, &tf[j].omtim); mtim_get(&sb, &tf[j].omtim);
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"seteuid(%u)", user_details.uid);
if (seteuid(user_details.uid) != 0) if (seteuid(user_details.uid) != 0)
sudo_fatal("seteuid(%d)", (int)user_details.uid); sudo_fatal("seteuid(%d)", (int)user_details.uid);
tfd = sudo_edit_mktemp(tf[j].ofile, &tf[j].tfile); tfd = sudo_edit_mktemp(tf[j].ofile, &tf[j].tfile);
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"seteuid(%u)", ROOT_UID);
if (seteuid(ROOT_UID) != 0) if (seteuid(ROOT_UID) != 0)
sudo_fatal("seteuid(ROOT_UID)"); sudo_fatal("seteuid(ROOT_UID)");
if (tfd == -1) { if (tfd == -1) {
@@ -263,11 +274,15 @@ sudo_edit_copy_tfiles(struct command_details *command_details,
/* Copy contents of temp files to real ones. */ /* Copy contents of temp files to real ones. */
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++) {
rc = -1; rc = -1;
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"seteuid(%u)", user_details.uid);
if (seteuid(user_details.uid) != 0) if (seteuid(user_details.uid) != 0)
sudo_fatal("seteuid(%d)", (int)user_details.uid); sudo_fatal("seteuid(%d)", (int)user_details.uid);
if ((tfd = open(tf[i].tfile, O_RDONLY, 0644)) != -1) { if ((tfd = open(tf[i].tfile, O_RDONLY, 0644)) != -1) {
rc = fstat(tfd, &sb); rc = fstat(tfd, &sb);
} }
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"seteuid(%u)", ROOT_UID);
if (seteuid(ROOT_UID) != 0) if (seteuid(ROOT_UID) != 0)
sudo_fatal("seteuid(ROOT_UID)"); sudo_fatal("seteuid(ROOT_UID)");
if (rc || !S_ISREG(sb.st_mode)) { if (rc || !S_ISREG(sb.st_mode)) {
@@ -530,6 +545,8 @@ sudo_edit(struct command_details *command_details)
* Set real, effective and saved uids to root. * Set real, effective and saved uids to root.
* We will change the euid as needed below. * We will change the euid as needed below.
*/ */
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"setuid(%u)", ROOT_UID);
if (setuid(ROOT_UID) != 0) { if (setuid(ROOT_UID) != 0) {
sudo_warn(U_("unable to change uid to root (%u)"), ROOT_UID); sudo_warn(U_("unable to change uid to root (%u)"), ROOT_UID);
goto cleanup; goto cleanup;