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

Defer setting runas defaults until after runaspw/gr is setup.

Browse Source
This commit is contained in:
Todd C. Miller
2008-11-01 13:20:01 +00:00
parent efb510a9dc
commit 8ba6fa2ae3
5 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
defaults.h
View File

@@ -93,9 +93,12 @@ struct sudo_defs_types {
/* /*
* Argument to update_defaults() * Argument to update_defaults()
*/ */
#define SKIP_CMND 1 #define SETDEF_GENERIC 0x01
#define ONLY_CMND 0 #define SETDEF_HOST 0x02
#define SET_ALL -1 #define SETDEF_USER 0x04
#define SETDEF_RUNAS 0x08
#define SETDEF_CMND 0x10
#define SETDEF_ALL (SETDEF_GENERIC|SETDEF_HOST|SETDEF_USER|SETDEF_RUNAS|SETDEF_CMND)
/* /*
* Prototypes * Prototypes

25
parse.c
View File

@@ -133,37 +133,42 @@ sudo_file_parse(nss)
* Returns TRUE on success and FALSE on failure. * Returns TRUE on success and FALSE on failure.
*/ */
int int
update_defaults(skip_cmnd) update_defaults(what)
int skip_cmnd; int what;
{ {
struct defaults *def; struct defaults *def;
tq_foreach_fwd(&defaults, def) { tq_foreach_fwd(&defaults, def) {
if (skip_cmnd == (def->type == DEFAULTS_CMND))
continue;
switch (def->type) { switch (def->type) {
case DEFAULTS: case DEFAULTS:
if (!set_default(def->var, def->val, def->op)) if (ISSET(what, SETDEF_GENERIC) &&
!set_default(def->var, def->val, def->op))
return(FALSE); return(FALSE);
break;
case DEFAULTS_USER: case DEFAULTS_USER:
if (userlist_matches(sudo_user.pw, &def->binding) == ALLOW && if (ISSET(what, SETDEF_USER) &&
userlist_matches(sudo_user.pw, &def->binding) == ALLOW &&
!set_default(def->var, def->val, def->op)) !set_default(def->var, def->val, def->op))
return(FALSE); return(FALSE);
break; break;
case DEFAULTS_RUNAS: case DEFAULTS_RUNAS:
if (runaslist_matches(&def->binding, NULL) == ALLOW && if (ISSET(what, SETDEF_RUNAS) &&
runaslist_matches(&def->binding, NULL) == ALLOW &&
!set_default(def->var, def->val, def->op)) !set_default(def->var, def->val, def->op))
return(FALSE); return(FALSE);
break; break;
case DEFAULTS_HOST: case DEFAULTS_HOST:
if (hostlist_matches(&def->binding) == ALLOW && if (ISSET(what, SETDEF_HOST) &&
hostlist_matches(&def->binding) == ALLOW &&
!set_default(def->var, def->val, def->op)) !set_default(def->var, def->val, def->op))
return(FALSE); return(FALSE);
break; break;
case DEFAULTS_CMND: case DEFAULTS_CMND:
if (cmndlist_matches(&def->binding) == ALLOW && if (ISSET(what, SETDEF_CMND) &&
cmndlist_matches(&def->binding) == ALLOW &&
!set_default(def->var, def->val, def->op)) !set_default(def->var, def->val, def->op))
return(FALSE); return(FALSE);
break;
} }
} }
return(TRUE); return(TRUE);
@@ -179,7 +184,7 @@ sudo_file_setdefs(nss)
if (nss->handle == NULL) if (nss->handle == NULL)
return(-1); return(-1);
if (!update_defaults(SKIP_CMND)) if (!update_defaults(SETDEF_GENERIC|SETDEF_HOST|SETDEF_USER))
return(-1); return(-1);
return(0); return(0);
} }

5
sudo.c
View File

@@ -293,6 +293,9 @@ main(argc, argv, envp)
} else } else
set_runaspw(runas_user ? runas_user : def_runas_default); set_runaspw(runas_user ? runas_user : def_runas_default);
if (!update_defaults(SETDEF_RUNAS))
log_error(NO_STDERR|NO_EXIT, "problem with defaults entries");
/* Set login class if applicable. */ /* Set login class if applicable. */
set_loginclass(sudo_user.pw); set_loginclass(sudo_user.pw);
@@ -807,7 +810,7 @@ set_cmnd(sudo_mode)
else else
user_base = user_cmnd; user_base = user_cmnd;
if (!update_defaults(ONLY_CMND)) if (!update_defaults(SETDEF_CMND))
log_error(NO_STDERR|NO_EXIT, "problem with defaults entries"); log_error(NO_STDERR|NO_EXIT, "problem with defaults entries");
return(rval); return(rval);

7
testsudoers.c
View File

@@ -254,7 +254,7 @@ main(argc, argv)
else else
(void) fputs("Parses OK", stdout); (void) fputs("Parses OK", stdout);
if (!update_defaults(SET_ALL)) if (!update_defaults(SETDEF_ALL))
(void) fputs(" (problem with defaults entries)", stdout); (void) fputs(" (problem with defaults entries)", stdout);
puts("."); puts(".");
@@ -336,9 +336,10 @@ set_runasgr(group)
} }
} }
/* XXX - sanity check defaults settings */
int int
update_defaults(skip_cmnd) update_defaults(what)
int skip_cmnd; int what;
{ {
return(TRUE); return(TRUE);
} }

7
visudo.c
View File

@@ -208,7 +208,7 @@ main(argc, argv)
error(1, "%s", sudoers_path); error(1, "%s", sudoers_path);
init_parser(sudoers_path, 0); init_parser(sudoers_path, 0);
yyparse(); yyparse();
(void) update_defaults(SKIP_CMND); (void) update_defaults(SETDEF_ALL & ~SETDEF_CMND);
editor = get_editor(&args); editor = get_editor(&args);
@@ -565,9 +565,10 @@ user_is_exempt()
} }
/* STUB */ /* STUB */
/* XXX - parse defaults to get editor and env_editor values */
int int
update_defaults(skip_cmnd) update_defaults(what)
int skip_cmnd; int what;
{ {
return(TRUE); return(TRUE);
} }