--- embedaddon/sudo/plugins/sudoers/sudoers.c 2012/02/21 16:23:02 1.1 +++ embedaddon/sudo/plugins/sudoers/sudoers.c 2012/10/09 09:29:52 1.1.1.3 @@ -70,17 +70,24 @@ # ifndef LOGIN_DEFROOTCLASS # define LOGIN_DEFROOTCLASS "daemon" # endif +# ifndef LOGIN_SETENV +# define LOGIN_SETENV 0 +# endif #endif #ifdef HAVE_SELINUX # include #endif #include #include +#ifndef HAVE_GETADDRINFO +# include "compat/getaddrinfo.h" +#endif #include "sudoers.h" #include "interfaces.h" #include "sudoers_version.h" #include "auth/sudo_auth.h" +#include "secure_path.h" /* * Prototypes @@ -92,29 +99,22 @@ static void set_runaspw(const char *); static void set_runasgr(const char *); static int cb_runas_default(const char *); static int sudoers_policy_version(int verbose); -static int deserialize_info(char * const settings[], char * const user_info[]); +static int deserialize_info(char * const args[], char * const settings[], + char * const user_info[]); static char *find_editor(int nfiles, char **files, char ***argv_out); static void create_admin_success_flag(void); /* * Globals */ -const char *sudoers_file = _PATH_SUDOERS; -mode_t sudoers_mode = SUDOERS_MODE; -uid_t sudoers_uid = SUDOERS_UID; -gid_t sudoers_gid = SUDOERS_GID; struct sudo_user sudo_user; struct passwd *list_pw; struct interface *interfaces; int long_list; -int debug_level; uid_t timestamp_uid; extern int errorlineno; -extern int parse_error; +extern bool parse_error; extern char *errorfile; -#ifdef HAVE_LOGIN_CAP_H -login_cap_t *lc; -#endif /* HAVE_LOGIN_CAP_H */ #ifdef HAVE_BSD_AUTH_H char *login_style; #endif /* HAVE_BSD_AUTH_H */ @@ -122,6 +122,7 @@ sudo_conv_t sudo_conv; sudo_printf_t sudo_printf; int sudo_mode; +static int sudo_version; static char *prev_user; static char *runas_user; static char *runas_group; @@ -133,27 +134,34 @@ static sigaction_t saved_sa_int, saved_sa_quit, saved_ int NewArgc; char **NewArgv; -/* plugin_error.c */ -extern sigjmp_buf error_jmp; +/* Declared here instead of plugin_error.c for static sudo builds. */ +sigjmp_buf error_jmp; static int sudoers_policy_open(unsigned int version, sudo_conv_t conversation, sudo_printf_t plugin_printf, char * const settings[], - char * const user_info[], char * const envp[]) + char * const user_info[], char * const envp[], char * const args[]) { volatile int sources = 0; sigaction_t sa; struct sudo_nss *nss; + struct sudo_nss *nss_next; + debug_decl(sudoers_policy_open, SUDO_DEBUG_PLUGIN) + sudo_version = version; if (!sudo_conv) sudo_conv = conversation; if (!sudo_printf) sudo_printf = plugin_printf; + /* Plugin args are only specified for API version 1.2 and higher. */ + if (sudo_version < SUDO_API_MKVERSION(1, 2)) + args = NULL; + if (sigsetjmp(error_jmp, 1)) { - /* called via error(), errorx() or log_error() */ + /* called via error(), errorx() or log_fatal() */ rewind_perms(); - return -1; + debug_return_bool(-1); } bindtextdomain("sudoers", LOCALEDIR); @@ -181,8 +189,8 @@ sudoers_policy_open(unsigned int version, sudo_conv_t /* Setup defaults data structures. */ init_defaults(); - /* Parse settings and user_info */ - sudo_mode = deserialize_info(settings, user_info); + /* Parse args, settings and user_info */ + sudo_mode = deserialize_info(args, settings, user_info); init_vars(envp); /* XXX - move this later? */ @@ -194,16 +202,19 @@ sudoers_policy_open(unsigned int version, sudo_conv_t set_perms(PERM_ROOT); /* Open and parse sudoers, set global defaults */ - tq_foreach_fwd(snl, nss) { - if (nss->open(nss) == 0 && nss->parse(nss) == 0) { - sources++; - if (nss->setdefs(nss) != 0) - log_error(NO_STDERR|NO_EXIT, _("problem with defaults entries")); - } + for (nss = snl->first; nss != NULL; nss = nss_next) { + nss_next = nss->next; + if (nss->open(nss) == 0 && nss->parse(nss) == 0) { + sources++; + if (nss->setdefs(nss) != 0) + log_error(NO_STDERR, _("problem with defaults entries")); + } else { + tq_remove(snl, nss); + } } if (sources == 0) { warningx(_("no valid sudoers sources found, quitting")); - return -1; + debug_return_bool(-1); } /* XXX - collect post-sudoers parse settings into a function */ @@ -212,7 +223,7 @@ sudoers_policy_open(unsigned int version, sudo_conv_t * Initialize external group plugin, if any. */ if (def_group_plugin) { - if (group_plugin_load(def_group_plugin) != TRUE) + if (group_plugin_load(def_group_plugin) != true) def_group_plugin = NULL; } @@ -229,25 +240,27 @@ sudoers_policy_open(unsigned int version, sudo_conv_t set_runaspw(runas_user ? runas_user : def_runas_default); if (!update_defaults(SETDEF_RUNAS)) - log_error(NO_STDERR|NO_EXIT, _("problem with defaults entries")); + log_error(NO_STDERR, _("problem with defaults entries")); if (def_fqdn) set_fqdn(); /* deferred until after sudoers is parsed */ /* Set login class if applicable. */ - set_loginclass(sudo_user.pw); + set_loginclass(runas_pw ? runas_pw : sudo_user.pw); restore_perms(); - return TRUE; + debug_return_bool(true); } static void sudoers_policy_close(int exit_status, int error_code) { + debug_decl(sudoers_policy_close, SUDO_DEBUG_PLUGIN) + if (sigsetjmp(error_jmp, 1)) { - /* called via error(), errorx() or log_error() */ - return; + /* called via error(), errorx() or log_fatal() */ + debug_return; } /* We do not currently log the exit status. */ @@ -259,27 +272,44 @@ sudoers_policy_close(int exit_status, int error_code) (void)sudo_auth_end_session(runas_pw); /* Free remaining references to password and group entries. */ - pw_delref(sudo_user.pw); - pw_delref(runas_pw); - if (runas_gr != NULL) - gr_delref(runas_gr); - if (user_group_list != NULL) - grlist_delref(user_group_list); + sudo_pw_delref(sudo_user.pw); + sudo_user.pw = NULL; + sudo_pw_delref(runas_pw); + runas_pw = NULL; + if (runas_gr != NULL) { + sudo_gr_delref(runas_gr); + runas_gr = NULL; + } + if (user_group_list != NULL) { + sudo_grlist_delref(user_group_list); + user_group_list = NULL; + } + efree(user_gids); + user_gids = NULL; + + debug_return; } /* * The init_session function is called before executing the command * and before uid/gid changes occur. + * Returns 1 on success, 0 on failure and -1 on error. */ static int -sudoers_policy_init_session(struct passwd *pwd) +sudoers_policy_init_session(struct passwd *pwd, char **user_env[]) { + debug_decl(sudoers_policy_init, SUDO_DEBUG_PLUGIN) + + /* user_env is only specified for API version 1.2 and higher. */ + if (sudo_version < SUDO_API_MKVERSION(1, 2)) + user_env = NULL; + if (sigsetjmp(error_jmp, 1)) { - /* called via error(), errorx() or log_error() */ - return -1; + /* called via error(), errorx() or log_fatal() */ + debug_return_bool(-1); } - return sudo_auth_begin_session(pwd); + debug_return_bool(sudo_auth_begin_session(pwd, user_env)); } static int @@ -291,10 +321,11 @@ sudoers_policy_main(int argc, char * const argv[], int struct sudo_nss *nss; int cmnd_status = -1, validated; volatile int info_len = 0; - volatile int rval = TRUE; + volatile int rval = true; + debug_decl(sudoers_policy_main, SUDO_DEBUG_PLUGIN) if (sigsetjmp(error_jmp, 1)) { - /* error recovery via error(), errorx() or log_error() */ + /* error recovery via error(), errorx() or log_fatal() */ rval = -1; goto done; } @@ -335,20 +366,16 @@ sudoers_policy_main(int argc, char * const argv[], int NewArgv = emalloc2(NewArgc + 2, sizeof(char *)); memcpy(++NewArgv, argv, argc * sizeof(char *)); NewArgv[NewArgc] = NULL; - if (ISSET(sudo_mode, MODE_LOGIN_SHELL)) + if (ISSET(sudo_mode, MODE_LOGIN_SHELL) && runas_pw != NULL) NewArgv[0] = estrdup(runas_pw->pw_shell); } /* If given the -P option, set the "preserve_groups" flag. */ if (ISSET(sudo_mode, MODE_PRESERVE_GROUPS)) - def_preserve_groups = TRUE; + def_preserve_groups = true; /* Find command in path */ cmnd_status = set_cmnd(); - if (cmnd_status == -1) { - rval = -1; - goto done; - } #ifdef HAVE_SETLOCALE if (!setlocale(LC_ALL, def_sudoers_locale)) { @@ -366,7 +393,7 @@ sudoers_policy_main(int argc, char * const argv[], int validated = nss->lookup(nss, validated, pwflag); if (ISSET(validated, VALIDATE_OK)) { - /* Handle "= auth" in netsvc.conf */ + /* Handle [SUCCESS=return] */ if (nss->ret_if_found) break; } else { @@ -397,11 +424,14 @@ sudoers_policy_main(int argc, char * const argv[], int pw = sudo_getpwuid(atoi(def_timestampowner + 1)); else pw = sudo_getpwnam(def_timestampowner); - if (!pw) + if (pw != NULL) { + timestamp_uid = pw->pw_uid; + sudo_pw_delref(pw); + } else { log_error(0, _("timestamp owner (%s): No such user"), def_timestampowner); - timestamp_uid = pw->pw_uid; - pw_delref(pw); + timestamp_uid = ROOT_UID; + } } /* If no command line args and "shell_noargs" is not set, error out. */ @@ -427,15 +457,18 @@ sudoers_policy_main(int argc, char * const argv[], int */ if (ISSET(sudo_mode, MODE_EDIT) || (ISSET(sudo_mode, MODE_PRESERVE_ENV) && def_setenv)) - def_env_reset = FALSE; + def_env_reset = false; /* Build a new environment that avoids any nasty bits. */ rebuild_env(); /* Require a password if sudoers says so. */ rval = check_user(validated, sudo_mode); - if (rval != TRUE) + if (rval != true) { + if (!ISSET(validated, VALIDATE_OK)) + log_failure(validated, cmnd_status); goto done; + } /* If run as root with SUDO_USER set, set sudo_user.pw to that user. */ /* XXX - causes confusion when root is not listed in sudoers */ @@ -445,7 +478,7 @@ sudoers_policy_main(int argc, char * const argv[], int if ((pw = sudo_getpwnam(prev_user)) != NULL) { if (sudo_user.pw != NULL) - pw_delref(sudo_user.pw); + sudo_pw_delref(sudo_user.pw); sudo_user.pw = pw; } } @@ -453,30 +486,7 @@ sudoers_policy_main(int argc, char * const argv[], int /* If the user was not allowed to run the command we are done. */ if (!ISSET(validated, VALIDATE_OK)) { - if (ISSET(validated, FLAG_NO_USER | FLAG_NO_HOST)) { - audit_failure(NewArgv, _("No user or host")); - log_denial(validated, 1); - } else { - if (def_path_info) { - /* - * We'd like to not leak path info at all here, but that can - * *really* confuse the users. To really close the leak we'd - * have to say "not allowed to run foo" even when the problem - * is just "no foo in path" since the user can trivially set - * their path to just contain a single dir. - */ - log_denial(validated, - !(cmnd_status == NOT_FOUND_DOT || cmnd_status == NOT_FOUND)); - if (cmnd_status == NOT_FOUND) - warningx(_("%s: command not found"), user_cmnd); - else if (cmnd_status == NOT_FOUND_DOT) - warningx(_("ignoring `%s' found in '.'\nUse `sudo ./%s' if this is the `%s' you wish to run."), user_cmnd, user_cmnd, user_cmnd); - } else { - /* Just tell the user they are not allowed to run foo. */ - log_denial(validated, 1); - } - audit_failure(NewArgv, _("validation failure")); - } + log_failure(validated, cmnd_status); goto bad; } @@ -582,15 +592,25 @@ sudoers_policy_main(int argc, char * const argv[], int NewArgv[1] = "--login"; } -#if defined(__linux__) || defined(_AIX) +#if defined(_AIX) || (defined(__linux__) && !defined(HAVE_PAM)) /* Insert system-wide environment variables. */ - read_env_file(_PATH_ENVIRONMENT, TRUE); + read_env_file(_PATH_ENVIRONMENT, true); #endif +#ifdef HAVE_LOGIN_CAP_H + /* Set environment based on login class. */ + if (login_class) { + login_cap_t *lc = login_getclass(login_class); + if (lc != NULL) { + setusercontext(lc, runas_pw, runas_pw->pw_uid, LOGIN_SETPATH|LOGIN_SETENV); + login_close(lc); + } + } +#endif /* HAVE_LOGIN_CAP_H */ } /* Insert system-wide environment variables. */ if (def_env_file) - read_env_file(def_env_file, FALSE); + read_env_file(def_env_file, false); /* Insert user-specified environment variables. */ insert_env_vars(sudo_user.env_vars); @@ -630,29 +650,41 @@ sudoers_policy_main(int argc, char * const argv[], int command_info[info_len++] = "preserve_groups=true"; } else { int i, len; + gid_t egid; size_t glsize; char *cp, *gid_list; - struct group_list *grlist = get_group_list(runas_pw); + struct group_list *grlist = sudo_get_grlist(runas_pw); - glsize = sizeof("runas_groups=") - 1 + (grlist->ngids * (MAX_UID_T_LEN + 1)); + /* We reserve an extra spot in the list for the effective gid. */ + glsize = sizeof("runas_groups=") - 1 + + ((grlist->ngids + 1) * (MAX_UID_T_LEN + 1)); gid_list = emalloc(glsize); memcpy(gid_list, "runas_groups=", sizeof("runas_groups=") - 1); cp = gid_list + sizeof("runas_groups=") - 1; + + /* On BSD systems the effective gid is the first group in the list. */ + egid = runas_gr ? (unsigned int)runas_gr->gr_gid : + (unsigned int)runas_pw->pw_gid; + len = snprintf(cp, glsize - (cp - gid_list), "%u", egid); + if (len < 0 || len >= glsize - (cp - gid_list)) + errorx(1, _("internal error, %s overflow"), "runas_groups"); + cp += len; for (i = 0; i < grlist->ngids; i++) { - /* XXX - check rval */ - len = snprintf(cp, glsize - (cp - gid_list), "%s%u", - i ? "," : "", (unsigned int) grlist->gids[i]); - cp += len; + if (grlist->gids[i] != egid) { + len = snprintf(cp, glsize - (cp - gid_list), ",%u", + (unsigned int) grlist->gids[i]); + if (len < 0 || len >= glsize - (cp - gid_list)) + errorx(1, _("internal error, %s overflow"), "runas_groups"); + cp += len; + } } command_info[info_len++] = gid_list; - grlist_delref(grlist); + sudo_grlist_delref(grlist); } if (def_closefrom >= 0) easprintf(&command_info[info_len++], "closefrom=%d", def_closefrom); if (def_noexec) command_info[info_len++] = estrdup("noexec=true"); - if (def_noexec_file) - command_info[info_len++] = fmt_string("noexec_file", def_noexec_file); if (def_set_utmp) command_info[info_len++] = estrdup("set_utmp=true"); if (def_use_pty) @@ -660,8 +692,8 @@ sudoers_policy_main(int argc, char * const argv[], int if (def_utmp_runas) command_info[info_len++] = fmt_string("utmp_user", runas_pw->pw_name); #ifdef HAVE_LOGIN_CAP_H - if (lc != NULL) - command_info[info_len++] = fmt_string("login_class", lc->lc_class); + if (def_use_loginclass) + command_info[info_len++] = fmt_string("login_class", login_class); #endif /* HAVE_LOGIN_CAP_H */ #ifdef HAVE_SELINUX if (user_role != NULL) @@ -669,6 +701,12 @@ sudoers_policy_main(int argc, char * const argv[], int if (user_type != NULL) command_info[info_len++] = fmt_string("selinux_type", user_type); #endif /* HAVE_SELINUX */ +#ifdef HAVE_PRIV_SET + if (runas_privs != NULL) + command_info[info_len++] = fmt_string("runas_privs", runas_privs); + if (runas_limitprivs != NULL) + command_info[info_len++] = fmt_string("runas_limitprivs", runas_limitprivs); +#endif /* HAVE_SELINUX */ /* Must audit before uid change. */ audit_success(NewArgv); @@ -676,12 +714,15 @@ sudoers_policy_main(int argc, char * const argv[], int *command_infop = command_info; *argv_out = edit_argv ? edit_argv : NewArgv; - *user_env_out = env_get(); /* our private copy */ + /* Get private version of the environment and zero out stashed copy. */ + *user_env_out = env_get(); + env_init(NULL); + goto done; bad: - rval = FALSE; + rval = false; done: rewind_perms(); @@ -690,37 +731,45 @@ done: sudo_endpwent(); sudo_endgrent(); - return rval; + debug_return_bool(rval); } static int sudoers_policy_check(int argc, char * const argv[], char *env_add[], char **command_infop[], char **argv_out[], char **user_env_out[]) { + debug_decl(sudoers_policy_check, SUDO_DEBUG_PLUGIN) + if (!ISSET(sudo_mode, MODE_EDIT)) SET(sudo_mode, MODE_RUN); - return sudoers_policy_main(argc, argv, 0, env_add, command_infop, - argv_out, user_env_out); + debug_return_bool(sudoers_policy_main(argc, argv, 0, env_add, command_infop, + argv_out, user_env_out)); } static int sudoers_policy_validate(void) { + debug_decl(sudoers_policy_validate, SUDO_DEBUG_PLUGIN) + user_cmnd = "validate"; SET(sudo_mode, MODE_VALIDATE); - return sudoers_policy_main(0, NULL, I_VERIFYPW, NULL, NULL, NULL, NULL); + debug_return_bool(sudoers_policy_main(0, NULL, I_VERIFYPW, NULL, NULL, NULL, NULL)); } static void sudoers_policy_invalidate(int remove) { + debug_decl(sudoers_policy_invalidate, SUDO_DEBUG_PLUGIN) + user_cmnd = "kill"; if (sigsetjmp(error_jmp, 1) == 0) { remove_timestamp(remove); plugin_cleanup(0); } + + debug_return; } static int @@ -728,6 +777,7 @@ sudoers_policy_list(int argc, char * const argv[], int const char *list_user) { int rval; + debug_decl(sudoers_policy_list, SUDO_DEBUG_PLUGIN) user_cmnd = "list"; if (argc) @@ -740,16 +790,16 @@ sudoers_policy_list(int argc, char * const argv[], int list_pw = sudo_getpwnam(list_user); if (list_pw == NULL) { warningx(_("unknown user: %s"), list_user); - return -1; + debug_return_bool(-1); } } rval = sudoers_policy_main(argc, argv, I_LISTPW, NULL, NULL, NULL, NULL); if (list_user) { - pw_delref(list_pw); + sudo_pw_delref(list_pw); list_pw = NULL; } - return rval; + debug_return_bool(rval); } /* @@ -760,6 +810,7 @@ static void init_vars(char * const envp[]) { char * const * ep; + debug_decl(init_vars, SUDO_DEBUG_PLUGIN) #ifdef HAVE_TZSET (void) tzset(); /* set the timezone if applicable */ @@ -799,9 +850,9 @@ init_vars(char * const envp[]) if (sudo_mode == MODE_KILL || sudo_mode == MODE_INVALIDATE) errorx(1, _("unknown uid: %u"), (unsigned int) user_uid); - /* Need to make a fake struct passwd for the call to log_error(). */ + /* Need to make a fake struct passwd for the call to log_fatal(). */ sudo_user.pw = sudo_fakepwnamid(user_name, user_uid, user_gid); - log_error(0, _("unknown uid: %u"), (unsigned int) user_uid); + log_fatal(0, _("unknown uid: %u"), (unsigned int) user_uid); /* NOTREACHED */ } @@ -809,12 +860,13 @@ init_vars(char * const envp[]) * Get group list. */ if (user_group_list == NULL) - user_group_list = get_group_list(sudo_user.pw); + user_group_list = sudo_get_grlist(sudo_user.pw); /* Set runas callback. */ sudo_defs_table[I_RUNAS_DEFAULT].callback = cb_runas_default; - /* It is now safe to use log_error() and set_perms() */ + /* It is now safe to use log_fatal() and set_perms() */ + debug_return; } /* @@ -826,10 +878,11 @@ set_cmnd(void) { int rval; char *path = user_path; + debug_decl(set_cmnd, SUDO_DEBUG_PLUGIN) /* Resolve the path and return. */ rval = FOUND; - user_stat = emalloc(sizeof(struct stat)); + user_stat = ecalloc(1, sizeof(struct stat)); /* Default value for cmnd, overridden below. */ if (user_cmnd == NULL) @@ -880,7 +933,7 @@ set_cmnd(void) for (to = user_args, av = NewArgv + 1; *av; av++) { n = strlcpy(to, *av, size - (to - user_args)); if (n >= size - (to - user_args)) - errorx(1, _("internal error, set_cmnd() overflow")); + errorx(1, _("internal error, %s overflow"), "set_cmnd()"); to += n; *to++ = ' '; } @@ -897,9 +950,9 @@ set_cmnd(void) user_base = user_cmnd; if (!update_defaults(SETDEF_CMND)) - log_error(NO_STDERR|NO_EXIT, _("problem with defaults entries")); + log_error(NO_STDERR, _("problem with defaults entries")); - return rval; + debug_return_int(rval); } /* @@ -907,93 +960,82 @@ set_cmnd(void) * Returns a handle to the sudoers file or NULL on error. */ FILE * -open_sudoers(const char *sudoers, int doedit, int *keepopen) +open_sudoers(const char *sudoers, bool doedit, bool *keepopen) { - struct stat statbuf; + struct stat sb; FILE *fp = NULL; - int rootstat; + debug_decl(open_sudoers, SUDO_DEBUG_PLUGIN) - /* - * Fix the mode and group on sudoers file from old default. - * Only works if file system is readable/writable by root. - */ - if ((rootstat = stat_sudoers(sudoers, &statbuf)) == 0 && - sudoers_uid == statbuf.st_uid && sudoers_mode != 0400 && - (statbuf.st_mode & 0007777) == 0400) { + set_perms(PERM_SUDOERS); - if (chmod(sudoers, sudoers_mode) == 0) { - warningx(_("fixed mode on %s"), sudoers); - SET(statbuf.st_mode, sudoers_mode); - if (statbuf.st_gid != sudoers_gid) { - if (chown(sudoers, (uid_t) -1, sudoers_gid) == 0) { - warningx(_("set group on %s"), sudoers); - statbuf.st_gid = sudoers_gid; - } else - warning(_("unable to set group on %s"), sudoers); + switch (sudo_secure_file(sudoers, sudoers_uid, sudoers_gid, &sb)) { + case SUDO_PATH_SECURE: + /* + * If we are expecting sudoers to be group readable but + * it is not, we must open the file as root, not uid 1. + */ + if (sudoers_uid == ROOT_UID && (sudoers_mode & S_IRGRP)) { + if ((sb.st_mode & S_IRGRP) == 0) { + restore_perms(); + set_perms(PERM_ROOT); + } } - } else - warning(_("unable to fix mode on %s"), sudoers); + /* + * Open sudoers and make sure we can read it so we can present + * the user with a reasonable error message (unlike the lexer). + */ + if ((fp = fopen(sudoers, "r")) == NULL) { + log_error(USE_ERRNO, _("unable to open %s"), sudoers); + } else { + if (sb.st_size != 0 && fgetc(fp) == EOF) { + log_error(USE_ERRNO, _("unable to read %s"), + sudoers); + fclose(fp); + fp = NULL; + } else { + /* Rewind fp and set close on exec flag. */ + rewind(fp); + (void) fcntl(fileno(fp), F_SETFD, 1); + } + } + break; + case SUDO_PATH_MISSING: + log_error(USE_ERRNO, _("unable to stat %s"), sudoers); + break; + case SUDO_PATH_BAD_TYPE: + log_error(0, _("%s is not a regular file"), sudoers); + break; + case SUDO_PATH_WRONG_OWNER: + log_error(0, _("%s is owned by uid %u, should be %u"), + sudoers, (unsigned int) sb.st_uid, (unsigned int) sudoers_uid); + break; + case SUDO_PATH_WORLD_WRITABLE: + log_error(0, _("%s is world writable"), sudoers); + break; + case SUDO_PATH_GROUP_WRITABLE: + log_error(0, _("%s is owned by gid %u, should be %u"), + sudoers, (unsigned int) sb.st_gid, (unsigned int) sudoers_gid); + break; + default: + /* NOTREACHED */ + break; } - /* - * Sanity checks on sudoers file. Must be done as sudoers - * file owner. We already did a stat as root, so use that - * data if we can't stat as sudoers file owner. - */ - set_perms(PERM_SUDOERS); - - if (rootstat != 0 && stat_sudoers(sudoers, &statbuf) != 0) - log_error(USE_ERRNO|NO_EXIT, _("unable to stat %s"), sudoers); - else if (!S_ISREG(statbuf.st_mode)) - log_error(NO_EXIT, _("%s is not a regular file"), sudoers); - else if ((statbuf.st_mode & 07577) != sudoers_mode) - log_error(NO_EXIT, _("%s is mode 0%o, should be 0%o"), sudoers, - (unsigned int) (statbuf.st_mode & 07777), - (unsigned int) sudoers_mode); - else if (statbuf.st_uid != sudoers_uid) - log_error(NO_EXIT, _("%s is owned by uid %u, should be %u"), sudoers, - (unsigned int) statbuf.st_uid, (unsigned int) sudoers_uid); - else if (statbuf.st_gid != sudoers_gid && ISSET(statbuf.st_mode, S_IRGRP|S_IWGRP)) - log_error(NO_EXIT, _("%s is owned by gid %u, should be %u"), sudoers, - (unsigned int) statbuf.st_gid, (unsigned int) sudoers_gid); - else if ((fp = fopen(sudoers, "r")) == NULL) - log_error(USE_ERRNO|NO_EXIT, _("unable to open %s"), sudoers); - else { - /* - * Make sure we can actually read sudoers so we can present the - * user with a reasonable error message (unlike the lexer). - */ - if (statbuf.st_size != 0 && fgetc(fp) == EOF) { - log_error(USE_ERRNO|NO_EXIT, _("unable to read %s"), sudoers); - fclose(fp); - fp = NULL; - } - } - - if (fp != NULL) { - rewind(fp); - (void) fcntl(fileno(fp), F_SETFD, 1); - } - restore_perms(); /* change back to root */ - return fp; + + debug_return_ptr(fp); } #ifdef HAVE_LOGIN_CAP_H static void set_loginclass(struct passwd *pw) { - int errflags; + const int errflags = NO_MAIL|MSG_ONLY; + login_cap_t *lc; + debug_decl(set_loginclass, SUDO_DEBUG_PLUGIN) - /* - * Don't make it a fatal error if the user didn't specify the login - * class themselves. We do this because if login.conf gets - * corrupted we want the admin to be able to use sudo to fix it. - */ - if (login_class) - errflags = NO_MAIL|MSG_ONLY; - else - errflags = NO_MAIL|MSG_ONLY|NO_EXIT; + if (!def_use_loginclass) + debug_return; if (login_class && strcmp(login_class, "-") != 0) { if (user_uid != 0 && @@ -1006,12 +1048,22 @@ set_loginclass(struct passwd *pw) (pw->pw_uid == 0) ? LOGIN_DEFROOTCLASS : LOGIN_DEFCLASS; } + /* Make sure specified login class is valid. */ lc = login_getclass(login_class); if (!lc || !lc->lc_class || strcmp(lc->lc_class, login_class) != 0) { - log_error(errflags, _("unknown login class: %s"), login_class); - if (!lc) - lc = login_getclass(NULL); /* needed for login_getstyle() later */ + /* + * Don't make it a fatal error if the user didn't specify the login + * class themselves. We do this because if login.conf gets + * corrupted we want the admin to be able to use sudo to fix it. + */ + if (login_class) + log_fatal(errflags, _("unknown login class: %s"), login_class); + else + log_error(errflags, _("unknown login class: %s"), login_class); + def_use_loginclass = false; } + login_close(lc); + debug_return; } #else static void @@ -1020,62 +1072,59 @@ set_loginclass(struct passwd *pw) } #endif /* HAVE_LOGIN_CAP_H */ +#ifndef AI_FQDN +# define AI_FQDN AI_CANONNAME +#endif + /* * Look up the fully qualified domain name and set user_host and user_shost. + * Use AI_FQDN if available since "canonical" is not always the same as fqdn. */ void set_fqdn(void) { -#ifdef HAVE_GETADDRINFO struct addrinfo *res0, hint; -#else - struct hostent *hp; -#endif char *p; + debug_decl(set_fqdn, SUDO_DEBUG_PLUGIN) -#ifdef HAVE_GETADDRINFO zero_bytes(&hint, sizeof(hint)); hint.ai_family = PF_UNSPEC; - hint.ai_flags = AI_CANONNAME; + hint.ai_flags = AI_FQDN; if (getaddrinfo(user_host, NULL, &hint, &res0) != 0) { -#else - if (!(hp = gethostbyname(user_host))) { -#endif - log_error(MSG_ONLY|NO_EXIT, - _("unable to resolve host %s"), user_host); + log_error(MSG_ONLY, _("unable to resolve host %s"), user_host); } else { if (user_shost != user_host) efree(user_shost); efree(user_host); -#ifdef HAVE_GETADDRINFO user_host = estrdup(res0->ai_canonname); freeaddrinfo(res0); -#else - user_host = estrdup(hp->h_name); -#endif + if ((p = strchr(user_host, '.')) != NULL) + user_shost = estrndup(user_host, (size_t)(p - user_host)); + else + user_shost = user_host; } - if ((p = strchr(user_host, '.')) != NULL) - user_shost = estrndup(user_host, (size_t)(p - user_host)); - else - user_shost = user_host; + debug_return; } /* * Get passwd entry for the user we are going to run commands as * and store it in runas_pw. By default, commands run as "root". */ -void +static void set_runaspw(const char *user) { + debug_decl(set_runaspw, SUDO_DEBUG_PLUGIN) + if (runas_pw != NULL) - pw_delref(runas_pw); + sudo_pw_delref(runas_pw); if (*user == '#') { if ((runas_pw = sudo_getpwuid(atoi(user + 1))) == NULL) runas_pw = sudo_fakepwnam(user, runas_gr ? runas_gr->gr_gid : 0); } else { if ((runas_pw = sudo_getpwnam(user)) == NULL) - log_error(NO_MAIL|MSG_ONLY, _("unknown user: %s"), user); + log_fatal(NO_MAIL|MSG_ONLY, _("unknown user: %s"), user); } + debug_return; } /* @@ -1085,15 +1134,18 @@ set_runaspw(const char *user) static void set_runasgr(const char *group) { + debug_decl(set_runasgr, SUDO_DEBUG_PLUGIN) + if (runas_gr != NULL) - gr_delref(runas_gr); + sudo_gr_delref(runas_gr); if (*group == '#') { if ((runas_gr = sudo_getgrgid(atoi(group + 1))) == NULL) runas_gr = sudo_fakegrnam(group); } else { if ((runas_gr = sudo_getgrnam(group)) == NULL) - log_error(NO_MAIL|MSG_ONLY, _("unknown group: %s"), group); + log_fatal(NO_MAIL|MSG_ONLY, _("unknown group: %s"), group); } + debug_return; } /* @@ -1105,7 +1157,7 @@ cb_runas_default(const char *user) /* Only reset runaspw if user didn't specify one. */ if (!runas_user && !runas_group) set_runaspw(user); - return TRUE; + return true; } /* @@ -1117,6 +1169,7 @@ plugin_cleanup(int gotsignal) struct sudo_nss *nss; if (!gotsignal) { + debug_decl(plugin_cleanup, SUDO_DEBUG_PLUGIN) if (snl != NULL) { tq_foreach_fwd(snl, nss) nss->close(nss); @@ -1125,15 +1178,18 @@ plugin_cleanup(int gotsignal) group_plugin_unload(); sudo_endpwent(); sudo_endgrent(); + debug_return; } } static int sudoers_policy_version(int verbose) { + debug_decl(sudoers_policy_version, SUDO_DEBUG_PLUGIN) + if (sigsetjmp(error_jmp, 1)) { - /* error recovery via error(), errorx() or log_error() */ - return -1; + /* error recovery via error(), errorx() or log_fatal() */ + debug_return_bool(-1); } sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers policy plugin version %s\n"), @@ -1153,21 +1209,48 @@ sudoers_policy_version(int verbose) dump_auth_methods(); dump_defaults(); sudo_printf(SUDO_CONV_INFO_MSG, "\n"); - dump_interfaces(interfaces_string); - sudo_printf(SUDO_CONV_INFO_MSG, "\n"); + if (interfaces_string != NULL) { + dump_interfaces(interfaces_string); + sudo_printf(SUDO_CONV_INFO_MSG, "\n"); + } } - return TRUE; + debug_return_bool(true); } static int -deserialize_info(char * const settings[], char * const user_info[]) +deserialize_info(char * const args[], char * const settings[], char * const user_info[]) { char * const *cur; const char *p, *groups = NULL; + const char *debug_flags = NULL; int flags = 0; + debug_decl(deserialize_info, SUDO_DEBUG_PLUGIN) #define MATCHES(s, v) (strncmp(s, v, sizeof(v) - 1) == 0) + /* Parse sudo.conf plugin args. */ + if (args != NULL) { + for (cur = args; *cur != NULL; cur++) { + if (MATCHES(*cur, "sudoers_file=")) { + sudoers_file = *cur + sizeof("sudoers_file=") - 1; + continue; + } + if (MATCHES(*cur, "sudoers_uid=")) { + sudoers_uid = (uid_t) atoi(*cur + sizeof("sudoers_uid=") - 1); + continue; + } + if (MATCHES(*cur, "sudoers_gid=")) { + sudoers_gid = (gid_t) atoi(*cur + sizeof("sudoers_gid=") - 1); + continue; + } + if (MATCHES(*cur, "sudoers_mode=")) { + sudoers_mode = (mode_t) strtol(*cur + sizeof("sudoers_mode=") - 1, + NULL, 8); + continue; + } + } + } + /* Parse command line settings. */ user_closefrom = -1; for (cur = settings; *cur != NULL; cur++) { @@ -1175,75 +1258,87 @@ deserialize_info(char * const settings[], char * const user_closefrom = atoi(*cur + sizeof("closefrom=") - 1); continue; } - if (MATCHES(*cur, "debug_level=")) { - debug_level = atoi(*cur + sizeof("debug_level=") - 1); + if (MATCHES(*cur, "debug_flags=")) { + debug_flags = *cur + sizeof("debug_flags=") - 1; continue; } if (MATCHES(*cur, "runas_user=")) { runas_user = *cur + sizeof("runas_user=") - 1; + sudo_user.flags |= RUNAS_USER_SPECIFIED; continue; } if (MATCHES(*cur, "runas_group=")) { runas_group = *cur + sizeof("runas_group=") - 1; + sudo_user.flags |= RUNAS_GROUP_SPECIFIED; continue; } if (MATCHES(*cur, "prompt=")) { user_prompt = *cur + sizeof("prompt=") - 1; - def_passprompt_override = TRUE; + def_passprompt_override = true; continue; } if (MATCHES(*cur, "set_home=")) { - if (atobool(*cur + sizeof("set_home=") - 1) == TRUE) + if (atobool(*cur + sizeof("set_home=") - 1) == true) SET(flags, MODE_RESET_HOME); continue; } if (MATCHES(*cur, "preserve_environment=")) { - if (atobool(*cur + sizeof("preserve_environment=") - 1) == TRUE) + if (atobool(*cur + sizeof("preserve_environment=") - 1) == true) SET(flags, MODE_PRESERVE_ENV); continue; } if (MATCHES(*cur, "run_shell=")) { - if (atobool(*cur + sizeof("run_shell=") - 1) == TRUE) + if (atobool(*cur + sizeof("run_shell=") - 1) == true) SET(flags, MODE_SHELL); continue; } if (MATCHES(*cur, "login_shell=")) { - if (atobool(*cur + sizeof("login_shell=") - 1) == TRUE) { + if (atobool(*cur + sizeof("login_shell=") - 1) == true) { SET(flags, MODE_LOGIN_SHELL); - def_env_reset = TRUE; + def_env_reset = true; } continue; } if (MATCHES(*cur, "implied_shell=")) { - if (atobool(*cur + sizeof("implied_shell=") - 1) == TRUE) + if (atobool(*cur + sizeof("implied_shell=") - 1) == true) SET(flags, MODE_IMPLIED_SHELL); continue; } if (MATCHES(*cur, "preserve_groups=")) { - if (atobool(*cur + sizeof("preserve_groups=") - 1) == TRUE) + if (atobool(*cur + sizeof("preserve_groups=") - 1) == true) SET(flags, MODE_PRESERVE_GROUPS); continue; } if (MATCHES(*cur, "ignore_ticket=")) { - if (atobool(*cur + sizeof("ignore_ticket=") - 1) == TRUE) + if (atobool(*cur + sizeof("ignore_ticket=") - 1) == true) SET(flags, MODE_IGNORE_TICKET); continue; } if (MATCHES(*cur, "noninteractive=")) { - if (atobool(*cur + sizeof("noninteractive=") - 1) == TRUE) + if (atobool(*cur + sizeof("noninteractive=") - 1) == true) SET(flags, MODE_NONINTERACTIVE); continue; } if (MATCHES(*cur, "sudoedit=")) { - if (atobool(*cur + sizeof("sudoedit=") - 1) == TRUE) + if (atobool(*cur + sizeof("sudoedit=") - 1) == true) SET(flags, MODE_EDIT); continue; } if (MATCHES(*cur, "login_class=")) { login_class = *cur + sizeof("login_class=") - 1; - def_use_loginclass = TRUE; + def_use_loginclass = true; continue; } +#ifdef HAVE_PRIV_SET + if (MATCHES(*cur, "runas_privs=")) { + def_privs = *cur + sizeof("runas_privs=") - 1; + continue; + } + if (MATCHES(*cur, "runas_limitprivs=")) { + def_limitprivs = *cur + sizeof("runas_limitprivs=") - 1; + continue; + } +#endif /* HAVE_PRIV_SET */ #ifdef HAVE_SELINUX if (MATCHES(*cur, "selinux_role=")) { user_role = *cur + sizeof("selinux_role=") - 1; @@ -1271,23 +1366,6 @@ deserialize_info(char * const settings[], char * const set_interfaces(interfaces_string); continue; } - if (MATCHES(*cur, "sudoers_file=")) { - sudoers_file = *cur + sizeof("sudoers_file=") - 1; - continue; - } - if (MATCHES(*cur, "sudoers_uid=")) { - sudoers_uid = (uid_t) atoi(*cur + sizeof("sudoers_uid=") - 1); - continue; - } - if (MATCHES(*cur, "sudoers_gid=")) { - sudoers_gid = (gid_t) atoi(*cur + sizeof("sudoers_gid=") - 1); - continue; - } - if (MATCHES(*cur, "sudoers_mode=")) { - sudoers_mode = (mode_t) strtol(*cur + sizeof("sudoers_mode=") - 1, - NULL, 8); - continue; - } } for (cur = user_info; *cur != NULL; cur++) { @@ -1364,19 +1442,30 @@ deserialize_info(char * const settings[], char * const break; cp++; /* skip over comma */ } - set_group_list(user_name, gids, ngids); - efree(gids); + user_gids = gids; + user_ngids = ngids; } + /* Setup debugging if indicated. */ + if (debug_flags != NULL) { + sudo_debug_init(NULL, debug_flags); + for (cur = settings; *cur != NULL; cur++) + sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur); + for (cur = user_info; *cur != NULL; cur++) + sudo_debug_printf(SUDO_DEBUG_INFO, "user_info: %s", *cur); + } + #undef MATCHES - return flags; + debug_return_int(flags); } static char * resolve_editor(char *editor, int nfiles, char **files, char ***argv_out) { char *cp, **nargv, *editor_path = NULL; - int ac, i, nargc, wasblank; + int ac, i, nargc; + bool wasblank; + debug_decl(resolve_editor, SUDO_DEBUG_PLUGIN) editor = estrdup(editor); /* becomes part of argv_out */ @@ -1386,11 +1475,11 @@ resolve_editor(char *editor, int nfiles, char **files, * line args so look for those and alloc space for them too. */ nargc = 1; - for (wasblank = FALSE, cp = editor; *cp != '\0'; cp++) { + for (wasblank = false, cp = editor; *cp != '\0'; cp++) { if (isblank((unsigned char) *cp)) - wasblank = TRUE; + wasblank = true; else if (wasblank) { - wasblank = FALSE; + wasblank = false; nargc++; } } @@ -1399,7 +1488,7 @@ resolve_editor(char *editor, int nfiles, char **files, if (cp == NULL || find_path(cp, &editor_path, NULL, getenv("PATH"), 0) != FOUND) { efree(editor); - return NULL; + debug_return_str(NULL); } nargv = (char **) emalloc2(nargc + 1 + nfiles + 1, sizeof(char *)); for (ac = 0; cp != NULL && ac < nargc; ac++) { @@ -1412,7 +1501,7 @@ resolve_editor(char *editor, int nfiles, char **files, nargv[ac] = NULL; *argv_out = nargv; - return editor_path; + debug_return_str(editor_path); } /* @@ -1424,6 +1513,7 @@ static char * find_editor(int nfiles, char **files, char ***argv_out) { char *cp, *editor, *editor_path = NULL, **ev, *ev0[4]; + debug_decl(find_editor, SUDO_DEBUG_PLUGIN) /* * If any of SUDO_EDITOR, VISUAL or EDITOR are set, choose the first one. @@ -1454,7 +1544,7 @@ find_editor(int nfiles, char **files, char ***argv_out audit_failure(NewArgv, _("%s: command not found"), editor); warningx(_("%s: command not found"), editor); } - return editor_path; + debug_return_str(editor_path); } #ifdef USE_ADMIN_FLAG @@ -1464,16 +1554,17 @@ create_admin_success_flag(void) struct stat statbuf; char flagfile[PATH_MAX]; int fd, n; + debug_decl(create_admin_success_flag, SUDO_DEBUG_PLUGIN) /* Check whether the user is in the admin group. */ if (!user_in_group(sudo_user.pw, "admin")) - return; + debug_return; /* Build path to flag file. */ n = snprintf(flagfile, sizeof(flagfile), "%s/.sudo_as_admin_successful", user_dir); if (n <= 0 || n >= sizeof(flagfile)) - return; + debug_return; /* Create admin flag file if it doesn't already exist. */ set_perms(PERM_USER); @@ -1482,6 +1573,7 @@ create_admin_success_flag(void) close(fd); } restore_perms(); + debug_return; } #else /* !USE_ADMIN_FLAG */ static void @@ -1491,7 +1583,32 @@ create_admin_success_flag(void) } #endif /* USE_ADMIN_FLAG */ -struct policy_plugin sudoers_policy = { +static void +sudoers_policy_register_hooks(int version, int (*register_hook)(struct sudo_hook *hook)) +{ + struct sudo_hook hook; + + memset(&hook, 0, sizeof(hook)); + hook.hook_version = SUDO_HOOK_VERSION; + + hook.hook_type = SUDO_HOOK_SETENV; + hook.hook_fn = sudoers_hook_setenv; + register_hook(&hook); + + hook.hook_type = SUDO_HOOK_UNSETENV; + hook.hook_fn = sudoers_hook_unsetenv; + register_hook(&hook); + + hook.hook_type = SUDO_HOOK_GETENV; + hook.hook_fn = sudoers_hook_getenv; + register_hook(&hook); + + hook.hook_type = SUDO_HOOK_PUTENV; + hook.hook_fn = sudoers_hook_putenv; + register_hook(&hook); +} + +__dso_public struct policy_plugin sudoers_policy = { SUDO_POLICY_PLUGIN, SUDO_API_VERSION, sudoers_policy_open, @@ -1501,5 +1618,6 @@ struct policy_plugin sudoers_policy = { sudoers_policy_list, sudoers_policy_validate, sudoers_policy_invalidate, - sudoers_policy_init_session + sudoers_policy_init_session, + sudoers_policy_register_hooks };