From 475662aaa4ca9f34aa63b0cf03e6e70231eed5f4 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 25 Oct 2012 16:58:31 -0400 Subject: [PATCH] Refactor policy plugin interface code from sudoers.c into policy.c --- MANIFEST | 1 + plugins/sudoers/Makefile.in | 21 +- plugins/sudoers/iolog_path.c | 2 +- plugins/sudoers/logging.c | 2 +- plugins/sudoers/plugin_error.c | 6 +- plugins/sudoers/policy.c | 689 +++++++++++++++++++++++++++++++ plugins/sudoers/sudoers.c | 714 +++------------------------------ plugins/sudoers/sudoers.h | 13 +- plugins/sudoers/testsudoers.c | 6 - plugins/sudoers/visudo.c | 7 - 10 files changed, 779 insertions(+), 682 deletions(-) create mode 100644 plugins/sudoers/policy.c diff --git a/MANIFEST b/MANIFEST index 52684388c..f2df42422 100644 --- a/MANIFEST +++ b/MANIFEST @@ -223,6 +223,7 @@ plugins/sudoers/po/vi.mo plugins/sudoers/po/vi.po plugins/sudoers/po/zh_CN.mo plugins/sudoers/po/zh_CN.po +plugins/sudoers/policy.c plugins/sudoers/prompt.c plugins/sudoers/pwutil.c plugins/sudoers/pwutil.h diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index b1258cf91..d46b8cbae 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -129,8 +129,9 @@ LIBPARSESUDOERS_OBJS = alias.lo audit.lo defaults.lo gram.lo match.lo \ SUDOERS_OBJS = $(AUTH_OBJS) boottime.lo check.lo env.lo find_path.lo \ goodpath.lo group_plugin.lo interfaces.lo iolog.lo \ - iolog_path.lo logging.lo logwrap.lo parse.lo prompt.lo \ - set_perms.lo sudo_nss.lo sudoers.lo timestamp.lo @SUDOERS_OBJS@ + iolog_path.lo logging.lo logwrap.lo parse.lo policy.lo \ + prompt.lo set_perms.lo sudo_nss.lo sudoers.lo \ + timestamp.lo @SUDOERS_OBJS@ VISUDO_OBJS = visudo.o goodpath.o find_path.o error.o @@ -671,6 +672,14 @@ plugin_error.lo: $(srcdir)/plugin_error.c $(top_builddir)/config.h \ $(incdir)/missing.h $(incdir)/alloc.h $(incdir)/error.h \ $(incdir)/sudo_plugin.h $(incdir)/gettext.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(DEFS) $(srcdir)/plugin_error.c +policy.lo: $(srcdir)/policy.c $(top_builddir)/config.h $(srcdir)/sudoers.h \ + $(top_srcdir)/compat/stdbool.h $(top_builddir)/pathnames.h \ + $(incdir)/missing.h $(incdir)/error.h $(incdir)/alloc.h \ + $(incdir)/list.h $(incdir)/fileops.h $(srcdir)/defaults.h \ + $(devdir)/def_data.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_debug.h $(incdir)/gettext.h \ + $(srcdir)/sudoers_version.h $(srcdir)/interfaces.h + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(DEFS) $(srcdir)/policy.c prompt.lo: $(srcdir)/prompt.c $(top_builddir)/config.h $(srcdir)/sudoers.h \ $(top_srcdir)/compat/stdbool.h $(top_builddir)/pathnames.h \ $(incdir)/missing.h $(incdir)/error.h $(incdir)/alloc.h \ @@ -774,7 +783,7 @@ sudoers.lo: $(srcdir)/sudoers.c $(top_builddir)/config.h \ $(incdir)/alloc.h $(incdir)/list.h $(incdir)/fileops.h \ $(srcdir)/defaults.h $(devdir)/def_data.h $(srcdir)/logging.h \ $(srcdir)/sudo_nss.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_debug.h $(incdir)/gettext.h $(srcdir)/interfaces.h \ + $(incdir)/sudo_debug.h $(incdir)/gettext.h \ $(srcdir)/sudoers_version.h $(srcdir)/auth/sudo_auth.h \ $(incdir)/secure_path.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(DEFS) $(srcdir)/sudoers.c @@ -841,7 +850,7 @@ visudo.o: $(srcdir)/visudo.c $(top_builddir)/config.h $(srcdir)/sudoers.h \ $(incdir)/list.h $(incdir)/fileops.h $(srcdir)/defaults.h \ $(devdir)/def_data.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_debug.h $(incdir)/gettext.h \ - $(srcdir)/interfaces.h $(srcdir)/parse.h $(srcdir)/redblack.h \ - $(incdir)/gettext.h $(srcdir)/sudoers_version.h \ - $(incdir)/sudo_conf.h $(incdir)/list.h $(devdir)/gram.h + $(srcdir)/parse.h $(srcdir)/redblack.h $(incdir)/gettext.h \ + $(srcdir)/sudoers_version.h $(incdir)/sudo_conf.h $(incdir)/list.h \ + $(devdir)/gram.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(DEFS) $(srcdir)/visudo.c diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c index c0947f10b..fec178142 100644 --- a/plugins/sudoers/iolog_path.c +++ b/plugins/sudoers/iolog_path.c @@ -158,7 +158,7 @@ static struct path_escape io_path_escapes[] = { */ char * expand_iolog_path(const char *prefix, const char *dir, const char *file, - char const **slashp) + char **slashp) { size_t len, prelen = 0; char *dst, *dst0, *path, *pathend, tmpbuf[PATH_MAX]; diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c index 4b1522d42..a2b577ddb 100644 --- a/plugins/sudoers/logging.c +++ b/plugins/sudoers/logging.c @@ -492,7 +492,7 @@ log_fatal(int flags, const char *fmt, ...) va_end(ap); /* Exit the plugin. */ - plugin_cleanup(0); + sudoers_plugin_cleanup(0); sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys); siglongjmp(error_jmp, 1); } diff --git a/plugins/sudoers/plugin_error.c b/plugins/sudoers/plugin_error.c index 142eddc1d..51b121808 100644 --- a/plugins/sudoers/plugin_error.c +++ b/plugins/sudoers/plugin_error.c @@ -33,7 +33,7 @@ #include "gettext.h" static void _warning(int, const char *, va_list); - void plugin_cleanup(int); + void sudoers_plugin_cleanup(int); extern sigjmp_buf error_jmp; @@ -47,7 +47,7 @@ error2(int eval, const char *fmt, ...) va_start(ap, fmt); _warning(1, fmt, ap); va_end(ap); - plugin_cleanup(0); + sudoers_plugin_cleanup(0); siglongjmp(error_jmp, eval); } @@ -59,7 +59,7 @@ errorx2(int eval, const char *fmt, ...) va_start(ap, fmt); _warning(0, fmt, ap); va_end(ap); - plugin_cleanup(0); + sudoers_plugin_cleanup(0); siglongjmp(error_jmp, eval); } diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c new file mode 100644 index 000000000..7fa6c3eb7 --- /dev/null +++ b/plugins/sudoers/policy.c @@ -0,0 +1,689 @@ +/* + * Copyright (c) 2010-2012 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +#include +#include +#include +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif /* STDC_HEADERS */ +#ifdef HAVE_STRING_H +# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) +# include +# endif +# include +#endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ +#ifdef HAVE_UNISTD_H +# include +#endif /* HAVE_UNISTD_H */ +#include +#include +#include + +#include "sudoers.h" +#include "sudoers_version.h" +#include "interfaces.h" + +/* + * Info passed in from the sudo front-end. + */ +struct sudoers_policy_open_info { + char * const *settings; + char * const *user_info; + char * const *plugin_args; +}; + +/* + * Command execution args to be filled in: argv, envp and command info. + */ +struct sudoers_exec_args { + char ***argv; + char ***envp; + char ***info; +}; + +static int sudo_version; +static const char *interfaces_string; + +#ifdef HAVE_BSD_AUTH_H +extern char *login_style; +#endif /* HAVE_BSD_AUTH_H */ + +extern sigjmp_buf error_jmp; + +/* + * Deserialize args, settings and user_info arrays. + * Fills in struct sudo_user and other common sudoers state. + */ +int +sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group) +{ + struct sudoers_policy_open_info *info = v; + char * const *cur; + const char *p, *groups = NULL; + const char *debug_flags = NULL; + int flags = 0; + debug_decl(sudoers_policy_deserialize_info, SUDO_DEBUG_PLUGIN) + +#define MATCHES(s, v) (strncmp(s, v, sizeof(v) - 1) == 0) + + /* Parse sudo.conf plugin args. */ + if (info->plugin_args != NULL) { + for (cur = info->plugin_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 = info->settings; *cur != NULL; cur++) { + if (MATCHES(*cur, "closefrom=")) { + user_closefrom = atoi(*cur + sizeof("closefrom=") - 1); + continue; + } + 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; + continue; + } + if (MATCHES(*cur, "set_home=")) { + 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) + SET(flags, MODE_PRESERVE_ENV); + continue; + } + if (MATCHES(*cur, "run_shell=")) { + 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) { + SET(flags, MODE_LOGIN_SHELL); + def_env_reset = true; + } + continue; + } + if (MATCHES(*cur, "implied_shell=")) { + 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) + SET(flags, MODE_PRESERVE_GROUPS); + continue; + } + if (MATCHES(*cur, "ignore_ticket=")) { + 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) + SET(flags, MODE_NONINTERACTIVE); + continue; + } + if (MATCHES(*cur, "sudoedit=")) { + 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; + 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; + continue; + } + if (MATCHES(*cur, "selinux_type=")) { + user_type = *cur + sizeof("selinux_type=") - 1; + continue; + } +#endif /* HAVE_SELINUX */ +#ifdef HAVE_BSD_AUTH_H + if (MATCHES(*cur, "bsdauth_type=")) { + login_style = *cur + sizeof("bsdauth_type=") - 1; + continue; + } +#endif /* HAVE_BSD_AUTH_H */ +#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME) + if (MATCHES(*cur, "progname=")) { + setprogname(*cur + sizeof("progname=") - 1); + continue; + } +#endif + if (MATCHES(*cur, "network_addrs=")) { + interfaces_string = *cur + sizeof("network_addrs=") - 1; + set_interfaces(interfaces_string); + continue; + } + } + + for (cur = info->user_info; *cur != NULL; cur++) { + if (MATCHES(*cur, "user=")) { + user_name = estrdup(*cur + sizeof("user=") - 1); + continue; + } + if (MATCHES(*cur, "uid=")) { + user_uid = (uid_t) atoi(*cur + sizeof("uid=") - 1); + continue; + } + if (MATCHES(*cur, "gid=")) { + p = *cur + sizeof("gid=") - 1; + user_gid = (gid_t) atoi(p); + continue; + } + if (MATCHES(*cur, "groups=")) { + groups = *cur + sizeof("groups=") - 1; + continue; + } + if (MATCHES(*cur, "cwd=")) { + user_cwd = estrdup(*cur + sizeof("cwd=") - 1); + continue; + } + if (MATCHES(*cur, "tty=")) { + user_tty = user_ttypath = estrdup(*cur + sizeof("tty=") - 1); + if (strncmp(user_tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) + user_tty += sizeof(_PATH_DEV) - 1; + continue; + } + if (MATCHES(*cur, "host=")) { + user_host = user_shost = estrdup(*cur + sizeof("host=") - 1); + if ((p = strchr(user_host, '.'))) + user_shost = estrndup(user_host, (size_t)(p - user_host)); + continue; + } + if (MATCHES(*cur, "lines=")) { + sudo_user.lines = atoi(*cur + sizeof("lines=") - 1); + continue; + } + if (MATCHES(*cur, "cols=")) { + sudo_user.cols = atoi(*cur + sizeof("cols=") - 1); + continue; + } + } + if (user_cwd == NULL) + user_cwd = "unknown"; + if (user_tty == NULL) + user_tty = "unknown"; /* user_ttypath remains NULL */ + + if (groups != NULL && groups[0] != '\0') { + const char *cp; + GETGROUPS_T *gids; + int ngids; + + /* Count number of groups, including passwd gid. */ + ngids = 2; + for (cp = groups; *cp != '\0'; cp++) { + if (*cp == ',') + ngids++; + } + + /* The first gid in the list is the passwd group gid. */ + gids = emalloc2(ngids, sizeof(GETGROUPS_T)); + gids[0] = user_gid; + ngids = 1; + cp = groups; + for (;;) { + gids[ngids] = atoi(cp); + if (gids[0] != gids[ngids]) + ngids++; + cp = strchr(cp, ','); + if (cp == NULL) + break; + cp++; /* skip over comma */ + } + user_gids = gids; + user_ngids = ngids; + } + + /* Setup debugging if indicated. */ + if (debug_flags != NULL) { + sudo_debug_init(NULL, debug_flags); + for (cur = info->settings; *cur != NULL; cur++) + sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur); + for (cur = info->user_info; *cur != NULL; cur++) + sudo_debug_printf(SUDO_DEBUG_INFO, "user_info: %s", *cur); + } + +#undef MATCHES + debug_return_int(flags); +} + +/* + * Setup the execution environment. + * Builds up the command_info list and sets argv and envp. + * Returns 1 on success and -1 on error. + */ +int +sudoers_policy_exec_setup(char *argv[], char *envp[], mode_t cmnd_umask, + char *iolog_path, void *v) +{ + struct sudoers_exec_args *exec_args = v; + char **command_info; + int info_len = 0; + debug_decl(sudoers_policy_exec_setup, SUDO_DEBUG_PLUGIN) + + /* Increase the length of command_info as needed, it is *not* checked. */ + command_info = ecalloc(32, sizeof(char **)); + + command_info[info_len++] = fmt_string("command", safe_cmnd); + if (def_log_input || def_log_output) { + if (iolog_path) + command_info[info_len++] = iolog_path; + if (def_log_input) { + command_info[info_len++] = estrdup("iolog_stdin=true"); + command_info[info_len++] = estrdup("iolog_ttyin=true"); + } + if (def_log_output) { + command_info[info_len++] = estrdup("iolog_stdout=true"); + command_info[info_len++] = estrdup("iolog_stderr=true"); + command_info[info_len++] = estrdup("iolog_ttyout=true"); + } + if (def_compress_io) { + command_info[info_len++] = estrdup("iolog_compress=true"); + } + } + if (ISSET(sudo_mode, MODE_EDIT)) + command_info[info_len++] = estrdup("sudoedit=true"); + if (ISSET(sudo_mode, MODE_LOGIN_SHELL)) { + /* Set cwd to run user's homedir. */ + command_info[info_len++] = fmt_string("cwd", runas_pw->pw_dir); + } + if (def_stay_setuid) { + easprintf(&command_info[info_len++], "runas_uid=%u", + (unsigned int)user_uid); + easprintf(&command_info[info_len++], "runas_gid=%u", + (unsigned int)user_gid); + easprintf(&command_info[info_len++], "runas_euid=%u", + (unsigned int)runas_pw->pw_uid); + easprintf(&command_info[info_len++], "runas_egid=%u", + runas_gr ? (unsigned int)runas_gr->gr_gid : + (unsigned int)runas_pw->pw_gid); + } else { + easprintf(&command_info[info_len++], "runas_uid=%u", + (unsigned int)runas_pw->pw_uid); + easprintf(&command_info[info_len++], "runas_gid=%u", + runas_gr ? (unsigned int)runas_gr->gr_gid : + (unsigned int)runas_pw->pw_gid); + } + if (def_preserve_groups) { + 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 = sudo_get_grlist(runas_pw); + + /* 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++) { + 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; + 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_set_utmp) + command_info[info_len++] = estrdup("set_utmp=true"); + if (def_use_pty) + command_info[info_len++] = estrdup("use_pty=true"); + if (def_utmp_runas) + command_info[info_len++] = fmt_string("utmp_user", runas_pw->pw_name); + if (cmnd_umask != 0777) + easprintf(&command_info[info_len++], "umask=0%o", (unsigned int)cmnd_umask); +#ifdef HAVE_LOGIN_CAP_H + 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) + command_info[info_len++] = fmt_string("selinux_role", user_role); + 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 */ + + /* Fill in exec environment info */ + *(exec_args->argv) = argv; + *(exec_args->envp) = envp; + *(exec_args->info) = command_info; + + debug_return_bool(true); +} + +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 args[]) +{ + struct sudoers_policy_open_info info; + 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_fatal() */ + rewind_perms(); + debug_return_bool(-1); + } + + /* Call the sudoers init function. */ + info.settings = settings; + info.user_info = user_info; + info.plugin_args = args; + return sudoers_policy_init(&info, envp); +} + +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_fatal() */ + debug_return; + } + + /* We do not currently log the exit status. */ + if (error_code) + warningx(_("unable to execute %s: %s"), safe_cmnd, strerror(error_code)); + + /* Close the session we opened in sudoers_policy_init_session(). */ + if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT)) + (void)sudo_auth_end_session(runas_pw); + + /* Free remaining references to password and group entries. */ + /* XXX - move cleanup to function in sudoers.c */ + 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, 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_fatal() */ + debug_return_bool(-1); + } + + debug_return_bool(sudo_auth_begin_session(pwd, user_env)); +} + +static int +sudoers_policy_check(int argc, char * const argv[], char *env_add[], + char **command_infop[], char **argv_out[], char **user_env_out[]) +{ + struct sudoers_exec_args exec_args; + debug_decl(sudoers_policy_check, SUDO_DEBUG_PLUGIN) + + if (!ISSET(sudo_mode, MODE_EDIT)) + SET(sudo_mode, MODE_RUN); + + exec_args.argv = argv_out; + exec_args.envp = user_env_out; + exec_args.info = command_infop; + + debug_return_bool(sudoers_policy_main(argc, argv, 0, env_add, &exec_args)); +} + +static int +sudoers_policy_validate(void) +{ + debug_decl(sudoers_policy_validate, SUDO_DEBUG_PLUGIN) + + user_cmnd = "validate"; + SET(sudo_mode, MODE_VALIDATE); + + debug_return_bool(sudoers_policy_main(0, NULL, I_VERIFYPW, 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); + sudoers_plugin_cleanup(0); + } + + debug_return; +} + +static int +sudoers_policy_list(int argc, char * const argv[], int verbose, + const char *list_user) +{ + int rval; + debug_decl(sudoers_policy_list, SUDO_DEBUG_PLUGIN) + + user_cmnd = "list"; + if (argc) + SET(sudo_mode, MODE_CHECK); + else + SET(sudo_mode, MODE_LIST); + if (verbose) + long_list = 1; + if (list_user) { + list_pw = sudo_getpwnam(list_user); + if (list_pw == NULL) { + warningx(_("unknown user: %s"), list_user); + debug_return_bool(-1); + } + } + rval = sudoers_policy_main(argc, argv, I_LISTPW, NULL, NULL); + if (list_user) { + sudo_pw_delref(list_pw); + list_pw = NULL; + } + + debug_return_bool(rval); +} + +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_fatal() */ + debug_return_bool(-1); + } + + sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers policy plugin version %s\n"), + PACKAGE_VERSION); + sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers file grammar version %d\n"), + SUDOERS_GRAMMAR_VERSION); + + if (verbose) { + sudo_printf(SUDO_CONV_INFO_MSG, _("\nSudoers path: %s\n"), sudoers_file); +#ifdef HAVE_LDAP +# ifdef _PATH_NSSWITCH_CONF + sudo_printf(SUDO_CONV_INFO_MSG, _("nsswitch path: %s\n"), _PATH_NSSWITCH_CONF); +# endif + sudo_printf(SUDO_CONV_INFO_MSG, _("ldap.conf path: %s\n"), _PATH_LDAP_CONF); + sudo_printf(SUDO_CONV_INFO_MSG, _("ldap.secret path: %s\n"), _PATH_LDAP_SECRET); +#endif + dump_auth_methods(); + dump_defaults(); + sudo_printf(SUDO_CONV_INFO_MSG, "\n"); + if (interfaces_string != NULL) { + dump_interfaces(interfaces_string); + sudo_printf(SUDO_CONV_INFO_MSG, "\n"); + } + } + debug_return_bool(true); +} + +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, + sudoers_policy_close, + sudoers_policy_version, + sudoers_policy_check, + sudoers_policy_list, + sudoers_policy_validate, + sudoers_policy_invalidate, + sudoers_policy_init_session, + sudoers_policy_register_hooks +}; diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c index 36530e746..f6f16644f 100644 --- a/plugins/sudoers/sudoers.c +++ b/plugins/sudoers/sudoers.c @@ -16,9 +16,6 @@ * Sponsored in part by the Defense Advanced Research Projects * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F39502-99-1-0512. - * - * For a brief history of sudo, please see the HISTORY file included - * with this distribution. */ #define _SUDO_MAIN @@ -63,7 +60,6 @@ #ifdef HAVE_SETLOCALE # include #endif -#include #include #ifdef HAVE_LOGIN_CAP_H # include @@ -84,7 +80,6 @@ #endif #include "sudoers.h" -#include "interfaces.h" #include "sudoers_version.h" #include "auth/sudo_auth.h" #include "secure_path.h" @@ -92,17 +87,15 @@ /* * Prototypes */ -static void init_vars(char * const *); +static char *find_editor(int nfiles, char **files, char ***argv_out); +static int cb_runas_default(const char *); static int set_cmnd(void); +static void create_admin_success_flag(void); +static void init_vars(char * const *); +static void set_fqdn(void); static void set_loginclass(struct passwd *); -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 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); +static void set_runaspw(const char *); /* * Globals @@ -121,13 +114,10 @@ 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; static struct sudo_nss_list *snl; -static const char *interfaces_string; -static sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp; /* XXX - must be extern for audit bits of sudo_auth.c */ int NewArgc; @@ -136,49 +126,15 @@ char **NewArgv; /* 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 args[]) +int +sudoers_policy_init(void *info, char * const envp[]) { 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_fatal() */ - rewind_perms(); - debug_return_bool(-1); - } + struct sudo_nss *nss, *nss_next; + debug_decl(sudoers_policy_init, SUDO_DEBUG_PLUGIN) bindtextdomain("sudoers", LOCALEDIR); - /* - * Signal setup: - * Ignore keyboard-generated signals so the user cannot interrupt - * us at some point and avoid the logging. - * Install handler to wait for children when they exit. - */ - zero_bytes(&sa, sizeof(sa)); - sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_RESTART; - sa.sa_handler = SIG_IGN; - (void) sigaction(SIGINT, &sa, &saved_sa_int); - (void) sigaction(SIGQUIT, &sa, &saved_sa_quit); - (void) sigaction(SIGTSTP, &sa, &saved_sa_tstp); - sudo_setpwent(); sudo_setgrent(); @@ -188,8 +144,8 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation, /* Setup defaults data structures. */ init_defaults(); - /* Parse args, settings and user_info */ - sudo_mode = deserialize_info(args, settings, user_info); + /* Parse info from front-end. */ + sudo_mode = sudoers_policy_deserialize_info(info, &runas_user, &runas_group); init_vars(envp); /* XXX - move this later? */ @@ -231,6 +187,7 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation, * Note that if runas_group was specified without runas_user we * defer setting runas_pw so the match routines know to ignore it. */ + /* XXX - qpm4u does more here as it may have already set runas_pw */ if (runas_group != NULL) { set_runasgr(runas_group); if (runas_user != NULL) @@ -252,189 +209,9 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation, 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_fatal() */ - debug_return; - } - - /* We do not currently log the exit status. */ - if (error_code) - warningx(_("unable to execute %s: %s"), safe_cmnd, strerror(error_code)); - - /* Close the session we opened in sudoers_policy_init_session(). */ - if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT)) - (void)sudo_auth_end_session(runas_pw); - - /* Free remaining references to password and group entries. */ - 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, 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_fatal() */ - debug_return_bool(-1); - } - - debug_return_bool(sudo_auth_begin_session(pwd, user_env)); -} - -/* - * Build up command_info list. - * XXX - convert into setter function that takes care - * of command_info, argv_out and user_env_out - */ -static char ** -build_command_info(mode_t cmnd_umask, char *iolog_path) -{ - char **command_info; - int info_len = 0; - debug_decl(build_command_info, SUDO_DEBUG_PLUGIN) - - /* Increase the length of command_info as needed, it is *not* checked. */ - command_info = ecalloc(32, sizeof(char **)); - - command_info[info_len++] = fmt_string("command", safe_cmnd); - if (def_log_input || def_log_output) { - if (iolog_path) - command_info[info_len++] = iolog_path; - if (def_log_input) { - command_info[info_len++] = estrdup("iolog_stdin=true"); - command_info[info_len++] = estrdup("iolog_ttyin=true"); - } - if (def_log_output) { - command_info[info_len++] = estrdup("iolog_stdout=true"); - command_info[info_len++] = estrdup("iolog_stderr=true"); - command_info[info_len++] = estrdup("iolog_ttyout=true"); - } - if (def_compress_io) { - command_info[info_len++] = estrdup("iolog_compress=true"); - } - } - if (ISSET(sudo_mode, MODE_EDIT)) - command_info[info_len++] = estrdup("sudoedit=true"); - if (ISSET(sudo_mode, MODE_LOGIN_SHELL)) { - /* Set cwd to run user's homedir. */ - command_info[info_len++] = fmt_string("cwd", runas_pw->pw_dir); - } - if (def_stay_setuid) { - easprintf(&command_info[info_len++], "runas_uid=%u", - (unsigned int)user_uid); - easprintf(&command_info[info_len++], "runas_gid=%u", - (unsigned int)user_gid); - easprintf(&command_info[info_len++], "runas_euid=%u", - (unsigned int)runas_pw->pw_uid); - easprintf(&command_info[info_len++], "runas_egid=%u", - runas_gr ? (unsigned int)runas_gr->gr_gid : - (unsigned int)runas_pw->pw_gid); - } else { - easprintf(&command_info[info_len++], "runas_uid=%u", - (unsigned int)runas_pw->pw_uid); - easprintf(&command_info[info_len++], "runas_gid=%u", - runas_gr ? (unsigned int)runas_gr->gr_gid : - (unsigned int)runas_pw->pw_gid); - } - if (def_preserve_groups) { - 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 = sudo_get_grlist(runas_pw); - - /* 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++) { - 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; - 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_set_utmp) - command_info[info_len++] = estrdup("set_utmp=true"); - if (def_use_pty) - command_info[info_len++] = estrdup("use_pty=true"); - if (def_utmp_runas) - command_info[info_len++] = fmt_string("utmp_user", runas_pw->pw_name); - if (cmnd_umask != 0777) - easprintf(&command_info[info_len++], "umask=0%o", (unsigned int)cmnd_umask); -#ifdef HAVE_LOGIN_CAP_H - 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) - command_info[info_len++] = fmt_string("selinux_role", user_role); - 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 */ - debug_return_ptr(command_info); -} - -static int +int sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[], - char **command_infop[], char **argv_out[], char **user_env_out[]) + void *closure) { char **edit_argv = NULL; char *iolog_path = NULL; @@ -442,8 +219,24 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[], struct sudo_nss *nss; int cmnd_status = -1, validated; volatile int rval = true; + sigaction_t sa, saved_sa_int, saved_sa_quit, saved_sa_tstp; debug_decl(sudoers_policy_main, SUDO_DEBUG_PLUGIN) + /* + * Signal setup: + * Ignore keyboard-generated signals so the user cannot interrupt + * us at some point and avoid the logging. + * XXX - just block signals for critical sections (logging/auditing) + */ + zero_bytes(&sa, sizeof(sa)); + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; + sa.sa_handler = SIG_IGN; + (void) sigaction(SIGINT, &sa, &saved_sa_int); + (void) sigaction(SIGQUIT, &sa, &saved_sa_quit); + (void) sigaction(SIGTSTP, &sa, &saved_sa_tstp); + + /* XXX - would like to move this to policy.c but need the cleanup. */ if (sigsetjmp(error_jmp, 1)) { /* error recovery via error(), errorx() or log_fatal() */ rval = -1; @@ -720,11 +513,6 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[], /* Insert user-specified environment variables. */ insert_env_vars(sudo_user.env_vars); - /* Restore signal handlers before we exec. */ - (void) sigaction(SIGINT, &saved_sa_int, NULL); - (void) sigaction(SIGQUIT, &saved_sa_quit, NULL); - (void) sigaction(SIGTSTP, &saved_sa_tstp, NULL); - if (ISSET(sudo_mode, MODE_EDIT)) { efree(safe_cmnd); safe_cmnd = find_editor(NewArgc - 1, NewArgv + 1, &edit_argv); @@ -735,14 +523,11 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[], /* Must audit before uid change. */ audit_success(NewArgv); - /* XXX - use a setter that is passed instead of setting - command_infop, argv_out and user_env_out directly */ - *command_infop = build_command_info(cmnd_umask, iolog_path); - - *argv_out = edit_argv ? edit_argv : NewArgv; + /* Setup execution environment to pass back to front-end. */ + rval = sudoers_policy_exec_setup(edit_argv ? edit_argv : NewArgv, + env_get(), cmnd_umask, iolog_path, closure); - /* Get private version of the environment and zero out stashed copy. */ - *user_env_out = env_get(); + /* Zero out stashed copy of environment, it is owned by the front-end. */ env_init(NULL); goto done; @@ -753,6 +538,11 @@ bad: done: rewind_perms(); + /* Restore signal handlers before we exec. */ + (void) sigaction(SIGINT, &saved_sa_int, NULL); + (void) sigaction(SIGQUIT, &saved_sa_quit, NULL); + (void) sigaction(SIGTSTP, &saved_sa_tstp, NULL); + /* Close the password and group files and free up memory. */ sudo_endpwent(); sudo_endgrent(); @@ -760,77 +550,8 @@ done: 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); - - 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); - - 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 -sudoers_policy_list(int argc, char * const argv[], int verbose, - const char *list_user) -{ - int rval; - debug_decl(sudoers_policy_list, SUDO_DEBUG_PLUGIN) - - user_cmnd = "list"; - if (argc) - SET(sudo_mode, MODE_CHECK); - else - SET(sudo_mode, MODE_LIST); - if (verbose) - long_list = 1; - if (list_user) { - list_pw = sudo_getpwnam(list_user); - if (list_pw == NULL) { - warningx(_("unknown user: %s"), list_user); - debug_return_bool(-1); - } - } - rval = sudoers_policy_main(argc, argv, I_LISTPW, NULL, NULL, NULL, NULL); - if (list_user) { - sudo_pw_delref(list_pw); - list_pw = NULL; - } - - debug_return_bool(rval); -} - /* - * Initialize timezone, set umask, fill in ``sudo_user'' struct and - * load the ``interfaces'' array. + * Initialize timezone and fill in ``sudo_user'' struct. */ static void init_vars(char * const envp[]) @@ -863,23 +584,24 @@ init_vars(char * const envp[]) } /* - * Get a local copy of the user's struct passwd with the shadow password - * if necessary. It is assumed that euid is 0 at this point so we - * can read the shadow passwd file if necessary. + * Get a local copy of the user's struct passwd if we don't already + * have one. */ - if ((sudo_user.pw = sudo_getpwuid(user_uid)) == NULL) { - /* - * It is not unusual for users to place "sudo -k" in a .logout - * file which can cause sudo to be run during reboot after the - * YP/NIS/NIS+/LDAP/etc daemon has died. - */ - if (sudo_mode == MODE_KILL || sudo_mode == MODE_INVALIDATE) - errorx(1, _("unknown uid: %u"), (unsigned int) user_uid); + if (sudo_user.pw == NULL) { + if ((sudo_user.pw = sudo_getpwnam(user_name)) == NULL) { + /* + * It is not unusual for users to place "sudo -k" in a .logout + * file which can cause sudo to be run during reboot after the + * YP/NIS/NIS+/LDAP/etc daemon has died. + */ + 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_fatal(). */ - sudo_user.pw = sudo_fakepwnamid(user_name, user_uid, user_gid); - log_fatal(0, _("unknown uid: %u"), (unsigned int) user_uid); - /* NOTREACHED */ + /* 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_fatal(0, _("unknown uid: %u"), (unsigned int) user_uid); + /* NOTREACHED */ + } } /* @@ -1106,7 +828,7 @@ set_loginclass(struct passwd *pw) * 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 +static void set_fqdn(void) { struct addrinfo *res0, hint; @@ -1190,12 +912,12 @@ cb_runas_default(const char *user) * Cleanup hook for error()/errorx() */ void -plugin_cleanup(int gotsignal) +sudoers_plugin_cleanup(int gotsignal) { struct sudo_nss *nss; if (!gotsignal) { - debug_decl(plugin_cleanup, SUDO_DEBUG_PLUGIN) + debug_decl(sudoers_plugin_cleanup, SUDO_DEBUG_PLUGIN) if (snl != NULL) { tq_foreach_fwd(snl, nss) nss->close(nss); @@ -1208,283 +930,6 @@ plugin_cleanup(int gotsignal) } } -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_fatal() */ - debug_return_bool(-1); - } - - sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers policy plugin version %s\n"), - PACKAGE_VERSION); - sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers file grammar version %d\n"), - SUDOERS_GRAMMAR_VERSION); - - if (verbose) { - sudo_printf(SUDO_CONV_INFO_MSG, _("\nSudoers path: %s\n"), sudoers_file); -#ifdef HAVE_LDAP -# ifdef _PATH_NSSWITCH_CONF - sudo_printf(SUDO_CONV_INFO_MSG, _("nsswitch path: %s\n"), _PATH_NSSWITCH_CONF); -# endif - sudo_printf(SUDO_CONV_INFO_MSG, _("ldap.conf path: %s\n"), _PATH_LDAP_CONF); - sudo_printf(SUDO_CONV_INFO_MSG, _("ldap.secret path: %s\n"), _PATH_LDAP_SECRET); -#endif - dump_auth_methods(); - dump_defaults(); - sudo_printf(SUDO_CONV_INFO_MSG, "\n"); - if (interfaces_string != NULL) { - dump_interfaces(interfaces_string); - sudo_printf(SUDO_CONV_INFO_MSG, "\n"); - } - } - debug_return_bool(true); -} - -static int -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++) { - if (MATCHES(*cur, "closefrom=")) { - user_closefrom = atoi(*cur + sizeof("closefrom=") - 1); - continue; - } - 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; - continue; - } - if (MATCHES(*cur, "set_home=")) { - 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) - SET(flags, MODE_PRESERVE_ENV); - continue; - } - if (MATCHES(*cur, "run_shell=")) { - 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) { - SET(flags, MODE_LOGIN_SHELL); - def_env_reset = true; - } - continue; - } - if (MATCHES(*cur, "implied_shell=")) { - 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) - SET(flags, MODE_PRESERVE_GROUPS); - continue; - } - if (MATCHES(*cur, "ignore_ticket=")) { - 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) - SET(flags, MODE_NONINTERACTIVE); - continue; - } - if (MATCHES(*cur, "sudoedit=")) { - 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; - 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; - continue; - } - if (MATCHES(*cur, "selinux_type=")) { - user_type = *cur + sizeof("selinux_type=") - 1; - continue; - } -#endif /* HAVE_SELINUX */ -#ifdef HAVE_BSD_AUTH_H - if (MATCHES(*cur, "bsdauth_type=")) { - login_style = *cur + sizeof("bsdauth_type=") - 1; - continue; - } -#endif /* HAVE_BSD_AUTH_H */ -#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME) - if (MATCHES(*cur, "progname=")) { - setprogname(*cur + sizeof("progname=") - 1); - continue; - } -#endif - if (MATCHES(*cur, "network_addrs=")) { - interfaces_string = *cur + sizeof("network_addrs=") - 1; - set_interfaces(interfaces_string); - continue; - } - } - - for (cur = user_info; *cur != NULL; cur++) { - if (MATCHES(*cur, "user=")) { - user_name = estrdup(*cur + sizeof("user=") - 1); - continue; - } - if (MATCHES(*cur, "uid=")) { - user_uid = (uid_t) atoi(*cur + sizeof("uid=") - 1); - continue; - } - if (MATCHES(*cur, "gid=")) { - p = *cur + sizeof("gid=") - 1; - user_gid = (gid_t) atoi(p); - continue; - } - if (MATCHES(*cur, "groups=")) { - groups = *cur + sizeof("groups=") - 1; - continue; - } - if (MATCHES(*cur, "cwd=")) { - user_cwd = estrdup(*cur + sizeof("cwd=") - 1); - continue; - } - if (MATCHES(*cur, "tty=")) { - user_tty = user_ttypath = estrdup(*cur + sizeof("tty=") - 1); - if (strncmp(user_tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) - user_tty += sizeof(_PATH_DEV) - 1; - continue; - } - if (MATCHES(*cur, "host=")) { - user_host = user_shost = estrdup(*cur + sizeof("host=") - 1); - if ((p = strchr(user_host, '.'))) - user_shost = estrndup(user_host, (size_t)(p - user_host)); - continue; - } - if (MATCHES(*cur, "lines=")) { - sudo_user.lines = atoi(*cur + sizeof("lines=") - 1); - continue; - } - if (MATCHES(*cur, "cols=")) { - sudo_user.cols = atoi(*cur + sizeof("cols=") - 1); - continue; - } - } - if (user_cwd == NULL) - user_cwd = "unknown"; - if (user_tty == NULL) - user_tty = "unknown"; /* user_ttypath remains NULL */ - - if (groups != NULL && groups[0] != '\0') { - const char *cp; - GETGROUPS_T *gids; - int ngids; - - /* Count number of groups, including passwd gid. */ - ngids = 2; - for (cp = groups; *cp != '\0'; cp++) { - if (*cp == ',') - ngids++; - } - - /* The first gid in the list is the passwd group gid. */ - gids = emalloc2(ngids, sizeof(GETGROUPS_T)); - gids[0] = user_gid; - ngids = 1; - cp = groups; - for (;;) { - gids[ngids] = atoi(cp); - if (gids[0] != gids[ngids]) - ngids++; - cp = strchr(cp, ','); - if (cp == NULL) - break; - cp++; /* skip over comma */ - } - 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 - debug_return_int(flags); -} - static char * resolve_editor(const char *ed, size_t edlen, int nfiles, char **files, char ***argv_out) { @@ -1613,42 +1058,3 @@ create_admin_success_flag(void) /* STUB */ } #endif /* USE_ADMIN_FLAG */ - -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, - sudoers_policy_close, - sudoers_policy_version, - sudoers_policy_check, - sudoers_policy_list, - sudoers_policy_validate, - sudoers_policy_invalidate, - sudoers_policy_init_session, - sudoers_policy_register_hooks -}; diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h index 9e731a547..eeb257c43 100644 --- a/plugins/sudoers/sudoers.h +++ b/plugins/sudoers/sudoers.h @@ -86,7 +86,7 @@ struct sudo_user { char *limitprivs; #endif const char *cwd; - const char *iolog_file; + char *iolog_file; GETGROUPS_T *gids; int ngids; int closefrom; @@ -323,7 +323,7 @@ void io_nextid(char *iolog_dir, char *iolog_dir_fallback, char sessid[7]); /* iolog_path.c */ char *expand_iolog_path(const char *prefix, const char *dir, const char *file, - char const **slashp); + char **slashp); /* env.c */ char **env_get(void); @@ -346,9 +346,14 @@ int sudoers_hook_unsetenv(const char *name, void *closure); char *fmt_string(const char *, const char *); /* sudoers.c */ -void plugin_cleanup(int); -void set_fqdn(void); FILE *open_sudoers(const char *, bool, bool *); +int sudoers_policy_init(void *info, char * const envp[]); +int sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[], void *closure); +void sudoers_plugin_cleanup(int); + +/* policy.c */ +int sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group); +int sudoers_policy_exec_setup(char *argv[], char *envp[], mode_t cmnd_umask, char *iolog_path, void *v); /* aix.c */ void aix_restoreauthdb(void); diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c index 837545750..5594313fd 100644 --- a/plugins/sudoers/testsudoers.c +++ b/plugins/sudoers/testsudoers.c @@ -415,12 +415,6 @@ sudo_endspent(void) return; } -void -set_fqdn(void) -{ - return; -} - FILE * open_sudoers(const char *sudoers, bool doedit, bool *keepopen) { diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c index 6b01d6ccc..0b7c10ded 100644 --- a/plugins/sudoers/visudo.c +++ b/plugins/sudoers/visudo.c @@ -649,13 +649,6 @@ done: debug_return_bool(rval); } -/* STUB */ -void -set_fqdn(void) -{ - return; -} - /* STUB */ void init_envtables(void) -- 2.40.0